From 9674867b9dee7816c263c54fd4b47b8a85b4cd2c Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 7 Nov 2011 19:19:31 +0000
Subject: [PATCH] switch use of Option/Alt and Control on OS X for bindings.
 Option/Alt is intended by Apple to be used primarily (if not entirely) for
 entering alternate characters. Shift would be more conventional as 2ndary
 modified on OS X but that might have a few more implications than we want to
 deal with right now

git-svn-id: svn://localhost/ardour2/branches/3.0@10481 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/gtkmm2ext/keyboard.cc | 14 +++++++-------
 tools/fmt-bindings         | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 10c9723696..1550ab9b68 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -57,19 +57,19 @@ guint Keyboard::snap_mod = GDK_MOD3_MASK;
 
 #ifdef GTKOSX
 
-guint Keyboard::PrimaryModifier = GDK_META_MASK;   // Command
-guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option
+uint Keyboard::PrimaryModifier = GDK_META_MASK;   // Command
+guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Alt/Option
 guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift
-guint Keyboard::Level4Modifier = GDK_CONTROL_MASK; // Control
-guint Keyboard::CopyModifier = GDK_MOD1_MASK;      // Alt/Option
+guint Keyboard::Level4Modifier = GDK_MOD1_MASK; // Control
+guint Keyboard::CopyModifier = GDK_CONTROL_MASK;      // Control
 guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK;
 guint Keyboard::button2_modifiers = Keyboard::SecondaryModifier|Keyboard::Level4Modifier;
 
 const char* Keyboard::primary_modifier_name() { return _("Command"); }
-const char* Keyboard::secondary_modifier_name() { return _("Option"); }
+const char* Keyboard::secondary_modifier_name() { return _("Control"); }
 const char* Keyboard::tertiary_modifier_name() { return _("Shift"); }
-const char* Keyboard::level4_modifier_name() { return _("Control"); }
-const char* Keyboard::copy_modifier_name() { return _("Mod1"); }
+const char* Keyboard::level4_modifier_name() { return _("Option"); }
+const char* Keyboard::copy_modifier_name() { return _("Control"); }
 const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
 
 #else
diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index 363dad02dd..c9184f72d7 100755
--- a/tools/fmt-bindings
+++ b/tools/fmt-bindings
@@ -31,23 +31,23 @@ GetOptions ("platform=s" => \$platform,
 
 if ($platform eq "darwin") {
 
-    $gtk_modifier_map{'PRIMARY'} = 'meta';
-    $gtk_modifier_map{'SECONDARY'} = 'Mod1';
+    $gtk_modifier_map{'PRIMARY'} = 'Meta';
+    $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 {