summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ui.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/ui.c b/ui.c
index 4435a52..53e4a19 100644
--- a/ui.c
+++ b/ui.c
@@ -102,6 +102,7 @@ static struct {
 	uint len;
 	uint show;
 	uint swap;
+	uint user;
 } windows;
 
 static uint windowPush(struct Window *window) {
@@ -825,6 +826,7 @@ static void windowShow(uint num) {
 	touchwin(windows.ptrs[num]->pad);
 	windows.swap = windows.show;
 	windows.show = num;
+	windows.user = num;
 	mark(windows.ptrs[windows.swap]);
 	unmark(windows.ptrs[windows.show]);
 	inputUpdate();
@@ -877,10 +879,6 @@ static void toggleIgnore(struct Window *window) {
 }
 
 static void showAuto(void) {
-	static uint swap;
-	if (windows.swap != swap) {
-		swap = windows.show;
-	}
 	uint minHot = UINT_MAX, numHot;
 	uint minWarm = UINT_MAX, numWarm;
 	for (uint num = 0; num < windows.len; ++num) {
@@ -896,14 +894,15 @@ static void showAuto(void) {
 			numWarm = num;
 		}
 	}
+	uint user = windows.user;
 	if (minHot < UINT_MAX) {
 		windowShow(numHot);
-		windows.swap = swap;
+		windows.user = user;
 	} else if (minWarm < UINT_MAX) {
 		windowShow(numWarm);
-		windows.swap = swap;
+		windows.user = user;
 	} else {
-		windowShow(windows.swap);
+		windowShow(user);
 	}
 }
 
class='nohover-highlight'> 2021-02-04Replace donation button with LiberapayJune McEnroe 2020-06-25Use DisableForwarding in sshd_configJune McEnroe 2019-12-19Remove READMEJune McEnroe 2019-12-15Update git URLsJune McEnroe 2019-08-05Add buymeacoffee linkJune McEnroe Can't hurt, I guess? I don't expect to get anything... 2019-07-27Use braces in MakefileJune McEnroe 2019-07-27Make copyright headers consistentJune McEnroe 2019-07-08Remove NetHack from indexJune McEnroe 2019-04-08Don't install rc.kfcgi eitherJune McEnroe 2019-03-28Remove rc.kfcgiJune McEnroe I sent a better version of it to the port maintainer and it is now in the ports tree. 2019-01-16Reformat index.html with explore linkJune McEnroe 2019-01-16Return false from keydown handler in exploreJune McEnroe 2019-01-08Draw lines to tile edgeJune McEnroe 2019-01-08Factor out default pathsJune McEnroe 2019-01-08Remove incorrect default coordinatesJune McEnroe 2019-01-07Set img src when explore fragment changesJune McEnroe 2019-01-07Compress PNG data in imageJune McEnroe kcgi never enables compression for FastCGI. 2019-01-07madvise MADV_NOCORE in imageJune McEnroe 2019-01-07Add license notice to explore JavaScriptJune McEnroe 2019-01-07Add Q/Home binding in exploreJune McEnroe 2019-01-07Fix explore image URLJune McEnroe 2019-01-07Add HOME button, ssh link, AGPL notice to exploreJune McEnroe 2019-01-06Add meta viewport to exploreJune McEnroe 2019-01-06Set background and max-width in exploreJune McEnroe 2019-01-06Swallow writes after the connection is closedJune McEnroe It was not okay. 2019-01-06Handle KCGI_HUPJune McEnroe I hope it's okay that I keep writing to the fwopen stream after streamWrite returns -1. 2019-01-06Install html filesJune McEnroe