ncurses 5.6 - patch 20080816

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

diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index 27b21b08d718c5498a09aa740ffc235aae1c3bde..fd5c53e07fc4536f6dd8cf50bb06bbf7791a0a10 100644 (file)
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -45,7 +45,7 @@
 #include <ctype.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 
-MODULE_ID("$Id: lib_slk.c,v 1.31 2008/01/12 20:21:00 tom Exp $")
+MODULE_ID("$Id: lib_slk.c,v 1.34 2008/08/16 19:20:04 tom Exp $")
 
 /*
  * We'd like to move these into the screen context structure, but cannot,
@@ -60,14 +60,16 @@ _nc_slk_format = 0;         /* one more than format specified in slk_init() */
 static void
 slk_paint_info(WINDOW *win)
 {
-    if (win && SP->slk_format == 4) {
+    SCREEN *sp = _nc_screen_of(win);
+
+    if (win && sp && (sp->slk_format == 4)) {
        int i;
 
        mvwhline(win, 0, 0, 0, getmaxx(win));
        wmove(win, 0, 0);
 
-       for (i = 0; i < SP->_slk->maxlab; i++) {
-           mvwprintw(win, 0, SP->_slk->ent[i].ent_x, "F%d", i + 1);
+       for (i = 0; i < sp->_slk->maxlab; i++) {
+           mvwprintw(win, 0, sp->_slk->ent[i].ent_x, "F%d", i + 1);
        }
     }
 }
@@ -145,7 +147,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
        memset(SP->_slk->ent[i].form_text, 0, used);
 
        memset(SP->_slk->ent[i].form_text, ' ', max_length);
-       SP->_slk->ent[i].visible = (i < SP->_slk->maxlab);
+       SP->_slk->ent[i].visible = (char) (i < SP->_slk->maxlab);
     }
     if (_nc_globals.slk_format >= 3) { /* PC style */
        int gap = (cols - 3 * (3 + 4 * max_length)) / 2;