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

tweaks: rearrange some key reading stuff in a clearer way

master
Benno Schulenberg 2016-05-17 22:12:28 +02:00
parent f7c3e1cac2
commit 5cbaf5903b
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/winio.c
View File

@ -110,7 +110,7 @@ static sig_atomic_t sigwinch_counter_save = 0;
void get_key_buffer(WINDOW *win) void get_key_buffer(WINDOW *win)
{ {
int input; int input;
size_t errcount; size_t errcount = 0;
/* If the keystroke buffer isn't empty, get out. */ /* If the keystroke buffer isn't empty, get out. */
if (key_buffer != NULL) if (key_buffer != NULL)
@ -121,31 +121,29 @@ void get_key_buffer(WINDOW *win)
doupdate(); doupdate();
/* Read in the first character using whatever mode we're in. */ /* Read in the first character using whatever mode we're in. */
errcount = 0; input = wgetch(win);
if (nodelay_mode) {
if ((input = wgetch(win)) == ERR)
return;
} else {
while ((input = wgetch(win)) == ERR) {
#ifndef NANO_TINY
/* Did we get SIGWINCH since we were last here? */
if (sigwinch_counter != sigwinch_counter_save) {
sigwinch_counter_save = sigwinch_counter;
regenerate_screen();
input = KEY_WINCH;
break;
} else
#endif
errcount++;
/* If we've failed to get a character MAX_BUF_SIZE times in a if (input == ERR && nodelay_mode)
* row, assume that the input source we were using is gone and return;
* die gracefully. We could check if errno is set to EIO
* ("Input/output error") and die gracefully in that case, but while (input == ERR) {
* it's not always set properly. Argh. */ /* If we've failed to get a character MAX_BUF_SIZE times in a row,
if (errcount == MAX_BUF_SIZE) * assume our input source is gone and die gracefully. We could
handle_hupterm(0); * check if errno is set to EIO ("Input/output error") and die in
* that case, but it's not always set properly. Argh. */
if (++errcount == MAX_BUF_SIZE)
handle_hupterm(0);
#ifndef NANO_TINY
/* Did we get a SIGWINCH since we were last here? */
if (sigwinch_counter != sigwinch_counter_save) {
sigwinch_counter_save = sigwinch_counter;
regenerate_screen();
input = KEY_WINCH;
break;
} }
#endif
input = wgetch(win);
} }
/* Increment the length of the keystroke buffer, and save the value /* Increment the length of the keystroke buffer, and save the value