Merge pull request elfmz#2328 from rampitec/check-inside-plugin

Fix CheckInsidePlugin for non-panel plugins
rampitec · Aug 12, 2024 · a7d56c1 · a7d56c1
2 parents 5670315 + 0e47a56
commit a7d56c1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/far2l/src/macro/macro.cpp b/far2l/src/macro/macro.cpp
@@ -6440,7 +6440,9 @@ BOOL KeyMacro::CheckEditSelected(DWORD CurFlags)
 
 BOOL KeyMacro::CheckInsidePlugin(DWORD CurFlags)
 {
-	if (CtrlObject && CtrlObject->Plugins.CurPluginItem && (CurFlags & MFLAGS_NOSENDKEYSTOPLUGINS))		// ?????
+	if (CtrlObject && (CtrlObject->Plugins.CurPluginItem ||
+	                   CtrlObject->Plugins.CheckFlags(PSIF_ENTERTOOPENPLUGIN)) &&
+		(CurFlags & MFLAGS_NOSENDKEYSTOPLUGINS))		// ?????
 		// if(CtrlObject && CtrlObject->Plugins.CurEditor && (CurFlags&MFLAGS_NOSENDKEYSTOPLUGINS))
 		return FALSE;
 

diff --git a/far2l/src/plug/plugins.cpp b/far2l/src/plug/plugins.cpp
@@ -1753,7 +1753,9 @@ Plugin *PluginManager::FindPlugin(DWORD SysID)
 
 HANDLE PluginManager::OpenPlugin(Plugin *pPlugin, int OpenFrom, INT_PTR Item)
 {
+	Flags.Set(PSIF_ENTERTOOPENPLUGIN);
 	HANDLE hPlugin = pPlugin->OpenPlugin(OpenFrom, Item);
+	Flags.Clear(PSIF_ENTERTOOPENPLUGIN);
 
 	if (hPlugin != INVALID_HANDLE_VALUE) {
 		PluginHandle *handle = new PluginHandle;

diff --git a/incsrch/REG/^#enter.reg b/incsrch/REG/^#enter.reg
@@ -8,3 +8,4 @@ REGEDIT4
 "DisableOutput"=dword:00000001
 "Description"="Search previous selection"
 "NoInsidePlugin"=dword:00000001
+"NoSendKeysToPlugins"=dword:00000001
diff --git a/incsrch/REG/^enter.reg b/incsrch/REG/^enter.reg
@@ -8,3 +8,4 @@ REGEDIT4
 "DisableOutput"=dword:00000001
 "Description"="Search next selection"
 "NoInsidePlugin"=dword:00000001
+"NoSendKeysToPlugins"=dword:00000001
diff --git a/incsrch/key_macros.ini b/incsrch/key_macros.ini
@@ -0,0 +1,18 @@
+# Incremental search
+[KeyMacros/Editor/CtrlI]
+DisableOutput=0x1
+Sequence=F11 I Home Enter
+
+# Search selected next
+[KeyMacros/Editor/CtrlEnter]
+DisableOutput=0x1
+NoInsidePlugin=0x1
+NoSendKeysToPlugins=0x1
+Sequence=F11 I Home Down Down Enter
+
+# Search selected previous
+[KeyMacros/Editor/CtrlShiftEnter]
+DisableOutput=0x1
+NoInsidePlugin=0x1
+NoSendKeysToPlugins=0x1
+Sequence=F11 I Home Down Down Down Enter