ncurses 6.1 - patch 20191207

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

diff --git a/ncurses/base/lib_vline.c b/ncurses/base/lib_vline.c
index e48b864f497da09fafdaf9e5c2274ec10053e2e7..acb5dfd125f88227de877d6f8e04e8215d59b038 100644 (file)
--- a/ncurses/base/lib_vline.c
+++ b/ncurses/base/lib_vline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 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,6 +29,8 @@
 /****************************************************************************
  *  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,31 +42,41 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_vline.c,v 1.5 2000/04/29 21:14:11 tom Exp $")
+MODULE_ID("$Id: lib_vline.c,v 1.14 2017/10/28 19:55:44 tom Exp $")
 
-int
+NCURSES_EXPORT(int)
 wvline(WINDOW *win, chtype ch, int n)
 {
     int code = ERR;
-    NCURSES_SIZE_T row, col;
-    NCURSES_SIZE_T end;
 
-    T((T_CALLED("wvline(%p,%s,%d)"), win, _tracechtype(ch), n));
+    T((T_CALLED("wvline(%p,%s,%d)"), (void *) win, _tracechtype(ch), n));
 
     if (win) {
-       row = win->_cury;
-       col = win->_curx;
-       end = row + n - 1;
+       NCURSES_CH_T wch;
+       int row = win->_cury;
+       int col = win->_curx;
+       int end = row + n - 1;
+
        if (end > win->_maxy)
            end = win->_maxy;
 
        if (ch == 0)
-           ch = ACS_VLINE;
-       ch = _nc_render(win, ch);
+           SetChar2(wch, ACS_VLINE);
+       else
+           SetChar2(wch, ch);
+       wch = _nc_render(win, wch);
 
        while (end >= row) {
            struct ldat *line = &(win->_line[end]);
-           line->text[col] = ch;
+#if USE_WIDEC_SUPPORT
+           if (col > 0 && isWidecExt(line->text[col])) {
+               SetChar2(line->text[col - 1], ' ');
+           }
+           if (col < win->_maxx && isWidecExt(line->text[col + 1])) {
+               SetChar2(line->text[col + 1], ' ');
+           }
+#endif
+           line->text[col] = wch;
            CHANGED_CELL(line, col);
            end--;
        }