NO-OP; clean up script spacing and remove goto

[ardour.git] / gtk2_ardour / keyboard.cc

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index b3137a7b9ed6d836c797ef124656cce1d03ad9f1..d5b9dd8c4572679276fea223409e286ef8b257b1 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -23,6 +23,7 @@
 #include "pbd/basename.h"
 
 #include "ardour/filesystem_paths.h"
+#include "ardour/revision.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
@@ -41,14 +42,26 @@ using Gtkmm2ext::Keyboard;
 #ifdef __APPLE__
 guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier;
 #else
-guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier;
+guint ArdourKeyboard::constraint_mod = Keyboard::TertiaryModifier;
 #endif
+
+/* TrimDrag::start_grab() */
 guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier;
+
+/* TrimDrag::motion() */
 guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier;
-guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier;
-guint ArdourKeyboard::fine_adjust_mod = Keyboard::SecondaryModifier;
-guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier;
-guint ArdourKeyboard::note_size_relative_mod = Keyboard::PrimaryModifier;
+
+/* TrimDrag::start_grab() */
+guint ArdourKeyboard::trim_anchored_mod = Keyboard::PrimaryModifier|Keyboard::TertiaryModifier;
+
+/* ControlPointDrag::motion() && LineDrag::motion()*/
+guint ArdourKeyboard::fine_adjust_mod = Keyboard::PrimaryModifier|Keyboard::SecondaryModifier; // XXX better just 2ndary
+
+/* ControlPointDrag::start_grab() && MarkerDrag::motion() */
+guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier|Keyboard::Level4Modifier;
+
+/* NoteResizeDrag::start_grab() */
+guint ArdourKeyboard::note_size_relative_mod = Keyboard::TertiaryModifier; // XXX better: 2ndary
 
 ArdourKeyboard::ArdourKeyboard (ARDOUR_UI& ardour_ui) : ui (ardour_ui)
 {
@@ -91,6 +104,16 @@ ArdourKeyboard::setup_keybindings ()
 
        string lowercase_program_name = downcase (string(PROGRAM_NAME));
 
+#ifndef MIXBUS // not for v4.0 just yet
+       /* extract and append minor vesion */
+       std::string rev (revision);
+       std::size_t pos = rev.find_first_of("-");
+       if (pos != string::npos && pos > 0) {
+               lowercase_program_name += "-";
+               lowercase_program_name += rev.substr (0, pos);
+       }
+#endif
+
        user_keybindings_path = Glib::build_filename (user_config_directory(), lowercase_program_name + binding_filename_suffix);
 
        if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) {