/****************************************************************************
- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 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 *
#define _POSIX_SOURCE
#endif
-MODULE_ID("$Id: lib_tstp.c,v 1.33 2006/12/30 21:44:53 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.37 2008/05/03 16:24:56 tom Exp $")
#if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
#define USE_SIGTSTP 1
static void
cleanup(int sig)
{
- static int nested;
-
/*
* 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
* settings on the way out.
*/
- if (!nested++
+ if (!_nc_globals.cleanup_nested++
&& (sig == SIGINT
|| sig == SIGQUIT)) {
#if HAVE_SIGACTION || HAVE_SIGVEC
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 = _nc_outch;
}
set_term(scan);
endwin();
if (SP)
SP->_endwin = FALSE; /* in case we have an atexit! */
- scan = scan->_next_screen;
}
}
}
static void
sigwinch(int sig GCC_UNUSED)
{
- _nc_handle_sigwinch(-1);
+ _nc_globals.have_sigwinch = 1;
}
#endif /* USE_SIGWINCH */
NCURSES_EXPORT(void)
_nc_signal_handler(bool enable)
{
- static bool initialized = FALSE;
-
T((T_CALLED("_nc_signal_handler(%d)"), enable));
#if USE_SIGTSTP /* Xenix 2.x doesn't have SIGTSTP, for example */
{
}
#endif /* !USE_SIGTSTP */
- if (!initialized) {
+ if (!_nc_globals.init_signals) {
if (enable) {
CatchIfDefault(SIGINT, cleanup);
CatchIfDefault(SIGTERM, cleanup);
#if USE_SIGWINCH
CatchIfDefault(SIGWINCH, sigwinch);
#endif
- initialized = TRUE;
+ _nc_globals.init_signals = TRUE;
}
}
returnVoid;