ncurses 5.1

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

diff --git a/ncurses/base/lib_box.c b/ncurses/base/lib_box.c
index bcd96416f954f32b4770bbdca43c54f42c2c412d..8a682585b5605266b73e36026edd980149837216 100644 (file)
--- a/ncurses/base/lib_box.c
+++ b/ncurses/base/lib_box.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000 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            *
@@ -31,8 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **     lib_box.c
 **
@@ -42,69 +40,80 @@
 
 #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.11 2000/04/29 21:12:37 tom Exp $")
 
-int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts,
-       chtype bs, chtype tl, chtype tr, chtype bl, chtype br)
+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;
 
     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);
+
+    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);
 }