ncurses 5.9 - patch 20130112

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

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

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2013 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            *


@@ -42,51 +42,51 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-#include <term.h>
-

 #ifndef CUR
 #ifndef CUR

-#define CUR SP_TERMTYPE 
+#define CUR SP_TERMTYPE

 #endif
 
 #endif
 

-MODULE_ID("$Id: lib_options.c,v 1.63 2009/05/10 00:48:29 tom Exp $")
-
-static int _nc_meta(SCREEN *, bool);
+MODULE_ID("$Id: lib_options.c,v 1.74 2013/01/12 16:44:17 tom Exp $")

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

-#if NCURSES_SP_FUNCS
-    SCREEN *sp = CURRENT_SCREEN;
-#endif
-    T((T_CALLED("idlok(%p,%d)"), win, flag));
+    int res = ERR;
+    T((T_CALLED("idlok(%p,%d)"), (void *) win, flag));

 
     if (win) {
 
     if (win) {

-       _nc_idlok = win->_idlok = (flag && (has_il() || change_scroll_region));
-       returnCode(OK);
-    } else
-       returnCode(ERR);
+       SCREEN *sp = _nc_screen_of(win);
+       if (sp && IsTermInfo(sp)) {
+           sp->_nc_sp_idlok =
+               win->_idlok = (flag && (NCURSES_SP_NAME(has_il) (NCURSES_SP_ARG)
+                                       || change_scroll_region));
+           res = OK;
+       }
+    }
+    returnCode(res);

 }
 
 NCURSES_EXPORT(void)
 idcok(WINDOW *win, bool flag)
 {
 }
 
 NCURSES_EXPORT(void)
 idcok(WINDOW *win, bool flag)
 {

-    T((T_CALLED("idcok(%p,%d)"), win, flag));
-
-    if (win)
-       _nc_idcok = win->_idcok = (flag && has_ic());
+    T((T_CALLED("idcok(%p,%d)"), (void *) win, flag));

 
 

+    if (win) {
+       SCREEN *sp = _nc_screen_of(win);
+       sp->_nc_sp_idcok = win->_idcok = (flag && NCURSES_SP_NAME(has_ic) (NCURSES_SP_ARG));
+    }

     returnVoid;
 }
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)
 {
     returnVoid;
 }
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)
 {

-    T((T_CALLED("halfdelay(%d)"), t));
+    T((T_CALLED("halfdelay(%p,%d)"), (void *) SP_PARM, t));

 
 

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

        returnCode(ERR);
 
        returnCode(ERR);
 

-    cbreak();
+    NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);

     SP_PARM->_cbreak = t + 1;
     returnCode(OK);
 }
     SP_PARM->_cbreak = t + 1;
     returnCode(OK);
 }


@@ -102,7 +102,7 @@ halfdelay(int t)
 NCURSES_EXPORT(int)
 nodelay(WINDOW *win, bool flag)
 {
 NCURSES_EXPORT(int)
 nodelay(WINDOW *win, bool flag)
 {

-    T((T_CALLED("nodelay(%p,%d)"), win, flag));
+    T((T_CALLED("nodelay(%p,%d)"), (void *) win, flag));

 
     if (win) {
        if (flag == TRUE)
 
     if (win) {
        if (flag == TRUE)


@@ -117,7 +117,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("notimeout(%p,%d)"), win, f));
+    T((T_CALLED("notimeout(%p,%d)"), (void *) win, f));

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


@@ -129,7 +129,7 @@ notimeout(WINDOW *win, bool f)
 NCURSES_EXPORT(void)
 wtimeout(WINDOW *win, int delay)
 {
 NCURSES_EXPORT(void)
 wtimeout(WINDOW *win, int delay)
 {

-    T((T_CALLED("wtimeout(%p,%d)"), win, delay));
+    T((T_CALLED("wtimeout(%p,%d)"), (void *) win, delay));

 
     if (win) {
        win->_delay = delay;
 
     if (win) {
        win->_delay = delay;


@@ -140,11 +140,11 @@ wtimeout(WINDOW *win, int delay)
 NCURSES_EXPORT(int)
 keypad(WINDOW *win, bool flag)
 {
 NCURSES_EXPORT(int)
 keypad(WINDOW *win, bool flag)
 {

-    T((T_CALLED("keypad(%p,%d)"), win, flag));
+    T((T_CALLED("keypad(%p,%d)"), (void *) win, flag));

 
     if (win) {
        win->_use_keypad = flag;
 
     if (win) {
        win->_use_keypad = flag;

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

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


@@ -152,11 +152,33 @@ 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;
+    int result = ERR;
+    SCREEN *sp = (win == 0) ? CURRENT_SCREEN : _nc_screen_of(win);

 
     /* Ok, we stay relaxed and don't signal an error if win is NULL */
 
     /* Ok, we stay relaxed and don't signal an error if win is NULL */

-    T((T_CALLED("meta(%p,%d)"), win, flag));
-    result = _nc_meta(SP, flag);
+    T((T_CALLED("meta(%p,%d)"), (void *) win, flag));
+
+    /* Ok, we stay relaxed and don't signal an error if win is NULL */
+
+    if (sp != 0) {
+       sp->_use_meta = flag;
+#ifdef USE_TERM_DRIVER
+       if (IsTermInfo(sp)) {
+           if (flag) {
+               NCURSES_PUTP2("meta_on", meta_on);
+           } else {
+               NCURSES_PUTP2("meta_off", meta_off);
+           }
+       }
+#else
+       if (flag) {
+           NCURSES_PUTP2("meta_on", meta_on);
+       } else {
+           NCURSES_PUTP2("meta_off", meta_off);
+       }
+#endif
+       result = OK;
+    }

     returnCode(result);
 }
 
     returnCode(result);
 }
 


@@ -165,32 +187,38 @@ meta(WINDOW *win GCC_UNUSED, bool flag)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(curs_set) (NCURSES_SP_DCLx int vis)
 {
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(curs_set) (NCURSES_SP_DCLx int vis)
 {

-    int result = ERR;
+    int code = ERR;
+    T((T_CALLED("curs_set(%p,%d)"), (void *) SP_PARM, vis));

 
 

-    T((T_CALLED("curs_set(%p,%d)"), SP_PARM, vis));

     if (SP_PARM != 0 && vis >= 0 && vis <= 2) {
        int cursor = SP_PARM->_cursor;
     if (SP_PARM != 0 && vis >= 0 && vis <= 2) {
        int cursor = SP_PARM->_cursor;

-
+       bool bBuiltIn = !IsTermInfo(SP_PARM);

        if (vis == cursor) {
        if (vis == cursor) {

-           result = cursor;
+           code = cursor;

        } else {
        } 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);
+           if (!bBuiltIn) {
+               switch (vis) {
+               case 2:
+                   code = NCURSES_PUTP2_FLUSH("cursor_visible",
+                                              cursor_visible);
+                   break;
+               case 1:
+                   code = NCURSES_PUTP2_FLUSH("cursor_normal",
+                                              cursor_normal);
+                   break;
+               case 0:
+                   code = NCURSES_PUTP2_FLUSH("cursor_invisible",
+                                              cursor_invisible);
+                   break;
+               }
+           } else
+               code = ERR;
+           if (code != ERR)
+               code = (cursor == -1 ? 1 : cursor);

            SP_PARM->_cursor = vis;
        }
     }
            SP_PARM->_cursor = vis;
        }
     }

-    returnCode(result);
+    returnCode(code);

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -204,8 +232,8 @@ curs_set(int vis)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd)
 {
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd)
 {

-    T((T_CALLED("typeahead(%d)"), fd));
-    if (SP_PARM != 0) {
+    T((T_CALLED("typeahead(%p, %d)"), (void *) SP_PARM, fd));
+    if (IsValidTIScreen(SP_PARM)) {

        SP_PARM->_checkfd = fd;
        returnCode(OK);
     } else {
        SP_PARM->_checkfd = fd;
        returnCode(OK);
     } else {


@@ -241,10 +269,18 @@ has_key_internal(int keycode, TRIES * tp)
                || has_key_internal(keycode, tp->sibling));
 }
 
                || has_key_internal(keycode, tp->sibling));
 }
 

+#ifdef USE_TERM_DRIVER
+NCURSES_EXPORT(int)
+TINFO_HAS_KEY(SCREEN *sp, int keycode)
+{
+    return IsValidTIScreen(sp) ?
+       has_key_internal(keycode, sp->_keytry) : 0;
+}
+#else

 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode)
 {
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode)
 {

-    T((T_CALLED("has_key(%p,%d)"), SP_PARM, keycode));
+    T((T_CALLED("has_key(%p,%d)"), (void *) SP_PARM, keycode));

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


@@ -255,48 +291,21 @@ has_key(int keycode)
     return NCURSES_SP_NAME(has_key) (CURRENT_SCREEN, keycode);
 }
 #endif
     return NCURSES_SP_NAME(has_key) (CURRENT_SCREEN, keycode);
 }
 #endif

-#endif /* NCURSES_EXT_FUNCS */
-
-/*
- * Internal entrypoints use SCREEN* parameter to obtain capabilities rather
- * than cur_term.
- */
-#undef CUR
-#define CUR SP_TERMTYPE 
-
-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
 #endif

+#endif /* NCURSES_EXT_FUNCS */

 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx
                                 const char *name, const char *value)
 {
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx
                                 const char *name, const char *value)
 {

-    int rc = _nc_putp(name, value);
+    int rc = NCURSES_PUTP2(name, value);

     if (rc != ERR) {
        _nc_flush();
     }
     return rc;
 }
 
     if (rc != ERR) {
        _nc_flush();
     }
     return rc;
 }
 

-#if NCURSES_SP_FUNCS
+#if 0 && NCURSES_SP_FUNCS

 NCURSES_EXPORT(int)
 _nc_putp_flush(const char *name, const char *value)
 {
 NCURSES_EXPORT(int)
 _nc_putp_flush(const char *name, const char *value)
 {


@@ -312,7 +321,7 @@ _nc_putp_flush(const char *name, const char *value)
  * the terminal state _before_ switching modes.
  */
 NCURSES_EXPORT(int)
  * the terminal state _before_ switching modes.
  */
 NCURSES_EXPORT(int)

-_nc_keypad(SCREEN *sp, bool flag)
+_nc_keypad(SCREEN *sp, int flag)

 {
     int rc = ERR;
 
 {
     int rc = ERR;
 


@@ -336,10 +345,15 @@ _nc_keypad(SCREEN *sp, bool flag)
        } else
 #endif
        {
        } else
 #endif
        {

+#ifdef USE_TERM_DRIVER
+           rc = CallDriver_1(sp, kpad, flag);
+           if (rc == OK)
+               sp->_keypad_on = flag;
+#else

            if (flag) {
            if (flag) {

-               (void) _nc_putp_flush("keypad_xmit", keypad_xmit);
+               (void) NCURSES_PUTP2_FLUSH("keypad_xmit", keypad_xmit);

            } else if (!flag && keypad_local) {
            } else if (!flag && keypad_local) {

-               (void) _nc_putp_flush("keypad_local", keypad_local);
+               (void) NCURSES_PUTP2_FLUSH("keypad_local", keypad_local);

            }
 
            if (flag && !sp->_tried) {
            }
 
            if (flag && !sp->_tried) {


@@ -348,27 +362,8 @@ _nc_keypad(SCREEN *sp, bool flag)
            }
            sp->_keypad_on = flag;
            rc = OK;
            }
            sp->_keypad_on = flag;
            rc = OK;

+#endif

        }
     }
     return (rc);
 }
        }
     }
     return (rc);
 }

-
-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;
-}