Fix GDK keysymsgtk3_port

2 files changed, 15 insertions, 14 deletions

diff --git a/UMain.pas b/UMain.pas
index 75a0bd9..3b83ff9 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -1583,29 +1583,30 @@ begin
                                 end;
 
 
-    GDK_KEY_A: if ((Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2)) or (Shift = [ssCtrl]) then begin
+    GDK_KEY_A, GDK_KEY_a_: if ((Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2)) or (Shift = [ssCtrl]) then begin
                             KeyHandled := True;
                             CommandLineComboKeyDown(Sender, Key, Shift, Accept);
                           end;
-    GDK_KEY_D: if Shift = [ssCtrl] then begin
+    GDK_KEY_D, GDK_KEY_d_: if Shift = [ssCtrl] then begin
                             Accept := False;
                             KeyHandled := True;
                             ShowBookmarkQuick(LeftPanel);
                           end;
-    GDK_KEY_O : if (Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2) then begin
+    GDK_KEY_O, GDK_KEY_o_: if (Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2) then begin
                              Accept := False;
                              KeyHandled := True;
                              SwitchOtherPanel(LeftPanel, False);
                            end;
-    GDK_KEY_P, GDK_KEY_N:
+    GDK_KEY_P, GDK_KEY_p_, GDK_KEY_N, GDK_KEY_n_:
       if (((Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2)) or (Shift = [ssCtrl])) { and (CommandLineHistory.Count > 0) } then begin
         KeyHandled := True;
         CommandLineComboKeyDown(Sender, Key, Shift, Accept);
       end;
-    GDK_KEY_S : if ((Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2)) or (Shift = [ssCtrl]) then begin
-                             KeyHandled := True;
-                             ActivateQuickFind(LeftPanel);
-                           end;
+    GDK_KEY_S, GDK_KEY_s_:
+      if ((Shift = [ssAlt]) and (ConfQuickSearchActivationKey <> 2)) or (Shift = [ssCtrl]) then begin
+        KeyHandled := True;
+        ActivateQuickFind(LeftPanel);
+      end;
   end;
   if not KeyHandled then Accept := not HandleKey(Key, Shift, LeftPanel);
 end;
@@ -3670,7 +3671,7 @@ begin
                    if LeftLastFocused then RightListView.SetFocus
                                       else LeftListView.SetFocus;
                  end;
-    GDK_KEY_P: if ((Shift = [ssAlt]) or (Shift = [ssCtrl])) and (CommandLineHistory.Count > 0) then
+    GDK_KEY_P, GDK_KEY_p_: if ((Shift = [ssAlt]) or (Shift = [ssCtrl])) and (CommandLineHistory.Count > 0) then
       begin
         Accept := False;
         Orig := Trim(CommandLineCombo.Entry.Text);
@@ -3684,7 +3685,7 @@ begin
         CommandLineCombo.Entry.SetFocus;
         CommandLineCombo.Entry.SelectRegion(Length(CommandLineCombo.Entry.Text), Length(CommandLineCombo.Entry.Text));
       end else if not CommandLineCombo.Entry.Focused then ActivateCommandLine(Key);
-    GDK_KEY_N: if ((Shift = [ssAlt]) or (Shift = [ssCtrl])) and (CommandLineHistory.Count > 0) then
+    GDK_KEY_N, GDK_KEY_n_: if ((Shift = [ssAlt]) or (Shift = [ssCtrl])) and (CommandLineHistory.Count > 0) then
       begin
         Accept := False;
         Orig := Trim(CommandLineCombo.Entry.Text);
@@ -3699,7 +3700,7 @@ begin
         CommandLineCombo.Entry.SetFocus;
         CommandLineCombo.Entry.SelectRegion(Length(CommandLineCombo.Entry.Text), Length(CommandLineCombo.Entry.Text));
       end else if not CommandLineCombo.Entry.Focused then ActivateCommandLine(Key);
-    GDK_KEY_A: if (Shift = [ssAlt]) or (Shift = [ssCtrl]) then
+    GDK_KEY_A, GDK_KEY_a_: if (Shift = [ssAlt]) or (Shift = [ssCtrl]) then
       begin
         Accept := False;
         if LeftLastFocused then Engine := LeftPanelEngine
diff --git a/UViewer.pas b/UViewer.pas
index 4c37af2..0c20b96 100644
--- a/UViewer.pas
+++ b/UViewer.pas
@@ -252,18 +252,18 @@ begin
                     smooth_scroll(hadj, x, False);
                     Accept := False;
                   end;
-    GDK_KEY_W: if (Shift = []) then begin
+    GDK_KEY_W, GDK_KEY_w_: if (Shift = []) then begin
                  if TextView.WrapMode = wmWrapNone then TextView.WrapMode := wmWrapWord
                                                    else TextView.WrapMode := wmWrapNone;
                  Accept := False;
                end;
 //    GDK_C, GDK_Capital_C, GDK_Insert: if (ssCtrl in Shift) then Accept := True;
-    GDK_KEY_S: if (Shift = []) then begin
+    GDK_KEY_S, GDK_KEY_s_: if (Shift = []) then begin
                  ConfViewerMonospaceFont := True;
                  ApplyFont;
                  Accept := False;
                end;
-    GDK_KEY_A: if (Shift = []) then begin
+    GDK_KEY_A, GDK_KEY_a_: if (Shift = []) then begin
                  ConfViewerMonospaceFont := False;
                  ApplyFont;
                  Accept := False;