ncurses 6.2 - patch 20210418

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

diff --git a/ncurses/base/lib_hline.c b/ncurses/base/lib_hline.c
index 2ef2cc585e100d2beb55c7c155ed34043bb569e6..938c4998343bc44627fb2ad6056803e0cd7ab51d 100644 (file)
--- a/ncurses/base/lib_hline.c
+++ b/ncurses/base/lib_hline.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +30,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  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                    *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -40,23 +43,21 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_hline.c,v 1.11 2006/03/11 21:52:27 tom Exp $")
+MODULE_ID("$Id: lib_hline.c,v 1.16 2020/02/02 23:34:34 tom Exp $")

 
 NCURSES_EXPORT(int)
 whline(WINDOW *win, chtype ch, int n)
 {
     int code = ERR;
 
 NCURSES_EXPORT(int)
 whline(WINDOW *win, chtype ch, int n)
 {
     int code = ERR;

-    NCURSES_SIZE_T start;
-    NCURSES_SIZE_T 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]);
        NCURSES_CH_T wch;
 
     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;
 


@@ -68,6 +69,14 @@ whline(WINDOW *win, chtype ch, int n)
            SetChar2(wch, ch);
        wch = _nc_render(win, wch);
 
            SetChar2(wch, ch);
        wch = _nc_render(win, wch);
 

+#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], ' ');
+       }
+#endif

        while (end >= start) {
            line->text[end] = wch;
            end--;
        while (end >= start) {
            line->text[end] = wch;
            end--;