Fix: curses popup-dialog getline bypassed debug_fuzzer hook.

Fuzzing in curses mode runs pretty slowly, but I was consistently
watching the fuzzer stall after only a few turns. This commit addresses
that issue.

* win/curses/cursdial.c: the popup_dialog branch of
  curses_line_input_dialog() called wgetnstr() to read the answer,
  but wgetnstr() reads real PTY stdin and bypasses the
  curses_getch() -> randomkey() fuzz hook used by every other
  curses input path. So once popup_dialog was toggled on, any
  getlin() prompt (e.g. setting compound options like packorder or
  fruit name from the in-game options menu) hung the fuzzer
  indefinitely. Replace wgetnstr() with a hand-rolled curses_getch()
  loop that mirrors the special-key handling in
  curses_message_win_getline(): ENTER/RETURN accept, ESC returns
  "\033", backspace / erase_char / KEY_BACKSPACE / KEY_DC erase the
  previous char, kill_char (when a control char) clears the line,
  ERR returns empty. Drop the echo() / noecho() toggle since each
  char is now drawn manually via mvwaddch(). Real users with
  popup_dialog on see no functional change beyond ESC reliably
  cancelling the prompt and ^U being honored uniformly with the
  non-popup path.

Author: k21971

doc/evilhack-changelog.md

@@ -5450,4 +5450,5 @@ The following changes to date are:
 - Fix: curses convert-glyph fallback indexed defsyms[] out of bounds
 - Fix: three correctness issues in the curses windowport
 - Fix: nine correctness issues in the curses windowport (pass two)
+- Fix: curses popup-dialog getline bypassed debug_fuzzer hook
 

win/curses/cursdial.c

@@ -186,15 +186,66 @@ curses_line_input_dialog(const char *prompt, char *answer, int buffer)
         free(tmpstr);
     }
 
-    echo();
-    curs_set(1);
-    wgetnstr(askwin, input, buffer - 1);
-    curs_set(0);
+    {
+        /* Hand-rolled line input so debug_fuzzer mode can drive this
+           prompt. wgetnstr() would block on real stdin and bypass the
+           curses_getch() -> randomkey() hook used by every other curses
+           input path */
+        int x_in, y_in, ch, len = 0;
+        int max_in = buffer - 1;
+
+        getyx(askwin, y_in, x_in);
+        input[0] = '\0';
+        curs_set(1);
+        while (1) {
+            wmove(askwin, y_in, x_in + len);
+            wrefresh(askwin);
+            ch = curses_getch();
+            if (ch == ERR) {
+                input[0] = '\0';
+                break;
+            }
+            if (ch == '\033') {
+                input[0] = '\033';
+                input[1] = '\0';
+                break;
+            }
+            if (ch == '\r' || ch == '\n') {
+                input[len] = '\0';
+                break;
+            }
+            if (ch == '\b' || ch == '\177'
+                || ch == KEY_BACKSPACE || ch == KEY_DC
+                || (erase_char && ch == (int) (uchar) erase_char)) {
+                if (len > 0) {
+                    len--;
+                    input[len] = '\0';
+                    mvwaddch(askwin, y_in, x_in + len, ' ');
+                }
+                continue;
+            }
+            /* honor kill_char if it's a control char, not if it's '@' */
+            if (kill_char && ch == (int) (uchar) kill_char
+                && (ch < ' ' || ch >= '\177')) {
+                while (len > 0) {
+                    len--;
+                    mvwaddch(askwin, y_in, x_in + len, ' ');
+                }
+                input[0] = '\0';
+                continue;
+            }
+            if (len < max_in) {
+                input[len++] = (char) ch;
+                input[len] = '\0';
+                mvwaddch(askwin, y_in, x_in + len - 1, ch);
+            }
+        }
+        curs_set(0);
+    }
     Strcpy(answer, input);
     werase(bwin);
     delwin(bwin);
     curses_destroy_win(askwin);
-    noecho();
 }
 
 /* Get a single character response from the player, such as a y/n prompt */