ncurses 5.6 - patch 20080927

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

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index c8ca28b9dd84387d2e9d1a22a7ad8963f2967f43..cb1beba0e2a1c7ad15fc56e7bf2f3d7a7b3335cd 100644 (file)
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -40,7 +40,27 @@
 #include <curses.priv.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 
 #include <curses.priv.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 

-MODULE_ID("$Id: lib_slkrefr.c,v 1.15 2006/11/25 22:32:15 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.
 
 /*
  * Write the soft labels to the soft-key window.


@@ -60,8 +80,10 @@ slk_intern_refresh(SLK * slk)
                        putp(TPARM_2(plab_norm, i + 1, slk->ent[i].form_text));
                    }
                } else {
                        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);
                    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);

-                   if (SP && SP->_slk) {
+                   if (SP->_slk) {

                        wattrset(slk->win, AttrOf(SP->_slk->attr));
                    }
                    waddstr(slk->win, slk->ent[i].form_text);
                        wattrset(slk->win, AttrOf(SP->_slk->attr));
                    }
                    waddstr(slk->win, slk->ent[i].form_text);