ncurses 5.6 - patch 20080628

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

diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index b58602af72bbec024892408cc4fa5874406222d7..eb170354f4dc630e15509c8799edd4d4ac26f797 100644 (file)
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -42,9 +43,12 @@
 
 #include <term.h>
 
 
 #include <term.h>
 

-MODULE_ID("$Id: lib_options.c,v 1.39 2000/03/12 00:19:11 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.57 2008/06/28 23:31:15 tom Exp $")

 
 

-int
+static int _nc_curs_set(SCREEN *, int);
+static int _nc_meta(SCREEN *, bool);
+
+NCURSES_EXPORT(int)

 idlok(WINDOW *win, bool flag)
 {
     T((T_CALLED("idlok(%p,%d)"), win, flag));
 idlok(WINDOW *win, bool flag)
 {
     T((T_CALLED("idlok(%p,%d)"), win, flag));


@@ -56,7 +60,7 @@ idlok(WINDOW *win, bool flag)
        returnCode(ERR);
 }
 
        returnCode(ERR);
 }
 

-void
+NCURSES_EXPORT(void)

 idcok(WINDOW *win, bool flag)
 {
     T((T_CALLED("idcok(%p,%d)"), win, flag));
 idcok(WINDOW *win, bool flag)
 {
     T((T_CALLED("idcok(%p,%d)"), win, flag));


@@ -67,12 +71,12 @@ idcok(WINDOW *win, bool flag)
     returnVoid;
 }
 
     returnVoid;
 }
 

-int
+NCURSES_EXPORT(int)

 halfdelay(int t)
 {
     T((T_CALLED("halfdelay(%d)"), t));
 
 halfdelay(int t)
 {
     T((T_CALLED("halfdelay(%d)"), t));
 

-    if (t < 1 || t > 255)
+    if (t < 1 || t > 255 || SP == 0)

        returnCode(ERR);
 
     cbreak();
        returnCode(ERR);
 
     cbreak();


@@ -80,7 +84,7 @@ halfdelay(int t)
     returnCode(OK);
 }
 
     returnCode(OK);
 }
 

-int
+NCURSES_EXPORT(int)

 nodelay(WINDOW *win, bool flag)
 {
     T((T_CALLED("nodelay(%p,%d)"), win, flag));
 nodelay(WINDOW *win, bool flag)
 {
     T((T_CALLED("nodelay(%p,%d)"), win, flag));


@@ -95,10 +99,10 @@ nodelay(WINDOW *win, bool flag)
        returnCode(ERR);
 }
 
        returnCode(ERR);
 }
 

-int
+NCURSES_EXPORT(int)

 notimeout(WINDOW *win, bool f)
 {
 notimeout(WINDOW *win, bool f)
 {

-    T((T_CALLED("notimout(%p,%d)"), win, f));
+    T((T_CALLED("notimeout(%p,%d)"), win, f));

 
     if (win) {
        win->_notimeout = f;
 
     if (win) {
        win->_notimeout = f;


@@ -107,7 +111,7 @@ notimeout(WINDOW *win, bool f)
        returnCode(ERR);
 }
 
        returnCode(ERR);
 }
 

-void
+NCURSES_EXPORT(void)

 wtimeout(WINDOW *win, int delay)
 {
     T((T_CALLED("wtimeout(%p,%d)"), win, delay));
 wtimeout(WINDOW *win, int delay)
 {
     T((T_CALLED("wtimeout(%p,%d)"), win, delay));


@@ -115,88 +119,54 @@ wtimeout(WINDOW *win, int delay)
     if (win) {
        win->_delay = delay;
     }
     if (win) {
        win->_delay = delay;
     }

+    returnVoid;

 }
 
 }
 

-int
+NCURSES_EXPORT(int)

 keypad(WINDOW *win, bool flag)
 {
     T((T_CALLED("keypad(%p,%d)"), win, flag));
 
     if (win) {
        win->_use_keypad = flag;
 keypad(WINDOW *win, bool flag)
 {
     T((T_CALLED("keypad(%p,%d)"), win, flag));
 
     if (win) {
        win->_use_keypad = flag;

-       returnCode(_nc_keypad(flag));
+       returnCode(_nc_keypad(SP, flag));

     } else
        returnCode(ERR);
 }
 
     } else
        returnCode(ERR);
 }
 

-int
+NCURSES_EXPORT(int)

 meta(WINDOW *win GCC_UNUSED, bool flag)
 {
 meta(WINDOW *win GCC_UNUSED, bool flag)
 {

+    int result;
+

     /* Ok, we stay relaxed and don't signal an error if win is NULL */
     T((T_CALLED("meta(%p,%d)"), win, flag));
     /* Ok, we stay relaxed and don't signal an error if win is NULL */
     T((T_CALLED("meta(%p,%d)"), win, flag));

-
-    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);
-    }
-    returnCode(OK);
+    result = _nc_meta(SP, flag);
+    returnCode(result);

 }
 
 /* curs_set() moved here to narrow the kernel interface */
 
 }
 
 /* curs_set() moved here to narrow the kernel interface */
 

-int
+NCURSES_EXPORT(int)

 curs_set(int vis)
 {
 curs_set(int vis)
 {

-    int cursor = SP->_cursor;
+    int result;

 
     T((T_CALLED("curs_set(%d)"), vis));
 
     T((T_CALLED("curs_set(%d)"), vis));

-
-    if (vis < 0 || vis > 2)
-       returnCode(ERR);
-
-    if (vis == cursor)
-       returnCode(cursor);
-
-    switch (vis) {
-    case 2:
-       if (cursor_visible) {
-           TPUTS_TRACE("cursor_visible");
-           putp(cursor_visible);
-       } else
-           returnCode(ERR);
-       break;
-    case 1:
-       if (cursor_normal) {
-           TPUTS_TRACE("cursor_normal");
-           putp(cursor_normal);
-       } else
-           returnCode(ERR);
-       break;
-    case 0:
-       if (cursor_invisible) {
-           TPUTS_TRACE("cursor_invisible");
-           putp(cursor_invisible);
-       } else
-           returnCode(ERR);
-       break;
-    }
-    SP->_cursor = vis;
-    _nc_flush();
-
-    returnCode(cursor == -1 ? 1 : cursor);
+    result = _nc_curs_set(SP, vis);
+    returnCode(result);

 }
 
 }
 

-int
+NCURSES_EXPORT(int)

 typeahead(int fd)
 {
     T((T_CALLED("typeahead(%d)"), fd));
 typeahead(int fd)
 {
     T((T_CALLED("typeahead(%d)"), fd));

-    SP->_checkfd = fd;
-    returnCode(OK);
+    if (SP != 0) {
+       SP->_checkfd = fd;
+       returnCode(OK);
+    } else {
+       returnCode(ERR);
+    }

 }
 
 /*
 }
 
 /*


@@ -206,9 +176,9 @@ typeahead(int fd)
 **
 */
 
 **
 */
 

-#ifdef NCURSES_EXT_FUNCS
+#if NCURSES_EXT_FUNCS

 static int
 static int

-has_key_internal(int keycode, struct tries *tp)
+has_key_internal(int keycode, TRIES * tp)

 {
     if (tp == 0)
        return (FALSE);
 {
     if (tp == 0)
        return (FALSE);


@@ -216,17 +186,46 @@ has_key_internal(int keycode, struct tries *tp)
        return (TRUE);
     else
        return (has_key_internal(keycode, tp->child)
        return (TRUE);
     else
        return (has_key_internal(keycode, tp->child)

-           || has_key_internal(keycode, tp->sibling));
+               || has_key_internal(keycode, tp->sibling));

 }
 
 }
 

-int
+NCURSES_EXPORT(int)

 has_key(int keycode)
 {
     T((T_CALLED("has_key(%d)"), keycode));
 has_key(int keycode)
 {
     T((T_CALLED("has_key(%d)"), keycode));

-    returnCode(has_key_internal(keycode, SP->_keytry));
+    returnCode(SP != 0 ? has_key_internal(keycode, SP->_keytry) : FALSE);

 }
 #endif /* NCURSES_EXT_FUNCS */
 
 }
 #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
 /* Turn the keypad on/off
  *
  * Note:  we flush the output because changing this mode causes some terminals


@@ -234,22 +233,95 @@ has_key(int keycode)
  * flush, then the next wgetch may get the escape sequence that corresponds to
  * the terminal state _before_ switching modes.
  */
  * flush, then the next wgetch may get the escape sequence that corresponds to
  * the terminal state _before_ switching modes.
  */

-int
-_nc_keypad(bool flag)
+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) {
+#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 (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;
+       }
+    }
+    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 && !SP->_tried) {
-       _nc_init_keytry();
-       SP->_tried = TRUE;
+       if (flag) {
+           _nc_putp("meta_on", meta_on);
+       } else {
+           _nc_putp("meta_off", meta_off);
+       }
+       result = OK;

     }
     }

-    return (OK);
+    return result;

 }
 }