hirc

commit 57b19d8dd0526b9b455135870a0b0a5b8b171c94
parent f999806762a83daf59fa1f009e4c032a3aa809c8
Author: hhvn <dev@hhvn.uk>
Date:   Thu,  9 Dec 2021 00:47:41 +0000

commands.c struct.h: /clear

Diffstat:
M
commands.c
 | 
39
++++++++++++++++++++++++++++++++++++++-
M
struct.h
 | 
3
++-

2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/commands.c b/commands.c
@@ -26,6 +26,7 @@ static void command_bind(struct Server *server, char *str);
 static void command_help(struct Server *server, char *str);
 static void command_echo(struct Server *server, char *str);
 static void command_grep(struct Server *server, char *str);
+static void command_clear(struct Server *server, char *str);
 
 static char *command_optarg;
 enum {
@@ -104,6 +105,9 @@ struct Command commands[] = {
 		"If no argument supplied, clears previous search",
 		"Searches are also cleared after selecting another buffer",
 		"See also config variables: regex.extended and regex.icase", NULL}},
+	{"clear", command_clear, {
+		"usage: /clear [-tmp]",
+		"Clear selected buffer of (temporary if -tmp) messages", NULL}},
 	{NULL, NULL},
 };
 
@@ -701,6 +705,34 @@ command_grep(struct Server *server, char *str) {
 	hist_format(selected.history, Activity_none, HIST_SHOW|HIST_TMP|HIST_GREP, "SELF_GREP_END :end of /grep command");
 }
 
+static void
+command_clear(struct Server *server, char *str) {
+	int ret, tmp = 0;
+	enum { opt_tmp };
+	static struct CommandOpts opts[] = {
+		{"tmp", CMD_NARG, opt_tmp},
+		{NULL, 0, 0},
+	};
+
+	if (str) {
+		while ((ret = command_getopt(&str, opts)) != opt_done) {
+			switch (ret) {
+			case opt_error:
+				return;
+			case opt_tmp:
+				tmp = 1;
+				break;
+			}
+		}
+
+		if (*str)
+			ui_error("ignoring remaining args to /clear", NULL);
+	}
+
+	hist_purgeopt(selected.history, tmp ? HIST_TMP : HIST_ALL);
+	windows[Win_main].refresh = 1;
+}
+
 int
 command_getopt(char **str, struct CommandOpts *opts) {
 	char *opt;
@@ -725,9 +757,14 @@ command_getopt(char **str, struct CommandOpts *opts) {
 					(*str)++;
 				}
 			} else {
-				*((*str)-1) = '\0';
+				if (*str && **str)
+					*((*str)-1) = '\0';
 			}
 
+			/* Always return something that's not NULL */
+			if (!*str)
+				*str = "";
+
 			return opts->ret;
 		}
 	}
diff --git a/struct.h b/struct.h
@@ -38,7 +38,8 @@ enum HistOpt {
 	HIST_SELF = 8,  /* from = self */
 	HIST_TMP = 16,  /* purge later */
 	HIST_GREP = 32, /* generated by /grep */
-	HIST_DFL = HIST_SHOW|HIST_LOG
+	HIST_DFL = HIST_SHOW|HIST_LOG,
+	HIST_ALL = 0xFFFF
 };
 
 struct History {