Ticket #3176: menu.diff

src/preferences/menu/MenuSettings.cpp

@@ -75 +75 @@
 MenuSettings::AltAsShortcut() const
 {
     key_map *keys; 
-    char* chars; 
+    char* chars;
     
     get_key_map(&keys, &chars);
-
-    bool altAsShortcut = (keys->left_command_key == 0x5d)
-        && (keys->left_control_key == 0x5c); 
-
+    
+    // TODO: don't hardcode Alt to 0x5d ; instead get it from the current
+    // keymap at the first invocation of Menu pref applet, with an assupmtion
+    // that for every new keymap loaded and at the very first invocation of
+    // applet, Alt (Command Key) is the default modifier (which is always the 
+    // case, in reality, cf. System Keymap and factory Keymaps).
+    // Then, to get rid of hardcoding: at first invocation of Menu preferences
+    // applet, if no pref file exists, or if pref file exists but keymap has
+    // been changed by user), record the new keymap and the value of
+    // left_command_key in the ~/config/.../pref file, in order
+    // to know what it was on subsequent calls. Everytime the user 
+    // changes keymap and we notice it from here, we should reset the
+    // preference file, like if it was the first invocation of Menu 
+    // preference applet.
+    
+    bool altAsShortcut = (keys->left_command_key == 0x5d);
+    
     free(chars);
     free(keys);
-    
+        
     return altAsShortcut;   
 }
 
@@ -92 +105 @@
 void
 MenuSettings::SetAltAsShortcut(bool altAsShortcut)
 {
-    if (altAsShortcut) {
+
+    key_map *keys; 
+    char* chars;
+    
+    get_key_map(&keys, &chars);
+
+    if ( (altAsShortcut && !AltAsShortcut())
+        || (!altAsShortcut && AltAsShortcut()) ) {
+        // as the current settings are recorded directly in the keymap,
+        // we just need to invert them from a temp local copy.
+        
         // This might not be the same for all keyboards
-        set_modifier_key(B_LEFT_COMMAND_KEY, 0x5d);
-        set_modifier_key(B_LEFT_CONTROL_KEY, 0x5c);
-    } else {
-        // This might not be the same for all keyboards
-        set_modifier_key(B_LEFT_COMMAND_KEY, 0x5c);
-        set_modifier_key(B_LEFT_CONTROL_KEY, 0x5d);
+        set_modifier_key(B_LEFT_COMMAND_KEY, keys->left_control_key);
+        set_modifier_key(B_LEFT_CONTROL_KEY, keys->left_command_key);
+
+        be_roster->Broadcast(new BMessage(B_MODIFIERS_CHANGED));    
     }
-    be_roster->Broadcast(new BMessage(B_MODIFIERS_CHANGED));    
+    
+    free(chars);
+    free(keys);
 }