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

top: make the new 'Ctrl' bottom window behavior sticky 

After using this new feature for awhile, I encountered
numerous times when that 'Ctrl' window would disappear
as I was studying the contents. This was caused by the
death of the target task but it made me think that the
window could/should persist until dismissed by a user.

Well, now it will persist until that same Ctrl key has
been struck a 2nd time or a different Ctrl key used to
target another process after positioning it on row #1.

So now, instead of that former 'moving target' type of
approach, this window is more of a 'snapshot' in time.

[ even more significant, perhaps, is the fact that a ]
[ Ctrl window will now be drawn exactly 1 time only, ]
[ instead of being repainted after each delay cycle. ]

[ this will remain true no matter how many intervals ]
[ might elapse while its contents were under review. ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2022-05-02 00:00:00 -05:00 committed by Craig Small
parent b9723148a2
commit 0f2a755b0b
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
top/top.c
View File

@ -106,8 +106,10 @@ static int Screen_cols, Screen_rows, Max_lines;
#define SCREEN_ROWS ( Screen_rows - Tagged_rsvd )
// 1 for horizontal separator
#define TAGGED_RSVD ( 1 )
#define TAGGED_UNDO do { Tagged_task = Tagged_rsvd = Tagged_enum = 0; \
Fieldstab[eu_GENERIC].item = PIDS_extra; } while (0)
#define TAGGED_KEEP Tagged_func = NULL
#define TAGGED_TOSS do { Tagged_func = NULL; \
Tagged_task = Tagged_rsvd = Tagged_enum = 0; \
Fieldstab[eu_GENERIC].item = PIDS_extra; } while(0)
static int Tagged_task,
Tagged_rsvd,
Tagged_enum;
@ -4355,7 +4357,7 @@ static void win_reset (WIN_t *q) {
// these next guys are global, not really windows based
Monpidsidx = 0;
Rc.tics_scaled = 0;
TAGGED_UNDO;
TAGGED_TOSS;
} // end: win_reset
@ -4642,20 +4644,15 @@ static void wins_tag_cmdline (void) {
if (i < PIDSmaxt) {
snprintf(buf, sizeof(buf), " command line for pid %d, %s"
, Tagged_task, PID_VAL(EU_CMD, str, Curwin->ppt[i]));
#ifndef TAG_CMD_MUST
p = PID_VAL(eu_CMDLINE, str, Curwin->ppt[i]);
if (!p || !*p) p = "n/a";
#else
p = CHKw(Curwin, Show_CMDLIN) ? PID_VAL(eu_CMDLINE, str, Curwin->ppt[i]) : "n/a";
#endif
Tagged_rsvd = 1 + TAGGED_RSVD + (strlen(p) / Screen_cols);
putp(fmtmk("%s%s%-*s", tg2(0, SCREEN_ROWS), Curwin->capclr_hdr, Screen_cols, buf));
putp(fmtmk("%s%s", tg2(0, SCREEN_ROWS + 1), Cap_clr_eos));
putp(fmtmk("%s%s", tg2(0, SCREEN_ROWS + 1), Cap_norm));
fputs(p, stdout);
} else {
TAGGED_UNDO;
}
TAGGED_KEEP;
} // end: wins_tag_cmdline
@ -4681,9 +4678,8 @@ static void wins_tag_generic (void) {
putp(fmtmk("%s%s", tg2(0, SCREEN_ROWS + 1), Cap_clr_eos));
putp(fmtmk("%s%s", tg2(0, SCREEN_ROWS + 1), Cap_norm));
fputs(p, stdout);
} else {
TAGGED_UNDO;
}
TAGGED_KEEP;
} // end: wins_tag_generic
@ -5304,7 +5300,7 @@ static void keys_global (int ch) {
def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]);
// if already targeted, assume user wants to turn it off ...
if (Tagged_task && Fieldstab[eu_GENERIC].item == PIDS_CGROUP) {
TAGGED_UNDO;
TAGGED_TOSS;
} else {
Tagged_task = def;
Tagged_enum = eu_GENERIC;
@ -5316,13 +5312,11 @@ static void keys_global (int ch) {
case kbd_CtrlK:
def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]);
// if already targeted, assume user wants to turn it off ...
if (Tagged_task && Tagged_func == wins_tag_cmdline) {
TAGGED_UNDO;
if (Tagged_task && Tagged_enum == eu_CMDLINE) {
TAGGED_TOSS;
} else {
Tagged_task = def;
#ifndef TAG_CMD_MUST
Tagged_enum = eu_CMDLINE;
#endif
Tagged_func = wins_tag_cmdline;
Fieldstab[eu_GENERIC].item = PIDS_extra;
}
@ -5357,7 +5351,7 @@ static void keys_global (int ch) {
def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]);
// if already targeted, assume user wants to turn it off ...
if (Tagged_task && Fieldstab[eu_GENERIC].item == PIDS_SUPGROUPS) {
TAGGED_UNDO;
TAGGED_TOSS;
} else {
Tagged_task = def;
Tagged_enum = eu_GENERIC;
@ -5370,7 +5364,7 @@ static void keys_global (int ch) {
def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]);
// if already targeted, assume user wants to turn it off ...
if (Tagged_task && Fieldstab[eu_GENERIC].item == PIDS_ENVIRON) {
TAGGED_UNDO;
TAGGED_TOSS;
} else {
Tagged_task = def;
Tagged_enum = eu_GENERIC;
@ -6807,8 +6801,10 @@ static void frame_make (void) {
/* deal with potential signal(s) since the last time around
plus any input which may change 'tasks_refresh' needs... */
if (Frames_signal)
if (Frames_signal) {
if (Frames_signal == BREAK_sig) TAGGED_TOSS;
zap_fieldstab();
}
#ifdef THREADED_TSK
sem_post(&Semaphore_tasks_beg);
@ -6867,12 +6863,15 @@ static void frame_make (void) {
/* clear to end-of-screen - critical if last window is 'idleps off'
(main loop must iterate such that we're always called before sleep) */
if (scrlins < Max_lines) {
putp(Cap_nl_clreos);
for (i = scrlins + Msg_row + 1; i < SCREEN_ROWS; i++) {
putp(tg2(0, i));
putp(Cap_clr_eol);
}
PSU_CLREOS(Pseudo_row);
}
if (CHKw(w, View_SCROLL) && VIZISw(Curwin)) show_scroll();
if (Tagged_task) Tagged_func();
if (Tagged_func) Tagged_func();
fflush(stdout);
/* we'll deem any terminal not supporting tgoto as dumb and disable

1
top/top.h
View File

@ -54,7 +54,6 @@
//#define SCROLLVAR_NO /* disable intra-column horizontal scrolls */
//#define SCROLLV_BY_1 /* when scrolling left/right do not move 8 */
//#define STRINGCASENO /* case insenstive compare/locate versions */
//#define TAG_CMD_MUST /* CtrlK (cmdline) needs proper 'c' toggle */
//#define TERMIOS_ONLY /* use native input only (just limp along) */
//#define THREADED_CPU /* separate background thread for cpu updt */
//#define THREADED_MEM /* separate background thread for mem updt */