From 9b5af17a7e98e6587e5d9f9e6ac723ace9118e0a Mon Sep 17 00:00:00 2001
From: fincs <fincs.alt1@gmail.com>
Date: Wed, 11 May 2022 20:02:16 +0200
Subject: [PATCH] Debugger: Move shortcut handling to SciTE
 (ahk.debugger.shortcuts)

---
 source/SciTEGlobal.properties  |  8 +++++---
 source/ahk.commands.properties |  8 +++++++-
 source/tools/SciTEDebug.ahk    | 11 +----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/source/SciTEGlobal.properties b/source/SciTEGlobal.properties
index 5556ce0..7275746 100644
--- a/source/SciTEGlobal.properties
+++ b/source/SciTEGlobal.properties
@@ -241,14 +241,16 @@ print.footer.style=font:Arial Narrow,size:10,italics
 # A '&' may be placed before a letter to be used as an accelerator. This does not work on GTK+.
 menu.language=$(star language.menu.)
 
+# Contextual menu
+user.context.menu=$(ahk.context.menu)$(s4ahk.user.context.menu)
+
 # User defined key commands
 user.shortcuts=\
 Ctrl+Shift+V|IDM_PASTEANDDOWN|\
 Ctrl+PageUp|IDM_PREVFILE|\
 Ctrl+PageDown|IDM_NEXTFILE|\
-KeypadPlus|IDM_EXPAND|\
-KeypadMinus|IDM_BLOCK_COMMENT|\
-Ctrl+F1|IDM_HELP_SCITE|
+Ctrl+F1|IDM_HELP_SCITE|\
+$(ahk.debugger.shortcuts)$(s4ahk.user.shortcuts)
 
 # Variables for extensions
 extensions.dir=$(SciteUserHome)\Extensions
diff --git a/source/ahk.commands.properties b/source/ahk.commands.properties
index 8b11e06..56ebc81 100644
--- a/source/ahk.commands.properties
+++ b/source/ahk.commands.properties
@@ -7,13 +7,19 @@
 #
 
 # Contextual menu
-user.context.menu=||\
+ahk.context.menu=||\
 Open #Include|1121|\
 Add scriptlet...|1122|\
 Run selection|1123|\
 ||\
 Inspect variable...|1126|
 
+# Debugger shortcuts
+ahk.debugger.shortcuts=\
+F10|1129|\
+F11|1130|\
+Shift+F11|1131|
+
 # Run (F5)
 command.go.$(file.patterns.ahk)="$(AutoHotkey)" /ErrorStdOut "$(FilePath)" $(1) $(2) $(3) $(4)
 
diff --git a/source/tools/SciTEDebug.ahk b/source/tools/SciTEDebug.ahk
index f021ae0..811ce3c 100644
--- a/source/tools/SciTEDebug.ahk
+++ b/source/tools/SciTEDebug.ahk
@@ -328,12 +328,6 @@ return
 
 ;{ Toolbar Commands
 
-F5::
-if Dbg_OnBreak
-	goto cmd_run
-else
-	goto cmd_pause
-
 cmd_run:
 Dbg_Continue("run")
 return
@@ -374,17 +368,14 @@ if bIsAttach
 OnExit
 goto GuiClose
 
-F10::
 cmd_stepinto:
 Dbg_Continue("step_into")
 return
 
-F11::
 cmd_stepover:
 Dbg_Continue("step_over")
 return
 
-+F11::
 cmd_stepout:
 Dbg_Continue("step_out")
 return
@@ -1175,7 +1166,7 @@ SciTE_EnsureFileIsOpen(fname)
 }
 
 SciTE_GetFile()
-{	
+{
 	global oSciTE
 	return oSciTE.CurrentFile
 }