fix and tweak menu flags updates (#820)

mintty · Jan 9, 2019 · d3b0303 · d3b0303
1 parent 8df6435
commit d3b0303
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/src/wininput.c b/src/wininput.c
@@ -298,8 +298,14 @@ add_launcher(HMENU menu, bool vsep, bool hsep)
 #define dont_debug_modify_menu
 
 void
-win_update_menus(void)
+win_update_menus(bool callback)
 {
+  if (callback) {
+    // invoked after WM_INITMENU
+  }
+  else
+    return;
+
   bool shorts = !term.shortcut_override;
   bool clip = shorts && cfg.clip_shortcuts;
   bool alt_fn = shorts && cfg.alt_fn_shortcuts;
@@ -316,7 +322,7 @@ win_update_menus(void)
   // label: if null, use current label
   // key: shortcut description; localize "Ctrl+Alt+Shift+"
   {
-    bool sysentry = item & 0xF000;
+    bool sysentry = item >= 0xF000;
 #ifdef debug_modify_menu
     if (sysentry)
       printf("mm %04X <%ls> <%ls>\n", item, label, key);
@@ -558,12 +564,12 @@ win_update_menus(void)
       struct function_def * fudef = function_def(paramp);
       // localize
       wchar * label = _W(cmdp);
-      modify_menu(menu, idm_cmd + n, 0, label, null);
+      uint status = 0;
       if (fudef && fudef->fct_status) {
-        uint status = fudef->fct_status();
-        // set flag status
-        EnableMenuItem(menu, idm_cmd + n, status);
+        status = fudef->fct_status();
+        //EnableMenuItem(menu, idm_cmd + n, status);  // done by modify_menu
       }
+      modify_menu(menu, idm_cmd + n, status, label, null);
 
       cmdp = newcmdp;
       n++;
@@ -760,7 +766,7 @@ open_popup_menu(bool use_text_cursor, string menucfg, mod_keys mods)
     }
     menucfg++;
   }
-  win_update_menus();
+  win_update_menus(false);  // dispensable; also called via WM_INITMENU
 
   POINT p;
   if (use_text_cursor) {
@@ -769,6 +775,7 @@ open_popup_menu(bool use_text_cursor, string menucfg, mod_keys mods)
   }
   else
     GetCursorPos(&p);
+
   TrackPopupMenu(
     ctxmenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON,
     p.x, p.y, 0, wnd, null
@@ -1171,6 +1178,12 @@ mflags_lock_title()
   return title_settable ? MF_ENABLED : MF_GRAYED;
 }
 
+static uint
+mflags_flipscreen()
+{
+  return term.show_other_screen ? MF_CHECKED : MF_UNCHECKED;
+}
+
 // user-definable functions
 static struct function_def cmd_defs[] = {
 #ifdef support_sc_defs
@@ -1221,7 +1234,7 @@ static struct function_def cmd_defs[] = {
   {"lock-title", {.fct = lock_title}, mflags_lock_title},
   {"reset", {IDM_RESET}, 0},
   {"break", {IDM_BREAK}, 0},
-  {"flipscreen", {IDM_FLIPSCREEN}, 0},
+  {"flipscreen", {IDM_FLIPSCREEN}, mflags_flipscreen},
   {"open", {IDM_OPEN}, 0},
   {"toggle-logging", {IDM_TOGLOG}, 0},
   {"toggle-char-info", {IDM_TOGCHARINFO}, 0},

diff --git a/src/winmain.c b/src/winmain.c
@@ -2566,7 +2566,7 @@ static struct {
       // which is supposed to initiate this message;
       // however, if we skip the call here, the "New" item will 
       // not be initialised !?!
-      win_update_menus();
+      win_update_menus(true);
       return 0;
 
     when WM_MOVING:

diff --git a/src/winpriv.h b/src/winpriv.h
@@ -73,7 +73,7 @@ extern void win_show_tip(int x, int y, int cols, int rows);
 extern void win_destroy_tip(void);
 
 extern void win_init_menus(void);
-extern void win_update_menus(void);
+extern void win_update_menus(bool callback);
 extern void user_function(wstring commands, int n);
 
 extern void win_show_mouse(void);