Merge lp:~djaler1/noise/fix-1235489 into lp:~elementary-apps/noise/trunk

[Kirill Romanov]

Fix Ctrl+Q support for non-Latin keyboard layouts

Fix bug#1235489

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2016-02-07 16:33:45 +0000
+++ src/LibraryWindow.vala	2016-07-17 09:35:14 +0000
@@ -152,6 +152,21 @@
         }
     }
 
+    /** Returns true if the code parameter matches the keycode of the keyval parameter for
+    * any keyboard group or level (in order to allow for non-QWERTY keyboards) **/
+    protected bool match_keycode (int keyval, uint code) {
+        Gdk.KeymapKey [] keys;
+        Gdk.Keymap keymap = Gdk.Keymap.get_default ();
+        if (keymap.get_entries_for_keyval (keyval, out keys)) {
+            foreach (var key in keys) {
+                if (code == key.keycode)
+                    return true;
+                }
+            }
+
+        return false;
+    }
+
     public override bool key_press_event (Gdk.EventKey event) {
         // when typing in an editable widget, such as Gtk.Entry, don't block the event
         var focus_widget = get_focus ();
@@ -191,13 +206,15 @@
                     }
 
                     break;
-                case Gdk.Key.f:
-                    searchField.grab_focus ();
-                    return false;
-                case Gdk.Key.q:
-                case Gdk.Key.w:
-                    this.destroy ();
-                    return true;
+            }
+
+            uint keycode = event.hardware_keycode;
+            if (match_keycode (Gdk.Key.f, keycode)) {
+                searchField.grab_focus ();
+                return false;
+            } else if (match_keycode (Gdk.Key.q, keycode) || match_keycode (Gdk.Key.w, keycode)) {
+                this.destroy ();
+                return true;
             }
         }