mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 06:44:57 +01:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
73dd9d37e7
commit
bb457bb960
168 changed files with 11821 additions and 5338 deletions
|
|
@ -46,10 +46,27 @@ class Keyboard : public sigc::trackable, PBD::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 +86,6 @@ class Keyboard : public sigc::trackable, PBD::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 +125,8 @@ class Keyboard : public sigc::trackable, PBD::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;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue