ncurses 6.2 - patch 20200531

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

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 2cdc89cc31feb9f72ea0b8f86f7b577f9c8d59f0..c6bf9d2e06f610771d088aa33089f58bfc112894 100644 (file)
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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 +44,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slkrefr.c,v 1.28 2012/12/08 22:31:14 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.31 2020/02/02 23:34:34 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels    InfoOf(SP_PARM).numlabels
@@ -97,11 +98,13 @@ 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 {
@@ -123,14 +126,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
     }