ncurses 5.7 - patch 20090411

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

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

- * Copyright (c) 1998-2003,2005 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            *


@@ -30,6 +30,7 @@
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *

+ *     and: Juergen Pfeifer                         2009                    *

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


@@ -43,7 +44,10 @@
 
 #include <term.h>
 
 
 #include <term.h>
 

-MODULE_ID("$Id: lib_options.c,v 1.48 2005/01/22 21:13:34 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.60 2009/02/28 21:07:56 tom Exp $")
+
+static int _nc_curs_set(SCREEN *, int);
+static int _nc_meta(SCREEN *, bool);

 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)
 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)


@@ -69,18 +73,26 @@ idcok(WINDOW *win, bool flag)
 }
 
 NCURSES_EXPORT(int)
 }
 
 NCURSES_EXPORT(int)

-halfdelay(int t)
+NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)

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

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

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

-    SP->_cbreak = t + 1;
+    SP_PARM->_cbreak = t + 1;

     returnCode(OK);
 }
 
     returnCode(OK);
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+halfdelay(int t)
+{
+    return NCURSES_SP_NAME(halfdelay) (CURRENT_SCREEN, t);
+}
+#endif
+

 NCURSES_EXPORT(int)
 nodelay(WINDOW *win, bool flag)
 {
 NCURSES_EXPORT(int)
 nodelay(WINDOW *win, bool flag)
 {


@@ -99,7 +111,7 @@ nodelay(WINDOW *win, bool flag)
 NCURSES_EXPORT(int)
 notimeout(WINDOW *win, bool f)
 {
 NCURSES_EXPORT(int)
 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;


@@ -126,7 +138,7 @@ keypad(WINDOW *win, bool flag)
 
     if (win) {
        win->_use_keypad = flag;
 
     if (win) {
        win->_use_keypad = flag;

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

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


@@ -134,23 +146,11 @@ keypad(WINDOW *win, bool flag)
 NCURSES_EXPORT(int)
 meta(WINDOW *win GCC_UNUSED, 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));
 
     /* 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);
 }
 
     returnCode(result);
 }
 


@@ -159,58 +159,33 @@ meta(WINDOW *win GCC_UNUSED, bool flag)
 NCURSES_EXPORT(int)
 curs_set(int vis)
 {
 NCURSES_EXPORT(int)
 curs_set(int vis)
 {

-    int result = ERR;
+    int result;

 
     T((T_CALLED("curs_set(%d)"), vis));
 
     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);
 }
 
 NCURSES_EXPORT(int)
     returnCode(result);
 }
 
 NCURSES_EXPORT(int)

-typeahead(int fd)
+NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd)

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

-    if (SP != 0) {
-       SP->_checkfd = fd;
+    if (SP_PARM != 0) {
+       SP_PARM->_checkfd = fd;

        returnCode(OK);
     } else {
        returnCode(ERR);
     }
 }
 
        returnCode(OK);
     } else {
        returnCode(ERR);
     }
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+typeahead(int fd)
+{
+    return NCURSES_SP_NAME(typeahead) (CURRENT_SCREEN, fd);
+}
+#endif
+

 /*
 **      has_key()
 **
 /*
 **      has_key()
 **


@@ -220,7 +195,7 @@ typeahead(int fd)
 
 #if NCURSES_EXT_FUNCS
 static int
 
 #if NCURSES_EXT_FUNCS
 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);


@@ -239,6 +214,53 @@ has_key(int keycode)
 }
 #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.
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
+                          const char *name GCC_UNUSED, const char *value)
+{
+    int rc = ERR;
+
+    if (value) {
+       TPUTS_TRACE(name);
+       rc = putp(value);
+    }
+    return rc;
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+_nc_putp(const char *name, const char *value)
+{
+    return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, value);
+}
+#endif
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx
+                                const char *name, const char *value)
+{
+    int rc = _nc_putp(name, value);
+    if (rc != ERR) {
+       _nc_flush();
+    }
+    return rc;
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+_nc_putp_flush(const char *name, const char *value)
+{
+    return NCURSES_SP_NAME(_nc_putp_flush) (CURRENT_SCREEN, name, value);
+}
+#endif
+

 /* 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


@@ -247,24 +269,94 @@ has_key(int keycode)
  * the terminal state _before_ switching modes.
  */
 NCURSES_EXPORT(int)
  * the terminal state _before_ switching modes.
  */
 NCURSES_EXPORT(int)

-_nc_keypad(bool flag)
+_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 (_nc_use_pthreads && sp != CURRENT_SCREEN) {
+           SCREEN *save_sp;
+
+           /* cannot use use_screen(), since that is not in tinfo library */
+           _nc_lock_global(curses);
+           save_sp = CURRENT_SCREEN;
+           _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 (SP != 0) {
-       if (flag && !SP->_tried) {
-           _nc_init_keytry();
-           SP->_tried = TRUE;
+       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;

        }
        }

-       SP->_keypad_on = flag;

     }
     }

-    return (OK);
+    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;

 }
 }