mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-24 20:22:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2175: clean quick search input line after interrupt of search.

Browse Source 
Also quick search is interrupted now by any panel command.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-05-25 13:45:40 +04:00
parent f8daba73db
commit 893c020b01
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/screen.c
View File

@ -2484,6 +2484,13 @@ start_search (WPanel * panel)
}
}
static void
stop_search (WPanel * panel)
{
panel->searching = 0;
display_mini_info (panel);
}
/* Return 1 if the Enter key has been processed, 0 otherwise */
static int
do_enter_on_file_entry (file_entry * fe)
@ -2867,6 +2874,9 @@ panel_execute_cmd (WPanel * panel, unsigned long command)
{
int res = MSG_HANDLED;
if (command != CK_PanelStartSearch)
stop_search (panel);
switch (command)
{
case CK_PanelChdirOtherPanel:
@ -3001,28 +3011,10 @@ static cb_ret_t
panel_key (WPanel * panel, int key)
{
size_t i;
unsigned long res, command;
for (i = 0; panel_map[i].key != 0; i++)
{
if (key == panel_map[i].key)
{
int old_searching = panel->searching;
if (panel_map[i].command != CK_PanelStartSearch)
panel->searching = 0;
command = panel_map[i].command;
res = panel_execute_cmd (panel, command);
if (res == MSG_NOT_HANDLED)
return res;
if (panel->searching != old_searching)
display_mini_info (panel);
return MSG_HANDLED;
}
}
return panel_execute_cmd (panel, panel_map[i].command);
if (torben_fj_mode && key == ALT ('h'))
{
@ -3032,8 +3024,7 @@ panel_key (WPanel * panel, int key)
if (is_abort_char (key))
{
panel->searching = 0;
display_mini_info (panel);
stop_search (panel);
return MSG_HANDLED;
}
@ -3095,11 +3086,7 @@ panel_callback (Widget * w, widget_msg_t msg, int parm)
case WIDGET_UNFOCUS:
/* Janne: look at this for the multiple panel options */
if (panel->searching)
{
panel->searching = 0;
display_mini_info (panel);
}
stop_search (panel);
panel->active = 0;
show_dir (panel);
unselect_item (panel);