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

WPanel: use structure for quick search fields.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-07-26 16:46:56 +03:00
parent 968d24a38c
commit da223237c8
5 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filemanager/cmd.c
View File

@ -1275,7 +1275,7 @@ help_cmd (void)
{
ev_help_t event_data = { NULL, NULL };
if (current_panel->searching)
if (current_panel->quick_search.active)
event_data.node = "[Quick search]";
else
event_data.node = "[main]";

4
src/filemanager/layout.c
View File

@ -1277,8 +1277,8 @@ swap_panels (void)
panelswap (dir_stat);
#undef panelswap
panel1->searching = FALSE;
panel2->searching = FALSE;
panel1->quick_search.active = FALSE;
panel2->quick_search.active = FALSE;
if (current_panel == panel1)
current_panel = panel2;

4
src/filemanager/midnight.c
View File

@ -1558,7 +1558,7 @@ midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
if ((!mc_global.tty.alternate_plus_minus
|| !(mc_global.tty.console_flag != '\0' || mc_global.tty.xterm_flag)) && !quote
&& !current_panel->searching)
&& !current_panel->quick_search.active)
{
if (!only_leading_plus_minus)
{
@ -1594,7 +1594,7 @@ midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
return MSG_NOT_HANDLED;
case MSG_HOTKEY_HANDLED:
if ((get_current_type () == view_listing) && current_panel->searching)
if ((get_current_type () == view_listing) && current_panel->quick_search.active)
{
current_panel->dirty = 1; /* FIXME: unneeded? */
send_message (current_panel, NULL, MSG_ACTION, CK_SearchStop, NULL);

73
src/filemanager/panel.c
View File

@ -990,11 +990,11 @@ display_mini_info (WPanel * panel)
widget_gotoyx (w, panel_lines (panel) + 3, 1);
if (panel->searching)
if (panel->quick_search.active)
{
tty_setcolor (INPUT_COLOR);
tty_print_char ('/');
tty_print_string (str_fit_to_term (panel->search_buffer, w->cols - 3, J_LEFT));
tty_print_string (str_fit_to_term (panel->quick_search.buffer, w->cols - 3, J_LEFT));
return;
}
@ -2634,47 +2634,48 @@ do_search (WPanel * panel, int c_code)
char *reg_exp, *esc_str;
gboolean is_found = FALSE;
l = strlen (panel->search_buffer);
l = strlen (panel->quick_search.buffer);
if (c_code == KEY_BACKSPACE)
{
if (l != 0)
{
act = panel->search_buffer + l;
str_prev_noncomb_char (&act, panel->search_buffer);
act = panel->quick_search.buffer + l;
str_prev_noncomb_char (&act, panel->quick_search.buffer);
act[0] = '\0';
}
panel->search_chpoint = 0;
panel->quick_search.chpoint = 0;
}
else
{
if (c_code != 0 && (gsize) panel->search_chpoint < sizeof (panel->search_char))
if (c_code != 0 && (gsize) panel->quick_search.chpoint < sizeof (panel->quick_search.ch))
{
panel->search_char[panel->search_chpoint] = c_code;
panel->search_chpoint++;
panel->quick_search.ch[panel->quick_search.chpoint] = c_code;
panel->quick_search.chpoint++;
}
if (panel->search_chpoint > 0)
if (panel->quick_search.chpoint > 0)
{
switch (str_is_valid_char (panel->search_char, panel->search_chpoint))
switch (str_is_valid_char (panel->quick_search.ch, panel->quick_search.chpoint))
{
case -2:
return;
case -1:
panel->search_chpoint = 0;
panel->quick_search.chpoint = 0;
return;
default:
if (l + panel->search_chpoint < sizeof (panel->search_buffer))
if (l + panel->quick_search.chpoint < sizeof (panel->quick_search.buffer))
{
memcpy (panel->search_buffer + l, panel->search_char, panel->search_chpoint);
l += panel->search_chpoint;
panel->search_buffer[l] = '\0';
panel->search_chpoint = 0;
memcpy (panel->quick_search.buffer + l, panel->quick_search.ch,
panel->quick_search.chpoint);
l += panel->quick_search.chpoint;
panel->quick_search.buffer[l] = '\0';
panel->quick_search.chpoint = 0;
}
}
}
}
reg_exp = g_strdup_printf ("%s*", panel->search_buffer);
reg_exp = g_strdup_printf ("%s*", panel->quick_search.buffer);
esc_str = strutils_escape (reg_exp, -1, ",|\\{}[]", TRUE);
search = mc_search_new (esc_str, NULL);
search->search_type = MC_SEARCH_T_GLOB;
@ -2720,8 +2721,8 @@ do_search (WPanel * panel, int c_code)
}
else if (c_code != KEY_BACKSPACE)
{
act = panel->search_buffer + l;
str_prev_noncomb_char (&act, panel->search_buffer);
act = panel->quick_search.buffer + l;
str_prev_noncomb_char (&act, panel->quick_search.buffer);
act[0] = '\0';
}
mc_search_free (search);
@ -2737,7 +2738,7 @@ do_search (WPanel * panel, int c_code)
static void
start_search (WPanel * panel)
{
if (panel->searching)
if (panel->quick_search.active)
{
if (panel->selected == panel->dir.len - 1)
panel->selected = 0;
@ -2746,18 +2747,18 @@ start_search (WPanel * panel)
/* in case if there was no search string we need to recall
previous string, with which we ended previous searching */
if (panel->search_buffer[0] == '\0')
g_strlcpy (panel->search_buffer, panel->prev_search_buffer,
sizeof (panel->search_buffer));
if (panel->quick_search.buffer[0] == '\0')
g_strlcpy (panel->quick_search.buffer, panel->quick_search.prev_buffer,
sizeof (panel->quick_search.buffer));
do_search (panel, 0);
}
else
{
panel->searching = TRUE;
panel->search_buffer[0] = '\0';
panel->search_char[0] = '\0';
panel->search_chpoint = 0;
panel->quick_search.active = TRUE;
panel->quick_search.buffer[0] = '\0';
panel->quick_search.ch[0] = '\0';
panel->quick_search.chpoint = 0;
display_mini_info (panel);
mc_refresh ();
}
@ -2768,13 +2769,13 @@ start_search (WPanel * panel)
static void
stop_search (WPanel * panel)
{
panel->searching = FALSE;
panel->quick_search.active = FALSE;
/* if user had overrdied search string, we need to store it
to the previous_search_buffer */
if (panel->search_buffer[0] != '\0')
g_strlcpy (panel->prev_search_buffer, panel->search_buffer,
sizeof (panel->prev_search_buffer));
/* if user overrdied search string, we need to store it
to the quick_search.prev_buffer */
if (panel->quick_search.buffer[0] != '\0')
g_strlcpy (panel->quick_search.prev_buffer, panel->quick_search.buffer,
sizeof (panel->quick_search.prev_buffer));
display_mini_info (panel);
}
@ -3601,7 +3602,7 @@ panel_key (WPanel * panel, int key)
return MSG_HANDLED;
}
if (panel->searching && ((key >= ' ' && key <= 255) || key == KEY_BACKSPACE))
if (panel->quick_search.active && ((key >= ' ' && key <= 255) || key == KEY_BACKSPACE))
{
do_search (panel, key);
return MSG_HANDLED;
@ -4235,7 +4236,7 @@ panel_clean_dir (WPanel * panel)
panel->marked = 0;
panel->dirs_marked = 0;
panel->total = 0;
panel->searching = FALSE;
panel->quick_search.active = FALSE;
panel->is_panelized = FALSE;
panel->dirty = 1;
panel->content_shift = -1;

14
src/filemanager/panel.h
View File

@ -134,11 +134,15 @@ typedef struct
GList *current; /* Pointer to the current history item */
} dir_history;
gboolean searching;
char search_buffer[MC_MAXFILENAMELEN];
char prev_search_buffer[MC_MAXFILENAMELEN];
char search_char[MB_LEN_MAX]; /*buffer for multibytes characters */
int search_chpoint; /*point after last characters in search_char */
struct
{
gboolean active;
char buffer[MC_MAXFILENAMELEN];
char prev_buffer[MC_MAXFILENAMELEN];
char ch[MB_LEN_MAX]; /* Buffer for multi-byte character */
int chpoint; /* Point after last characters in @ch */
} quick_search;
int content_shift; /* Number of characters of filename need to skip from left side. */
int max_shift; /* Max shift for visible part of current panel */
} WPanel;