From 4b40cc0529928c96178829568f2957035f6eec54 Mon Sep 17 00:00:00 2001
From: David Yu Yang <davidyang6us@gmail.com>
Date: Wed, 20 Oct 2021 21:45:17 +0800
Subject: [PATCH] Keyboard shortcut fixes

Fix keyboard shortcuts without the shift key, switch tab mappings and update split tab vertical keybind default to new keybinding code.
---
 guake/data/org.guake.gschema.xml              |  2 +-
 guake/keybindings.py                          | 24 +++++++++----------
 .../keybinding_fixes-51d91ab3004cdfa3.yaml    |  6 +++++
 3 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/keybinding_fixes-51d91ab3004cdfa3.yaml

diff --git a/guake/data/org.guake.gschema.xml b/guake/data/org.guake.gschema.xml
index 44ca1ef96..14407c04a 100644
--- a/guake/data/org.guake.gschema.xml
+++ b/guake/data/org.guake.gschema.xml
@@ -559,7 +559,7 @@
             <description>Switch to the last tab.</description>
         </key>
         <key name="split-tab-vertical" type="s">
-            <default>'&lt;Super&gt;less'</default>
+            <default>'&lt;Super&gt;comma'</default>
             <summary>Split tab vertical.</summary>
             <description>Split tab vertical.</description>
         </key>
diff --git a/guake/keybindings.py b/guake/keybindings.py
index 7acb0477c..227bca25c 100644
--- a/guake/keybindings.py
+++ b/guake/keybindings.py
@@ -84,16 +84,16 @@ def x(*args):
             ("search-on-web", self.guake.search_on_web),
             ("move-tab-left", self.guake.accel_move_tab_left),
             ("move-tab-right", self.guake.accel_move_tab_right),
-            ("switch-tab1", self.guake.gen_accel_switch_tabN(1)),
-            ("switch-tab2", self.guake.gen_accel_switch_tabN(2)),
-            ("switch-tab3", self.guake.gen_accel_switch_tabN(3)),
-            ("switch-tab4", self.guake.gen_accel_switch_tabN(4)),
-            ("switch-tab5", self.guake.gen_accel_switch_tabN(5)),
-            ("switch-tab6", self.guake.gen_accel_switch_tabN(6)),
-            ("switch-tab7", self.guake.gen_accel_switch_tabN(7)),
-            ("switch-tab8", self.guake.gen_accel_switch_tabN(8)),
-            ("switch-tab9", self.guake.gen_accel_switch_tabN(9)),
-            ("switch-tab10", self.guake.gen_accel_switch_tabN(10)),
+            ("switch-tab1", self.guake.gen_accel_switch_tabN(0)),
+            ("switch-tab2", self.guake.gen_accel_switch_tabN(1)),
+            ("switch-tab3", self.guake.gen_accel_switch_tabN(2)),
+            ("switch-tab4", self.guake.gen_accel_switch_tabN(3)),
+            ("switch-tab5", self.guake.gen_accel_switch_tabN(4)),
+            ("switch-tab6", self.guake.gen_accel_switch_tabN(5)),
+            ("switch-tab7", self.guake.gen_accel_switch_tabN(6)),
+            ("switch-tab8", self.guake.gen_accel_switch_tabN(7)),
+            ("switch-tab9", self.guake.gen_accel_switch_tabN(8)),
+            ("switch-tab10", self.guake.gen_accel_switch_tabN(9)),
             ("switch-tab-last", self.guake.accel_switch_tab_last),
             ("reset-terminal", self.guake.accel_reset_terminal),
             (
@@ -239,8 +239,8 @@ def activate(self, window, event):
                 key = Gdk.keyval_to_lower(key)
         else:
             keys = Gdk.keyval_convert_case(key)
-            if keys[0] != keys[1]:
-                key = keys[1]
+            if key != keys[1]:
+                key = keys[0]
                 mod &= ~Gdk.ModifierType.SHIFT_MASK
 
         mask = mod & self._masks
diff --git a/releasenotes/notes/keybinding_fixes-51d91ab3004cdfa3.yaml b/releasenotes/notes/keybinding_fixes-51d91ab3004cdfa3.yaml
new file mode 100644
index 000000000..993feba56
--- /dev/null
+++ b/releasenotes/notes/keybinding_fixes-51d91ab3004cdfa3.yaml
@@ -0,0 +1,6 @@
+release_summary: >
+    Fix keybinding regressions
+
+fixes:
+  - |
+      - Some shortcut keys are abnormal #1939