zygo

commit 69db6398bc595a74157431304420dd83c3cdcceb
parent a7dfc248ff4d88d5f7f63df0e61c63b29623216f
Author: hhvn <dev@hhvn.uk>
Date:   Sun, 16 Jan 2022 19:38:38 +0000

zygo.c zygo.h: implement history

Diffstat:
M
zygo.c
 | 
53
++++++++++++++++++++++++++++++++++++++++++++---------
M
zygo.h
 | 
3
++-

2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/zygo.c b/zygo.c
@@ -374,6 +374,28 @@ list_len(List **l) {
 	return (*l)->len;
 }
 
+Elem *
+list_pop(List **l) {
+	Elem *ret;
+	size_t i;
+
+	if (!l || !(*l))
+		return NULL;
+
+	if ((*l)->len == 1) {
+		ret = *(*l)->elems;
+		free((*l)->elems);
+		free((*l));
+		*l = NULL;
+	} else {
+		ret = *((*l)->elems + (*l)->len - 1);
+		(*l)->len--;
+		(*l)->elems = erealloc((*l)->elems, sizeof(Elem *) * (*l)->len);
+	}
+
+	return ret;
+}
+
 /*
  * Misc functions
  */
@@ -394,9 +416,10 @@ readline(char *buf, size_t count) {
 }
 
 int
-go(Elem *e) {
+go(Elem *e, int mhist) {
 	char line[BUFLEN];
 	Elem *elem;
+	Elem *dup = elem_dup(e); /* elem may be part of page */
 	int ret;
 
 	if (e->type != '1' && e->type != '7' && e->type != '+') {
@@ -405,7 +428,7 @@ go(Elem *e) {
 	}
 
 	if ((ret = net_connect(e)) == -1) {
-		if (e->tls) {
+		if (dup->tls) {
 			printw("| ");
 			attron(A_BOLD);
 			printw("Try again in cleartext? ");
@@ -415,7 +438,7 @@ go(Elem *e) {
 			if (tolower(getch()) == 'y') {
 				elem = elem_dup(e);
 				elem->tls = 0;
-				ret = go(elem);
+				ret = go(elem, mhist);
 				elem_free(elem);
 			}
 		}
@@ -430,14 +453,15 @@ go(Elem *e) {
 
 	list_free(&page);
 	while (readline(line, sizeof(line))) {
-		elem = gophertoelem(e, line);
+		elem = gophertoelem(dup, line);
 		list_append(&page, elem);
 		elem_free(elem);
 	}
 
+	if (current && mhist)
+		list_append(&history, current);
 	elem_free(current);
-	current = elem_dup(e);
-	list_append(&history, current);
+	current = dup;
 	ui.scroll = 0;
 	return 0;
 }
@@ -591,7 +615,7 @@ run(void) {
 				switch (ui.cmd) {
 				case ':':
 					e = uritoelem(ui.arg);
-					go(e);
+					go(e, 1);
 					elem_free(e);
 					break;
 				}
@@ -679,6 +703,17 @@ run(void) {
 				draw_bar();
 				break;
 			/* commands without arg */
+			case '<':
+				if (history) {
+					e = list_pop(&history);
+					go(e, 0);
+					free(e);
+					draw_page();
+					draw_bar();
+				} else {
+					error("no history");
+				}
+				break;
 			/* commands with arg */
 			case ':':
 				ui.cmd = (char)c;
@@ -704,7 +739,7 @@ gonum:
 		if (atoi(ui.arg) >= page->lastid || atoi(ui.arg) < 1)
 			error("no such link: %d", atoi(ui.arg));
 		else
-			go(list_idget(&page, atoi(ui.arg)));
+			go(list_idget(&page, atoi(ui.arg)), 1);
 		ui.wantinput = 0;
 		draw_page();
 		draw_bar();
@@ -739,7 +774,7 @@ main(int argc, char *argv[]) {
 	}
 
 	target = uritoelem(targeturi);
-	go(target);
+	go(target, 1);
 
 	setlocale(LC_ALL, "");
 	initscr();
diff --git a/zygo.h b/zygo.h
@@ -86,6 +86,7 @@ void list_free(List **l);
 void list_append(List **l, Elem *e);
 Elem *list_get(List **l, size_t elem);
 Elem *list_idget(List **l, size_t id);
+Elem *list_pop(List **l);
 size_t list_len(List **l);
 
 
@@ -110,5 +111,5 @@ void run(void);
 
 /* Misc */
 int readline(char *buf, size_t count);
-int go(Elem *e);
+int go(Elem *e, int mhist);
 void sighandler(int signal);