emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: cursor repositioning includes line oriented input

Browse Source 
A recent patch introduced the ability to recognize the
need to reposition the cursor at suspension or program
end. There remained unmet 1 additional potential need.

This commit extends that ability to embrace line input
so that if a user issues ^Z or ^C while being prompted
the resulting shell output will no longer be embedded.

Reference(s):
http://www.freelists.org/post/procps/top-library-miscellaneous-tweaks,7
commit 5c974ff44d

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2013-07-01 00:00:00 -05:00 committed by Jaromir Capik
parent 25ed080eaa
commit 33104a2bcc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
top/top.c
View File

@ -1081,12 +1081,14 @@ static char *ioline (const char *prompt) {
static char buf[MEDBUFSIZ]; static char buf[MEDBUFSIZ];
char *p; char *p;
Cursor_repos = 1;
show_pmt(prompt); show_pmt(prompt);
memset(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
ioch(1, buf, sizeof(buf)-1); ioch(1, buf, sizeof(buf)-1);
if ((p = strpbrk(buf, ws))) *p = '\0'; if ((p = strpbrk(buf, ws))) *p = '\0';
// note: we DO produce a vaid 'string' // note: we DO produce a vaid 'string'
Cursor_repos = 0;
return buf; return buf;
} // end: ioline } // end: ioline
@ -1117,6 +1119,7 @@ static char *ioline (const char *prompt) {
}; };
static struct lin_s *anchor, *plin; static struct lin_s *anchor, *plin;
Cursor_repos = 1;
if (!anchor) { if (!anchor) {
anchor = alloc_c(sizeof(struct lin_s)); anchor = alloc_c(sizeof(struct lin_s));
anchor->str = alloc_s(""); // top-of-stack == empty str anchor->str = alloc_s(""); // top-of-stack == empty str
@ -1182,6 +1185,7 @@ static char *ioline (const char *prompt) {
putp(tg2(beg+pos, Msg_row)); putp(tg2(beg+pos, Msg_row));
} while (key && key != kbd_ENTER && key != kbd_ESC); } while (key && key != kbd_ENTER && key != kbd_ESC);
Cursor_repos = 0;
// weed out duplicates, including empty strings (top-of-stack)... // weed out duplicates, including empty strings (top-of-stack)...
for (i = 0, plin = anchor; ; i++) { for (i = 0, plin = anchor; ; i++) {
#ifdef RECALL_FIXED #ifdef RECALL_FIXED