From adc6d3bdd241e1dad6646ae537e7f8020ac4c971 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Tue, 26 Feb 2019 23:13:55 -0500
Subject: Add M-/ to switch to previously active window

This is also a weechat binding.
---
 catgirl.1 |  4 +++-
 ui.c      | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/catgirl.1 b/catgirl.1
index 722cfd8..cb2826a 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd February 25, 2019
+.Dd February 26, 2019
 .Dt CATGIRL 1
 .Os
 .
@@ -304,6 +304,8 @@ Redraw the UI.
 Switch to the next window.
 .It Ic C-p
 Switch to the previous window.
+.It Ic M-/
+Switch to the previously active window.
 .It Ic M-a
 Switch to next hot or unread window.
 .It Ic M-l
diff --git a/ui.c b/ui.c
index fb4a366..643d627 100644
--- a/ui.c
+++ b/ui.c
@@ -61,6 +61,7 @@ struct Window {
 
 static struct {
 	struct Window *active;
+	struct Window *other;
 	struct Window *head;
 	struct Window *tail;
 	struct Window *tag[TagsLen];
@@ -126,11 +127,13 @@ static void windowShow(struct Window *win) {
 		touchwin(win->log);
 		windowUnmark(win);
 	}
+	windows.other = windows.active;
 	windows.active = win;
 }
 
 static void windowClose(struct Window *win) {
 	if (windows.active == win) windowShow(win->next ? win->next : win->prev);
+	if (windows.other == win) windows.other = NULL;
 	windowRemove(win);
 	delwin(win->log);
 	free(win);
@@ -352,12 +355,16 @@ static void uiStatus(void) {
 	wclrtoeol(ui.status);
 }
 
-void uiShowTag(struct Tag tag) {
-	windowShow(windowFor(tag));
+static void uiShowWindow(struct Window *win) {
+	windowShow(win);
 	uiStatus();
 	uiPrompt(false);
 }
 
+void uiShowTag(struct Tag tag) {
+	uiShowWindow(windowFor(tag));
+}
+
 void uiShowNum(int num, bool relative) {
 	struct Window *win = (relative ? windows.active : windows.head);
 	if (num < 0) {
@@ -365,10 +372,7 @@ void uiShowNum(int num, bool relative) {
 	} else {
 		for (; win; win = win->next) if (!num--) break;
 	}
-	if (!win) return;
-	windowShow(win);
-	uiStatus();
-	uiPrompt(false);
+	if (win) uiShowWindow(win);
 }
 
 static void uiShowAuto(void) {
@@ -379,9 +383,7 @@ static void uiShowAuto(void) {
 		if (!unread && hot->unread) unread = hot;
 	}
 	if (!hot && !unread) return;
-	windowShow(hot ? hot : unread);
-	uiStatus();
-	uiPrompt(false);
+	uiShowWindow(hot ? hot : unread);
 }
 
 void uiCloseTag(struct Tag tag) {
@@ -465,6 +467,7 @@ static void keyMeta(wchar_t ch) {
 	struct Window *win = windows.active;
 	if (ch >= L'0' && ch <= L'9') uiShowNum(ch - L'0', false);
 	if (ch == L'a') uiShowAuto();
+	if (ch == L'/' && windows.other) uiShowWindow(windows.other);
 	if (!win) return;
 	switch (ch) {
 		break; case L'b':  edit(win->tag, EditBackWord, 0);
-- 
cgit 1.4.1