1 files changed, 22 insertions, 5 deletions

diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index a975fe5c..9e4aab3a 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -33,6 +33,7 @@
 #include "window-items.h"
 #include "windows-layout.h"
 #include "printtext.h"
+#include "command-history.h"
 
 static void window_print_binds(WINDOW_REC *win)
 {
@@ -127,7 +128,7 @@ static void cmd_window_info(WINDOW_REC *win)
 				   win->active_server->tag : "NONE");
 	} else {
 		if (win->active_server != NULL &&
-		    strcmp(win->active_server->tag, win->servertag) != 0)
+		    g_strcmp0(win->active_server->tag, win->servertag) != 0)
                         g_warning("Active server isn't the sticky server!");
 
 		printformat_window(win, MSGLEVEL_CLIENTCRAP,
@@ -529,7 +530,7 @@ static void cmd_window_item_goto(const char *data, SERVER_REC *server)
 	GSList *tmp;
 	void *free_arg;
 	char *target;
-	
+
 	if (!cmd_get_params(data, &free_arg, 1, &target))
 		return;
 
@@ -609,16 +610,31 @@ static void cmd_window_name(const char *data)
 	if (win == NULL || win == active_win)
 		window_set_name(active_win, data);
 	else if (active_win->name == NULL ||
-		 strcmp(active_win->name, data) != 0) {
+		 g_strcmp0(active_win->name, data) != 0) {
 		printformat_window(active_win, MSGLEVEL_CLIENTERROR,
 				   TXT_WINDOW_NAME_NOT_UNIQUE, data);
 	}
 }
 
-/* SYNTAX: WINDOW HISTORY <name> */
+/* SYNTAX: WINDOW HISTORY [-clear] <name> */
 void cmd_window_history(const char *data)
 {
-	window_set_history(active_win, data);
+	GHashTable *optlist;
+	char *name;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+			    "window history", &optlist, &name))
+		return;
+
+	if (g_hash_table_lookup(optlist, "clear") != NULL) {
+		signal_continue(1, data);
+		window_clear_history(active_win, name);
+	} else {
+		window_set_history(active_win, name);
+	}
+
+	cmd_params_free(free_arg);
 }
 
 /* we're moving the first window to last - move the first contiguous block
@@ -883,6 +899,7 @@ void window_commands_init(void)
 	command_set_options("window number", "sticky");
 	command_set_options("window server", "sticky unsticky");
 	command_set_options("window theme", "delete");
+	command_set_options("window history", "clear");
 }
 
 void window_commands_deinit(void)