From 6fa14a1b47a9a62d5a9f8f89271535347f114578 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sun, 15 Dec 2019 20:34:14 +0100
Subject: [PATCH] VKeybd: Pass on primary (Ctrl/Cmd) shortcuts

This allows Ctrl/Cmd+s (save) and Ctrl/Cmd+z (undo) etc shortcuts
to work, even though the virtual-keyboard is visible.
---
 gtk2_ardour/pianokeyboard.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gtk2_ardour/pianokeyboard.cc b/gtk2_ardour/pianokeyboard.cc
index 9323f4fbf0..c68b674742 100644
--- a/gtk2_ardour/pianokeyboard.cc
+++ b/gtk2_ardour/pianokeyboard.cc
@@ -30,6 +30,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include "gtkmm2ext/keyboard.h"
+
 #include "pianokeyboard.h"
 
 #ifndef M_PI
@@ -559,6 +561,10 @@ get_keycode (GdkEventKey* event)
 bool
 APianoKeyboard::on_key_press_event (GdkEventKey* event)
 {
+	 if (Gtkmm2ext::Keyboard::modifier_state_contains (event->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
+		 return false;
+	 }
+
 	char const* key = get_keycode (event);
 	int note = key_binding (key);
 
@@ -594,6 +600,9 @@ APianoKeyboard::on_key_press_event (GdkEventKey* event)
 bool
 APianoKeyboard::on_key_release_event (GdkEventKey* event)
 {
+	 if (Gtkmm2ext::Keyboard::modifier_state_contains (event->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
+		 return false;
+	 }
 	char const* key = get_keycode (event);
 
 	if (!key) {