#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
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 {