ncurses 5.7 - patch 20090117

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

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 9040cc0429ecb2b9ac0222b63a7a4b29ae81b3aa..cb1beba0e2a1c7ad15fc56e7bf2f3d7a7b3335cd 100644 (file)
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2008 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: Juergen Pfeifer                         1996-on                 *
+ *     and: Thomas E. Dickey                                                *
  ****************************************************************************/
 
 /*
@@ -38,7 +40,27 @@
 #include <curses.priv.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 
-MODULE_ID("$Id: lib_slkrefr.c,v 1.11 2003/03/29 22:53:48 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $")
+
+/*
+ * 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);
+       }
+    }
+}
 
 /*
  * Write the soft labels to the soft-key window.
@@ -55,18 +77,20 @@ slk_intern_refresh(SLK * slk)
                if (num_labels > 0 && SLK_STDFMT(fmt)) {
                    if (i < num_labels) {
                        TPUTS_TRACE("plab_norm");
-                       putp(tparm(plab_norm, i + 1, slk->ent[i].form_text));
+                       putp(TPARM_2(plab_norm, i + 1, slk->ent[i].form_text));
                    }
                } else {
+                   if (fmt == 4)
+                       slk_paint_info(slk->win);
                    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
-                   if (SP && SP->_slk)
-                       wattrset(slk->win, SP->_slk->attr);
-                   waddnstr(slk->win, slk->ent[i].form_text,
-                            MAX_SKEY_LEN(fmt));
+                   if (SP->_slk) {
+                       wattrset(slk->win, AttrOf(SP->_slk->attr));
+                   }
+                   waddstr(slk->win, slk->ent[i].form_text);
                    /* if we simulate SLK's, it's looking much more
                       natural to use the current ATTRIBUTE also
                       for the label window */
-                   wattrset(slk->win, stdscr->_attrs);
+                   wattrset(slk->win, WINDOW_ATTRS(stdscr));
                }
            }
            slk->ent[i].dirty = FALSE;