Add command history

Author: tleino

Makefile.in

@@ -12,8 +12,22 @@ mandir = $(datarootdir)/man
 INSTALL ?= install
 INSTALLFLAGS ?=
 
-SRCS=text.c prompt.c cocowm.c layout.c trace.c keyboard.c pane.c action.c \
-	resize.c column.c event.c create.c manage.c draw.c init.c
+SRCS=history.c \
+	text.c \
+	prompt.c \
+	cocowm.c \
+	layout.c \
+	trace.c \
+	keyboard.c \
+	pane.c \
+	action.c \
+	resize.c \
+	column.c \
+	event.c \
+	create.c \
+	manage.c \
+	draw.c \
+	init.c
 DISTFILES=\
 	Makefile\
 	README\

action.c

@@ -167,12 +167,32 @@ new_command(struct pane *focus, struct layout *l)
 		close_pane(p, l);
 }
 
+void
+edit_finish(const char *s, void *udata)
+{
+	struct pane *p = udata;
+}
+
+void
+edit_step(const char *s, void *udata)
+{
+	struct pane *p = udata;
+	const char *q;
+	int col;
+
+	TRACE("Edit step: '%s'", s);
+
+	q = history_match(s);
+	if (q != NULL)
+		snprintf(p->prompt.text, sizeof(p->prompt.text), "%s", q);
+}
+
 static int
 edit_command(struct pane *p, struct layout *l)
 {
 	p->flags |= PF_EDIT;
 	draw_frame(p, l);
-	if (prompt_read(&p->prompt)) {
+	if (prompt_read(&p->prompt, edit_finish, edit_step, p)) {
 		p->flags |= PF_WANT_RESTART;
 		close_pane(p, l);
 		return 1;
@@ -383,11 +403,7 @@ run_command(struct pane *pane, char *s)
 	if (snprintf(p, sz, "%s%s", prefix, cmd) >= sz)
 		assert(0);
 
-#if 0
-	if (add_command_to_history(q, 1))
-		save_command_history();
-#endif
-
+	history_add(q);
 	free(q);
 
 	sh = getenv("SHELL");

cocowm.c

@@ -52,7 +52,7 @@ main(int argc, char *argv[])
 
 #ifdef __OpenBSD__
 #if 1
-	if (pledge("stdio rpath proc exec", NULL) == -1)
+	if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1)
 		err(1, "pledge");
 #else
 	if (pledge("stdio rpath", NULL) == -1)

draw.c

@@ -112,7 +112,7 @@ void
 draw_frame(struct pane *p, struct layout *l)
 {
 	char number_str[20];
-	int x, y;
+	int x, y, prompt_x;
 	XftColor bg;
 
 	TRACE("try draw frame of %s", PANE_STR(p));
@@ -140,6 +140,7 @@ draw_frame(struct pane *p, struct layout *l)
 
 	x += font_draw(p->ftdraw, l->display, p->frame, l->text_fg, bg,
 	    x, x, y, number_str, strlen(number_str));
+	prompt_x = x;
 
 	if (p->flags & PF_EDIT) {
 		x += font_draw(p->ftdraw, l->display, p->frame, l->text_fg, bg,
@@ -152,9 +153,14 @@ draw_frame(struct pane *p, struct layout *l)
 		    x, x, y, p->icon_name, strlen(p->icon_name));
 	}
 
+	/*
+	 * Draw cursor.
+	 */
 	if (p->flags & PF_EDIT) {
+		prompt_x += ((p->prompt.cursor - p->prompt.text) * l->font_width_px);
 		x += font_draw(p->ftdraw, l->display, p->frame, l->text_fg,
-		    l->text_cursor, x, x, y, " ", 1);
+		    l->text_cursor, prompt_x, prompt_x, y,
+		    *p->prompt.cursor != '\0' ? p->prompt.cursor : " ", 1);
 	}
 
 	if (p->flags & PF_FULLSCREEN)

extern.h

@@ -195,9 +195,16 @@ void send_take_focus(struct pane *p, Display *d);
 void minimize(struct pane *, struct layout *);
 void minimize_others(struct pane *, struct layout *);
 
+typedef void (*PromptCallback)(const char *, void *);
+
 void prompt_insert(struct prompt *, char *);
 void prompt_init(struct prompt *, struct pane *, struct layout *);
-int prompt_read(struct prompt *);
+int prompt_read(struct prompt *, PromptCallback, PromptCallback, void *);
+
+const char *history_match(const char *s);
+void history_load();
+void history_save();
+void history_add(const char *s);
 
 enum action {
 	NoAction=0,

history.c

@@ -0,0 +1,188 @@
+/*
+ * cocowm - Column Commander Window Manager for X11 Window System
+ * Copyright (c) 2023, Tommi Leino <[email protected]>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "extern.h"
+
+#include <err.h>
+
+struct history {
+	char *line;
+	struct history *prev;
+	struct history *next;
+};
+
+static struct history *head;
+static struct history *tail;
+
+static char *file = ".cocowm_history";
+
+static const char *history_path();
+
+void history_save();
+
+static const char *
+history_path()
+{
+	const char *home;
+	static char s[PATH_MAX];
+
+	home = getenv("HOME");
+	if (home == NULL)
+		home = "/";
+
+	if (snprintf(s, sizeof(s), "%s/%s", home, file) >= sizeof(s))
+		err(1, "history path name overflow");
+
+	return s;
+}
+
+const char *
+history_match(const char *s)
+{
+	ssize_t i;
+	size_t best_pts = 0, pts;
+	const char *best_match = NULL, *p, *q;
+	struct history *h;
+
+	if (s == NULL)
+		return NULL;
+
+	if (head == NULL)
+		history_load();
+
+	for (h = head; h != NULL; h = h->next) {
+		q = s;
+		p = h->line;
+		pts = 0;
+		while (*p != '\0' && *q != '\0')
+			if (*p++ == *q++)
+				pts++;
+			else {
+				pts = 0;
+				break;
+			}
+		if (*p == '\0' && *q != '\0')
+			pts = 0;
+		if (pts > best_pts) {
+			best_pts = pts;
+			best_match = h->line;
+		}
+	}
+
+	return best_match;	
+}
+
+void
+history_remove(const char *s)
+{
+	struct history *h;
+
+	for (h = head; h != NULL; h = h->next)
+		if (strcmp(h->line, s) == 0)
+			break;
+	if (h == NULL)
+		return;
+
+	if (h->prev)
+		h->prev->next = h->next;
+	if (h->next)
+		h->next->prev = h->prev;
+	if (h == head)
+		head = h->next;
+	if (h == tail)
+		tail = h->prev;
+
+	free(h->line);
+	free(h);
+}
+
+void
+history_add(const char *s)
+{
+	struct history *h;
+
+	history_remove(s);
+
+	h = calloc(1, sizeof(*h));
+	if (h == NULL) {
+		warn("saving history");
+		return;
+	}
+
+	h->line = strdup(s);
+	if (h->line == NULL) {
+		free(h);
+		warn("strdup history");
+		return;
+	}
+
+	h->next = head;
+	if (h->next != NULL)
+		h->next->prev = h;
+	head = h;
+	if (tail == NULL)
+		tail = h;
+
+	history_save();
+}
+
+void
+history_load()
+{
+	FILE *fp;
+	char *line = NULL;
+	size_t sz = 0;
+	ssize_t len;
+	const char *s;
+
+	s = history_path();
+	fp = fopen(s, "r");
+	if (fp == NULL) {
+		warnx("fopen history for reading");
+		return;
+	}
+
+	while ((len = getline(&line, &sz, fp)) > 0) {
+		line[strcspn(line, "\r\n")] = '\0';
+		history_add(line);
+	}
+	if (ferror(fp))
+		warnx("getline %s", s);
+
+	if (line != NULL)
+		free(line);
+}
+
+void
+history_save()
+{
+	FILE *fp;
+	struct history *h;
+	const char *s;
+
+	s = history_path();
+	fp = fopen(s, "w");
+	if (fp == NULL)
+		err(1, "fopen history for writing");
+
+	for (h = tail; h != NULL; h = h->prev)
+		fprintf(fp, "%s\n", h->line);
+
+	if (ferror(fp))
+		warn("%s", s);
+	fclose(fp);
+}

prompt.c

@@ -53,15 +53,13 @@ isu8cont(unsigned char c)
 void
 prompt_insert(struct prompt *p, char *s)
 {
-	TRACE("Insert char %s", s);
 	while (*s != '\0') {
 		if (is_full(p))
 			break;
 		*(p->cursor)++ = *s++;
 	}
 
 	*p->cursor = '\0';
-	TRACE("text is now %s", p->text);
 }
 
 static int
@@ -100,7 +98,7 @@ prompt_init(struct prompt *p, struct pane *pane, struct layout *layout)
  * Read text from the prompt.
  */
 int
-prompt_read(struct prompt *p)
+prompt_read(struct prompt *p, PromptCallback callback, PromptCallback step, void *udata)
 {
 	Display *dpy;
 	int ret = 1;
@@ -134,6 +132,7 @@ prompt_read(struct prompt *p)
 				} else
 					ret = 0;
 			}
+			step(p->text, udata);
 			draw_frame(p->pane, p->pane->column->layout);
 			break;
 		case KeyRelease: