4 files changed, 410 insertions, 27 deletions

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 55474b1b..32d7adaa 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -30,10 +30,93 @@
 #include "command-history.h"
 
 /* command history */
+static GList *history_entries;
 static HISTORY_REC *global_history;
 static int window_history;
 static GSList *histories;
 
+static HISTORY_ENTRY_REC *history_entry_new(HISTORY_REC *history, const char *text)
+{
+	HISTORY_ENTRY_REC *entry;
+
+	entry = g_new0(HISTORY_ENTRY_REC, 1);
+	entry->text = g_strdup(text);
+	entry->history = history;
+	entry->time = time(NULL);
+
+	return entry;
+}
+
+static void history_entry_destroy(HISTORY_ENTRY_REC *entry)
+{
+	g_free((char *)entry->text);
+	g_free(entry);
+}
+
+GList *command_history_list_last(HISTORY_REC *history)
+{
+	GList *link;
+
+	link = g_list_last(history_entries);
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->prev;
+	}
+
+	return link;
+}
+
+GList *command_history_list_first(HISTORY_REC *history)
+{
+	GList *link;
+
+	link = history_entries;
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->next;
+	}
+
+	return link;
+}
+
+GList *command_history_list_prev(HISTORY_REC *history, GList *pos)
+{
+	GList *link;
+
+	link = pos != NULL ? pos->prev : NULL;
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->prev;
+	}
+
+	return link;
+}
+
+GList *command_history_list_next(HISTORY_REC *history, GList *pos)
+{
+	GList *link;
+
+	link = pos != NULL ? pos->next : NULL;
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->next;
+	}
+
+	return link;
+}
+
+static void command_history_clear_pos_for_unlink_func(HISTORY_REC *history, GList* link)
+{
+	if (history->pos == link) {
+		history->pos = command_history_list_next(history, link);
+		history->redo = 1;
+	}
+}
+
+static void history_list_delete_link_and_destroy(GList *link)
+{
+	g_slist_foreach(histories,
+		       (GFunc) command_history_clear_pos_for_unlink_func, link);
+	history_entry_destroy(link->data);
+	history_entries = g_list_delete_link(history_entries, link);
+}
+
 void command_history_add(HISTORY_REC *history, const char *text)
 {
 	GList *link;
@@ -41,21 +124,19 @@ void command_history_add(HISTORY_REC *history, const char *text)
 	g_return_if_fail(history != NULL);
 	g_return_if_fail(text != NULL);
 
-	link = g_list_last(history->list);
-	if (link != NULL && g_strcmp0(link->data, text) == 0)
-	  return; /* same as previous entry */
+	link = command_history_list_last(history);
+	if (link != NULL && g_strcmp0(((HISTORY_ENTRY_REC *)link->data)->text, text) == 0)
+		return; /* same as previous entry */
 
 	if (settings_get_int("max_command_history") < 1 ||
 	    history->lines < settings_get_int("max_command_history"))
 		history->lines++;
 	else {
-		link = history->list;
-		g_free(link->data);
-		history->list = g_list_remove_link(history->list, link);
-		g_list_free_1(link);
+		link = command_history_list_first(history);
+		history_list_delete_link_and_destroy(link);
 	}
 
-	history->list = g_list_append(history->list, g_strdup(text));
+	history_entries = g_list_append(history_entries, history_entry_new(history, text));
 }
 
 HISTORY_REC *command_history_find(HISTORY_REC *history)
@@ -87,6 +168,61 @@ HISTORY_REC *command_history_find_name(const char *name)
 	return NULL;
 }
 
+static int history_entry_after_time_sort(const HISTORY_ENTRY_REC *a, const HISTORY_ENTRY_REC *b)
+{
+	return a->time == b->time ? 1 : a->time - b->time;
+}
+
+void command_history_load_entry(time_t history_time, HISTORY_REC *history, const char *text)
+{
+	HISTORY_ENTRY_REC *entry;
+
+	g_return_if_fail(history != NULL);
+	g_return_if_fail(text != NULL);
+
+	entry = g_new0(HISTORY_ENTRY_REC, 1);
+	entry->text = g_strdup(text);
+	entry->history = history;
+	entry->time = history_time;
+
+	history->lines++;
+
+	history_entries = g_list_insert_sorted(history_entries, entry, (GCompareFunc)history_entry_after_time_sort);
+}
+
+static int history_entry_find_func(const HISTORY_ENTRY_REC *data, const HISTORY_ENTRY_REC *user_data)
+{
+	if ((user_data->time == -1 || (data->time == user_data->time)) &&
+	    (user_data->history == NULL || (data->history == user_data->history)) &&
+	    g_strcmp0(data->text, user_data->text) == 0) {
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+gboolean command_history_delete_entry(time_t history_time, HISTORY_REC *history, const char *text)
+{
+	GList *link;
+	HISTORY_ENTRY_REC entry;
+
+	g_return_val_if_fail(history != NULL, FALSE);
+	g_return_val_if_fail(text != NULL, FALSE);
+
+	entry.text = text;
+	entry.history = history;
+	entry.time = history_time;
+
+	link = g_list_find_custom(history_entries, &entry, (GCompareFunc)history_entry_find_func);
+	if (link != NULL) {
+		((HISTORY_ENTRY_REC *)link->data)->history->lines--;
+		history_list_delete_link_and_destroy(link);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
 HISTORY_REC *command_history_current(WINDOW_REC *window)
 {
 	HISTORY_REC *rec;
@@ -104,32 +240,44 @@ HISTORY_REC *command_history_current(WINDOW_REC *window)
 	return global_history;
 }
 
-const char *command_history_prev(WINDOW_REC *window, const char *text)
+static const char *command_history_prev_int(WINDOW_REC *window, const char *text, gboolean global)
 {
 	HISTORY_REC *history;
 	GList *pos;
 
 	history = command_history_current(window);
 	pos = history->pos;
+	history->redo = 0;
 
 	if (pos != NULL) {
 		/* don't go past the first entry (no wrap around) */
-		if (history->pos->prev != NULL)
-			history->pos = history->pos->prev;
+		GList *prev = command_history_list_prev(global ? NULL : history, history->pos);
+		if (prev != NULL)
+			history->pos = prev;
 	} else {
-		history->pos = g_list_last(history->list);
+		history->pos = command_history_list_last(global ? NULL : history);
 	}
 
 	if (*text != '\0' &&
-	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {
+	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
 		command_history_add(history, text);
 	}
 
-	return history->pos == NULL ? text : history->pos->data;
+	return history->pos == NULL ? text : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
 }
 
-const char *command_history_next(WINDOW_REC *window, const char *text)
+const char *command_history_prev(WINDOW_REC *window, const char *text)
+{
+	return command_history_prev_int(window, text, FALSE);
+}
+
+const char *command_global_history_prev(WINDOW_REC *window, const char *text)
+{
+	return command_history_prev_int(window, text, TRUE);
+}
+
+static const char *command_history_next_int(WINDOW_REC *window, const char *text, gboolean global)
 {
 	HISTORY_REC *history;
 	GList *pos;
@@ -137,15 +285,43 @@ const char *command_history_next(WINDOW_REC *window, const char *text)
 	history = command_history_current(window);
 	pos = history->pos;
 
-	if (pos != NULL)
-		history->pos = history->pos->next;
+	if (!(history->redo) && pos != NULL)
+		history->pos = command_history_list_next(global ? NULL : history, history->pos);
+	history->redo = 0;
 
 	if (*text != '\0' &&
-	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {
+	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
 		command_history_add(history, text);
 	}
-	return history->pos == NULL ? "" : history->pos->data;
+	return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
+}
+
+const char *command_history_next(WINDOW_REC *window, const char *text)
+{
+	return command_history_next_int(window, text, FALSE);
+}
+
+const char *command_global_history_next(WINDOW_REC *window, const char *text)
+{
+	return command_history_next_int(window, text, TRUE);
+}
+
+const char *command_history_delete_current(WINDOW_REC *window, const char *text)
+{
+	HISTORY_REC *history;
+	GList *pos;
+
+	history = command_history_current(window);
+	pos = history->pos;
+
+	if (pos != NULL && g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) == 0) {
+		((HISTORY_ENTRY_REC *)pos->data)->history->lines--;
+		history_list_delete_link_and_destroy(pos);
+	}
+
+	history->redo = 0;
+	return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
 }
 
 void command_history_clear_pos_func(HISTORY_REC *history, gpointer user_data)
@@ -175,12 +351,17 @@ HISTORY_REC *command_history_create(const char *name)
 
 void command_history_clear(HISTORY_REC *history)
 {
+	GList *link, *next;
+
 	g_return_if_fail(history != NULL);
 
 	command_history_clear_pos_func(history, NULL);
-	g_list_foreach(history->list, (GFunc) g_free, NULL);
-	g_list_free(history->list);
-	history->list = NULL;
+	link = command_history_list_first(history);
+	while (link != NULL) {
+		next = command_history_list_next(history, link);
+		history_list_delete_link_and_destroy(link);
+		link = next;
+	}
 	history->lines = 0;
 }
 
@@ -264,8 +445,8 @@ static char *special_history_func(const char *text, void *item, int *free_ret)
 	ret = NULL;
 
 	history = command_history_current(window);
-	for (tmp = history->list; tmp != NULL; tmp = tmp->next) {
-		const char *line = tmp->data;
+	for (tmp = command_history_list_first(history); tmp != NULL; tmp = command_history_list_next(history, tmp)) {
+		const char *line = ((HISTORY_ENTRY_REC *)tmp->data)->text;
 
 		if (match_wildcards(findtext, line)) {
 			*free_ret = TRUE;
@@ -289,6 +470,8 @@ void command_history_init(void)
 
 	special_history_func_set(special_history_func);
 
+	history_entries = NULL;
+
 	global_history = command_history_create(NULL);
 
 	read_settings();
@@ -308,4 +491,6 @@ void command_history_deinit(void)
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
 	command_history_destroy(global_history);
+
+	g_list_free_full(history_entries, (GDestroyNotify) history_entry_destroy);
 }
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 45126092..ed093415 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -6,12 +6,19 @@
 typedef struct {
 	char *name;
 
-	GList *list, *pos;
+	GList *pos;
 	int lines;
 
 	int refcount;
+	int redo:1;
 } HISTORY_REC;
 
+typedef struct {
+	const char *text;
+	HISTORY_REC *history;
+	time_t time;
+} HISTORY_ENTRY_REC;
+
 HISTORY_REC *command_history_find(HISTORY_REC *history);
 HISTORY_REC *command_history_find_name(const char *name);
 
@@ -21,9 +28,19 @@ void command_history_init(void);
 void command_history_deinit(void);
 
 void command_history_add(HISTORY_REC *history, const char *text);
+void command_history_load_entry(time_t time, HISTORY_REC *history, const char *text);
+gboolean command_history_delete_entry(time_t history_time, HISTORY_REC *history, const char *text);
+
+GList *command_history_list_last(HISTORY_REC *history);
+GList *command_history_list_first(HISTORY_REC *history);
+GList *command_history_list_prev(HISTORY_REC *history, GList *pos);
+GList *command_history_list_next(HISTORY_REC *history, GList *pos);
 
 const char *command_history_prev(WINDOW_REC *window, const char *text);
 const char *command_history_next(WINDOW_REC *window, const char *text);
+const char *command_global_history_prev(WINDOW_REC *window, const char *text);
+const char *command_global_history_next(WINDOW_REC *window, const char *text);
+const char *command_history_delete_current(WINDOW_REC *window, const char *text);
 
 void command_history_clear_pos(WINDOW_REC *window);
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 3688f15e..b3a78396 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -530,6 +530,39 @@ static void key_forward_history(void)
         g_free(line);
 }
 
+static void key_backward_global_history(void)
+{
+	const char *text;
+	char *line;
+
+	line = gui_entry_get_text(active_entry);
+	text = command_global_history_prev(active_win, line);
+	gui_entry_set_text(active_entry, text);
+	g_free(line);
+}
+
+static void key_forward_global_history(void)
+{
+	const char *text;
+	char *line;
+
+	line = gui_entry_get_text(active_entry);
+	text = command_global_history_next(active_win, line);
+	gui_entry_set_text(active_entry, text);
+	g_free(line);
+}
+
+static void key_erase_history_entry(void)
+{
+	const char *text;
+	char *line;
+
+	line = gui_entry_get_text(active_entry);
+	text = command_history_delete_current(active_win, line);
+	gui_entry_set_text(active_entry, text);
+	g_free(line);
+}
+
 static void key_beginning_of_line(void)
 {
         gui_entry_set_pos(active_entry, 0);
@@ -1176,6 +1209,8 @@ void gui_readline_init(void)
 	key_bind("key", NULL, "meta2-5C", "cright", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;5D", "cleft", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;5C", "cright", (SIGNAL_FUNC) key_combo);
+	key_bind("key", NULL, "meta2-1;5A", "cup", (SIGNAL_FUNC) key_combo);
+	key_bind("key", NULL, "meta2-1;5B", "cdown", (SIGNAL_FUNC) key_combo);
 
 	key_bind("key", NULL, "meta2-1;3A", "mup", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;3B", "mdown", (SIGNAL_FUNC) key_combo);
@@ -1217,6 +1252,9 @@ void gui_readline_init(void)
         /* history */
 	key_bind("backward_history", "Go back one line in the history", "up", NULL, (SIGNAL_FUNC) key_backward_history);
 	key_bind("forward_history", "Go forward one line in the history", "down", NULL, (SIGNAL_FUNC) key_forward_history);
+	key_bind("backward_global_history", "Go back one line in the global history", "cup", NULL, (SIGNAL_FUNC) key_backward_global_history);
+	key_bind("forward_global_history", "Go forward one line in the global history", "cdown", NULL, (SIGNAL_FUNC) key_forward_global_history);
+	key_bind("erase_history_entry", "Erase the currently active entry from the history", NULL, NULL, (SIGNAL_FUNC) key_erase_history_entry);
 
         /* line editing */
 	key_bind("backspace", "Delete the previous character", "backspace", NULL, (SIGNAL_FUNC) key_backspace);
@@ -1310,6 +1348,9 @@ void gui_readline_deinit(void)
 
 	key_unbind("backward_history", (SIGNAL_FUNC) key_backward_history);
 	key_unbind("forward_history", (SIGNAL_FUNC) key_forward_history);
+	key_unbind("backward_global_history", (SIGNAL_FUNC) key_backward_global_history);
+	key_unbind("forward_global_history", (SIGNAL_FUNC) key_forward_global_history);
+	key_unbind("erase_history_entry", (SIGNAL_FUNC) key_erase_history_entry);
 
 	key_unbind("backspace", (SIGNAL_FUNC) key_backspace);
 	key_unbind("delete_character", (SIGNAL_FUNC) key_delete_character);
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index 8c994cc2..85e284bb 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -252,8 +252,148 @@ PREINIT:
 	GList *tmp;
 PPCODE:
 	rec = command_history_current(window);
-	for (tmp = rec->list; tmp != NULL; tmp = tmp->next)
-		XPUSHs(sv_2mortal(new_pv(tmp->data)));
+	for (tmp = command_history_list_first(rec); tmp != NULL; tmp = command_history_list_next(rec, tmp))
+		XPUSHs(sv_2mortal(new_pv(((HISTORY_ENTRY_REC *)tmp->data)->text)));
+
+void
+window_get_history_entries(window)
+	Irssi::UI::Window window
+PREINIT:
+	HISTORY_REC *rec;
+	HISTORY_ENTRY_REC *ent;
+	WINDOW_REC *win;
+	GList *tmp;
+	GSList *stmp;
+	HV *hv;
+PPCODE:
+	rec = window == NULL ? NULL : command_history_current(window);
+	for (tmp = command_history_list_first(rec); tmp != NULL; tmp = command_history_list_next(rec, tmp)) {
+		hv = (HV*)sv_2mortal((SV*)newHV());
+		ent = tmp->data;
+		hv_store(hv, "text", 4, newSVpv(ent->text, 0), 0);
+		hv_store(hv, "time", 4, newSViv(ent->time), 0);
+		if (ent->history == command_history_current(NULL)) {
+			hv_store(hv, "history", 7, newSV(0), 0);
+			hv_store(hv, "window", 6, newSV(0), 0);
+		} else {
+			if (ent->history->name == NULL) {
+				hv_store(hv, "history", 7, newSV(0), 0);
+				for (stmp = windows; stmp != NULL; stmp = stmp->next) {
+					win = stmp->data;
+					if (win->history == ent->history) {
+						hv_store(hv, "window", 6, newSViv(win->refnum), 0);
+						break;
+					}
+				}
+			} else {
+				hv_store(hv, "history", 7, new_pv(ent->history->name), 0);
+				hv_store(hv, "window", 6, newSV(0), 0);
+			}
+		}
+		XPUSHs(sv_2mortal(newRV_inc((SV*)hv)));
+	}
+
+void
+window_load_history_entries(window, ...)
+	Irssi::UI::Window window
+PREINIT:
+	HV *hv;
+	SV **sv;
+	HISTORY_REC *history;
+	WINDOW_REC *tmp;
+	const char *text;
+	long hist_time;
+	int i;
+PPCODE:
+	for (i = 1; i < items; i++) {
+		if (!is_hvref(ST(i))) {
+			croak("Usage: Irssi::UI::Window::load_history_entries(window, hash...)");
+		}
+		hv = hvref(ST(i));
+		if (hv != NULL) {
+			tmp = NULL;
+			text = NULL;
+			hist_time = time(NULL);
+			history = command_history_current(NULL);
+
+			sv = hv_fetch(hv, "text", 4, 0);
+			if (sv != NULL) text = SvPV_nolen(*sv);
+			sv = hv_fetch(hv, "time", 4, 0);
+			if (sv != NULL && SvOK(*sv)) hist_time = SvIV(*sv);
+
+			if (window != NULL) {
+				history = command_history_current(window);
+			} else {
+				sv = hv_fetch(hv, "history", 7, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					history = command_history_find_name(SvPV_nolen(*sv));
+				}
+
+				sv = hv_fetch(hv, "window", 6, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					tmp = window_find_refnum(SvIV(*sv));
+					if (tmp != NULL) {
+						history = tmp->history;
+					}
+				}
+			}
+
+			if (text != NULL && history != NULL) {
+				command_history_load_entry(hist_time, history, text);
+			}
+		}
+	}
+
+void
+window_delete_history_entries(window, ...)
+	Irssi::UI::Window window
+PREINIT:
+	HV *hv;
+	SV **sv;
+	HISTORY_REC *history;
+	WINDOW_REC *tmp;
+	const char *text;
+	long hist_time;
+	int i;
+PPCODE:
+	for (i = 1; i < items; i++) {
+		if (!is_hvref(ST(i))) {
+			croak("Usage: Irssi::UI::Window::delete_history_entries(window, hash...)");
+		}
+		hv = hvref(ST(i));
+		if (hv != NULL) {
+			tmp = NULL;
+			text = NULL;
+			hist_time = -1;
+			history = command_history_current(NULL);
+
+			sv = hv_fetch(hv, "text", 4, 0);
+			if (sv != NULL) text = SvPV_nolen(*sv);
+			sv = hv_fetch(hv, "time", 4, 0);
+			if (sv != NULL && SvOK(*sv)) hist_time = SvIV(*sv);
+
+			if (window != NULL) {
+				history = command_history_current(window);
+			} else {
+				sv = hv_fetch(hv, "history", 7, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					history = command_history_find_name(SvPV_nolen(*sv));
+				}
+
+				sv = hv_fetch(hv, "window", 6, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					tmp = window_find_refnum(SvIV(*sv));
+					if (tmp != NULL) {
+						history = tmp->history;
+					}
+				}
+			}
+
+			if (text != NULL && history != NULL) {
+				XPUSHs(boolSV(command_history_delete_entry(hist_time, history, text)));
+			}
+		}
+	}
 
 #*******************************
 MODULE = Irssi::UI::Window  PACKAGE = Irssi::Windowitem  PREFIX = window_item_