Always return OPs in the op member

conn/dlg_verifycert.c

@@ -87,9 +87,9 @@ static int menu_dialog_dokey(struct Menu *menu, int *id)
   ch = mutt_getch_timeout(5000);
   // mutt_curses_set_cursor(cursor);
 
-  if (ch.ch < OP_NULL)
+  if ((ch.op == OP_TIMEOUT) || (ch.op == OP_ABORT))
   {
-    *id = ch.ch;
+    *id = ch.op;
     return 0;
   }
 

enter/enter.c

@@ -692,7 +692,7 @@ int mutt_enter_string_full(char *buf, size_t buflen, int col, CompletionFlags fl
           {
             quote_event = mutt_getch();
           } while (quote_event.ch == OP_TIMEOUT);
-          if (quote_event.ch >= 0)
+          if (quote_event.op != OP_ABORT)
           {
             event = quote_event;
             goto self_insert;

flags.c

@@ -456,13 +456,13 @@ int mutt_change_flag(struct Mailbox *m, struct EmailList *el, bool bf)
   do
   {
     event = mutt_getch();
-  } while (event.ch == -2); // Timeout
+  } while (event.op == OP_TIMEOUT);
   mutt_curses_set_cursor(cursor);
 
   window_set_focus(old_focus);
   msgwin_clear_text();
 
-  if (event.ch < 0) // SIGINT, Abort key (Ctrl-G)
+  if (event.op == OP_ABORT)
     return -1;
 
   switch (event.ch)

gui/curs_lib.c

@@ -258,8 +258,8 @@ static int mutt_monitor_getch(void)
 struct KeyEvent mutt_getch(void)
 {
   int ch;
-  const struct KeyEvent err = { OP_ABORT, OP_NULL };
-  const struct KeyEvent timeout = { OP_TIMEOUT, OP_NULL };
+  const struct KeyEvent err = { 0, OP_ABORT };
+  const struct KeyEvent timeout = { 0, OP_TIMEOUT };
 
   struct KeyEvent *key = array_pop(&UngetKeyEvents);
   if (key)
@@ -311,6 +311,7 @@ struct KeyEvent mutt_getch(void)
     /* send ALT-x as ESC-x */
     ch &= ~0x80;
     mutt_unget_ch(ch);
+    ch = '\033';
     return (struct KeyEvent){ .ch = '\033' /* Escape */, .op = OP_NULL };
   }
 
@@ -580,7 +581,7 @@ int mutt_buffer_enter_fname(const char *prompt, struct Buffer *fname,
   do
   {
     ch = mutt_getch();
-  } while (ch.ch == OP_TIMEOUT);
+  } while (ch.op == OP_TIMEOUT);
   mutt_curses_set_cursor(cursor);
 
   mutt_window_move(win, 0, 0);

keymap.c

@@ -666,7 +666,7 @@ struct KeyEvent km_dokey_event(enum MenuType mtype)
           /* If a timeout was not received, or the window was resized, exit the
            * loop now.  Otherwise, continue to loop until reaching a total of
            * $timeout seconds.  */
-          if ((tmp.ch != OP_TIMEOUT) || SigWinch)
+          if ((tmp.op != OP_TIMEOUT) || SigWinch)
             goto gotkey;
 #ifdef USE_INOTIFY
           if (MonitorFilesChanged)
@@ -685,12 +685,11 @@ struct KeyEvent km_dokey_event(enum MenuType mtype)
   gotkey:
 #endif
     /* hide timeouts, but not window resizes, from the line editor. */
-    if ((mtype == MENU_EDITOR) && (tmp.ch == OP_TIMEOUT) && !SigWinch)
+    if ((mtype == MENU_EDITOR) && (tmp.op == OP_TIMEOUT) && !SigWinch)
       continue;
 
-    if (tmp.ch < 0)
+    if ((tmp.op == OP_TIMEOUT) || (tmp.op == OP_ABORT))
     {
-      tmp.op = tmp.ch;
       return tmp;
     }
 
@@ -755,7 +754,7 @@ struct KeyEvent km_dokey_event(enum MenuType mtype)
     if (++pos == map->len)
     {
       if (map->op != OP_MACRO)
-        return (struct KeyEvent){ .ch = '\0', .op = map->op };
+        return (struct KeyEvent){ .ch = tmp.ch, .op = map->op };
 
       /* OptIgnoreMacroEvents turns off processing the MacroEvents buffer
        * in mutt_getch().  Generating new macro events during that time would
@@ -769,7 +768,7 @@ struct KeyEvent km_dokey_event(enum MenuType mtype)
        * but less so than aborting the prompt.  */
       if (OptIgnoreMacroEvents)
       {
-        return (struct KeyEvent){ .ch = '\0', .op = OP_NULL };
+        return (struct KeyEvent){ .ch = tmp.ch, .op = OP_NULL };
       }
 
       if (n++ == 10)

question/question.c

@@ -143,10 +143,9 @@ int mutt_multi_choice(const char *prompt, const char *letters)
     mutt_refresh();
     /* SigWinch is not processed unless timeout is set */
     ch = mutt_getch_timeout(30 * 1000);
-    if (ch.ch == OP_TIMEOUT)
+    if (ch.op == OP_TIMEOUT)
       continue;
-    /* (ch.ch == 0) is technically possible.  Treat the same as < 0 (abort) */
-    if ((ch.ch <= 0) || CI_is_return(ch.ch))
+    if ((ch.op == OP_NULL) || (ch.op == OP_ABORT) || CI_is_return(ch.ch))
     {
       choice = -1;
       break;
@@ -318,11 +317,11 @@ enum QuadOption mutt_yesorno(const char *msg, enum QuadOption def)
     mutt_refresh();
     /* SigWinch is not processed unless timeout is set */
     ch = mutt_getch_timeout(30 * 1000);
-    if (ch.ch == OP_TIMEOUT)
+    if (ch.op == OP_TIMEOUT)
       continue;
     if (CI_is_return(ch.ch))
       break;
-    if (ch.ch < 0)
+    if (ch.op == OP_ABORT)
     {
       def = MUTT_ABORT;
       break;