ncurses 5.6 - patch 20070224
[ncurses.git] / ncurses / base / lib_box.c
index bcd96416f954f32b4770bbdca43c54f42c2c412d..d6cfc6cfe09cbbe57f7a1b5f7de00fc04e4151f0 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2002,2005 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            *
 /****************************************************************************
  *  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_box.c
 **
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_box.c,v 1.10 1998/02/11 12:13:56 tom Exp $")
+MODULE_ID("$Id: lib_box.c,v 1.22 2005/11/26 15:39:42 tom Exp $")
 
-int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts,
-       chtype bs, chtype tl, chtype tr, chtype bl, chtype br)
+#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 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)
 {
-short i;
-short endx, endy;
+    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)));
-
-        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);
-
-       T(("using %#lx, %#lx, %#lx, %#lx, %#lx, %#lx, %#lx, %#lx", ls, rs, ts, bs, tl, tr, bl, br));
-
-       endx = win->_maxx;
-       endy = win->_maxy;
-
-       for (i = 0; i <= endx; i++) {
-               win->_line[0].text[i] = ts;
-               win->_line[endy].text[i] = bs;
-       }
-       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;
-               win->_line[i].firstchar = 0;
-               win->_line[i].lastchar = endx;
-       }
-       win->_line[0].text[0] = tl;
-       win->_line[0].text[endx] = tr;
-       win->_line[endy].text[0] = bl;
-       win->_line[endy].text[endx] = br;
-
-       _nc_synchook(win);
-       returnCode(OK);
+       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);
+
+    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 %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++) {
+       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++) {
+       SetChar2(win->_line[i].text[0], wls);
+       SetChar2(win->_line[i].text[endx], wrs);
+       win->_line[i].firstchar = 0;
+       win->_line[i].lastchar = endx;
+    }
+    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);
 }