rationalize text/base/bg/fg colors in all entry styles

[ardour.git] / tools / fmt-bindings

diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index 39849b1847734155df9b576470af07a12be999d9..c6b71e4e372d6b063ee371417aaf4ca9e6a2f6ab 100755 (executable)
--- a/tools/fmt-bindings
+++ b/tools/fmt-bindings
@@ -18,7 +18,7 @@ $group_number = 0;
 %merge_bindings;
 
 $platform = linux;
-$winkey = 'Mod4><Super';
+$winkey = 'Mod4\>\<Super';
 $make_cheatsheet = 1;
 $make_accelmap = 0;
 $merge_from = "";
@@ -29,25 +29,25 @@ GetOptions ("platform=s" => \$platform,
            "accelmap" => \$make_accelmap,
            "merge=s" => \$merge_from);
 
-if ($platform eq "osx") {
+if ($platform eq "darwin") {
 
-    $gtk_modifier_map{'PRIMARY'} = 'meta';
-    $gtk_modifier_map{'SECONDARY'} = 'Mod1';
+    $gtk_modifier_map{'PRIMARY'} = 'Primary';
+    $gtk_modifier_map{'SECONDARY'} = 'Control';
     $gtk_modifier_map{'TERTIARY'} = 'Shift';
-    $gtk_modifier_map{'LEVEL4'} = 'Control';
-    $gtk_modifier_map{'WINDOW'} = 'Mod1';
+    $gtk_modifier_map{'LEVEL4'} = 'Mod1';
+    $gtk_modifier_map{'WINDOW'} = 'Control';
 
     $cs_modifier_map{'PRIMARY'} = 'Command';
-    $cs_modifier_map{'SECONDARY'} = 'Opt';
+    $cs_modifier_map{'SECONDARY'} = 'Control';
     $cs_modifier_map{'TERTIARY'} = 'Shift';
-    $cs_modifier_map{'LEVEL4'} = 'Control';
-    $cs_modifier_map{'WINDOW'} = 'Opt';
+    $cs_modifier_map{'LEVEL4'} = 'Mod1';
+    $cs_modifier_map{'WINDOW'} = 'Control';
 
     $mouse_modifier_map{'PRIMARY'} = 'Cmd';
-    $mouse_modifier_map{'SECONDARY'} = 'Opt';
+    $mouse_modifier_map{'SECONDARY'} = 'Ctrl';
     $mouse_modifier_map{'TERTIARY'} = 'Shift';
-    $mouse_modifier_map{'LEVEL4'} = 'Control';
-    $mouse_modifier_map{'WINDOW'} = 'Opt';
+    $mouse_modifier_map{'LEVEL4'} = 'Opt';
+    $mouse_modifier_map{'WINDOW'} = 'Ctrl';
 
 } else {