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 c13b06afe50f6dad2ff204fda0926303b713e297..a785edbfc0b77238e771ce0445dc3a9f9b6afa4b 100644 (file)
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_keyboard_h__
@@ -26,6 +25,7 @@
 
 #include <sigc++/signal.h>
 #include <gtk/gtk.h>
+#include <gtkmm/window.h>
 
 #include <ardour/types.h>
 #include <pbd/stateful.h>
@@ -45,19 +45,29 @@ class Keyboard : public sigc::trackable, Stateful
        int set_state (const XMLNode&);
 
        typedef vector<uint32_t> State;
-       
-       int  get_prefix(float&, bool& was_floating);
-       void start_prefix ();
-
-       static State  translate_key_name (const string&);
-       static string get_real_keyname (const string& name);
-
        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);
 
@@ -77,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); }
 
@@ -98,36 +106,29 @@ class Keyboard : public sigc::trackable, Stateful
 
        static Keyboard& the_keyboard() { return *_the_keyboard; }
 
+       static bool some_magic_widget_has_focus ();
+       static void magic_widget_grab_focus ();
+       static void magic_widget_drop_focus ();
+
   private:
        static Keyboard* _the_keyboard;
 
-       bool   _queue_events;
-       bool   _flush_queue;
-
        guint           snooper_id;
        State           state;
-       bool            collecting_prefix;
-       string          current_prefix;
-       int*            modifier_masks;
-       int             modifier_mask;
-       int             min_keycode;
-       int             max_keycode;
 
        static guint     edit_but;
        static guint     edit_mod;
        static guint     delete_but;
        static guint     delete_mod;
        static guint     snap_mod;
+       static Gtk::Window* current_window;
 
        static gint _snooper (GtkWidget*, GdkEventKey*, gpointer);
        gint snooper (GtkWidget*, GdkEventKey*);
-       
-       void queue_event (GdkEventKey*);
-       void get_modifier_masks ();
-       void check_modifier_state ();
-       void clear_modifier_state ();
 
-       void check_meta_numlock (char keycode, guint mod, string modname);
+       static void set_modifier (uint32_t newval, uint32_t& variable);
+
+       static bool _some_magic_widget_has_focus;
 };
 
 #endif /* __ardour_keyboard_h__ */