Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-04 22:34:37 +00:00
Code Issues Projects Releases Wiki Activity

lineedit: limit ASK_TERMINAL to the case when we can't find out the width

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-07-18 22:53:06 +02:00
parent b9e35dc15d
commit 55241fa2e0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libbb/lineedit.c
View File

@ -149,6 +149,7 @@ struct lineedit_statics {
CHAR_T delbuf[DELBUFSIZ]; /* a place to store deleted characters */ CHAR_T delbuf[DELBUFSIZ]; /* a place to store deleted characters */
#endif #endif
#if ENABLE_FEATURE_EDITING_ASK_TERMINAL #if ENABLE_FEATURE_EDITING_ASK_TERMINAL
smallint unknown_width;
smallint sent_ESC_br6n; smallint sent_ESC_br6n;
#endif #endif
@ -1610,14 +1611,16 @@ static void ask_terminal(void)
* poll([{fd=0, events=POLLIN}], 1, 4294967295) = 1 ([{fd=0, revents=POLLIN}]) * poll([{fd=0, events=POLLIN}], 1, 4294967295) = 1 ([{fd=0, revents=POLLIN}])
* read(0, "\n", 1) = 1 <-- oh crap, user's input got in first * read(0, "\n", 1) = 1 <-- oh crap, user's input got in first
*/ */
struct pollfd pfd; if (S.unknown_width) { /* only if window size is not known */
struct pollfd pfd;
pfd.fd = STDIN_FILENO; pfd.fd = STDIN_FILENO;
pfd.events = POLLIN; pfd.events = POLLIN;
if (safe_poll(&pfd, 1, 0) == 0) { if (safe_poll(&pfd, 1, 0) == 0) {
S.sent_ESC_br6n = 1; S.sent_ESC_br6n = 1;
fputs("\033" "[6n", stdout); fputs("\033" "[6n", stdout);
fflush_all(); /* make terminal see it ASAP! */ fflush_all(); /* make terminal see it ASAP! */
}
} }
} }
#else #else
@ -1763,11 +1766,13 @@ static void cmdedit_setwidth(unsigned w, int redraw_flg)
static void win_changed(int nsig) static void win_changed(int nsig)
{ {
int sv_errno = errno;
unsigned width; unsigned width;
get_terminal_width_height(0, &width, NULL); IF_FEATURE_EDITING_ASK_TERMINAL(S.unknown_width =) get_terminal_width_height(0, &width, NULL);
cmdedit_setwidth(width, nsig /* - just a yes/no flag */); cmdedit_setwidth(width, nsig /* - just a yes/no flag */);
if (nsig == SIGWINCH) if (nsig == SIGWINCH)
signal(SIGWINCH, win_changed); /* rearm ourself */ signal(SIGWINCH, win_changed); /* rearm ourself */
errno = sv_errno;
} }
static int lineedit_read_key(char *read_key_buffer) static int lineedit_read_key(char *read_key_buffer)