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

Refactoring of WInput history.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-11-05 13:52:13 +04:00
parent de94164cb5
commit 5a61ac80d0
2 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
lib/widget/input.c
View File

@ -72,7 +72,7 @@ const global_keymap_t *input_map = NULL;
#endif #endif
#define should_show_history_button(in) \ #define should_show_history_button(in) \
(in->history != NULL && WIDGET (in)->cols > HISTORY_BUTTON_WIDTH * 2 + 1 \ (in->history.list != NULL && WIDGET (in)->cols > HISTORY_BUTTON_WIDTH * 2 + 1 \
&& WIDGET (in)->owner != NULL) && WIDGET (in)->owner != NULL)
/*** file scope type declarations ****************************************************************/ /*** file scope type declarations ****************************************************************/
@ -105,9 +105,9 @@ draw_history_button (WInput * in)
char c; char c;
gboolean disabled = (WIDGET (in)->options & W_DISABLED) != 0; gboolean disabled = (WIDGET (in)->options & W_DISABLED) != 0;
if (g_list_next (in->history_current) == NULL) if (g_list_next (in->history.current) == NULL)
c = '^'; c = '^';
else if (g_list_previous (in->history_current) == NULL) else if (g_list_previous (in->history.current) == NULL)
c = 'v'; c = 'v';
else else
c = '|'; c = '|';
@ -193,10 +193,10 @@ do_show_hist (WInput * in)
size_t len; size_t len;
char *r; char *r;
len = get_history_length (in->history); len = get_history_length (in->history.list);
r = history_show (&in->history, WIDGET (in), r = history_show (&in->history.list, WIDGET (in),
g_list_position (in->history_current, in->history)); g_list_position (in->history.list, in->history.list));
if (r != NULL) if (r != NULL)
{ {
input_assign_text (in, r); input_assign_text (in, r);
@ -204,8 +204,8 @@ do_show_hist (WInput * in)
} }
/* Has history cleaned up or not? */ /* Has history cleaned up or not? */
if (len != get_history_length (in->history)) if (len != get_history_length (in->history.list))
in->history_changed = TRUE; in->history.changed = TRUE;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -261,7 +261,7 @@ push_history (WInput * in, const char *text)
g_free (t); g_free (t);
t = g_strdup (empty ? "" : text); t = g_strdup (empty ? "" : text);
if (!empty && in->history_name != NULL && in->strip_password) if (!empty && in->history.name != NULL && in->strip_password)
{ {
/* /*
We got string user:pass@host without any VFS prefixes We got string user:pass@host without any VFS prefixes
@ -275,12 +275,12 @@ push_history (WInput * in, const char *text)
t = url_with_stripped_password; t = url_with_stripped_password;
} }
if (in->history == NULL || in->history->data == NULL || strcmp (in->history->data, t) != 0 || if (in->history.list == NULL || in->history.list->data == NULL
in->history_changed) || strcmp (in->history.list->data, t) != 0 || in->history.changed)
{ {
in->history = list_append_unique (in->history, t); in->history.list = list_append_unique (in->history.list, t);
in->history_current = in->history; in->history.current = in->history.list;
in->history_changed = TRUE; in->history.changed = TRUE;
} }
else else
g_free (t); g_free (t);
@ -637,18 +637,18 @@ hist_prev (WInput * in)
{ {
GList *prev; GList *prev;
if (in->history == NULL) if (in->history.list == NULL)
return; return;
if (in->need_push) if (in->need_push)
push_history (in, in->buffer); push_history (in, in->buffer);
prev = g_list_previous (in->history_current); prev = g_list_previous (in->history.current);
if (prev != NULL) if (prev != NULL)
{ {
input_assign_text (in, (char *) prev->data); input_assign_text (in, (char *) prev->data);
in->history_current = prev; in->history.current = prev;
in->history_changed = TRUE; in->history.changed = TRUE;
in->need_push = FALSE; in->need_push = FALSE;
} }
} }
@ -667,20 +667,20 @@ hist_next (WInput * in)
return; return;
} }
if (in->history == NULL) if (in->history.list == NULL)
return; return;
next = g_list_next (in->history_current); next = g_list_next (in->history.current);
if (next == NULL) if (next == NULL)
{ {
input_assign_text (in, ""); input_assign_text (in, "");
in->history_current = in->history; in->history.current = in->history.list;
} }
else else
{ {
input_assign_text (in, (char *) next->data); input_assign_text (in, (char *) next->data);
in->history_current = next; in->history.current = next;
in->history_changed = TRUE; in->history.changed = TRUE;
in->need_push = FALSE; in->need_push = FALSE;
} }
} }
@ -841,15 +841,15 @@ input_load_history (const gchar * event_group_name, const gchar * event_name,
(void) event_group_name; (void) event_group_name;
(void) event_name; (void) event_name;
in->history = history_load (ev->cfg, in->history_name); in->history.list = history_load (ev->cfg, in->history.name);
in->history_current = in->history; in->history.current = in->history.list;
if (in->init_from_history) if (in->init_from_history)
{ {
const char *def_text = ""; const char *def_text = "";
if (in->history != NULL && in->history->data != NULL) if (in->history.list != NULL && in->history.list->data != NULL)
def_text = (const char *) in->history->data; def_text = (const char *) in->history.list->data;
input_assign_text (in, def_text); input_assign_text (in, def_text);
} }
@ -874,9 +874,9 @@ input_save_history (const gchar * event_group_name, const gchar * event_name,
ev_history_load_save_t *ev = (ev_history_load_save_t *) data; ev_history_load_save_t *ev = (ev_history_load_save_t *) data;
push_history (in, in->buffer); push_history (in, in->buffer);
if (in->history_changed) if (in->history.changed)
history_save (ev->cfg, in->history_name, in->history); history_save (ev->cfg, in->history.name, in->history.list);
in->history_changed = FALSE; in->history.changed = FALSE;
} }
return TRUE; return TRUE;
@ -896,14 +896,14 @@ input_destroy (WInput * in)
input_free_completions (in); input_free_completions (in);
/* clean history */ /* clean history */
if (in->history != NULL) if (in->history.list != NULL)
{ {
/* history is already saved before this moment */ /* history is already saved before this moment */
in->history = g_list_first (in->history); in->history.list = g_list_first (in->history.list);
g_list_foreach (in->history, (GFunc) g_free, NULL); g_list_foreach (in->history.list, (GFunc) g_free, NULL);
g_list_free (in->history); g_list_free (in->history.list);
} }
g_free (in->history_name); g_free (in->history.name);
g_free (in->buffer); g_free (in->buffer);
g_free (kill_buffer); g_free (kill_buffer);
@ -1028,12 +1028,12 @@ input_new (int y, int x, const int *input_colors, int width, const char *def_tex
input_assign_text (in, def_text); input_assign_text (in, def_text);
/* prepare to history setup */ /* prepare to history setup */
in->history = NULL; in->history.list = NULL;
in->history_current = NULL; in->history.current = NULL;
in->history_changed = FALSE; in->history.changed = FALSE;
in->history_name = NULL; in->history.name = NULL;
if ((histname != NULL) && (*histname != '\0')) if ((histname != NULL) && (*histname != '\0'))
in->history_name = g_strdup (histname); in->history.name = g_strdup (histname);
/* history will be loaded later */ /* history will be loaded later */
in->label = NULL; in->label = NULL;

11
lib/widget/input.h
View File

@ -57,10 +57,6 @@ typedef struct
gboolean is_password; /* is this a password input line? */ gboolean is_password; /* is this a password input line? */
gboolean init_from_history; /* init text will be get from history */ gboolean init_from_history; /* init text will be get from history */
char *buffer; /* pointer to editing buffer */ char *buffer; /* pointer to editing buffer */
char *history_name; /* name of history for loading and saving */
GList *history; /* the history */
GList *history_current; /* current history item */
gboolean history_changed; /* the history has changed */
gboolean need_push; /* need to push the current Input on hist? */ gboolean need_push; /* need to push the current Input on hist? */
gboolean strip_password; /* need to strip password before placing string to history */ gboolean strip_password; /* need to strip password before placing string to history */
char **completions; /* possible completions array */ char **completions; /* possible completions array */
@ -68,6 +64,13 @@ typedef struct
char charbuf[MB_LEN_MAX]; /* buffer for multibytes characters */ char charbuf[MB_LEN_MAX]; /* buffer for multibytes characters */
size_t charpoint; /* point to end of mulibyte sequence in charbuf */ size_t charpoint; /* point to end of mulibyte sequence in charbuf */
WLabel *label; /* label associated with this input line */ WLabel *label; /* label associated with this input line */
struct input_history_t
{
char *name; /* name of history for loading and saving */
GList *list; /* the history */
GList *current; /* current history item */
gboolean changed; /* the history has changed */
} history;
} WInput; } WInput;
/*** global variables defined in .c file *********************************************************/ /*** global variables defined in .c file *********************************************************/