ncurses 6.1 - patch 20190914

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

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 1635c7f474fcd939ebd796b1ebb1c68d11b7a7e7..382f9c4b00f7a2842aae38912e5dfa0d2c475a58 100644 (file)
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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            *
@@ -43,7 +43,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slkrefr.c,v 1.27 2012/06/09 20:29:33 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.30 2014/03/08 20:32:59 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels    InfoOf(SP_PARM).numlabels
@@ -97,20 +97,20 @@ slk_intern_refresh(SCREEN *sp)
            if (slk->ent[i].visible) {
                if (numlab > 0 && SLK_STDFMT(fmt)) {
 #ifdef USE_TERM_DRIVER
-                   CallDriver_2(sp, hwlabel, i + 1, slk->ent[i].form_text);
+                   CallDriver_2(sp, td_hwlabel, i + 1, slk->ent[i].form_text);
 #else
                    if (i < num_labels) {
-                       TPUTS_TRACE("plab_norm");
-                       putp(TPARM_2(plab_norm, i + 1, slk->ent[i].form_text));
+                       NCURSES_PUTP2("plab_norm",
+                                     TPARM_2(plab_norm,
+                                             i + 1,
+                                             slk->ent[i].form_text));
                    }
 #endif
                } else {
                    if (fmt == 4)
                        slk_paint_info(slk->win);
                    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
-                   if (sp->_slk) {
-                       (void) wattrset(slk->win, (int) AttrOf(sp->_slk->attr));
-                   }
+                   (void) wattrset(slk->win, (int) AttrOf(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
@@ -125,14 +125,12 @@ slk_intern_refresh(SCREEN *sp)
 
     if (numlab > 0) {
 #ifdef USE_TERM_DRIVER
-       CallDriver_1(sp, hwlabelOnOff, slk->hidden ? FALSE : TRUE);
+       CallDriver_1(sp, td_hwlabelOnOff, slk->hidden ? FALSE : TRUE);
 #else
        if (slk->hidden) {
-           TPUTS_TRACE("label_off");
-           putp(label_off);
+           NCURSES_PUTP2("label_off", label_off);
        } else {
-           TPUTS_TRACE("label_on");
-           putp(label_on);
+           NCURSES_PUTP2("label_on", label_on);
        }
 #endif
     }