Ticket #54662: patch_ncurses6x.diff

lib/tty/tty-ncurses.c

@@ -179 +179 @@
 void
 tty_init (gboolean mouse_enable, gboolean is_xterm)
 {
+    struct termios mode;
+
     initscr ();
 
 #ifdef HAVE_ESCDELAY
@@ -194 +196 @@
     ESCDELAY = 200;
 #endif /* HAVE_ESCDELAY */
 
-#ifdef NCURSES_VERSION
+    tcgetattr (STDIN_FILENO, &mode);
     /* use Ctrl-g to generate SIGINT */
-    cur_term->Nttyb.c_cc[VINTR] = CTRL ('g');   /* ^g */
+    mode.c_cc[VINTR] = CTRL ('g');      /* ^g */
     /* disable SIGQUIT to allow use Ctrl-\ key */
-    cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
-    tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
-#else
-    /* other curses implementation (bsd curses, ...) */
-    {
-        struct termios mode;
+    mode.c_cc[VQUIT] = NULL_VALUE;
+    tcsetattr (STDIN_FILENO, TCSANOW, &mode);
 
-        tcgetattr (STDIN_FILENO, &mode);
-        /* use Ctrl-g to generate SIGINT */
-        mode.c_cc[VINTR] = CTRL ('g');  /* ^g */
-        /* disable SIGQUIT to allow use Ctrl-\ key */
-        mode.c_cc[VQUIT] = NULL_VALUE;
-        tcsetattr (STDIN_FILENO, TCSANOW, &mode);
-    }
-#endif /* NCURSES_VERSION */
+    /* curses remembers the "in-program" modes after this call */
+    def_prog_mode ();
 
     tty_start_interrupt_key ();