ncurses 5.7 - patch 20100206

[ncurses.git] / ncurses / base / lib_slkinit.c

diff --git a/ncurses/base/lib_slkinit.c b/ncurses/base/lib_slkinit.c
index 29cfeedbae4ea29ab5b0f68d15a1542f098f5ee0..9cbdfea98430b8cec66695699f060b78ed836450 100644 (file)
--- a/ncurses/base/lib_slkinit.c
+++ b/ncurses/base/lib_slkinit.c
@@ -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                    *

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


@@ -39,20 +40,32 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkinit.c,v 1.10 2009/05/09 18:32:07 tom Exp $")
+MODULE_ID("$Id: lib_slkinit.c,v 1.13 2009/10/31 00:10:46 tom Exp $")
+
+#ifdef USE_SP_RIPOFF
+#define SoftkeyFormat SP_PARM->slk_format
+#else
+#define SoftkeyFormat _nc_globals.slk_format
+#endif

 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format)
 {
     int code = ERR;
 
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format)
 {
     int code = ERR;
 

-    T((T_CALLED("slk_init(%p,%d)"), SP_PARM, format));
+    START_TRACE();
+    T((T_CALLED("slk_init(%p,%d)"), (void *) SP_PARM, format));

 
 

-    if (SP_PARM && format >= 0 && format <= 3 && !SP_PARM->slk_format &&
-       SP_PARM->_prescreen) {
-       SP_PARM->slk_format = 1 + format;
+    if (format >= 0
+       && format <= 3
+#ifdef USE_SP_RIPOFF
+       && SP_PARM
+       && SP_PARM->_prescreen
+#endif
+       && !SoftkeyFormat) {
+       SoftkeyFormat = 1 + format;

        code = NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx
        code = NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx

-                                               -SLK_LINES(SP_PARM->slk_format),
+                                               -SLK_LINES(SoftkeyFormat),

                                                _nc_slk_initialize);
     }
     returnCode(code);
                                                _nc_slk_initialize);
     }
     returnCode(code);