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

lineedit: correctly handle prompt longer than screen width. closes bug 3414

Browse Source
This commit is contained in:
Denis Vlasenko 2008-05-25 21:52:03 +00:00
parent 4830fc565a
commit b267ed95bc
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libbb/lineedit.c
View File

@ -80,10 +80,9 @@ struct lineedit_statics {
volatile unsigned cmdedit_termw; /* = 80; */ /* actual terminal width */ volatile unsigned cmdedit_termw; /* = 80; */ /* actual terminal width */
sighandler_t previous_SIGWINCH_handler; sighandler_t previous_SIGWINCH_handler;
unsigned cmdedit_x; /* real x terminal position */
int cmdedit_x; /* real x terminal position */ unsigned cmdedit_y; /* pseudoreal y terminal position */
int cmdedit_y; /* pseudoreal y terminal position */ unsigned cmdedit_prmt_len; /* length of prompt (without colors etc) */
int cmdedit_prmt_len; /* length of prompt (without colors etc) */
unsigned cursor; unsigned cursor;
unsigned command_len; unsigned command_len;
@ -199,7 +198,7 @@ static void cmdedit_set_out_char(int next_char)
{ {
bb_putchar(c); bb_putchar(c);
} }
if (++cmdedit_x >= (int)cmdedit_termw) { if (++cmdedit_x >= cmdedit_termw) {
/* terminal is scrolled down */ /* terminal is scrolled down */
cmdedit_y++; cmdedit_y++;
cmdedit_x = 0; cmdedit_x = 0;
@ -262,12 +261,12 @@ static void input_backward(unsigned num)
return; return;
cursor -= num; cursor -= num;
if ((unsigned)cmdedit_x >= num) { if (cmdedit_x >= num) {
cmdedit_x -= num; cmdedit_x -= num;
if (num <= 4) { if (num <= 4) {
/* This is longer by 5 bytes on x86. /* This is longer by 5 bytes on x86.
* Also gets mysteriously * Also gets miscompiled for ARM users
* miscompiled for some ARM users. * (busybox.net/bugs/view.php?id=2274).
* printf(("\b\b\b\b" + 4) - num); * printf(("\b\b\b\b" + 4) - num);
* return; * return;
*/ */
@ -282,9 +281,12 @@ static void input_backward(unsigned num)
/* Need to go one or more lines up */ /* Need to go one or more lines up */
num -= cmdedit_x; num -= cmdedit_x;
count_y = 1 + (num / cmdedit_termw); {
cmdedit_y -= count_y; unsigned w = cmdedit_termw; /* volatile var */
cmdedit_x = cmdedit_termw * count_y - num; count_y = 1 + (num / w);
cmdedit_y -= count_y;
cmdedit_x = w * count_y - num;
}
/* go to 1st column; go up; go to correct column */ /* go to 1st column; go up; go to correct column */
printf("\r" "\033[%dA" "\033[%dC", count_y, cmdedit_x); printf("\r" "\033[%dA" "\033[%dC", count_y, cmdedit_x);
} }
@ -292,10 +294,12 @@ static void input_backward(unsigned num)
static void put_prompt(void) static void put_prompt(void)
{ {
out1str(cmdedit_prompt); out1str(cmdedit_prompt);
cmdedit_x = cmdedit_prmt_len;
cursor = 0; cursor = 0;
// Huh? what if cmdedit_prmt_len >= width? {
cmdedit_y = 0; /* new quasireal y */ unsigned w = cmdedit_termw; /* volatile var */
cmdedit_y = cmdedit_prmt_len / w; /* new quasireal y */
cmdedit_x = cmdedit_prmt_len % w;
}
} }
/* draw prompt, editor line, and clear tail */ /* draw prompt, editor line, and clear tail */