From e206bf6d689cab448f531b74db7cbc7a6cfce9d2 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Fri, 15 Oct 2021 15:55:52 +0000
Subject: Retry getch() after ERR

In the version of ncurses in OpenBSD, the SIGWINCH handler installed
by enabling keypad causes the read() inside getch() to fail with
EINTR, which getch() doesn't handle, itself returning ERR.
---
 2048.c     | 4 +++-
 freecell.c | 1 +
 play.c     | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/2048.c b/2048.c
index 260f67e..d2e44bb 100644
--- a/2048.c
+++ b/2048.c
@@ -260,7 +260,9 @@ static void drawGameOver(void) {
 }
 
 static bool input(void) {
-	switch (getch()) {
+	int ch = getch();
+	if (ch == ERR) ch = getch();
+	switch (ch) {
 		break; case 'h': case KEY_LEFT: if (left()) spawn();
 		break; case 'j': case KEY_DOWN: if (down()) spawn();
 		break; case 'k': case KEY_UP: if (up()) spawn();
diff --git a/freecell.c b/freecell.c
index 3855d18..b3ca0e9 100644
--- a/freecell.c
+++ b/freecell.c
@@ -325,6 +325,7 @@ static bool quit;
 static void input(void) {
 	MEVENT m;
 	int ch = getch();
+	if (ch == ERR) ch = getch();
 	uint stack = Stacks;
 
 	if (ch == KEY_MOUSE && getmouse(&m) == OK) {
diff --git a/play.c b/play.c
index 1e1ab51..ca3ac4f 100644
--- a/play.c
+++ b/play.c
@@ -249,6 +249,7 @@ static const struct Game *menu(void) {
 		clrtoeol();
 		move(1 + 3 * game, 2);
 		int ch = getch();
+		if (ch == ERR) ch = getch();
 		switch (ch) {
 			break; case 'k': case KEY_UP: {
 				if (game) game--;
-- 
cgit 1.4.1