ardour/livetrax
13
0
Fork 0
Code

refactor key press handling to include a hack that continues to use GTK accelerators/bindings for now

Browse Source
This commit is contained in:
Paul Davis 2015-07-15 15:06:06 -04:00
parent dd8cd579fc
commit 39ee7382e7
2 changed files with 62 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
gtk2_ardour/ardour_ui.cc
View File

@ -2066,7 +2066,6 @@ ARDOUR_UI::get_smart_mode() const
void
ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
{
PBD::stacktrace (cerr, 30);
if (!_session) {
return;
}
@ -5189,6 +5188,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
bool special_handling_of_unmodified_accelerators = false;
/* consider all relevant modifiers but not LOCK or SHIFT */
const guint mask = (Keyboard::RelevantModifierKeyMask & ~(Gdk::SHIFT_MASK|Gdk::LOCK_MASK));
GdkModifierType modifier = GdkModifierType (ev->state);
modifier = GdkModifierType (modifier & gtk_accelerator_get_default_mod_mask());
Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator(modifier);
@ -5248,43 +5248,6 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
all "normal text" accelerators.
*/
if (!special_handling_of_unmodified_accelerators && !bindings) {
/* XXX note that for a brief moment, the conditional above
* included "|| (ev->state & mask)" so as to enforce the
* implication of special_handling_of_UNMODIFIED_accelerators.
* however, this forces any key that GTK doesn't allow and that
* we have an alternative (see next comment) for to be
* automatically sent through the accel groups activation
* pathway, which prevents individual widgets & canvas items
* from ever seeing it if is used by a key binding.
*
* specifically, this hid Ctrl-down-arrow from MIDI region
* views because it is also bound to an action.
*
* until we have a robust, clean binding system, this
* quirk will have to remain in place.
*/
/* pretend that certain key events that GTK does not allow
to be used as accelerators are actually something that
it does allow. but only where there are no modifiers.
*/
uint32_t fakekey = ev->keyval;
if (Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tactivate (was %1 now %2) without special hanlding of unmodified accels\n",
ev->keyval, fakekey));
DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tmodified modifier was %1\n", show_gdk_event_state (modifier)));
if (gtk_accel_groups_activate(G_OBJECT(win), fakekey, modifier)) {
DEBUG_TRACE (DEBUG::Accelerators, "\taccel group activated by fakekey\n");
return true;
}
}
}
if (!special_handling_of_unmodified_accelerators || (ev->state & mask)) {
@ -5305,16 +5268,13 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
return true;
}
}
} else {
DEBUG_TRACE (DEBUG::Accelerators, "\tusing GTK accelerators for this window\n");
if (gtk_accel_groups_activate (G_OBJECT(win), ev->keyval, modifier)) {
if (try_gtk_accel_binding (win, ev, !special_handling_of_unmodified_accelerators, modifier)) {
DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
return true;
}
}
DEBUG_TRACE (DEBUG::Accelerators, "\tnot accelerated, now propagate\n");
@ -5329,7 +5289,11 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
DEBUG_TRACE (DEBUG::Accelerators, "\tpropagate, then activate\n");
if (!gtk_window_propagate_key_event (win, ev)) {
if (gtk_window_propagate_key_event (win, ev)) {
DEBUG_TRACE (DEBUG::Accelerators, "\thandled by propagate\n");
return true;
}
DEBUG_TRACE (DEBUG::Accelerators, "\tpropagation didn't handle, so activate\n");
if (bindings) {
@ -5342,20 +5306,15 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
return true;
}
} else {
}
DEBUG_TRACE (DEBUG::Accelerators, "\tusing GTK accelerators for this window\n");
DEBUG_TRACE (DEBUG::Accelerators, "\tnot yet handled, try GTK bindings\n");
if (gtk_accel_groups_activate (G_OBJECT(win), ev->keyval, modifier)) {
if (try_gtk_accel_binding (win, ev, !special_handling_of_unmodified_accelerators, modifier)) {
DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
return true;
}
}
} else {
DEBUG_TRACE (DEBUG::Accelerators, "\thandled by propagate\n");
return true;
}
}
DEBUG_TRACE (DEBUG::Accelerators, "\tnot yet handled, try global bindings\n");
@ -5369,3 +5328,29 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
DEBUG_TRACE (DEBUG::Accelerators, "\tnot handled\n");
return true;
}
bool
ARDOUR_UI::try_gtk_accel_binding (GtkWindow* win, GdkEventKey* ev, bool translate, GdkModifierType modifier)
{
uint32_t fakekey = ev->keyval;
if (translate) {
/* pretend that certain key events that GTK does not allow
to be used as accelerators are actually something that
it does allow. but only where there are no modifiers.
*/
if (Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tactivate (was %1 now %2) without special hanlding of unmodified accels, modifier was %3\n",
ev->keyval, fakekey, show_gdk_event_state (modifier)));
}
}
if (gtk_accel_groups_activate (G_OBJECT(win), fakekey, modifier)) {
DEBUG_TRACE (DEBUG::Accelerators, "\tGTK accel group activated\n");
return true;
}
return false;
}

2
gtk2_ardour/ardour_ui.h
View File

@ -832,6 +832,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void tabs_page_added (Gtk::Widget*, guint page_number);
void tabs_page_removed (Gtk::Widget*, guint page_number);
bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev, Gtkmm2ext::Bindings*);
bool try_gtk_accel_binding (GtkWindow* win, GdkEventKey* ev, bool translate, GdkModifierType modifier);
};
#endif /* __ardour_gui_h__ */