ncurses 5.7 - patch 20091227

[ncurses.git] / ncurses / tty / lib_tstp.c

diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index 2a341fa6ba29c3252c36848d8f0286c056beeef7..4a0ef50336362e3bb99b665e08ead49e7d47fa12 100644 (file)
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -46,7 +46,7 @@
 #define _POSIX_SOURCE
 #endif
 
 #define _POSIX_SOURCE
 #endif
 

-MODULE_ID("$Id: lib_tstp.c,v 1.36 2007/04/21 19:51:29 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.39 2009/05/09 15:46:20 tom Exp $")

 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1
 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1


@@ -59,16 +59,20 @@ static const char *
 signal_name(int sig)
 {
     switch (sig) {
 signal_name(int sig)
 {
     switch (sig) {

+#ifdef SIGALRM

     case SIGALRM:
        return "SIGALRM";
     case SIGALRM:
        return "SIGALRM";

+#endif

 #ifdef SIGCONT
     case SIGCONT:
        return "SIGCONT";
 #endif
     case SIGINT:
        return "SIGINT";
 #ifdef SIGCONT
     case SIGCONT:
        return "SIGCONT";
 #endif
     case SIGINT:
        return "SIGINT";

+#ifdef SIGQUIT

     case SIGQUIT:
        return "SIGQUIT";
     case SIGQUIT:
        return "SIGQUIT";

+#endif

     case SIGTERM:
        return "SIGTERM";
 #ifdef SIGTSTP
     case SIGTERM:
        return "SIGTERM";
 #ifdef SIGTSTP


@@ -136,6 +140,7 @@ signal_name(int sig)
 static void
 tstp(int dummy GCC_UNUSED)
 {
 static void
 tstp(int dummy GCC_UNUSED)
 {

+    SCREEN *sp = CURRENT_SCREEN;

     sigset_t mask, omask;
     sigaction_t act, oact;
 
     sigset_t mask, omask;
     sigaction_t act, oact;
 


@@ -154,11 +159,11 @@ tstp(int dummy GCC_UNUSED)
      * parent was stopped before us, and we would likely pick up the
      * settings already modified by the shell.
      */
      * parent was stopped before us, and we would likely pick up the
      * settings already modified by the shell.
      */

-    if (SP != 0 && !SP->_endwin)       /* don't do this if we're not in curses */
+    if (sp != 0 && !sp->_endwin)       /* don't do this if we're not in curses */

 #if HAVE_TCGETPGRP
        if (tcgetpgrp(STDIN_FILENO) == getpgrp())
 #endif
 #if HAVE_TCGETPGRP
        if (tcgetpgrp(STDIN_FILENO) == getpgrp())
 #endif

-           def_prog_mode();
+           NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);

 
     /*
      * Block window change and timer signals.  The latter
 
     /*
      * Block window change and timer signals.  The latter


@@ -166,7 +171,9 @@ tstp(int dummy GCC_UNUSED)
      * to repaint the screen.
      */
     (void) sigemptyset(&mask);
      * to repaint the screen.
      */
     (void) sigemptyset(&mask);

+#ifdef SIGALRM

     (void) sigaddset(&mask, SIGALRM);
     (void) sigaddset(&mask, SIGALRM);

+#endif

 #if USE_SIGWINCH
     (void) sigaddset(&mask, SIGWINCH);
 #endif
 #if USE_SIGWINCH
     (void) sigaddset(&mask, SIGWINCH);
 #endif


@@ -185,7 +192,7 @@ tstp(int dummy GCC_UNUSED)
      * End window mode, which also resets the terminal state to the
      * original (pre-curses) modes.
      */
      * End window mode, which also resets the terminal state to the
      * original (pre-curses) modes.
      */

-    endwin();
+    NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);

 
     /* Unblock SIGTSTP. */
     (void) sigemptyset(&mask);
 
     /* Unblock SIGTSTP. */
     (void) sigemptyset(&mask);


@@ -212,19 +219,19 @@ tstp(int dummy GCC_UNUSED)
 
     T(("SIGCONT received"));
     sigaction(SIGTSTP, &oact, NULL);
 
     T(("SIGCONT received"));
     sigaction(SIGTSTP, &oact, NULL);

-    flushinp();
+    NCURSES_SP_NAME(flushinp) (NCURSES_SP_ARG);

 
     /*
      * If the user modified the tty state while suspended, he wants
      * those changes to stick.  So save the new "default" terminal state.
      */
 
     /*
      * If the user modified the tty state while suspended, he wants
      * those changes to stick.  So save the new "default" terminal state.
      */

-    def_shell_mode();
+    NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);

 
     /*
      * This relies on the fact that doupdate() will restore the
      * program-mode tty state, and issue enter_ca_mode if need be.
      */
 
     /*
      * This relies on the fact that doupdate() will restore the
      * program-mode tty state, and issue enter_ca_mode if need be.
      */

-    doupdate();
+    NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG);

 
     /* Reset the signals. */
     (void) sigprocmask(SIG_SETMASK, &omask, NULL);
 
     /* Reset the signals. */
     (void) sigprocmask(SIG_SETMASK, &omask, NULL);


@@ -234,6 +241,8 @@ tstp(int dummy GCC_UNUSED)
 static void
 cleanup(int sig)
 {
 static void
 cleanup(int sig)
 {

+    SCREEN *sp = CURRENT_SCREEN;
+

     /*
      * Actually, doing any sort of I/O from within an signal handler is
      * "unsafe".  But we'll _try_ to clean up the screen and terminal
     /*
      * Actually, doing any sort of I/O from within an signal handler is
      * "unsafe".  But we'll _try_ to clean up the screen and terminal


@@ -241,7 +250,10 @@ cleanup(int sig)
      */
     if (!_nc_globals.cleanup_nested++
        && (sig == SIGINT
      */
     if (!_nc_globals.cleanup_nested++
        && (sig == SIGINT

-           || sig == SIGQUIT)) {
+#ifdef SIGQUIT
+           || sig == SIGQUIT
+#endif
+       )) {

 #if HAVE_SIGACTION || HAVE_SIGVEC
        sigaction_t act;
        sigemptyset(&act.sa_mask);
 #if HAVE_SIGACTION || HAVE_SIGVEC
        sigaction_t act;
        sigemptyset(&act.sa_mask);


@@ -252,19 +264,17 @@ cleanup(int sig)
        if (signal(sig, SIG_IGN) != SIG_ERR)
 #endif
        {
        if (signal(sig, SIG_IGN) != SIG_ERR)
 #endif
        {

-           SCREEN *scan = _nc_screen_chain;
-           while (scan) {
-               if (SP != 0
-                   && SP->_ofp != 0
-                   && isatty(fileno(SP->_ofp))) {
-                   SP->_cleanup = TRUE;
-                   SP->_outch = _nc_outch;
+           SCREEN *scan;
+           for (each_screen(scan)) {
+               if (scan->_ofp != 0
+                   && isatty(fileno(scan->_ofp))) {
+                   scan->_cleanup = TRUE;
+                   scan->_outch = NCURSES_SP_NAME(_nc_outch);

                }
                set_term(scan);
                }
                set_term(scan);

-               endwin();
-               if (SP)
-                   SP->_endwin = FALSE;        /* in case we have an atexit! */
-               scan = scan->_next_screen;
+               NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);
+               if (sp)
+                   sp->_endwin = FALSE;        /* in case we have an atexit! */

            }
        }
     }
            }
        }
     }