ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

screen: catch a window resize also when the keyboard is in nodelay mode 

This fixes https://savannah.gnu.org/bugs/?47954.
master
Benno Schulenberg 2016-05-18 11:14:17 +02:00
parent 5cbaf5903b
commit a878f5f183
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/winio.c
View File

@ -42,7 +42,18 @@ static bool seen_wide = FALSE;
/* Whether we've seen a multicolumn character in the current line. */ /* Whether we've seen a multicolumn character in the current line. */
#ifndef NANO_TINY #ifndef NANO_TINY
static sig_atomic_t sigwinch_counter_save = 0; static sig_atomic_t last_sigwinch_counter = 0;
/* Did we receive a SIGWINCH since we were last called? */
bool the_window_resized(void)
{
if (sigwinch_counter == last_sigwinch_counter)
return FALSE;
last_sigwinch_counter = sigwinch_counter;
regenerate_screen();
return TRUE;
}
#endif #endif
/* Control character compatibility: /* Control character compatibility:
@ -123,6 +134,11 @@ void get_key_buffer(WINDOW *win)
/* Read in the first character using whatever mode we're in. */ /* Read in the first character using whatever mode we're in. */
input = wgetch(win); input = wgetch(win);
#ifndef NANO_TINY
if (the_window_resized())
input = KEY_WINCH;
#endif
if (input == ERR && nodelay_mode) if (input == ERR && nodelay_mode)
return; return;
@ -135,10 +151,7 @@ void get_key_buffer(WINDOW *win)
handle_hupterm(0); handle_hupterm(0);
#ifndef NANO_TINY #ifndef NANO_TINY
/* Did we get a SIGWINCH since we were last here? */ if (the_window_resized()) {
if (sigwinch_counter != sigwinch_counter_save) {
sigwinch_counter_save = sigwinch_counter;
regenerate_screen();
input = KEY_WINCH; input = KEY_WINCH;
break; break;
} }