From f5d67dcb5c719af909ae498c7665e2b9eecee7bf Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 8 Mar 2001 00:45:56 +0000 Subject: [PATCH] Command history: allow "next history" to jump back to last msg in history if we already went over it with "prev history" once. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1365 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/core/command-history.c | 104 +++++++++++++++------------ src/fe-common/core/fe-queries.c | 20 ++++-- src/fe-common/core/fe-windows.h | 4 +- 3 files changed, 77 insertions(+), 51 deletions(-) diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c index 7f1d771d..cdf4b5a5 100644 --- a/src/fe-common/core/command-history.c +++ b/src/fe-common/core/command-history.c @@ -28,50 +28,61 @@ #include "window-items.h" /* command history */ -static GList *cmdhist, *histpos; -static int histlines; +static GList *history, *history_pos; +static int history_lines, history_over_counter; static int window_history; void command_history_add(WINDOW_REC *window, const char *text) { - GList **pcmdhist, *link; - int *phistlines; + GList **phistory, *link; + int *phistory_lines; g_return_if_fail(text != NULL); if (window_history) { /* window specific command history */ - pcmdhist = &window->cmdhist; - phistlines = &window->histlines; + phistory = &window->history; + phistory_lines = &window->history_lines; } else { /* global command history */ - pcmdhist = &cmdhist; - phistlines = &histlines; + phistory = &history; + phistory_lines = &history_lines; } - if (settings_get_int("max_command_history") < 1 || *phistlines < settings_get_int("max_command_history")) - (*phistlines)++; + if (settings_get_int("max_command_history") < 1 || *phistory_lines < settings_get_int("max_command_history")) + (*phistory_lines)++; else { - link = *pcmdhist; + link = *phistory; g_free(link->data); - *pcmdhist = g_list_remove_link(*pcmdhist, link); + *phistory = g_list_remove_link(*phistory, link); g_list_free_1(link); } - *pcmdhist = g_list_append(*pcmdhist, g_strdup(text)); + *phistory = g_list_append(*phistory, g_strdup(text)); } const char *command_history_prev(WINDOW_REC *window, const char *text) { - GList *pos, **phistpos; + GList *pos, **phistory_pos; + int *phistory_over_counter; - phistpos = window_history ? &window->histpos : &histpos; + if (window_history) { + phistory_pos = &window->history_pos; + phistory_over_counter = &window->history_over_counter; + } else { + phistory_pos = &history_pos; + phistory_over_counter = &history_over_counter; + } - pos = *phistpos; - if (*phistpos == NULL) - *phistpos = g_list_last(window_history ? window->cmdhist : cmdhist); - else - *phistpos = (*phistpos)->prev; + pos = *phistory_pos; + if (*phistory_pos != NULL) { + *phistory_pos = (*phistory_pos)->prev; + if (*phistory_pos == NULL) + (*phistory_over_counter)++; + } else { + *phistory_pos = g_list_last(window_history ? + window->history : history); + } if (*text != '\0' && (pos == NULL || strcmp(pos->data, text) != 0)) { @@ -79,45 +90,51 @@ const char *command_history_prev(WINDOW_REC *window, const char *text) command_history_add(window, text); } - return *phistpos == NULL ? "" : (*phistpos)->data; + return *phistory_pos == NULL ? "" : (*phistory_pos)->data; } const char *command_history_next(WINDOW_REC *window, const char *text) { - GList *pos, **phistpos; + GList *pos, **phistory_pos; + int *phistory_over_counter; - phistpos = window_history ? &window->histpos : &histpos; + if (window_history) { + phistory_pos = &window->history_pos; + phistory_over_counter = &window->history_over_counter; + } else { + phistory_pos = &history_pos; + phistory_over_counter = &history_over_counter; + } - pos = *phistpos; + pos = *phistory_pos; if (pos != NULL) - *phistpos = (*phistpos)->next; + *phistory_pos = (*phistory_pos)->next; + else if (*phistory_over_counter > 0) { + (*phistory_over_counter)--; + *phistory_pos = window_history ? window->history : history; + } if (*text != '\0' && (pos == NULL || strcmp(pos->data, text) != 0)) { /* save the old entry to history */ command_history_add(window, text); } - return *phistpos == NULL ? "" : (*phistpos)->data; + return *phistory_pos == NULL ? "" : (*phistory_pos)->data; } void command_history_clear_pos(WINDOW_REC *window) { - window->histpos = NULL; - histpos = NULL; -} - -static void sig_window_created(WINDOW_REC *window) -{ - window->histlines = 0; - window->cmdhist = NULL; - window->histpos = NULL; + window->history_over_counter = 0; + window->history_pos = NULL; + history_over_counter = 0; + history_pos = NULL; } static void sig_window_destroyed(WINDOW_REC *window) { - g_list_foreach(window->cmdhist, (GFunc) g_free, NULL); - g_list_free(window->cmdhist); + g_list_foreach(window->history, (GFunc) g_free, NULL); + g_list_free(window->history); } static char *special_history_func(const char *text, void *item, int *free_ret) @@ -131,7 +148,7 @@ static char *special_history_func(const char *text, void *item, int *free_ret) findtext = g_strdup_printf("*%s*", text); ret = NULL; - tmp = window_history ? window->cmdhist : cmdhist; + tmp = window_history ? window->history : history; for (; tmp != NULL; tmp = tmp->next) { const char *line = tmp->data; @@ -157,20 +174,19 @@ void command_history_init(void) special_history_func_set(special_history_func); - histlines = 0; - cmdhist = NULL; histpos = NULL; + history_lines = 0; history_over_counter = 0; + history = NULL; history_pos = NULL; + read_settings(); - signal_add("window created", (SIGNAL_FUNC) sig_window_created); signal_add("window destroyed", (SIGNAL_FUNC) sig_window_destroyed); signal_add("setup changed", (SIGNAL_FUNC) read_settings); } void command_history_deinit(void) { - signal_remove("window created", (SIGNAL_FUNC) sig_window_created); signal_remove("window destroyed", (SIGNAL_FUNC) sig_window_destroyed); signal_remove("setup changed", (SIGNAL_FUNC) read_settings); - g_list_foreach(cmdhist, (GFunc) g_free, NULL); - g_list_free(cmdhist); + g_list_foreach(history, (GFunc) g_free, NULL); + g_list_free(history); } diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c index c1ffdc9b..1924464a 100644 --- a/src/fe-common/core/fe-queries.c +++ b/src/fe-common/core/fe-queries.c @@ -190,12 +190,12 @@ static void cmd_unquery(const char *data, SERVER_REC *server, WI_ITEM_REC *item) query_destroy(query); } -/* SYNTAX: QUERY [-window] */ +/* SYNTAX: QUERY [-window] [-] [] */ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) { GHashTable *optlist; QUERY_REC *query; - char *nick; + char *nick, *msg; void *free_arg; g_return_if_fail(data != NULL); @@ -206,9 +206,9 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) return; } - if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | - PARAM_FLAG_UNKNOWN_OPTIONS, - "query", &optlist, &nick)) + if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | + PARAM_FLAG_OPTIONS | PARAM_FLAG_UNKNOWN_OPTIONS, + "query", &optlist, &nick, &msg)) return; if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); @@ -253,6 +253,16 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) (SIGNAL_FUNC) signal_query_created_curwin); } + if (*msg != '\0') { + /* FIXME: we'll need some function that does both + of these. and separate the , and . target handling + from own_private messagge.. */ + server->send_message(server, nick, msg); + + signal_emit("message own_private", 4, + server, msg, nick, nick); + } + cmd_params_free(free_arg); } diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h index ed490bd5..3f710a27 100644 --- a/src/fe-common/core/fe-windows.h +++ b/src/fe-common/core/fe-windows.h @@ -38,8 +38,8 @@ typedef struct { unsigned int destroying:1; /* window-specific command line history */ - GList *cmdhist, *histpos; - int histlines; + GList *history, *history_pos; + int history_lines, history_over_counter; int data_level; /* current data level */ int hilight_color, hilight_bg_color; /* current hilight color */