allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

remove Bindings::ignored_state and use Keyboard::RelevantModifierMask

Browse Source
This commit is contained in:
Paul Davis
2015-10-27 13:28:11 -04:00
parent fbc985f913
commit aa71d60ab9
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/ardour_ui.cc
View File

@@ -398,9 +398,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
keyboard->set_state (*node, Stateful::loading_state_version);
}
/* we don't like certain modifiers */
Bindings::set_ignored_state (GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK);
UIConfiguration::instance().reset_dpi ();
TimeAxisViewItem::set_constant_heights ();

5
libs/gtkmm2ext/bindings.cc
View File

@@ -43,13 +43,12 @@ using namespace Gtkmm2ext;
using namespace PBD;
list<Bindings*> Bindings::bindings; /* global. Gulp */
uint32_t Bindings::_ignored_state = 0;
list<ActionMap*> ActionMap::action_maps; /* global. Gulp */
PBD::Signal1<void,Bindings*> Bindings::BindingsChanged;
MouseButton::MouseButton (uint32_t state, uint32_t keycode)
{
uint32_t ignore = Bindings::ignored_state();
uint32_t ignore = ~Keyboard::RelevantModifierKeyMask;
if (gdk_keyval_is_upper (keycode) && gdk_keyval_is_lower (keycode)) {
/* key is not subject to case, so ignore SHIFT
@@ -138,7 +137,7 @@ MouseButton::name () const
KeyboardKey::KeyboardKey (uint32_t state, uint32_t keycode)
{
uint32_t ignore = Bindings::ignored_state();
uint32_t ignore = ~Keyboard::RelevantModifierKeyMask;
_val = (state & ~ignore);
_val <<= 32;

12
libs/gtkmm2ext/gtkmm2ext/bindings.h
View File

@@ -178,16 +178,6 @@ class LIBGTKMM2EXT_API Bindings {
void load_operation (XMLNode const& node);
void save (XMLNode& root);
/* There are modifiers that we just don't care about
when it comes to defining bindings. This sets the modifiers
that will be ignored when comparing a key event with
existing bindings.
*/
static void set_ignored_state (int mask) {
_ignored_state = mask;
}
static uint32_t ignored_state() { return _ignored_state; }
/* GTK has the following position a Gtk::Action:
*
* accel_path: <Actions>/GroupName/ActionName
@@ -231,8 +221,6 @@ class LIBGTKMM2EXT_API Bindings {
MouseButtonBindingMap button_press_bindings;
MouseButtonBindingMap button_release_bindings;
static uint32_t _ignored_state;
void push_to_gtk (KeyboardKey, Glib::RefPtr<Gtk::Action>);
};