Fix windows key bindings.

I am not sure if this is correct, but since the name in the bindings didn't
match that in keyboard.cc, the modifier was just ignored, which results in
conflicting bindings and consequent bugs.

"Meta" seems to be the name for this thing (oddly, to me), so I chose that,
though since my window manager steals this key (as basically all the standard
ones do these days) I can't tell if these bindings actually work with the
desired key.

diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index 913ff25e01b7723f5b84f971cd96ab0f77dbfbc9..5e1217366c11efe4d2a7ea86564cea6b49da7f80 100755 (executable)
--- a/tools/fmt-bindings
+++ b/tools/fmt-bindings
@@ -56,23 +56,23 @@ if ($platform eq "darwin") {
     $gtk_modifier_map{'PRIMARY'} = 'Control';
     $gtk_modifier_map{'SECONDARY'} = 'Alt';
     $gtk_modifier_map{'TERTIARY'} = 'Shift';
-    $gtk_modifier_map{'LEVEL4'} = 'window';
-    $gtk_modifier_map{'WINDOW'} = 'Alt';
-    $gtk_modifier_map{$winkey} => 'Win';
+    $gtk_modifier_map{'LEVEL4'} = 'Meta';
+    $gtk_modifier_map{'WINDOW'} = 'Meta';
+    $gtk_modifier_map{$winkey} => 'Meta';
 
     $cs_modifier_map{'PRIMARY'} = 'Control';
     $cs_modifier_map{'SECONDARY'} = 'Alt';
     $cs_modifier_map{'TERTIARY'} = 'Shift';
-    $cs_modifier_map{'LEVEL4'} = 'Win';
-    $cs_modifier_map{'WINDOW'} = 'Alt';
-    $cs_modifier_map{$winkey} => 'Win';
+    $cs_modifier_map{'LEVEL4'} = 'Meta';
+    $cs_modifier_map{'WINDOW'} = 'Meta';
+    $cs_modifier_map{$winkey} => 'Meta';
 
     $mouse_modifier_map{'PRIMARY'} = 'Ctl';
     $mouse_modifier_map{'SECONDARY'} = 'Alt';
     $mouse_modifier_map{'TERTIARY'} = 'Shift';
-    $mouse_modifier_map{'LEVEL4'} = 'Win';
-    $mouse_modifier_map{'WINDOW'} = 'Alt';
-    $mouse_modifier_map{$winkey} => 'Win';
+    $mouse_modifier_map{'LEVEL4'} = 'Meta';
+    $mouse_modifier_map{'WINDOW'} = 'Meta';
+    $mouse_modifier_map{$winkey} => 'Meta';
 }
 
 %keycodes = ();