top: remove the 'BOT_MENU_YES' prototype demonstration <=== port of newlib dedcfa76

______________________________ original newlib message

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>

diff --git a/top/top.c b/top/top.c
index 8a152480da7a0eca5d926a2c67bb3ac256cc8a05..c7d4d013bbbf96d9db7c76b3836f6066e4da76bc 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -116,16 +116,10 @@ static int   Screen_cols, Screen_rows, Max_lines;
            in managing the special separate bottom 'window' ... */
 #define      SCREEN_ROWS ( Screen_rows - Bot_rsvd )
 #define      BOT_UNFOCUS  -1           // tab focus not established
-#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
@@ -5307,36 +5301,6 @@ static void bot_item_toggle (int what, const char *name, char sep) {
       Bot_task = Curwin->ppt[Curwin->begtask]->tid;
    }
 } // 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_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 = Curwin->ppt[Curwin->begtask]->tid;
-   }
-} // end: bot_menu_toggle
-#endif
 \f
 /*######  Interactive Input Tertiary support  ############################*/
 
@@ -5712,11 +5676,6 @@ static void keys_global (int ch) {
       case kbd_CtrlG:
          bot_item_toggle((L_CGROUP), "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;
@@ -5746,15 +5705,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
 
@@ -6565,9 +6520,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_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' } },

diff --git a/top/top.h b/top/top.h
index 9df5139f28997175c46d24d0e17b7442b07ce263..225d8067fa2b94132f1acdd2cfaa5e2d2edea086 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -30,7 +30,6 @@
 //#define ATEOJ_RPTHSH            /* report on hash specifics, at end-of-job */
 //#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 */
@@ -191,9 +190,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'
@@ -837,10 +833,6 @@ typedef struct WIN_t {
 //atic void         *bot_item_hlp (proc_t *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);