Module Name: src Committed By: martin Date: Wed Oct 3 17:49:06 UTC 2018
Modified Files: src/lib/libcurses [netbsd-8]: get_wch.c getch.c resize.c Log Message: Pull up following revision(s) (requested by roy in ticket #1043): lib/libcurses/resize.c: revision 1.27 lib/libcurses/get_wch.c: revision 1.19 lib/libcurses/getch.c: revision 1.70 curses: resizeterm(3) should always send KEY_RESIZE Fixes #53636 OK kamil@ To generate a diff of this commit: cvs rdiff -u -r1.14.4.2 -r1.14.4.3 src/lib/libcurses/get_wch.c cvs rdiff -u -r1.65.4.2 -r1.65.4.3 src/lib/libcurses/getch.c cvs rdiff -u -r1.26 -r1.26.4.1 src/lib/libcurses/resize.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libcurses/get_wch.c diff -u src/lib/libcurses/get_wch.c:1.14.4.2 src/lib/libcurses/get_wch.c:1.14.4.3 --- src/lib/libcurses/get_wch.c:1.14.4.2 Thu Sep 27 15:12:15 2018 +++ src/lib/libcurses/get_wch.c Wed Oct 3 17:49:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: get_wch.c,v 1.14.4.2 2018/09/27 15:12:15 martin Exp $ */ +/* $NetBSD: get_wch.c,v 1.14.4.3 2018/10/03 17:49:06 martin Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation Inc. @@ -36,7 +36,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: get_wch.c,v 1.14.4.2 2018/09/27 15:12:15 martin Exp $"); +__RCSID("$NetBSD: get_wch.c,v 1.14.4.3 2018/10/03 17:49:06 martin Exp $"); #endif /* not lint */ #include <errno.h> @@ -530,8 +530,8 @@ wget_wch(WINDOW *win, wint_t *ch) __echoit, __rawmode, _cursesi_screen->nl, win->flags); #endif if (_cursesi_screen->resized) { - _cursesi_screen->resized = 0; resizeterm(LINES, COLS); + _cursesi_screen->resized = 0; *ch = KEY_RESIZE; return KEY_CODE_YES; } @@ -684,8 +684,8 @@ __fgetwc_resize(FILE *infd, bool *resize #ifdef DEBUG __CTRACE(__CTRACE_INPUT, "__fgetwc_resize returning KEY_RESIZE\n"); #endif - _cursesi_screen->resized = 0; resizeterm(LINES, COLS); + _cursesi_screen->resized = 0; *resized = true; return c; } Index: src/lib/libcurses/getch.c diff -u src/lib/libcurses/getch.c:1.65.4.2 src/lib/libcurses/getch.c:1.65.4.3 --- src/lib/libcurses/getch.c:1.65.4.2 Thu Sep 27 15:12:15 2018 +++ src/lib/libcurses/getch.c Wed Oct 3 17:49:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: getch.c,v 1.65.4.2 2018/09/27 15:12:15 martin Exp $ */ +/* $NetBSD: getch.c,v 1.65.4.3 2018/10/03 17:49:06 martin Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getch.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: getch.c,v 1.65.4.2 2018/09/27 15:12:15 martin Exp $"); +__RCSID("$NetBSD: getch.c,v 1.65.4.3 2018/10/03 17:49:06 martin Exp $"); #endif #endif /* not lint */ @@ -824,8 +824,8 @@ wgetch(WINDOW *win) __echoit, __rawmode, _cursesi_screen->nl, win->flags, win->delay); #endif if (_cursesi_screen->resized) { - _cursesi_screen->resized = 0; resizeterm(LINES, COLS); + _cursesi_screen->resized = 0; #ifdef DEBUG __CTRACE(__CTRACE_INPUT, "wgetch returning KEY_RESIZE\n"); #endif @@ -1013,7 +1013,7 @@ __fgetc_resize(FILE *infd) #ifdef DEBUG __CTRACE(__CTRACE_INPUT, "__fgetc_resize returning KEY_RESIZE\n"); #endif - _cursesi_screen->resized = 0; resizeterm(LINES, COLS); + _cursesi_screen->resized = 0; return KEY_RESIZE; } Index: src/lib/libcurses/resize.c diff -u src/lib/libcurses/resize.c:1.26 src/lib/libcurses/resize.c:1.26.4.1 --- src/lib/libcurses/resize.c:1.26 Tue Jan 24 17:27:30 2017 +++ src/lib/libcurses/resize.c Wed Oct 3 17:49:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: resize.c,v 1.26 2017/01/24 17:27:30 roy Exp $ */ +/* $NetBSD: resize.c,v 1.26.4.1 2018/10/03 17:49:06 martin 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.26 2017/01/24 17:27:30 roy Exp $"); +__RCSID("$NetBSD: resize.c,v 1.26.4.1 2018/10/03 17:49:06 martin Exp $"); #endif #endif /* not lint */ @@ -163,6 +163,8 @@ resizeterm(int nlines, int ncols) __CTRACE(__CTRACE_WINDOW, "resizeterm: (%d, %d)\n", nlines, ncols); #endif + /* Unconditionally inform application screen has been resized. */ + _cursesi_screen->resized = 1; if (!is_term_resized(nlines, ncols)) return OK;