Add option to use narrow mixer strips by default, and fix ardour_system.rc being...

[ardour.git] / gtk2_ardour / keyboard.h

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index a4904f770b9c67250af317a59092cdd786dcd3cd..a785edbfc0b77238e771ce0445dc3a9f9b6afa4b 100644 (file)
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -25,6 +25,7 @@
 
 #include <sigc++/signal.h>
 #include <gtk/gtk.h>
+#include <gtkmm/window.h>
 
 #include <ardour/types.h>
 #include <pbd/stateful.h>
@@ -46,10 +47,27 @@ class Keyboard : public sigc::trackable, Stateful
        typedef vector<uint32_t> State;
        typedef uint32_t ModifierMask;
 
-       static uint32_t Control;
-       static uint32_t Shift;
-       static uint32_t Alt;
-       static uint32_t Meta;
+       static uint32_t PrimaryModifier;
+       static uint32_t SecondaryModifier;
+       static uint32_t TertiaryModifier;
+       static uint32_t CopyModifier;
+       static uint32_t RangeSelectModifier;
+
+       static void set_primary_modifier (uint32_t newval) {
+               set_modifier (newval, PrimaryModifier);
+       }
+       static void set_secondary_modifier (uint32_t newval) {
+               set_modifier (newval, SecondaryModifier);
+       }
+       static void set_tertiary_modifier (uint32_t newval) {
+               set_modifier (newval, TertiaryModifier);
+       }
+       static void set_copy_modifier (uint32_t newval) {
+               set_modifier (newval, CopyModifier);
+       }
+       static void set_range_select_modifier (uint32_t newval) {
+               set_modifier (newval, RangeSelectModifier);
+       }
 
        bool key_is_down (uint32_t keyval);
 
@@ -69,8 +87,6 @@ class Keyboard : public sigc::trackable, Stateful
 
        static bool no_modifiers_active (guint state);
 
-       static void set_meta_modifier (guint);
-
        static void set_snap_modifier (guint);
        static ModifierMask snap_modifier () { return ModifierMask (snap_mod); }
 
@@ -110,6 +126,8 @@ class Keyboard : public sigc::trackable, Stateful
        static gint _snooper (GtkWidget*, GdkEventKey*, gpointer);
        gint snooper (GtkWidget*, GdkEventKey*);
 
+       static void set_modifier (uint32_t newval, uint32_t& variable);
+
        static bool _some_magic_widget_has_focus;
 };