ncurses 5.9 - patch 20150328

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

diff --git a/ncurses/base/lib_hline.c b/ncurses/base/lib_hline.c
index 3b0a602eeee936cffd9020e9f8f14898a8671ce0..1f0380830ddc7497dd36a5b8579d2150e990e0f0 100644 (file)
--- a/ncurses/base/lib_hline.c
+++ b/ncurses/base/lib_hline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -31,8 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **     lib_hline.c
 **
@@ -42,35 +40,41 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_hline.c,v 1.4 1998/06/28 00:11:01 tom Exp $")
+MODULE_ID("$Id: lib_hline.c,v 1.13 2010/12/19 01:48:39 tom Exp $")
 
-int whline(WINDOW *win, chtype ch, int n)
+NCURSES_EXPORT(int)
+whline(WINDOW *win, chtype ch, int n)
 {
-int   code = ERR;
-short start;
-short end;
+    int code = ERR;
+    int start;
+    int end;
 
-       T((T_CALLED("whline(%p,%s,%d)"), win, _tracechtype(ch), n));
+    T((T_CALLED("whline(%p,%s,%d)"), (void *) win, _tracechtype(ch), n));
 
-       if (win) {
-               struct ldat *line = &(win->_line[win->_cury]);
+    if (win) {
+       struct ldat *line = &(win->_line[win->_cury]);
+       NCURSES_CH_T wch;
 
-               start = win->_curx;
-               end   = start + n - 1;
-               if (end > win->_maxx)
-                       end   = win->_maxx;
+       start = win->_curx;
+       end = start + n - 1;
+       if (end > win->_maxx)
+           end = win->_maxx;
 
-               CHANGED_RANGE(line, start, end);
+       CHANGED_RANGE(line, start, end);
 
-               if (ch == 0)
-                       ch = ACS_HLINE;
-               ch = _nc_render(win, ch);
+       if (ch == 0)
+           SetChar2(wch, ACS_HLINE);
+       else
+           SetChar2(wch, ch);
+       wch = _nc_render(win, wch);
 
-               while ( end >= start) {
-                       line->text[end] = ch;
-                       end--;
-               }
-               code = OK;
+       while (end >= start) {
+           line->text[end] = wch;
+           end--;
        }
-       returnCode(code);
+
+       _nc_synchook(win);
+       code = OK;
+    }
+    returnCode(code);
 }