X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_slk.c;h=662f7e45b11661cbe516484f567e0872a797f2e4;hp=d45a7d2b3cdb9a20e298145b4c5184f0e20c59ce;hb=1f21085964c1dcb515970035e43b7f25ac2cfdf6;hpb=bd7ef7c2309fd00aa4576168c46f557c622cb9c3;ds=sidebyside

diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index d45a7d2b..662f7e45 100644
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -45,34 +45,7 @@
 #include <ctype.h>
 #include <term.h>		/* num_labels, label_*, plab_norm */
 
-MODULE_ID("$Id: lib_slk.c,v 1.33 2008/05/31 22:05:57 tom Exp $")
-
-/*
- * We'd like to move these into the screen context structure, but cannot,
- * because slk_init() is called before initscr()/newterm().
- */
-NCURSES_EXPORT_VAR(int)
-_nc_slk_format = 0;		/* one more than format specified in slk_init() */
-
-/*
- * Paint the info line for the PC style SLK emulation.
- */
-static void
-slk_paint_info(WINDOW *win)
-{
-    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);
-	}
-    }
-}
+MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $")
 
 /*
  * Free any memory related to soft labels, return an error.
@@ -147,7 +120,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;
@@ -160,7 +133,6 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
 	    x += max_length;
 	    x += (i == 3 || i == 7) ? gap : 1;
 	}
-	slk_paint_info(stwin);
     } else {
 	if (_nc_globals.slk_format == 2) {	/* 4-4 */
 	    int gap = cols - (SP->_slk->maxlab * max_length) - 6;
@@ -214,8 +186,6 @@ slk_restore(void)
 	return (ERR);
     SP->_slk->hidden = FALSE;
     SP->_slk->dirty = TRUE;
-    /* we have to repaint info line eventually */
-    slk_paint_info(SP->_slk->win);
 
     returnCode(slk_refresh());
 }