From c96f06dd42fe26d355aedcc816a7e90949c90546 Mon Sep 17 00:00:00 2001 From: Stanislav Mekhanoshin Date: Mon, 5 Aug 2024 16:24:26 -0700 Subject: [PATCH 1/3] Incsrch: add ^g/^#g as a duplicate of ^Enter/^#Enter Some terminals (like the default terminal of Ubuntu 24.04) steal ^Enter from the apps. Adding duplicate hotkeys to work in --tty mode. Bumped version to 2.2. --- incsrch/ENG/incsrche.hlf | 42 +++++++++++++++++++-------------------- incsrch/ENG/whatsnew.eng | 6 +++++- incsrch/OEM/incsrchr.hlf | 42 +++++++++++++++++++-------------------- incsrch/OEM/whatsnew.rus | 4 ++++ incsrch/REG/^#g.reg | 11 ++++++++++ incsrch/REG/^g.reg | 11 ++++++++++ incsrch/UTF8/incsrchr.hlf | 42 +++++++++++++++++++-------------------- incsrch/UTF8/whatsnew.rus | 4 ++++ incsrch/clip.c | 2 +- incsrch/control.c | 3 ++- incsrch/file_id.diz | 4 ++-- incsrch/incsrch.c | 2 +- incsrch/incsrch.h | 2 +- incsrch/incsrch.lnk | 2 +- incsrch/incsrch.rc | 10 +++++----- incsrch/key_macros.ini | 14 +++++++++++++ incsrch/loc.c | 2 +- incsrch/loc.h | 2 +- incsrch/makefile.msc | 2 +- incsrch/minwin.h | 2 +- incsrch/misc.h | 2 +- incsrch/search.c | 6 +++--- incsrch/srchlng.h | 2 +- incsrch/util.c | 2 +- 24 files changed, 135 insertions(+), 86 deletions(-) create mode 100644 incsrch/REG/^#g.reg create mode 100644 incsrch/REG/^g.reg diff --git a/incsrch/ENG/incsrche.hlf b/incsrch/ENG/incsrche.hlf index bb5ddd2e5..0e42bc394 100644 --- a/incsrch/ENG/incsrche.hlf +++ b/incsrch/ENG/incsrche.hlf @@ -3,8 +3,8 @@ @Contents $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Contents This plugin adds the #Incremental Search# capability to the internal FAR editor. @@ -20,8 +20,8 @@ $^#Contents @Menu $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Plugin menu# After choosing the plugin from editor plugins menu You will see the submenu like this: @@ -49,8 +49,8 @@ $^#Plugin menu# @Cfg $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Plugin configuration# There are two ways to configure plugin: from #Plugins configuration menu# (Main Menu|Options|Plugins Configuration|Incremental Search) or directly from ~Incremental Search plugin menu~@Menu@ from inside editor. @@ -84,8 +84,8 @@ $^#Plugin configuration# @Iface $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Interface and Keyboard reference# When in incremental search mode the leftmost characters of the top line will display the prompt #^:#. Start typing the search string and it will be displayed after this prompt. @@ -96,25 +96,25 @@ $^#Interface and Keyboard reference# ^#Key bindings# @+ - #Any printable character# appended to the search pattern - #Backspace# delete last pattern character - #Escape# ends incremental search - #Ctrl-V, Shift-Ins# paste search data from clipboard - #Ctrl-Enter# find next in forward search mode - find previous in backward search mode - #Ctrl-Shift-Enter# find previous in forward search mode - find next in backward search mode - #F1# about window and help - #Alt# clear messages area - #Any control character,# ends incremental search and bypass to FAR + #Any printable character# appended to the search pattern + #Backspace# delete last pattern character + #Escape# ends incremental search + #Ctrl-V, Shift-Ins# paste search data from clipboard + #Ctrl-Enter, Ctrl-G# find next in forward search mode + find previous in backward search mode + #Ctrl-Shift-Enter, Ctrl-Shift-G# find previous in forward search mode + find next in backward search mode + #F1# about window and help + #Alt# clear messages area + #Any control character,# ends incremental search and bypass to FAR #mouse click# ~Contents~@Contents@ @Contact $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Contact information# Stanislav V. Mekhanoshin, St.Petersburg, Russia diff --git a/incsrch/ENG/whatsnew.eng b/incsrch/ENG/whatsnew.eng index 2f1c25235..89e736c40 100644 --- a/incsrch/ENG/whatsnew.eng +++ b/incsrch/ENG/whatsnew.eng @@ -1,4 +1,8 @@ -Версия 2.1 +Version 2.2 + + Added ^G, ^#G hotkeys in addition to ^Enter and ^#Enter for search + next/previous. + +Version 2.1 + far2l (FAR for Linux) support Version 1.21 diff --git a/incsrch/OEM/incsrchr.hlf b/incsrch/OEM/incsrchr.hlf index 84cac3473..e88006eb4 100644 --- a/incsrch/OEM/incsrchr.hlf +++ b/incsrch/OEM/incsrchr.hlf @@ -3,8 +3,8 @@ @Contents $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#ঠ #ண ᪠# (#incremental search#) ஥ । FAR. @@ -20,8 +20,8 @@ $^# @Menu $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^# # ᫥ ⮣ ࠫ ।, ।  ᫥饣 : @@ -49,8 +49,8 @@ $^# @Cfg $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#ன # ᯮᮡ ன : # ன # (᭮ |ࠬ|ࠬ 譨 㫥| ), ।⢥ ~ ~@Menu@, 맢 ।. @@ -84,8 +84,8 @@ $^# @Iface $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#䥩 # 室 ० ᪠ 孥 ப 㤥 ᮤঠ ᪠ #^:#. 筨 ᪮ ப,  ᫥ ᪠. @@ -97,25 +97,25 @@ $^# ^#⢥⢨ # @+ - # ᨬ# ப ᪠ - #Backspace# 㤠 ᫥ ᨬ ᪠ - #Escape# 稢 - #Ctrl-V, Shift-Ins# ⠢ ப ᪠ - #Ctrl-Enter# ᫥饥 ᮢ ᪥ । - ।饥 ᮢ ᪥ - #Ctrl-Shift-Enter# ।饥 ᮢ ᪥ । - ᫥饥 ᮢ ᪥ - #F1# " ணࠬ" - #Alt# ᮮ饭 - # ࠢ騩# 蠥 । FAR + # ᨬ# ப ᪠ + #Backspace# 㤠 ᫥ ᨬ ᪠ + #Escape# 稢 + #Ctrl-V, Shift-Ins# ⠢ ப ᪠ + #Ctrl-Enter, Ctrl-G# ᫥饥 ᮢ ᪥ । + ।饥 ᮢ ᪥ + #Ctrl-Shift-Enter, Ctrl-Shift-G# ।饥 ᮢ ᪥ । + ᫥饥 ᮢ ᪥ + #F1# " ணࠬ" + #Alt# ᮮ饭 + # ࠢ騩# 蠥 । FAR #ᨬ, # ~ঠ~@Contents@ @Contact $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^# # ⠭᫠ 堭設, ., diff --git a/incsrch/OEM/whatsnew.rus b/incsrch/OEM/whatsnew.rus index d0c15fce1..4725e5cc2 100644 --- a/incsrch/OEM/whatsnew.rus +++ b/incsrch/OEM/whatsnew.rus @@ -1,3 +1,7 @@ + 2.2 + + ^G ^#G 㡫騥 ^Enter ^#Enter + ᪠ ᫥饣/।饣 ࠢ. + 2.1 + প far2l, FAR Linux diff --git a/incsrch/REG/^#g.reg b/incsrch/REG/^#g.reg new file mode 100644 index 000000000..f0438903d --- /dev/null +++ b/incsrch/REG/^#g.reg @@ -0,0 +1,11 @@ +REGEDIT4 + +[HKEY_CURRENT_USER\Software\Far\PluginHotkeys\Plugins/Editor/IncSrch/IncSrch.dll] +"Hotkey"="I" + +[HKEY_CURRENT_USER\Software\Far\KeyMacros\Editor\CtrlShiftG] +"Sequence"="F11 I Home Down Down Down Enter" +"DisableOutput"=dword:00000001 +"Description"="Search previous selection" +"NoInsidePlugin"=dword:00000001 +"NoSendKeysToPlugins"=dword:00000001 diff --git a/incsrch/REG/^g.reg b/incsrch/REG/^g.reg new file mode 100644 index 000000000..b5aceb5a2 --- /dev/null +++ b/incsrch/REG/^g.reg @@ -0,0 +1,11 @@ +REGEDIT4 + +[HKEY_CURRENT_USER\Software\Far\PluginHotkeys\Plugins/Editor/IncSrch/IncSrch.dll] +"Hotkey"="I" + +[HKEY_CURRENT_USER\Software\Far\KeyMacros\Editor\CtrlG] +"Sequence"="F11 I Home Down Down Enter" +"DisableOutput"=dword:00000001 +"Description"="Search next selection" +"NoInsidePlugin"=dword:00000001 +"NoSendKeysToPlugins"=dword:00000001 diff --git a/incsrch/UTF8/incsrchr.hlf b/incsrch/UTF8/incsrchr.hlf index dbfd27a9f..96197f546 100644 --- a/incsrch/UTF8/incsrchr.hlf +++ b/incsrch/UTF8/incsrchr.hlf @@ -3,8 +3,8 @@ @Contents $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Содержание Данный плагин добавляет возможность #быстрого поиска# (#incremental search#) во встроенном редакторе FAR. @@ -20,8 +20,8 @@ $^#Содержание @Menu $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Меню плагина# После того как Вы выбрали плагин из меню плагинов редактора, перед вами появится подменю следующего вида: @@ -49,8 +49,8 @@ $^#Меню плагина# @Cfg $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Настройка плагина# Существует два способа настройки плагина: из #меню настройки плагинов# (Основное меню|параметры|параметры внешних модулей|быстрый поиск), либо непосредственно из ~Меню плагина~@Menu@, вызванного в редакторе. @@ -84,8 +84,8 @@ $^#Настройка плагина# @Iface $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Интерфейс и клавиатурные команды# При входе в режим поиска левая часть верхней строки будет содержать подсказку #^:#. Начните набор искомой строки, и она появится после данной подсказки. @@ -97,25 +97,25 @@ $^#Интерфейс и клавиатурные команды# ^#Соответствия клавиш# @+ - #Любой печатный символ# добавляется к строке поиска - #Backspace# удаляет последний символ поиска - #Escape# заканчивает поиск - #Ctrl-V, Shift-Ins# вставить строку поиска из буфера обмена - #Ctrl-Enter# найти следующее совпадение при поиске вперед - найти предыдущее совпадение при поиске назад - #Ctrl-Shift-Enter# найти предыдущее совпадение при поиске вперед - найти следующее совпадение при поиске назад - #F1# "О программе" и помощь - #Alt# очистить область сообщений - #Любой управляющий# завершает поиск и передается в FAR + #Любой печатный символ# добавляется к строке поиска + #Backspace# удаляет последний символ поиска + #Escape# заканчивает поиск + #Ctrl-V, Shift-Ins# вставить строку поиска из буфера обмена + #Ctrl-Enter, Ctrl-G# найти следующее совпадение при поиске вперед + найти предыдущее совпадение при поиске назад + #Ctrl-Shift-Enter, Ctrl-Shift-G# найти предыдущее совпадение при поиске вперед + найти следующее совпадение при поиске назад + #F1# "О программе" и помощь + #Alt# очистить область сообщений + #Любой управляющий# завершает поиск и передается в FAR #символ, кнопка мыши# ────────── ~Содержание~@Contents@ @Contact $^#Incremental Search FAR plugin# -$^#Version 2.1# -$^#Copyright (C) 1999-2019 Stanislav V. Mekhanoshin# +$^#Version 2.2# +$^#Copyright (C) 1999-2024 Stanislav V. Mekhanoshin# $^#Об авторе# Станислав Механошин, Ст.Петербург, Россия diff --git a/incsrch/UTF8/whatsnew.rus b/incsrch/UTF8/whatsnew.rus index 8873459d9..e6aef2076 100644 --- a/incsrch/UTF8/whatsnew.rus +++ b/incsrch/UTF8/whatsnew.rus @@ -1,3 +1,7 @@ +Версия 2.2 + + Добавлены ^G и ^#G как дублирующие клавиши для ^Enter и ^#Enter для + поиска следующего/предыдущего сравнения. + Версия 2.1 + Поддержка far2l, FAR для Linux diff --git a/incsrch/clip.c b/incsrch/clip.c index cd19b6df1..1bb99aef2 100644 --- a/incsrch/clip.c +++ b/incsrch/clip.c @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/control.c b/incsrch/control.c index 6279dd4bd..5dff2e15a 100644 --- a/incsrch/control.c +++ b/incsrch/control.c @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -80,6 +80,7 @@ BOOL CollectEvents(void) PutEvent(KC_BACK); continue; case VK_RETURN: + case 'G': if (Event.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { PutEvent((Event.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) diff --git a/incsrch/file_id.diz b/incsrch/file_id.diz index bd2f67b29..2090b935b 100644 --- a/incsrch/file_id.diz +++ b/incsrch/file_id.diz @@ -1,5 +1,5 @@ -Incremental Search v2.1 FAR editor plugin -(c) 1999-2019, Stanislav V. Mekhanoshin +Incremental Search v2.2 FAR editor plugin +(c) 1999-2024, Stanislav V. Mekhanoshin http://rampitec.us.to This program is free software: you can redistribute it and/or modify diff --git a/incsrch/incsrch.c b/incsrch/incsrch.c index ba02f4d47..a52789a5d 100644 --- a/incsrch/incsrch.c +++ b/incsrch/incsrch.c @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/incsrch.h b/incsrch/incsrch.h index 328f437bb..8ddcc392f 100644 --- a/incsrch/incsrch.h +++ b/incsrch/incsrch.h @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/incsrch.lnk b/incsrch/incsrch.lnk index ff213fbd9..99e218d35 100644 --- a/incsrch/incsrch.lnk +++ b/incsrch/incsrch.lnk @@ -1,5 +1,5 @@ system nt_dll initi termi -option version=2.1 +option version=2.2 option quiet option case option eliminate diff --git a/incsrch/incsrch.rc b/incsrch/incsrch.rc index 08a6cddfc..4b29ef0cd 100644 --- a/incsrch/incsrch.rc +++ b/incsrch/incsrch.rc @@ -2,8 +2,8 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,0,0,1 -PRODUCTVERSION 2,0,0,1 +FILEVERSION 2,0,0,2 +PRODUCTVERSION 2,0,0,2 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -16,12 +16,12 @@ BEGIN BLOCK "040904B0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */ BEGIN VALUE "FileDescription", "Incremental search plugin for FAR manager\0" - VALUE "FileVersion", "2.1\0" + VALUE "FileVersion", "2.2\0" //VALUE "InternalName", "IncSrch\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2019, Stanislav V. Mekhanoshin\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2024, Stanislav V. Mekhanoshin\0" VALUE "Original Filename","INCSRCH\0" VALUE "ProductName", "Incremental Search plugin\0" - VALUE "ProductVersion", "2.1\0" + VALUE "ProductVersion", "2.2\0" VALUE "LegalTrademarks", "FAR (File and archive manager) is copyright (C) 1996-99 Eugene Roshal\0" END END diff --git a/incsrch/key_macros.ini b/incsrch/key_macros.ini index b7f0dcf5a..ffa8cd903 100644 --- a/incsrch/key_macros.ini +++ b/incsrch/key_macros.ini @@ -16,3 +16,17 @@ DisableOutput=0x1 NoInsidePlugin=0x1 NoSendKeysToPlugins=0x1 Sequence=F11 I Home Down Down Down Enter + +# Search selected next +[KeyMacros/Editor/CtrlG] +DisableOutput=0x1 +NoInsidePlugin=0x1 +NoSendKeysToPlugins=0x1 +Sequence=F11 I Home Down Down Enter + +# Search selected previous +[KeyMacros/Editor/CtrlShiftG] +DisableOutput=0x1 +NoInsidePlugin=0x1 +NoSendKeysToPlugins=0x1 +Sequence=F11 I Home Down Down Down Enter diff --git a/incsrch/loc.c b/incsrch/loc.c index c138f273c..2cccf9144 100644 --- a/incsrch/loc.c +++ b/incsrch/loc.c @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/loc.h b/incsrch/loc.h index f0f413686..ac27692fd 100644 --- a/incsrch/loc.h +++ b/incsrch/loc.h @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/makefile.msc b/incsrch/makefile.msc index 14825529e..f2919489e 100644 --- a/incsrch/makefile.msc +++ b/incsrch/makefile.msc @@ -1,4 +1,4 @@ -VERSION=2.1 +VERSION=2.2 !IF "$(compiler)"=="intel" CPP=icl.exe diff --git a/incsrch/minwin.h b/incsrch/minwin.h index 7b34b66e6..938171f79 100644 --- a/incsrch/minwin.h +++ b/incsrch/minwin.h @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/misc.h b/incsrch/misc.h index 0711badac..421dec962 100644 --- a/incsrch/misc.h +++ b/incsrch/misc.h @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/search.c b/incsrch/search.c index e3f27c2d5..b5981b6a0 100644 --- a/incsrch/search.c +++ b/incsrch/search.c @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,9 +88,9 @@ static void Help(void) { static const DialogTemplateItem DialogTemplate[11] = { {DI_TEXT, 2, 2, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("FAR Incremental Search plugin")}, - {DI_TEXT, 2, 3, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("Version 2.1")}, + {DI_TEXT, 2, 3, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("Version 2.2")}, {DI_TEXT, 2, 4, FALSE, DIF_CENTERGROUP | DIF_BOXCOLOR | DIF_SEPARATOR, 0}, - {DI_TEXT, 2, 5, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("copyright (c) 1999-2019, Stanislav V. Mekhanoshin")}, + {DI_TEXT, 2, 5, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("copyright (c) 1999-2024, Stanislav V. Mekhanoshin")}, {DI_TEXT, 2, 6, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("This program comes with ABSOLUTELY NO WARRANTY")}, {DI_TEXT, 2, 7, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("This is free software, and you are welcome to redistribute it")}, {DI_TEXT, 2, 8, FALSE, DIF_CENTERGROUP, (INT_PTR) _T("under certain conditions.")}, diff --git a/incsrch/srchlng.h b/incsrch/srchlng.h index f551649ac..1d103d0c5 100644 --- a/incsrch/srchlng.h +++ b/incsrch/srchlng.h @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/incsrch/util.c b/incsrch/util.c index e885b2986..c64013324 100644 --- a/incsrch/util.c +++ b/incsrch/util.c @@ -1,6 +1,6 @@ /* FAR manager incremental search plugin, search as you type in editor. -Copyright (C) 1999-2019, Stanislav V. Mekhanoshin +Copyright (C) 1999-2024, Stanislav V. Mekhanoshin This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 6824cf853647156fecb5968ce05eacf6d66d45be Mon Sep 17 00:00:00 2001 From: Stanislav Mekhanoshin Date: Tue, 13 Aug 2024 02:37:26 -0700 Subject: [PATCH 2/3] [incsrch] Remove obolete windows REG/* stuff --- incsrch/REG/^#g.reg | 11 ----------- incsrch/REG/^g.reg | 11 ----------- 2 files changed, 22 deletions(-) delete mode 100644 incsrch/REG/^#g.reg delete mode 100644 incsrch/REG/^g.reg diff --git a/incsrch/REG/^#g.reg b/incsrch/REG/^#g.reg deleted file mode 100644 index f0438903d..000000000 --- a/incsrch/REG/^#g.reg +++ /dev/null @@ -1,11 +0,0 @@ -REGEDIT4 - -[HKEY_CURRENT_USER\Software\Far\PluginHotkeys\Plugins/Editor/IncSrch/IncSrch.dll] -"Hotkey"="I" - -[HKEY_CURRENT_USER\Software\Far\KeyMacros\Editor\CtrlShiftG] -"Sequence"="F11 I Home Down Down Down Enter" -"DisableOutput"=dword:00000001 -"Description"="Search previous selection" -"NoInsidePlugin"=dword:00000001 -"NoSendKeysToPlugins"=dword:00000001 diff --git a/incsrch/REG/^g.reg b/incsrch/REG/^g.reg deleted file mode 100644 index b5aceb5a2..000000000 --- a/incsrch/REG/^g.reg +++ /dev/null @@ -1,11 +0,0 @@ -REGEDIT4 - -[HKEY_CURRENT_USER\Software\Far\PluginHotkeys\Plugins/Editor/IncSrch/IncSrch.dll] -"Hotkey"="I" - -[HKEY_CURRENT_USER\Software\Far\KeyMacros\Editor\CtrlG] -"Sequence"="F11 I Home Down Down Enter" -"DisableOutput"=dword:00000001 -"Description"="Search next selection" -"NoInsidePlugin"=dword:00000001 -"NoSendKeysToPlugins"=dword:00000001 From 4ce9ff9eea6b0f559a90ba91b87089790f90e88a Mon Sep 17 00:00:00 2001 From: Stanislav Mekhanoshin Date: Tue, 27 Aug 2024 13:41:16 -0700 Subject: [PATCH 3/3] Fixed bug if 'g' pressed w/o control --- incsrch/control.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/incsrch/control.c b/incsrch/control.c index 5dff2e15a..02015721d 100644 --- a/incsrch/control.c +++ b/incsrch/control.c @@ -88,6 +88,8 @@ BOOL CollectEvents(void) : KC_NEXT); continue; } + if (Event.Event.KeyEvent.wVirtualKeyCode == 'G') + goto Char; goto Quit; case VK_INSERT: if (Event.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) { @@ -102,6 +104,7 @@ BOOL CollectEvents(void) & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) goto Paste; default: +Char: if ((Event.Event.KeyEvent.dwControlKeyState & (ENHANCED_KEY | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED | RIGHT_ALT_PRESSED | RIGHT_CTRL_PRESSED))