X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_hline.c;h=0fac51de74fb8db4941ae3b1de87e93fd80d6c6c;hp=3b0a602eeee936cffd9020e9f8f14898a8671ce0;hb=f8f67d02e909c4d165fbed2ba2810c94f2862548;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_hline.c b/ncurses/base/lib_hline.c
index 3b0a602e..0fac51de 100644
--- 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-2016,2017 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,10 +29,10 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Sven Verdoolaege                        2001                    *
  ****************************************************************************/
 
-
-
 /*
 **	lib_hline.c
 **
@@ -42,35 +42,47 @@
 
 #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.15 2017/10/28 19:57:42 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;
 
-	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;
+	int start = win->_curx;
+	int end = start + n - 1;
 
-		start = win->_curx;
-		end   = start + n - 1;
-		if (end > win->_maxx)
-			end   = win->_maxx;
+	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;
+#if USE_WIDEC_SUPPORT
+	if (start > 0 && isWidecExt(line->text[start])) {
+	    SetChar2(line->text[start - 1], ' ');
+	}
+	if (end < win->_maxx && isWidecExt(line->text[end + 1])) {
+	    SetChar2(line->text[end + 1], ' ');
 	}
-	returnCode(code);
+#endif
+	while (end >= start) {
+	    line->text[end] = wch;
+	    end--;
+	}
+
+	_nc_synchook(win);
+	code = OK;
+    }
+    returnCode(code);
 }