ncurses 6.1 - patch 20191005

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

diff --git a/ncurses/base/lib_slkinit.c b/ncurses/base/lib_slkinit.c
index f003b5f033f084f0afdbc8e1064b742bb38ac8d7..11bbdef6ccf7c83225c0c087e0fcb22d518d1328 100644 (file)
--- a/ncurses/base/lib_slkinit.c
+++ b/ncurses/base/lib_slkinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2009,2017 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            *
@@ -29,6 +29,8 @@
 /****************************************************************************
  *  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                    *
  ****************************************************************************/
 
 /*
@@ -38,14 +40,46 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkinit.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
+MODULE_ID("$Id: lib_slkinit.c,v 1.14 2017/06/30 11:47:34 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;
+
+    START_TRACE();
+    T((T_CALLED("slk_init(%p,%d)"), (void *) SP_PARM, 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
+                                               -SLK_LINES(SoftkeyFormat),
+                                               _nc_slk_initialize);
+    }
+    returnCode(code);
+}
+
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 slk_init(int format)
 {
-    T((T_CALLED("slk_init(%d)"), format));
-    if (format < 0 || format > 3)
-       returnCode(ERR);
-    _nc_slk_format = 1 + format;
-    returnCode(OK);
+    int rc;
+    _nc_lock_global(prescreen);
+    START_TRACE();
+    rc = NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN_PRE, format);
+    _nc_unlock_global(prescreen);
+    return rc;
 }
+#endif