X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fkeyboard.cc;h=6328eb977c39492327ed7a55db6eff7cbcc5e57b;hb=9a0b1cce075f32768197d001f269a191869cc4e6;hp=f09bdef663f6ca0921bac328fb8edad63216cb92;hpb=7cf24873f8423df0e26c9f2daa5aaa225b1c3cab;p=ardour.git

diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index f09bdef663..6328eb977c 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -51,26 +51,26 @@ guint Keyboard::edit_but = 3;
 guint Keyboard::edit_mod = GDK_CONTROL_MASK;
 guint Keyboard::delete_but = 3;
 guint Keyboard::delete_mod = GDK_SHIFT_MASK;
-guint Keyboard::insert_note_but = 3;
+guint Keyboard::insert_note_but = 1;
 guint Keyboard::insert_note_mod = GDK_CONTROL_MASK;
 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_MOD2_MASK;   // Command
+guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control
 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; // Alt/Option
+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::tertiary_modifier_name() { return _("Shift"); }
-const char* Keyboard::level4_modifier_name() { return _("Control"); }
-const char* Keyboard::copy_modifier_name() { return _("Mod1";    ); }
-const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
+const char* Keyboard::secondary_modifier_name() { return _("Control"); }
+const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); }
+const char* Keyboard::level4_modifier_name() { return _("Option"); }
+const char* Keyboard::copy_modifier_name() { return _("Control"); }
+const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); }
 
 #else
 
@@ -84,13 +84,16 @@ guint Keyboard::button2_modifiers = 0; /* not used */
 
 const char* Keyboard::primary_modifier_name() { return _("Control"); }
 const char* Keyboard::secondary_modifier_name() { return _("Alt"); }
-const char* Keyboard::tertiary_modifier_name() { return _("Shift"); }
+const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); }
 const char* Keyboard::level4_modifier_name() { return _("Meta"); }
 const char* Keyboard::copy_modifier_name() { return _("Control"); }
-const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
+const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); }
 
 #endif
 
+guint Keyboard::GainFineScaleModifier = Keyboard::PrimaryModifier;
+guint Keyboard::GainExtraFineScaleModifier = Keyboard::SecondaryModifier;
+
 Keyboard*    Keyboard::_the_keyboard = 0;
 Gtk::Window* Keyboard::current_window = 0;
 bool         Keyboard::_some_magic_widget_has_focus = false;
@@ -299,11 +302,8 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 	if (event->type == GDK_KEY_RELEASE && modifier_state_equals (event->state, PrimaryModifier)) {
 		switch (event->keyval) {
 		case GDK_w:
-			if (current_window) {
-				current_window->hide ();
-				current_window = 0;
-				ret = true;
-			}
+			close_current_dialog ();
+			ret = true;
 			break;
 		}
 	}
@@ -311,6 +311,15 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 	return ret;
 }
 
+void
+Keyboard::close_current_dialog ()
+{
+	if (current_window) {
+		current_window->hide ();
+		current_window = 0;
+	}
+}
+
 bool
 Keyboard::key_is_down (uint32_t keyval)
 {
@@ -556,4 +565,3 @@ Keyboard::load_keybindings (string path)
 	return true;
 }
 
-