diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-28 19:32:41 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-28 19:32:41 +0000 |
commit | c73f4fde75f085171f9acb028e721b46c78632b7 (patch) | |
tree | f137e3fe44db367c700e82a9a4afb2ed9eb67a8c /gtk2_ardour/keyboard.h | |
parent | b8e300b36c1dc989e47b5e9b28848588e4dd2b20 (diff) |
parametize modifier key usage; fix keyboard-driven sync point setting; add ladspa whitelist to allow subset of plugins to be shown (hardcoded for now, but to expanded in the future)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2722 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/keyboard.h')
-rw-r--r-- | gtk2_ardour/keyboard.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h index 076bb73e43..a785edbfc0 100644 --- a/gtk2_ardour/keyboard.h +++ b/gtk2_ardour/keyboard.h @@ -47,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); @@ -70,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); } @@ -111,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; }; |