ardour/livetrax
13
0
Fork 0
Code

keyboard: if a magic widget has focus, handle Primary-(x,c,v) specially

Browse Source 
propagate first, so that the magic widget can handle things, then activate.

This fixes cut/copy/paste bindings within a "magic" widget.
This commit is contained in:
Paul Davis 2023-06-12 14:42:08 -06:00
parent 66e714b476
commit a8fdf7315b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/ardour_ui_keys.cc
View File

@ -125,6 +125,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
GtkWidget* focus = gtk_window_get_focus (win); GtkWidget* focus = gtk_window_get_focus (win);
bool special_handling_of_unmodified_accelerators = false; bool special_handling_of_unmodified_accelerators = false;
const guint mask = (Keyboard::RelevantModifierKeyMask & ~(Gdk::SHIFT_MASK|Gdk::LOCK_MASK)); const guint mask = (Keyboard::RelevantModifierKeyMask & ~(Gdk::SHIFT_MASK|Gdk::LOCK_MASK));
bool cutcopypaste = false;
if (focus) { if (focus) {
@ -152,7 +153,20 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
(focus ? gtk_widget_get_name (focus) : "no focus widget"), (focus ? gtk_widget_get_name (focus) : "no focus widget"),
((ev->state & mask) ? "yes" : "no"), ((ev->state & mask) ? "yes" : "no"),
window.get_title(), window.get_title(),
gdk_keyval_name (ev->keyval))) gdk_keyval_name (ev->keyval)));
if (Keyboard::some_magic_widget_has_focus() && (ev->state == Keyboard::PrimaryModifier)) {
switch (ev->keyval) {
case GDK_x:
case GDK_c:
case GDK_v:
cutcopypaste = true;
DEBUG_TRACE (DEBUG::Accelerators, string_compose ("seen cut/copy/paste keys with magic widget focus, Primary-%1\n", gdk_keyval_name (ev->keyval)));
break;
default:
break;
}
}
/* This exists to allow us to override the way GTK handles /* This exists to allow us to override the way GTK handles
key events. The normal sequence is: key events. The normal sequence is:
@ -186,7 +200,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
*/ */
if (!special_handling_of_unmodified_accelerators || (ev->state & mask)) { if (!cutcopypaste && (!special_handling_of_unmodified_accelerators || (ev->state & mask))) {
/* no special handling or there are modifiers in effect: accelerate first */ /* no special handling or there are modifiers in effect: accelerate first */
@ -243,7 +257,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
} else { } else {
/* no modifiers, propagate first */ /* no modifiers or cut/copy/paste key event, propagate first */
DEBUG_TRACE (DEBUG::Accelerators, "\tpropagate, then activate\n"); DEBUG_TRACE (DEBUG::Accelerators, "\tpropagate, then activate\n");