File 1434-Fix-keyboard-shortcuts.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1434-Fix-keyboard-shortcuts.patch of Package erlang (Revision c37f636f556d133a129c9e9a7093d763)

Currently displaying revision c37f636f556d133a129c9e9a7093d763 , Show latest

From b761d0dad5d1b1435f23ac037801712c72cecd47 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Tue, 6 Jul 2021 12:54:36 +0200
Subject: [PATCH 4/4] Fix keyboard shortcuts

Didn't not work, seems that stc is stealing keyboard presses,
disable all stc keyboard shortcuts and make them explicit in menus and
in buttons.
---
 lib/debugger/src/dbg_wx_code.erl      | 4 ++++
 lib/debugger/src/dbg_wx_mon.erl       | 2 +-
 lib/debugger/src/dbg_wx_trace_win.erl | 5 +++--
 lib/debugger/src/dbg_wx_win.erl       | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/debugger/src/dbg_wx_code.erl b/lib/debugger/src/dbg_wx_code.erl
index 4f1253e656..5c53576762 100644
--- a/lib/debugger/src/dbg_wx_code.erl
+++ b/lib/debugger/src/dbg_wx_code.erl
@@ -115,6 +115,10 @@ code_area(Parent) ->
 
     ?stc:connect(Ed, stc_doubleclick),
     ?stc:setReadOnly(Ed, true),
+    %% STC steals keyboard shortcuts on linux for some reason
+    ?stc:cmdKeyClearAll(Ed),
+    ?stc:cmdKeyAssign(Ed, ?wxSTC_KEY_DOWN, ?wxSTC_KEYMOD_NORM, ?wxSTC_CMD_LINEDOWN),
+    ?stc:cmdKeyAssign(Ed, ?wxSTC_KEY_UP, ?wxSTC_KEYMOD_NORM, ?wxSTC_CMD_LINEUP),
     Ed.
 
 load_code(Ed, Code) ->
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 08b20d3f69..e94acceb66 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -551,7 +551,7 @@ menus() ->
 	       {'Save Settings...', 2},
 	       separator,
 	       {'Exit', 0}]},
-     {'Edit', [{'Refresh', no},
+     {'Edit', [{'Refresh', 0},
 	       {'Kill All', no}]},
      {'Module', [{'Interpret...', 0},
 		 {'Delete All Modules', no},
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 526e673807..755f22d922 100644
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -977,8 +977,9 @@ is_button(Name) ->
 
 button_area(Parent) -> 
     Sz = wxBoxSizer:new(?wxHORIZONTAL),
-    wx:foreach(fun({Name, Button}) ->
-		       B=wxButton:new(Parent, Button, 
+    wx:foreach(fun({Name0, Button}) ->
+                       Name = [$&|atom_to_list(Name0)],
+		       B=wxButton:new(Parent, Button,
 				      [{label,dbg_wx_win:to_string(Name)}]),
 		       Id = wxWindow:getId(B),
 		       _ = wxSizer:add(Sz,B, []),
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index 25b76d1739..4d1b76091d 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -319,8 +319,8 @@ menu_name(Atom, N) when is_atom(Atom) ->
 menu_name("Help", _) -> %% Mac needs this to be exactly this
     "&Help";
 menu_name(Str, Pos) when is_integer(Pos) ->
-    {S1,S2} = lists:split(Pos,Str),
-    S1 ++ [$&|S2];
+    {S1,[Key|_]=S2} = lists:split(Pos,Str),
+    S1 ++ [$&|S2] ++ "\tCtrl+" ++ string:uppercase([Key]);
 menu_name(Str,_) ->
     Str.
 
-- 
2.31.1

Places

File 1434-Fix-keyboard-shortcuts.patch of Package erlang (Revision c37f636f556d133a129c9e9a7093d763)

Places