ncurses 6.1 - patch 20190323

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

diff --git a/ncurses/base/lib_box.c b/ncurses/base/lib_box.c
index 8a682585b5605266b73e36026edd980149837216..dccb8e12d61c6a05e5fda18b28c8ef1c67a4d79a 100644 (file)
--- a/ncurses/base/lib_box.c
+++ b/ncurses/base/lib_box.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2010,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,79 +42,97 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_box.c,v 1.11 2000/04/29 21:12:37 tom Exp $")
+MODULE_ID("$Id: lib_box.c,v 1.25 2017/10/27 21:56:17 tom Exp $")
 
-int
+#if USE_WIDEC_SUPPORT
+static NCURSES_INLINE chtype
+_my_render(WINDOW *win, chtype ch)
+{
+    NCURSES_CH_T wch;
+    SetChar2(wch, ch);
+    wch = _nc_render(win, wch);
+    return ((attr_t) CharOf(wch)) | AttrOf(wch);
+}
+
+#define RENDER_WITH_DEFAULT(ch,def) w ## ch = _my_render(win, (ch == 0) ? def : ch)
+#else
+#define RENDER_WITH_DEFAULT(ch,def) w ## ch = _nc_render(win, (ch == 0) ? def : ch)
+#endif
+
+NCURSES_EXPORT(int)
 wborder(WINDOW *win,
-    chtype ls, chtype rs, chtype ts, chtype bs,
-    chtype tl, chtype tr, chtype bl, chtype br)
+       chtype ls, chtype rs,
+       chtype ts, chtype bs,
+       chtype tl, chtype tr,
+       chtype bl, chtype br)
 {
     NCURSES_SIZE_T i;
     NCURSES_SIZE_T endx, endy;
+    chtype wls, wrs, wts, wbs, wtl, wtr, wbl, wbr;
 
     T((T_CALLED("wborder(%p,%s,%s,%s,%s,%s,%s,%s,%s)"),
-           win,
-           _tracechtype2(1, ls),
-           _tracechtype2(2, rs),
-           _tracechtype2(3, ts),
-           _tracechtype2(4, bs),
-           _tracechtype2(5, tl),
-           _tracechtype2(6, tr),
-           _tracechtype2(7, bl),
-           _tracechtype2(8, br)));
+       (void *) win,
+       _tracechtype2(1, ls),
+       _tracechtype2(2, rs),
+       _tracechtype2(3, ts),
+       _tracechtype2(4, bs),
+       _tracechtype2(5, tl),
+       _tracechtype2(6, tr),
+       _tracechtype2(7, bl),
+       _tracechtype2(8, br)));
 
     if (!win)
        returnCode(ERR);
 
-    if (ls == 0)
-       ls = ACS_VLINE;
-    if (rs == 0)
-       rs = ACS_VLINE;
-    if (ts == 0)
-       ts = ACS_HLINE;
-    if (bs == 0)
-       bs = ACS_HLINE;
-    if (tl == 0)
-       tl = ACS_ULCORNER;
-    if (tr == 0)
-       tr = ACS_URCORNER;
-    if (bl == 0)
-       bl = ACS_LLCORNER;
-    if (br == 0)
-       br = ACS_LRCORNER;
-
-    ls = _nc_render(win, ls);
-    rs = _nc_render(win, rs);
-    ts = _nc_render(win, ts);
-    bs = _nc_render(win, bs);
-    tl = _nc_render(win, tl);
-    tr = _nc_render(win, tr);
-    bl = _nc_render(win, bl);
-    br = _nc_render(win, br);
+    RENDER_WITH_DEFAULT(ls, ACS_VLINE);
+    RENDER_WITH_DEFAULT(rs, ACS_VLINE);
+    RENDER_WITH_DEFAULT(ts, ACS_HLINE);
+    RENDER_WITH_DEFAULT(bs, ACS_HLINE);
+    RENDER_WITH_DEFAULT(tl, ACS_ULCORNER);
+    RENDER_WITH_DEFAULT(tr, ACS_URCORNER);
+    RENDER_WITH_DEFAULT(bl, ACS_LLCORNER);
+    RENDER_WITH_DEFAULT(br, ACS_LRCORNER);
 
-    T(("using %#lx, %#lx, %#lx, %#lx, %#lx, %#lx, %#lx, %#lx",
-           ls, rs, ts, bs, tl, tr, bl, br));
+    T(("using %s, %s, %s, %s, %s, %s, %s, %s",
+       _tracechtype2(1, wls),
+       _tracechtype2(2, wrs),
+       _tracechtype2(3, wts),
+       _tracechtype2(4, wbs),
+       _tracechtype2(5, wtl),
+       _tracechtype2(6, wtr),
+       _tracechtype2(7, wbl),
+       _tracechtype2(8, wbr)));
 
     endx = win->_maxx;
     endy = win->_maxy;
 
     for (i = 0; i <= endx; i++) {
-       win->_line[0].text[i] = ts;
-       win->_line[endy].text[i] = bs;
+       SetChar2(win->_line[0].text[i], wts);
+       SetChar2(win->_line[endy].text[i], wbs);
     }
     win->_line[endy].firstchar = win->_line[0].firstchar = 0;
     win->_line[endy].lastchar = win->_line[0].lastchar = endx;
 
     for (i = 0; i <= endy; i++) {
-       win->_line[i].text[0] = ls;
-       win->_line[i].text[endx] = rs;
+#if USE_WIDEC_SUPPORT
+       if (endx > 0 && isWidecExt(win->_line[i].text[endx])) {
+           SetChar2(win->_line[i].text[endx - 1], ' ');
+       }
+#endif
+       SetChar2(win->_line[i].text[0], wls);
+       SetChar2(win->_line[i].text[endx], wrs);
        win->_line[i].firstchar = 0;
        win->_line[i].lastchar = endx;
+#if USE_WIDEC_SUPPORT
+       if (isWidecExt(win->_line[i].text[1])) {
+           SetChar2(win->_line[i].text[1], ' ');
+       }
+#endif
     }
-    win->_line[0].text[0] = tl;
-    win->_line[0].text[endx] = tr;
-    win->_line[endy].text[0] = bl;
-    win->_line[endy].text[endx] = br;
+    SetChar2(win->_line[0].text[0], wtl);
+    SetChar2(win->_line[0].text[endx], wtr);
+    SetChar2(win->_line[endy].text[0], wbl);
+    SetChar2(win->_line[endy].text[endx], wbr);
 
     _nc_synchook(win);
     returnCode(OK);