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

top: remove the 'BOT_MENU_YES' prototype demonstration

Browse Source 
Now that a potential use of that bottom 'window' for a
menu has been demonstrated, we'll remove such clutter.

[ after all, the prior commit cautioned against text ]
[ made conditional which might also be translatable. ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2022-05-27 00:00:00 -05:00 committed by Craig Small
parent b587d946bf
commit dedcfa7619
2 changed files with 3 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
top/top.c
View File

@ -110,16 +110,10 @@ static int Screen_cols, Screen_rows, Max_lines;
#define BOT_UNFOCUS -1 // tab focus not established
// a negative 'item' won't be seen by build_headers() ...
#define BOT_ITEM_NS -2 // data for namespaces req'd
#ifdef BOT_MENU_YES
# define BOT_MENU_ON -3 // in menu, tab focus active
#endif
// next 4 are used when toggling window contents
#define BOT_SEP_CMA ','
#define BOT_SEP_SLS '/'
#define BOT_SEP_SPC ' '
#ifdef BOT_MENU_YES
#define BOT_SEP_TAB '\t'
#endif
// 1 for horizontal separator
#define BOT_RSVD 1
#define BOT_KEEP Bot_show_func = NULL
@ -5142,37 +5136,6 @@ static void bot_item_toggle (int what, const char *name, char sep) {
Bot_task = PID_VAL(EU_PID, s_int, Curwin->ppt[Curwin->begtask]);
}
} // end: bot_item_toggle
#ifdef BOT_MENU_YES
/*
* This guy manages that bottom margin window |
* when it is used as a menu of user choices. | */
static void bot_menu_show (void) {
Bot_focus_func(Bot_name, "selection #1\t selection #2\t selecttion #3");
BOT_KEEP;
} // end: bot_menu_show
/*
* This guy can toggle between displaying the |
* bottom window or arranging to turn it off. | */
static void bot_menu_toggle (void) {
// if already in menu mode, assume user wants to exit ...
if (Bot_what == BOT_MENU_ON) {
BOT_TOSS;
} else {
Bot_sep = BOT_SEP_TAB;
Bot_what = BOT_MENU_ON;
Bot_indx = 0;
Bot_item[0] = BOT_DELIMIT;
Bot_name = (char *)"a menu, please choose among the following, then press <Enter> ...";
Bot_focus_func = (BOT_f)bot_focus_str;
Bot_show_func = bot_menu_show;
Bot_task = PID_VAL(EU_PID, s_int, Curwin->ppt[Curwin->begtask]);
}
} // end: bot_menu_toggle
#endif
/*###### Interactive Input Tertiary support ############################*/
@ -5554,11 +5517,6 @@ static void keys_global (int ch) {
case kbd_CtrlG:
bot_item_toggle(EU_CGR, "control groups", BOT_SEP_SLS);
break;
#ifdef BOT_MENU_YES
case kbd_CtrlH:
bot_menu_toggle();
break;
#endif
case kbd_CtrlI:
if (Bot_what) {
++Bot_indx;
@ -5614,15 +5572,11 @@ static void keys_global (int ch) {
Bot_indx = num + 1;
}
break;
case kbd_ENTER: // fall through
#ifdef BOT_MENU_YES
if (Bot_what == BOT_MENU_ON && Bot_indx != BOT_UNFOCUS)
show_msg(fmtmk("thanks for selecting menu item #%d", Bot_indx + 1));
#endif // the enter plus space keys will wake us
case kbd_ENTER: // these two have the effect of waking us
case kbd_SPACE: // from 'pselect', refreshing the display
break; // and updating any hot-plugged resources
default:
break; // keep gcc happy
default: // keep gcc happy
break;
}
} // end: keys_global
@ -6460,9 +6414,6 @@ static void do_key (int ch) {
, 'I', 'k', 'r', 's', 'X', 'Y', 'Z', '0'
, kbd_CtrlE, kbd_CtrlG, kbd_CtrlI, kbd_CtrlK
, kbd_CtrlN, kbd_CtrlP, kbd_CtrlR, kbd_CtrlU
#ifdef BOT_MENU_YES
, kbd_CtrlH
#endif
, kbd_ENTER, kbd_SPACE, kbd_BTAB, '\0' } },
{ keys_summary,
{ '!', '1', '2', '3', '4', 'C', 'l', 'm', 't', '\0' } },

8
top/top.h
View File

@ -27,7 +27,6 @@
/* Development/Debugging defines ----------------------------------- */
//#define ATEOJ_RPTSTD /* report on some miscellany at end-of-job */
//#define BOT_DEAD_ZAP /* zap Ctrl bottom window when target dies */
//#define BOT_MENU_YES /* enable bottom window for menu prototype */
//#define BOT_STRV_OFF /* don't emphasize strv w/ focus if spaces */
//#define CASEUP_HEXES /* show all those hex values in upper case */
//#define CASEUP_SUFIX /* show time/mem/cnts suffix in upper case */
@ -179,9 +178,6 @@ char *strcasestr(const char *haystack, const char *needle);
#define kbd_BTAB 140
#define kbd_CtrlE '\005'
#define kbd_CtrlG '\007'
#ifdef BOT_MENU_YES
#define kbd_CtrlH '\010'
#endif
#define kbd_CtrlI '\011'
#define kbd_CtrlK '\013'
#define kbd_CtrlN '\016'
@ -751,10 +747,6 @@ typedef struct WIN_t {
//atic void *bot_item_hlp (struct pids_stack *p);
//atic void bot_item_show (void);
//atic void bot_item_toggle (int what, const char *name, char sep);
#ifdef BOT_MENU_YES
//atic void bot_menu_show (void);
//atic void bot_menu_toggle (void);
#endif
/*------ Interactive Input Tertiary support ----------------------------*/
//atic inline int find_ofs (const WIN_t *q, const char *buf);
//atic void find_string (int ch);