From ef5927835e7f5b824129afd4b1e4088e875b2e3e Mon Sep 17 00:00:00 2001 From: blymn Date: Wed, 2 Jan 2002 10:38:27 +0000 Subject: [PATCH] Remove extraneous tabs from blank lines. --- lib/libcurses/clrtoeol.c | 6 +++--- lib/libcurses/color.c | 10 +++++----- lib/libcurses/copywin.c | 10 +++++----- lib/libcurses/curses_private.h | 6 +++--- lib/libcurses/getch.c | 10 +++++----- lib/libcurses/getstr.c | 8 ++++---- lib/libcurses/inch.c | 6 +++--- lib/libcurses/inchstr.c | 8 ++++---- lib/libcurses/initscr.c | 10 +++++----- lib/libcurses/insch.c | 6 +++--- lib/libcurses/instr.c | 8 ++++---- lib/libcurses/line.c | 6 +++--- lib/libcurses/mvwin.c | 8 ++++---- lib/libcurses/newwin.c | 8 ++++---- lib/libcurses/putchar.c | 6 +++--- lib/libcurses/refresh.c | 8 ++++---- lib/libcurses/resize.c | 18 +++++++++--------- lib/libcurses/screen.c | 20 ++++++++++---------- lib/libcurses/setterm.c | 14 +++++++------- lib/libcurses/touchwin.c | 8 ++++---- lib/libcurses/tstp.c | 8 ++++---- lib/libcurses/tty.c | 6 +++--- 22 files changed, 99 insertions(+), 99 deletions(-) diff --git a/lib/libcurses/clrtoeol.c b/lib/libcurses/clrtoeol.c index 20b8a6b4a33f..20c855dcf832 100644 --- a/lib/libcurses/clrtoeol.c +++ b/lib/libcurses/clrtoeol.c @@ -1,4 +1,4 @@ -/* $NetBSD: clrtoeol.c,v 1.14 2000/05/20 15:12:15 mycroft Exp $ */ +/* $NetBSD: clrtoeol.c,v 1.15 2002/01/02 10:38:27 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)clrtoeol.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: clrtoeol.c,v 1.14 2000/05/20 15:12:15 mycroft Exp $"); +__RCSID("$NetBSD: clrtoeol.c,v 1.15 2002/01/02 10:38:27 blymn Exp $"); #endif #endif /* not lint */ @@ -58,7 +58,7 @@ clrtoeol(void) } #endif - + /* * wclrtoeol -- * Clear up to the end of line. diff --git a/lib/libcurses/color.c b/lib/libcurses/color.c index 72a1e64826ed..4c3b8b935d92 100644 --- a/lib/libcurses/color.c +++ b/lib/libcurses/color.c @@ -1,4 +1,4 @@ -/* $NetBSD: color.c,v 1.16 2001/12/11 11:18:17 blymn Exp $ */ +/* $NetBSD: color.c,v 1.17 2002/01/02 10:38:27 blymn Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: color.c,v 1.16 2001/12/11 11:18:17 blymn Exp $"); +__RCSID("$NetBSD: color.c,v 1.17 2002/01/02 10:38:27 blymn Exp $"); #endif /* not lint */ #include "curses.h" @@ -110,7 +110,7 @@ start_color(void) _cursesi_screen->COLORS = COLORS; _cursesi_screen->COLOR_PAIRS = COLOR_PAIRS; - + /* Reset terminal colour and colour pairs. */ if (__tc_oc != NULL) tputs(__tc_oc, 0, __cputchar); @@ -149,7 +149,7 @@ start_color(void) break; } #endif - + /* * Attributes that cannot be used with color. * Store these in an attr_t for wattrset()/wattron(). @@ -377,7 +377,7 @@ __change_pair(short pair) WINDOW *win; int y, x; - + for (wlp = __winlistp; wlp != NULL; wlp = wlp->nextp) { #ifdef DEBUG __CTRACE("__change_pair: win = %0.2o\n", wlp->winp); diff --git a/lib/libcurses/copywin.c b/lib/libcurses/copywin.c index 0d3ea5ca3772..84c1112383a0 100644 --- a/lib/libcurses/copywin.c +++ b/lib/libcurses/copywin.c @@ -1,4 +1,4 @@ -/* $NetBSD: copywin.c,v 1.8 2001/11/04 14:04:27 lukem Exp $ */ +/* $NetBSD: copywin.c,v 1.9 2002/01/02 10:38:27 blymn Exp $ */ /*- * Copyright (c) 1998-1999 Brett Lymn @@ -31,7 +31,7 @@ #include #ifndef lint -__RCSID("$NetBSD: copywin.c,v 1.8 2001/11/04 14:04:27 lukem Exp $"); +__RCSID("$NetBSD: copywin.c,v 1.9 2002/01/02 10:38:27 blymn Exp $"); #endif /* not lint */ #include @@ -53,7 +53,7 @@ int copywin(const WINDOW *srcwin, WINDOW *dstwin, int sminrow, { int starty, startx, endy, endx, x, y, y1, y2, smaxrow, smaxcol; __LDATA *sp, *end; - + smaxrow = min(sminrow + dmaxrow - dminrow, srcwin->maxy); smaxcol = min(smincol + dmaxcol - dmincol, srcwin->maxx); starty = max(sminrow, dminrow); @@ -62,7 +62,7 @@ int copywin(const WINDOW *srcwin, WINDOW *dstwin, int sminrow, endx = min(smincol + smaxcol, dmincol + dmaxcol); if (starty >= endy || startx >= endx) return (OK); - + #ifdef DEBUG if (dooverlay == TRUE) { __CTRACE("copywin overlay mode: from (%d,%d) to (%d,%d)\n", @@ -71,7 +71,7 @@ int copywin(const WINDOW *srcwin, WINDOW *dstwin, int sminrow, __CTRACE("copywin overwrite mode: from (%d,%d) to (%d,%d)\n", starty, startx, endy, endx); } - + #endif y1 = starty - sminrow; y2 = starty - dminrow; diff --git a/lib/libcurses/curses_private.h b/lib/libcurses/curses_private.h index 3b373ab81da5..92f4413a08d0 100644 --- a/lib/libcurses/curses_private.h +++ b/lib/libcurses/curses_private.h @@ -1,4 +1,4 @@ -/* $NetBSD: curses_private.h,v 1.19 2001/12/31 14:23:11 blymn Exp $ */ +/* $NetBSD: curses_private.h,v 1.20 2002/01/02 10:38:27 blymn Exp $ */ /*- * Copyright (c) 1998-2000 Brett Lymn @@ -200,7 +200,7 @@ struct __screen { struct __color colours[MAX_COLORS]; struct __pair colour_pairs[MAX_PAIRS]; attr_t nca; - + /* Style of colour manipulation */ #define COLOR_NONE 0 #define COLOR_ANSI 1 /* ANSI/DEC-style colour manipulation */ @@ -208,7 +208,7 @@ struct __screen { #define COLOR_TEK 3 /* Tektronix-style colour manipulation */ #define COLOR_OTHER 4 /* None of the others but can set fore/back */ int color_type; - + attr_t mask_op; attr_t mask_me; attr_t mask_ue; diff --git a/lib/libcurses/getch.c b/lib/libcurses/getch.c index db790c9008da..ef8984a7728d 100644 --- a/lib/libcurses/getch.c +++ b/lib/libcurses/getch.c @@ -1,4 +1,4 @@ -/* $NetBSD: getch.c,v 1.35 2001/12/02 09:14:21 blymn Exp $ */ +/* $NetBSD: getch.c,v 1.36 2002/01/02 10:38:27 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)getch.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: getch.c,v 1.35 2001/12/02 09:14:21 blymn Exp $"); +__RCSID("$NetBSD: getch.c,v 1.36 2002/01/02 10:38:27 blymn Exp $"); #endif #endif /* not lint */ @@ -301,7 +301,7 @@ _cursesi_free_keymap(keymap_t *map) for (i = 0; i < map->count; i += KEYMAP_ALLOC_CHUNK) { free(map->key[i]); } - + free(map->key); free(map); } @@ -500,7 +500,7 @@ new_key(void) { key_entry_t *new_one; int i; - + if ((new_one = malloc(KEYMAP_ALLOC_CHUNK * sizeof(key_entry_t))) == NULL) { perror("inkey: Cannot allocate new key entry chunk"); @@ -511,7 +511,7 @@ new_key(void) new_one[i].type = 0; new_one[i].value.next = NULL; } - + return new_one; } diff --git a/lib/libcurses/getstr.c b/lib/libcurses/getstr.c index e6d3ead2af80..4c7d471cebbc 100644 --- a/lib/libcurses/getstr.c +++ b/lib/libcurses/getstr.c @@ -1,4 +1,4 @@ -/* $NetBSD: getstr.c,v 1.15 2001/12/02 09:14:21 blymn Exp $ */ +/* $NetBSD: getstr.c,v 1.16 2002/01/02 10:38:27 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)getstr.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: getstr.c,v 1.15 2001/12/02 09:14:21 blymn Exp $"); +__RCSID("$NetBSD: getstr.c,v 1.16 2002/01/02 10:38:27 blymn Exp $"); #endif #endif /* not lint */ @@ -173,7 +173,7 @@ __wgetnstr(WINDOW *win, char *str, int n) oldx = win->curx; _DIAGASSERT(n == -1 || n > 1); remain = n - 1; - + while ((c = wgetch(win)) != ERR && c != '\n' && c != '\r') { #ifdef DEBUG __CTRACE("__wgetnstr: win %0.2o, char 0x%x, remain %d\n", win, @@ -244,7 +244,7 @@ __wgetnstr(WINDOW *win, char *str, int n) } } } - + if (c == ERR) { *str = '\0'; return (ERR); diff --git a/lib/libcurses/inch.c b/lib/libcurses/inch.c index ce6d81d47bc3..3c5a938928af 100644 --- a/lib/libcurses/inch.c +++ b/lib/libcurses/inch.c @@ -1,4 +1,4 @@ -/* $NetBSD: inch.c,v 1.4 2000/04/24 14:09:43 blymn Exp $ */ +/* $NetBSD: inch.c,v 1.5 2002/01/02 10:38:27 blymn Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: inch.c,v 1.4 2000/04/24 14:09:43 blymn Exp $"); +__RCSID("$NetBSD: inch.c,v 1.5 2002/01/02 10:38:27 blymn Exp $"); #endif /* not lint */ #include "curses.h" @@ -75,7 +75,7 @@ mvwinch(WINDOW *win, int y, int x) { if (wmove(win, y, x) == ERR) return ERR; - + return winch(win); } diff --git a/lib/libcurses/inchstr.c b/lib/libcurses/inchstr.c index ff14e09dcaf3..6eb7091b0d32 100644 --- a/lib/libcurses/inchstr.c +++ b/lib/libcurses/inchstr.c @@ -1,4 +1,4 @@ -/* $NetBSD: inchstr.c,v 1.1 2001/01/01 10:36:12 simonb Exp $ */ +/* $NetBSD: inchstr.c,v 1.2 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -37,7 +37,7 @@ #include #ifndef lint -__RCSID("$NetBSD: inchstr.c,v 1.1 2001/01/01 10:36:12 simonb Exp $"); +__RCSID("$NetBSD: inchstr.c,v 1.2 2002/01/02 10:38:28 blymn Exp $"); #endif /* not lint */ #include "curses.h" @@ -92,7 +92,7 @@ mvwinchstr(WINDOW *win, int y, int x, chtype *chstr) { if (wmove(win, y, x) == ERR) return ERR; - + return winchstr(win, chstr); } @@ -101,7 +101,7 @@ mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n) { if (wmove(win, y, x) == ERR) return ERR; - + return winchnstr(win, chstr, n); } diff --git a/lib/libcurses/initscr.c b/lib/libcurses/initscr.c index 71ae541ddbc0..8ad1ef71ffb7 100644 --- a/lib/libcurses/initscr.c +++ b/lib/libcurses/initscr.c @@ -1,4 +1,4 @@ -/* $NetBSD: initscr.c,v 1.22 2001/12/02 09:14:21 blymn Exp $ */ +/* $NetBSD: initscr.c,v 1.23 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)initscr.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: initscr.c,v 1.22 2001/12/02 09:14:21 blymn Exp $"); +__RCSID("$NetBSD: initscr.c,v 1.23 2002/01/02 10:38:28 blymn Exp $"); #endif #endif /* not lint */ @@ -51,7 +51,7 @@ __RCSID("$NetBSD: initscr.c,v 1.22 2001/12/02 09:14:21 blymn Exp $"); /* Window list */ struct __winlist *__winlistp; - + /* * initscr -- * Initialize the current and standard screen. @@ -64,7 +64,7 @@ initscr(void) #ifdef DEBUG __CTRACE("initscr\n"); #endif - + /* * If My_term is set, or can't find a terminal in the environment, * use Def_term. @@ -91,6 +91,6 @@ initscr(void) set_term(_cursesi_screen); wrefresh(curscr); - + return (stdscr); } diff --git a/lib/libcurses/insch.c b/lib/libcurses/insch.c index a4cb4fdf7ad6..f45e7855458e 100644 --- a/lib/libcurses/insch.c +++ b/lib/libcurses/insch.c @@ -1,4 +1,4 @@ -/* $NetBSD: insch.c,v 1.15 2000/05/20 15:12:15 mycroft Exp $ */ +/* $NetBSD: insch.c,v 1.16 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)insch.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: insch.c,v 1.15 2000/05/20 15:12:15 mycroft Exp $"); +__RCSID("$NetBSD: insch.c,v 1.16 2002/01/02 10:38:28 blymn Exp $"); #endif #endif /* not lint */ @@ -78,7 +78,7 @@ mvwinsch(WINDOW *win, int y, int x, chtype ch) { if (wmove(win, y, x) == ERR) return ERR; - + return winsch(stdscr, ch); } diff --git a/lib/libcurses/instr.c b/lib/libcurses/instr.c index 13388a0709c4..253e560fcb24 100644 --- a/lib/libcurses/instr.c +++ b/lib/libcurses/instr.c @@ -1,4 +1,4 @@ -/* $NetBSD: instr.c,v 1.1 2001/01/01 10:36:12 simonb Exp $ */ +/* $NetBSD: instr.c,v 1.2 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -37,7 +37,7 @@ #include #ifndef lint -__RCSID("$NetBSD: instr.c,v 1.1 2001/01/01 10:36:12 simonb Exp $"); +__RCSID("$NetBSD: instr.c,v 1.2 2002/01/02 10:38:28 blymn Exp $"); #endif /* not lint */ #include "curses.h" @@ -94,7 +94,7 @@ mvwinstr(WINDOW *win, int y, int x, char *str) { if (wmove(win, y, x) == ERR) return ERR; - + return winstr(win, str); } @@ -103,7 +103,7 @@ mvwinnstr(WINDOW *win, int y, int x, char *str, int n) { if (wmove(win, y, x) == ERR) return ERR; - + return winnstr(win, str, n); } diff --git a/lib/libcurses/line.c b/lib/libcurses/line.c index 6e08d026d7c4..b7a5dc0772c0 100644 --- a/lib/libcurses/line.c +++ b/lib/libcurses/line.c @@ -1,4 +1,4 @@ -/* $NetBSD: line.c,v 1.3 2001/06/13 10:45:57 wiz Exp $ */ +/* $NetBSD: line.c,v 1.4 2002/01/02 10:38:28 blymn Exp $ */ /*- * Copyright (c) 1998-1999 Brett Lymn @@ -31,7 +31,7 @@ #include #ifndef lint -__RCSID("$NetBSD: line.c,v 1.3 2001/06/13 10:45:57 wiz Exp $"); +__RCSID("$NetBSD: line.c,v 1.4 2002/01/02 10:38:28 blymn Exp $"); #endif /* not lint */ #include "curses.h" @@ -85,7 +85,7 @@ whline(WINDOW *win, chtype ch, int count) n = min(count, win->maxx - win->curx); ocurx = win->curx; - + if (!(ch & __CHARTEXT)) ch |= ACS_HLINE; for (i = 0; i < n; i++) diff --git a/lib/libcurses/mvwin.c b/lib/libcurses/mvwin.c index 3264ef3b5b19..783213307fe4 100644 --- a/lib/libcurses/mvwin.c +++ b/lib/libcurses/mvwin.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvwin.c,v 1.12 2001/10/08 10:45:13 blymn Exp $ */ +/* $NetBSD: mvwin.c,v 1.13 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)mvwin.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: mvwin.c,v 1.12 2001/10/08 10:45:13 blymn Exp $"); +__RCSID("$NetBSD: mvwin.c,v 1.13 2002/01/02 10:38:28 blymn Exp $"); #endif #endif /* not lint */ @@ -55,7 +55,7 @@ mvderwin(WINDOW *win, int dy, int dx) { WINDOW *parent; int x, y; - + if (win == NULL) return ERR; @@ -68,7 +68,7 @@ mvderwin(WINDOW *win, int dy, int dx) y = parent->begy + dy; return mvwin(win, y, x); } - + /* * mvwin -- * Relocate the starting position of a window. diff --git a/lib/libcurses/newwin.c b/lib/libcurses/newwin.c index 507d1ac34915..c3e5e81fe9a0 100644 --- a/lib/libcurses/newwin.c +++ b/lib/libcurses/newwin.c @@ -1,4 +1,4 @@ -/* $NetBSD: newwin.c,v 1.27 2001/12/11 11:18:17 blymn Exp $ */ +/* $NetBSD: newwin.c,v 1.28 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)newwin.c 8.3 (Berkeley) 7/27/94"; #else -__RCSID("$NetBSD: newwin.c,v 1.27 2001/12/11 11:18:17 blymn Exp $"); +__RCSID("$NetBSD: newwin.c,v 1.28 2002/01/02 10:38:28 blymn Exp $"); #endif #endif /* not lint */ @@ -62,7 +62,7 @@ derwin(WINDOW *orig, int nlines, int ncols, int by, int bx) { if (orig == NULL) return ERR; - + return subwin(orig, nlines, ncols, orig->begy + by, orig->begx + bx); } @@ -83,7 +83,7 @@ dupwin(WINDOW *win) return new_one; } - + /* * newwin -- * Allocate space for and set up defaults for a new window. diff --git a/lib/libcurses/putchar.c b/lib/libcurses/putchar.c index b9c193ef63ba..3c545d51d4cb 100644 --- a/lib/libcurses/putchar.c +++ b/lib/libcurses/putchar.c @@ -1,4 +1,4 @@ -/* $NetBSD: putchar.c,v 1.15 2001/12/31 14:23:11 blymn Exp $ */ +/* $NetBSD: putchar.c,v 1.16 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)putchar.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: putchar.c,v 1.15 2001/12/31 14:23:11 blymn Exp $"); +__RCSID("$NetBSD: putchar.c,v 1.16 2002/01/02 10:38:28 blymn Exp $"); #endif #endif /* not lint */ @@ -64,7 +64,7 @@ void __cputchar_args(char ch, void *args) { FILE *outfd = (FILE *) args; - + #ifdef DEBUG __CTRACE("__cputchar_args: %s on fd %d\n", unctrl(ch), outfd); #endif diff --git a/lib/libcurses/refresh.c b/lib/libcurses/refresh.c index 2b4bf92246fa..a9f428643a46 100644 --- a/lib/libcurses/refresh.c +++ b/lib/libcurses/refresh.c @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.44 2001/12/31 14:23:11 blymn Exp $ */ +/* $NetBSD: refresh.c,v 1.45 2002/01/02 10:38:28 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94"; #else -__RCSID("$NetBSD: refresh.c,v 1.44 2001/12/31 14:23:11 blymn Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.45 2002/01/02 10:38:28 blymn Exp $"); #endif #endif /* not lint */ @@ -87,7 +87,7 @@ wnoutrefresh(WINDOW *win) int _cursesi_wnoutrefresh(SCREEN *screen, WINDOW *win) { - + short wy, wx, x_off; __LINE *wlp, *vlp; @@ -193,7 +193,7 @@ int wrefresh(WINDOW *win) { int retval; - + _cursesi_screen->curwin = (win == _cursesi_screen->curscr); if (!_cursesi_screen->curwin) retval = _cursesi_wnoutrefresh(_cursesi_screen, win); diff --git a/lib/libcurses/resize.c b/lib/libcurses/resize.c index b257d752d5fc..2db04dff9b47 100644 --- a/lib/libcurses/resize.c +++ b/lib/libcurses/resize.c @@ -1,4 +1,4 @@ -/* $NetBSD: resize.c,v 1.1 2001/09/20 11:11:54 blymn Exp $ */ +/* $NetBSD: resize.c,v 1.2 2002/01/02 10:38:29 blymn Exp $ */ /* * Copyright (c) 2001 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)resize.c blymn 2001/08/26"; #else -__RCSID("$NetBSD: resize.c,v 1.1 2001/09/20 11:11:54 blymn Exp $"); +__RCSID("$NetBSD: resize.c,v 1.2 2002/01/02 10:38:29 blymn Exp $"); #endif #endif /* not lint */ @@ -106,7 +106,7 @@ wresize(WINDOW *win, int nlines, int ncols) lp->hash = __hash((char *)(void *)lp->line, (int) (ncols * __LDATASIZE)); } - + return OK; } @@ -120,7 +120,7 @@ resizeterm(int nlines, int ncols) WINDOW *win; struct __winlist *list; int newlines, newcols, ldelta, cdelta; - + /* don't worry if things have not changed... we would like to do this but some bastard programs update LINES and COLS before calling resizeterm thus negating it's effect. @@ -133,7 +133,7 @@ resizeterm(int nlines, int ncols) ldelta = nlines - __virtscr->maxy; cdelta = ncols - __virtscr->maxx; - + for (list = __winlistp; list != NULL; list = list->nextp) { win = list->winp; newlines = win->maxy; @@ -209,13 +209,13 @@ __resizewin(WINDOW *win, int nlines, int ncols) return ERR; } win->lines = newlines; - + if ((newlspace = realloc(win->lspace, nlines * sizeof(__LINE))) == NULL) { return ERR; } win->lspace = newlspace; - + /* Don't allocate window and line space if it's a subwindow */ if (win->orig == NULL) { /* @@ -258,14 +258,14 @@ __resizewin(WINDOW *win, int nlines, int ncols) lp->flags = __ISDIRTY; } } - + win->cury = win->curx = 0; win->maxy = nlines; win->maxx = ncols; win->scr_b = win->maxy - 1; __swflags(win); - + #ifdef DEBUG __CTRACE("resize: win->wattr = %0.2o\n", win->wattr); __CTRACE("resize: win->flags = %0.2o\n", win->flags); diff --git a/lib/libcurses/screen.c b/lib/libcurses/screen.c index ae420ab48299..d6f818b09e6d 100644 --- a/lib/libcurses/screen.c +++ b/lib/libcurses/screen.c @@ -1,4 +1,4 @@ -/* $NetBSD: screen.c,v 1.4 2001/12/31 14:16:01 blymn Exp $ */ +/* $NetBSD: screen.c,v 1.5 2002/01/02 10:38:29 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)screen.c 8.2 (blymn) 11/27/2001"; #else -__RCSID("$NetBSD: screen.c,v 1.4 2001/12/31 14:16:01 blymn Exp $"); +__RCSID("$NetBSD: screen.c,v 1.5 2002/01/02 10:38:29 blymn Exp $"); #endif #endif /* not lint */ @@ -73,9 +73,9 @@ set_term(SCREEN *new) old_screen->NONL = __NONL; old_screen->UPPERCASE = __UPPERCASE; } - + _cursesi_screen = new; - + __echoit = new->echoit; __pfast = new->pfast; __rawmode = new->rawmode; @@ -90,7 +90,7 @@ set_term(SCREEN *new) __UPPERCASE = new->UPPERCASE; _cursesi_resetterm(new); - + __winlistp = new->winlistp; curscr = new->curscr; @@ -121,7 +121,7 @@ newterm(char *type, FILE *outfd, FILE *infd) sp = type; if ((type == NULL) && (sp = getenv("TERM")) == NULL) return NULL; - + if ((new_screen = (SCREEN *) malloc(sizeof(SCREEN))) == NULL) return NULL; @@ -137,7 +137,7 @@ newterm(char *type, FILE *outfd, FILE *infd) new_screen->curscr = NULL; new_screen->__virtscr = NULL; new_screen->curwin = 0; - + if (_cursesi_gettmode(new_screen) == ERR) goto error_exit; @@ -147,7 +147,7 @@ newterm(char *type, FILE *outfd, FILE *infd) /* Need either homing or cursor motion for refreshes */ if (!new_screen->tc_ho && !new_screen->tc_cm) goto error_exit; - + new_screen->winlistp = NULL; if ((new_screen->curscr = __newwin(new_screen, new_screen->LINES, @@ -184,7 +184,7 @@ newterm(char *type, FILE *outfd, FILE *infd) if (_cursesi_screen == NULL || _cursesi_screen->endwin) { set_term(new_screen); } - + #ifdef DEBUG __CTRACE("newterm: LINES = %d, COLS = %d\n", LINES, COLS); #endif @@ -223,7 +223,7 @@ delscreen(SCREEN *screen) free(list); list = np; } - + /* free the storage of the keymaps */ _cursesi_free_keymap(screen->base_keymap); diff --git a/lib/libcurses/setterm.c b/lib/libcurses/setterm.c index fb5013084fbe..c682cdd04a02 100644 --- a/lib/libcurses/setterm.c +++ b/lib/libcurses/setterm.c @@ -1,4 +1,4 @@ -/* $NetBSD: setterm.c,v 1.30 2001/12/11 11:18:18 blymn Exp $ */ +/* $NetBSD: setterm.c,v 1.31 2002/01/02 10:38:29 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)setterm.c 8.8 (Berkeley) 10/25/94"; #else -__RCSID("$NetBSD: setterm.c,v 1.30 2001/12/11 11:18:18 blymn Exp $"); +__RCSID("$NetBSD: setterm.c,v 1.31 2002/01/02 10:38:29 blymn Exp $"); #endif #endif /* not lint */ @@ -178,7 +178,7 @@ _cursesi_setterm(char *type, SCREEN *screen) if (zap(screen) == ERR) /* Get terminal description.*/ return ERR; } - + /* If we can't tab, we can't backtab, either. */ if (!screen->GT) screen->tc_bt = NULL; @@ -198,7 +198,7 @@ _cursesi_setterm(char *type, SCREEN *screen) * as this is all we can use. */ screen->pad_char = screen->tc_pc ? screen->tc_pc[0] : 0; - + if (unknown) { strcpy(screen->ttytype, "dumb"); } else { @@ -208,7 +208,7 @@ _cursesi_setterm(char *type, SCREEN *screen) return ERR; __longname(tc, screen->ttytype); } - + /* If no scrolling commands, no quick change. */ screen->noqch = (screen->tc_cs == NULL || screen->tc_ho == NULL || @@ -305,7 +305,7 @@ _cursesi_resetterm(SCREEN *screen) __CA = screen->CA; PC = screen->pad_char; - + __noqch = screen->noqch; __mask_op = screen->mask_op; __mask_me = screen->mask_me; @@ -358,7 +358,7 @@ zap(SCREEN *screen) } while (*namp); nampstr = "ABacaeAFALalasbcblbtcdceclcmcrcsdcDLdldmDOdoeAedeihoIcicimIpipk0k1k2k3k4k5k6k7k8k9kdkekhklkrkskuLEllmambmdmemhmkmmmompmrndnlocoppcrcRISbscseSFSfsfsospSRsrtatetiucueUPupusvbvevivs"; - + namp = nampstr; sp = &screen->tc_AB; screen->str_count = 0; diff --git a/lib/libcurses/touchwin.c b/lib/libcurses/touchwin.c index c10b28d4724b..c24901ddb581 100644 --- a/lib/libcurses/touchwin.c +++ b/lib/libcurses/touchwin.c @@ -1,4 +1,4 @@ -/* $NetBSD: touchwin.c,v 1.15 2000/05/20 15:12:15 mycroft Exp $ */ +/* $NetBSD: touchwin.c,v 1.16 2002/01/02 10:38:29 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)touchwin.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: touchwin.c,v 1.15 2000/05/20 15:12:15 mycroft Exp $"); +__RCSID("$NetBSD: touchwin.c,v 1.16 2002/01/02 10:38:29 blymn Exp $"); #endif #endif /* not lint */ @@ -54,10 +54,10 @@ is_linetouched(WINDOW *win, int line) { if (line > win->maxy) return FALSE; - + return ((win->lines[line]->flags & __ISDIRTY) != 0); } - + /* * Touch count lines starting at start. This is the SUS v2 compliant diff --git a/lib/libcurses/tstp.c b/lib/libcurses/tstp.c index 714276ed41f1..bad3dd77542f 100644 --- a/lib/libcurses/tstp.c +++ b/lib/libcurses/tstp.c @@ -1,4 +1,4 @@ -/* $NetBSD: tstp.c,v 1.24 2001/12/02 09:14:23 blymn Exp $ */ +/* $NetBSD: tstp.c,v 1.25 2002/01/02 10:38:29 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tstp.c 8.3 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: tstp.c,v 1.24 2001/12/02 09:14:23 blymn Exp $"); +__RCSID("$NetBSD: tstp.c,v 1.25 2002/01/02 10:38:29 blymn Exp $"); #endif #endif /* not lint */ @@ -132,7 +132,7 @@ __stopwin(void) if (__tc_mo != NULL) (void) tputs(__tc_mo, 0, __cputchar); - + if ((curscr != NULL) && (curscr->flags & __KEYPAD)) (void) tputs(__tc_ke, 0, __cputchar); (void) tputs(__tc_ve, 0, __cputchar); @@ -172,7 +172,7 @@ __restartwin(void) /* Reset cursor visibility */ __restore_cursor_vis(); - + /* Restart the screen. */ __startwin(_cursesi_screen); diff --git a/lib/libcurses/tty.c b/lib/libcurses/tty.c index 677d1c8eb16b..0839afa53eb1 100644 --- a/lib/libcurses/tty.c +++ b/lib/libcurses/tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.27 2001/12/31 14:23:12 blymn Exp $ */ +/* $NetBSD: tty.c,v 1.28 2002/01/02 10:38:29 blymn Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.6 (Berkeley) 1/10/95"; #else -__RCSID("$NetBSD: tty.c,v 1.27 2001/12/31 14:23:12 blymn Exp $"); +__RCSID("$NetBSD: tty.c,v 1.28 2002/01/02 10:38:29 blymn Exp $"); #endif #endif /* not lint */ @@ -114,7 +114,7 @@ _cursesi_gettmode(SCREEN *screen) screen->baset = screen->orig_termios; screen->baset.c_oflag &= ~OXTABS; - + screen->GT = 0; /* historical. was used before we wired OXTABS off */ screen->NONL = (screen->baset.c_oflag & ONLCR) == 0;