diff options
| author | sef <sef@FreeBSD.org> | 1994-08-13 23:15:38 +0000 |
|---|---|---|
| committer | sef <sef@FreeBSD.org> | 1994-08-13 23:15:38 +0000 |
| commit | 75d40fe0bd2b890ceffb238a53e26b30cee120de (patch) | |
| tree | bbb514854ed4891d87f8d7be9bbcca0b27533595 /lib/libcurses/newwin.c | |
| parent | 5769d4da59542affce5fd4e48c98355e45206254 (diff) | |
| download | FreeBSD-src-75d40fe0bd2b890ceffb238a53e26b30cee120de.zip FreeBSD-src-75d40fe0bd2b890ceffb238a53e26b30cee120de.tar.gz | |
Brought the 2.0 libcurses up-to-date with the current 4.4 stuff, as
distributed in keith bostic's nvi (got his permission first). Most changes
are cosmetic, but a few errors (mostly in tty..c) were cleared up.
Reviewed by: Sean Eric Fagan
Diffstat (limited to 'lib/libcurses/newwin.c')
| -rw-r--r-- | lib/libcurses/newwin.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/libcurses/newwin.c b/lib/libcurses/newwin.c index a2f577a..161b5d9 100644 --- a/lib/libcurses/newwin.c +++ b/lib/libcurses/newwin.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1981, 1993 + * Copyright (c) 1981, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,12 +32,13 @@ */ #ifndef lint -static char sccsid[] = "@(#)newwin.c 8.1 (Berkeley) 7/20/93"; +static char sccsid[] = "@(#)newwin.c 8.3 (Berkeley) 7/27/94"; #endif /* not lint */ -#include <curses.h> #include <stdlib.h> +#include "curses.h" + #undef nl /* Don't need it here, and it interferes. */ static WINDOW *__makenew __P((int, int, int, int, int)); @@ -232,16 +233,11 @@ void __swflags(win) register WINDOW *win; { - win->flags &= - ~(__ENDLINE | __FULLLINE | __FULLWIN | __SCROLLWIN | __LEAVEOK); + win->flags &= ~(__ENDLINE | __FULLWIN | __SCROLLWIN | __LEAVEOK); if (win->begx + win->maxx == COLS) { win->flags |= __ENDLINE; - if (win->begx == 0) { - if (AL && DL) - win->flags |= __FULLLINE; - if (win->maxy == LINES && win->begy == 0) + if (win->begx == 0 && win->maxy == LINES && win->begy == 0) win->flags |= __FULLWIN; - } if (win->begy + win->maxy == LINES) win->flags |= __SCROLLWIN; } |
