ncurses 5.7 - patch 20090523

[ncurses.git] / ncurses / tinfo / lib_ttyflags.c

diff --git a/ncurses/tinfo/lib_ttyflags.c b/ncurses/tinfo/lib_ttyflags.c
index 2cb9fd67b4dd2ed9f4835fefc0e8bfb3dd8dc7b3..8115662e7fe410ffa8efd584fbef1773e993006e 100644 (file)
--- a/ncurses/tinfo/lib_ttyflags.c
+++ b/ncurses/tinfo/lib_ttyflags.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 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            *
@@ -38,10 +38,14 @@
 #include <curses.priv.h>
 #include <term.h>              /* cur_term */
 
-MODULE_ID("$Id: lib_ttyflags.c,v 1.16 2008/05/03 22:39:03 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE 
+#endif
+
+MODULE_ID("$Id: lib_ttyflags.c,v 1.24 2009/05/10 00:48:29 tom Exp $")
 
 NCURSES_EXPORT(int)
-_nc_get_tty_mode(TTY * buf)
+NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
 {
     int result = OK;
 
@@ -65,13 +69,22 @@ _nc_get_tty_mode(TTY * buf)
            memset(buf, 0, sizeof(*buf));
 
        TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
-                       cur_term->Filedes, _nc_trace_ttymode(buf)));
+                       cur_term ? cur_term->Filedes : -1,
+                       _nc_trace_ttymode(buf)));
     }
     return (result);
 }
 
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-_nc_set_tty_mode(TTY * buf)
+_nc_get_tty_mode(TTY * buf)
+{
+    return NCURSES_SP_NAME(_nc_get_tty_mode) (CURRENT_SCREEN, buf);
+}
+#endif
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_DCLx TTY * buf)
 {
     int result = OK;
 
@@ -85,70 +98,103 @@ _nc_set_tty_mode(TTY * buf)
                if (SET_TTY(cur_term->Filedes, buf) != 0) {
                    if (errno == EINTR)
                        continue;
-                   if ((errno == ENOTTY) && (SP != 0))
-                       SP->_notty = TRUE;
+                   if ((errno == ENOTTY) && (SP_PARM != 0))
+                       SP_PARM->_notty = TRUE;
                    result = ERR;
                }
                break;
            }
        }
        TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s",
-                       cur_term->Filedes, _nc_trace_ttymode(buf)));
+                       cur_term ? cur_term->Filedes : -1,
+                       _nc_trace_ttymode(buf)));
     }
     return (result);
 }
 
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-def_shell_mode(void)
+_nc_set_tty_mode(TTY * buf)
 {
-    T((T_CALLED("def_shell_mode()")));
+    return NCURSES_SP_NAME(_nc_set_tty_mode) (CURRENT_SCREEN, buf);
+}
+#endif
 
-    /*
-     * If XTABS was on, remove the tab and backtab capabilities.
-     */
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0)
+{
+    int rc = ERR;
 
-    if (_nc_get_tty_mode(&cur_term->Ottyb) != OK)
-       returnCode(ERR);
+    T((T_CALLED("def_shell_mode()")));
+
+    if (cur_term != 0) {
+       /*
+        * If XTABS was on, remove the tab and backtab capabilities.
+        */
+       if (_nc_get_tty_mode(&cur_term->Ottyb) == OK) {
 #ifdef TERMIOS
-    if (cur_term->Ottyb.c_oflag & OFLAGS_TABS)
-       tab = back_tab = NULL;
+           if (cur_term->Ottyb.c_oflag & OFLAGS_TABS)
+               tab = back_tab = NULL;
 #else
-    if (cur_term->Ottyb.sg_flags & XTABS)
-       tab = back_tab = NULL;
+           if (cur_term->Ottyb.sg_flags & XTABS)
+               tab = back_tab = NULL;
 #endif
-    returnCode(OK);
+           rc = OK;
+       }
+    }
+    returnCode(rc);
 }
 
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-def_prog_mode(void)
+def_shell_mode(void)
 {
-    T((T_CALLED("def_prog_mode()")));
+    return NCURSES_SP_NAME(def_shell_mode) (CURRENT_SCREEN);
+}
+#endif
 
-    /*
-     * Turn off the XTABS bit in the tty structure if it was on.
-     */
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0)
+{
+    int rc = ERR;
+
+    T((T_CALLED("def_prog_mode()")));
 
-    if (_nc_get_tty_mode(&cur_term->Nttyb) != OK)
-       returnCode(ERR);
+    if (cur_term != 0) {
+       /*
+        * Turn off the XTABS bit in the tty structure if it was on.
+        */
+       if (_nc_get_tty_mode(&cur_term->Nttyb) == OK) {
 #ifdef TERMIOS
-    cur_term->Nttyb.c_oflag &= ~OFLAGS_TABS;
+           cur_term->Nttyb.c_oflag &= ~OFLAGS_TABS;
 #else
-    cur_term->Nttyb.sg_flags &= ~XTABS;
+           cur_term->Nttyb.sg_flags &= ~XTABS;
 #endif
-    returnCode(OK);
+           rc = OK;
+       }
+    }
+    returnCode(rc);
 }
 
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-reset_prog_mode(void)
+def_prog_mode(void)
+{
+    return NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
+}
+#endif
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("reset_prog_mode()")));
 
     if (cur_term != 0) {
        if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) {
-           if (SP) {
-               if (SP->_keypad_on)
-                   _nc_keypad(SP, TRUE);
-               NC_BUFFERED(TRUE);
+           if (SP_PARM) {
+               if (SP_PARM->_keypad_on)
+                   _nc_keypad(SP_PARM, TRUE);
+               NC_BUFFERED(SP_PARM, TRUE);
            }
            returnCode(OK);
        }
@@ -156,22 +202,38 @@ reset_prog_mode(void)
     returnCode(ERR);
 }
 
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-reset_shell_mode(void)
+reset_prog_mode(void)
+{
+    return NCURSES_SP_NAME(reset_prog_mode) (CURRENT_SCREEN);
+}
+#endif
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("reset_shell_mode()")));
 
     if (cur_term != 0) {
-       if (SP) {
-           _nc_keypad(SP, FALSE);
+       if (SP_PARM) {
+           _nc_keypad(SP_PARM, FALSE);
            _nc_flush();
-           NC_BUFFERED(FALSE);
+           NC_BUFFERED(SP_PARM, FALSE);
        }
        returnCode(_nc_set_tty_mode(&cur_term->Ottyb));
     }
     returnCode(ERR);
 }
 
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+reset_shell_mode(void)
+{
+    return NCURSES_SP_NAME(reset_shell_mode) (CURRENT_SCREEN);
+}
+#endif
+
 static TTY *
 saved_tty(void)
 {