From ae2b295c7deaf2d7c18ad1ed9b6050970e56bae7 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:31 -0800 Subject: Import Upstream version 5e2 --- crs.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'crs.c') diff --git a/crs.c b/crs.c index 0b4fe5f..9a45493 100644 --- a/crs.c +++ b/crs.c @@ -112,7 +112,7 @@ SCM *loc_stdscr = 0; SCM linitscr() { WINDOW *win; - if NIMP(*loc_stdscr) { + if (NIMP(*loc_stdscr)) { refresh(); return *loc_stdscr; } @@ -121,7 +121,7 @@ SCM linitscr() } SCM lendwin() { - if IMP(*loc_stdscr) return BOOL_F; + if (IMP(*loc_stdscr)) return BOOL_F; return ERR==endwin() ? BOOL_F : BOOL_T; } @@ -204,9 +204,9 @@ SCM lwadd(win, obj) SCM win, obj; { ASRTER(NIMP(win) && WINP(win), win, ARG1, s_wadd); - if ICHRP(obj) + if (ICHRP(obj)) return ERR==waddch(WIN(win), ICHR(obj)) ? BOOL_F : BOOL_T; - if INUMP(obj) + if (INUMP(obj)) return ERR==waddch(WIN(win), INUM(obj)) ? BOOL_F : BOOL_T; ASRTER(NIMP(obj) && STRINGP(obj), obj, ARG2, s_wadd); return ERR==waddstr(WIN(win), CHARS(obj)) ? BOOL_F : BOOL_T; @@ -216,7 +216,7 @@ SCM lwinsch(win, obj) SCM win, obj; { ASRTER(NIMP(win) && WINP(win), win, ARG1, s_winsch); - if INUMP(obj) + if (INUMP(obj)) return ERR==winsch(WIN(win), INUM(obj)) ? BOOL_F : BOOL_T; ASRTER(ICHRP(obj), obj, ARG2, s_winsch); return ERR==winsch(WIN(win), ICHR(obj)) ? BOOL_F : BOOL_T; @@ -227,12 +227,12 @@ SCM lbox(win, vertch, horch) { int v, h; ASRTER(NIMP(win) && WINP(win), win, ARG1, s_box); - if INUMP(vertch) v = INUM(vertch); + if (INUMP(vertch)) v = INUM(vertch); else { ASRTER(ICHRP(vertch), vertch, ARG2, s_box); v = ICHR(vertch); } - if INUMP(horch) h = INUM(horch); + if (INUMP(horch)) h = INUM(horch); else { ASRTER(ICHRP(horch), horch, ARG3, s_box); h = ICHR(horch); @@ -271,20 +271,20 @@ static char s_oheight[] = "output-port-height"; SCM owidth(arg) SCM arg; { - if UNBNDP(arg) arg = cur_outp; + if (UNBNDP(arg)) arg = cur_outp; ASRTER(NIMP(arg) && OPOUTPORTP(arg), arg, ARG1, s_owidth); - if NIMP(*loc_stdscr) - if WINP(arg) return MAKINUM(WIN(arg)->_maxx+1); + if (NIMP(*loc_stdscr)) + if (WINP(arg)) return MAKINUM(WIN(arg)->_maxx+1); else return MAKINUM(COLS); return MAKINUM(80); } SCM oheight(arg) SCM arg; { - if UNBNDP(arg) arg = cur_outp; + if (UNBNDP(arg)) arg = cur_outp; ASRTER(NIMP(arg) && OPOUTPORTP(arg), arg, ARG1, s_owidth); - if NIMP(*loc_stdscr) - if WINP(arg) return MAKINUM(WIN(arg)->_maxy+1); + if (NIMP(*loc_stdscr)) + if (WINP(arg)) return MAKINUM(WIN(arg)->_maxy+1); else return MAKINUM(LINES); return MAKINUM(24); } -- cgit v1.2.3