ncurses 5.7

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

diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index 98aae24baacbfc1aca8a6fa8c4f536a56a76b36c..f3b1485bf11133947656e959d40c1eec4c655b74 100644 (file)
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -43,7 +43,10 @@
 
 #include <term.h>
 
-MODULE_ID("$Id: lib_options.c,v 1.52 2008/05/03 23:09:20 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $")
+
+static int _nc_curs_set(SCREEN *, int);
+static int _nc_meta(SCREEN *, bool);
 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)
@@ -134,23 +137,11 @@ keypad(WINDOW *win, bool flag)
 NCURSES_EXPORT(int)
 meta(WINDOW *win GCC_UNUSED, bool flag)
 {
-    int result = ERR;
+    int result;
 
     /* Ok, we stay relaxed and don't signal an error if win is NULL */
     T((T_CALLED("meta(%p,%d)"), win, flag));
-
-    if (SP != 0) {
-       SP->_use_meta = flag;
-
-       if (flag && meta_on) {
-           TPUTS_TRACE("meta_on");
-           putp(meta_on);
-       } else if (!flag && meta_off) {
-           TPUTS_TRACE("meta_off");
-           putp(meta_off);
-       }
-       result = OK;
-    }
+    result = _nc_meta(SP, flag);
     returnCode(result);
 }
 
@@ -159,43 +150,10 @@ meta(WINDOW *win GCC_UNUSED, bool flag)
 NCURSES_EXPORT(int)
 curs_set(int vis)
 {
-    int result = ERR;
+    int result;
 
     T((T_CALLED("curs_set(%d)"), vis));
-    if (SP != 0 && vis >= 0 && vis <= 2) {
-       int cursor = SP->_cursor;
-
-       if (vis == cursor) {
-           result = cursor;
-       } else {
-           result = (cursor == -1 ? 1 : cursor);
-           switch (vis) {
-           case 2:
-               if (cursor_visible) {
-                   TPUTS_TRACE("cursor_visible");
-                   putp(cursor_visible);
-               } else
-                   result = ERR;
-               break;
-           case 1:
-               if (cursor_normal) {
-                   TPUTS_TRACE("cursor_normal");
-                   putp(cursor_normal);
-               } else
-                   result = ERR;
-               break;
-           case 0:
-               if (cursor_invisible) {
-                   TPUTS_TRACE("cursor_invisible");
-                   putp(cursor_invisible);
-               } else
-                   result = ERR;
-               break;
-           }
-           SP->_cursor = vis;
-           _nc_flush();
-       }
-    }
+    result = _nc_curs_set(SP, vis);
     returnCode(result);
 }
 
@@ -239,6 +197,35 @@ has_key(int keycode)
 }
 #endif /* NCURSES_EXT_FUNCS */
 
+/*
+ * Internal entrypoints use SCREEN* parameter to obtain capabilities rather
+ * than cur_term.
+ */
+#undef CUR
+#define CUR (sp->_term)->type.
+
+static int
+_nc_putp(const char *name GCC_UNUSED, const char *value)
+{
+    int rc = ERR;
+
+    if (value) {
+       TPUTS_TRACE(name);
+       rc = putp(value);
+    }
+    return rc;
+}
+
+static int
+_nc_putp_flush(const char *name, const char *value)
+{
+    int rc = _nc_putp(name, value);
+    if (rc != ERR) {
+       _nc_flush();
+    }
+    return rc;
+}
+
 /* Turn the keypad on/off
  *
  * Note:  we flush the output because changing this mode causes some terminals
@@ -249,22 +236,92 @@ has_key(int keycode)
 NCURSES_EXPORT(int)
 _nc_keypad(SCREEN *sp, bool flag)
 {
-    if (flag && keypad_xmit) {
-       TPUTS_TRACE("keypad_xmit");
-       putp(keypad_xmit);
-       _nc_flush();
-    } else if (!flag && keypad_local) {
-       TPUTS_TRACE("keypad_local");
-       putp(keypad_local);
-       _nc_flush();
-    }
+    int rc = ERR;
 
     if (sp != 0) {
-       if (flag && !sp->_tried) {
-           _nc_init_keytry(sp);
-           sp->_tried = TRUE;
+#ifdef USE_PTHREADS
+       /*
+        * We might have this situation in a multithreaded application that
+        * has wgetch() reading in more than one thread.  putp() and below
+        * may use SP explicitly.
+        */
+       if (_nc_use_pthreads && sp != SP) {
+           SCREEN *save_sp;
+
+           /* cannot use use_screen(), since that is not in tinfo library */
+           _nc_lock_global(curses);
+           save_sp = SP;
+           _nc_set_screen(sp);
+           rc = _nc_keypad(sp, flag);
+           _nc_set_screen(save_sp);
+           _nc_unlock_global(curses);
+       } else
+#endif
+       {
+           if (flag) {
+               (void) _nc_putp_flush("keypad_xmit", keypad_xmit);
+           } else if (!flag && keypad_local) {
+               (void) _nc_putp_flush("keypad_local", keypad_local);
+           }
+
+           if (flag && !sp->_tried) {
+               _nc_init_keytry(sp);
+               sp->_tried = TRUE;
+           }
+           sp->_keypad_on = flag;
+           rc = OK;
        }
-       sp->_keypad_on = flag;
     }
-    return (OK);
+    return (rc);
+}
+
+static int
+_nc_curs_set(SCREEN *sp, int vis)
+{
+    int result = ERR;
+
+    T((T_CALLED("curs_set(%d)"), vis));
+    if (sp != 0 && vis >= 0 && vis <= 2) {
+       int cursor = sp->_cursor;
+
+       if (vis == cursor) {
+           result = cursor;
+       } else {
+           switch (vis) {
+           case 2:
+               result = _nc_putp_flush("cursor_visible", cursor_visible);
+               break;
+           case 1:
+               result = _nc_putp_flush("cursor_normal", cursor_normal);
+               break;
+           case 0:
+               result = _nc_putp_flush("cursor_invisible", cursor_invisible);
+               break;
+           }
+           if (result != ERR)
+               result = (cursor == -1 ? 1 : cursor);
+           sp->_cursor = vis;
+       }
+    }
+    returnCode(result);
+}
+
+static int
+_nc_meta(SCREEN *sp, bool flag)
+{
+    int result = ERR;
+
+    /* Ok, we stay relaxed and don't signal an error if win is NULL */
+
+    if (SP != 0) {
+       SP->_use_meta = flag;
+
+       if (flag) {
+           _nc_putp("meta_on", meta_on);
+       } else {
+           _nc_putp("meta_off", meta_off);
+       }
+       result = OK;
+    }
+    return result;
 }