hrynco/hrynco-kswitcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 41 Wiki Activity

Release v0.6.15: reliable snippets and Enter actions

Browse Source
This commit is contained in:
Anatolii Hrynchuk
2026-10-30 13:15:50 +02:00
parent 39d3876fd2
commit 07e31228d7
13 changed files with 176 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration.cpp
+77 -2
View File
@@ -21,6 +21,12 @@ ks::App *app{};
HWND host{}, field{};
ks::Clip saved;
bool captured = false, failed = false;
int enterPresses = 0;
LRESULT CALLBACK observeEnter(HWND w, UINT message, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR)
{
if (message == WM_KEYDOWN && wp == VK_RETURN) ++enterPresses;
return DefSubclassProc(w, message, wp, lp);
}
int stage = 0, ru = -1, en = -1;
size_t punctuationCase = 0;
bool typeDuringCorrection = false, typedDuringCorrection = false;
@@ -281,7 +287,73 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
break;
case 17:
require(text() == punctuationCases.back().first, "undo preserves custom punctuation");
[[fallthrough]];
stage = 20;
break;
case 30:
case 32:
case 34:
if (!captured)
{
saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
captured = true;
}
app->ownSequence = ks::writeClipboard(app->window, ks::textClip(sentinel));
app->settings.autoCorrect = stage == 35;
app->settings.autoLanguages = {L"en", L"ru"};
app->autoPredictor.configure(L"dictionaries", app->settings.autoLanguages);
app->settings.snippets = {{L";r", stage == 31 ? L"rider .{cursor}" : L"rider .{cursor}{enter}"}};
enterPresses = 0;
ActivateKeyboardLayout(app->layouts[en].handle, 0);
prepare(L"prefix ", false);
{
std::vector<INPUT> inputs;
const std::vector<WORD> keys = stage == 35
? std::vector<WORD>{VK_OEM_1, 'R', 'G', 'H', 'B', 'D', 'T', 'N', VK_SPACE}
: std::vector<WORD>{VK_OEM_1, 'R', VK_SPACE, 'X'};
for (WORD key : keys)
for (DWORD flags : {DWORD(0), DWORD(KEYEVENTF_KEYUP)})
{
auto input = ks::keyboardInput(key, flags);
input.ki.dwExtraInfo = 123;
inputs.push_back(input);
}
require(SendInput((UINT)inputs.size(), inputs.data(), sizeof(INPUT)) == inputs.size(),
"snippet trigger and following text submitted without a pause");
}
break;
case 31:
require(text() == L"prefix rider . x", "snippet expands through keyboard hook and preserves following typing");
require(ks::readClipboard(app->window).text() == sentinel, "hook snippet restores clipboard");
require(enterPresses == 0, "snippet without Enter marker sends no Enter");
stage = 32;
break;
case 33:
require(text() == L"prefix rider .\r\n x", "Enter action precedes buffered typing");
require(enterPresses == 1, "Enter marker sends an actual Enter key press");
require(ks::readClipboard(app->window).text() == sentinel, "Enter snippet restores clipboard");
stage = 34;
break;
case 35:
require(text() == L"prefix rider .\r\nghbdtn ", "snippet replay does not trigger automatic correction");
require(app->settings.autoCorrect, "snippet preserves global auto-correction setting");
require(enterPresses == 1, "snippet punctuation and Enter survive with auto-correction enabled");
{
std::vector<INPUT> inputs;
for (WORD key : std::wstring(L"GHBDTN "))
for (DWORD flags : {DWORD(0), DWORD(KEYEVENTF_KEYUP)})
{
auto input = ks::keyboardInput(key == L' ' ? VK_SPACE : key, flags);
input.ki.dwExtraInfo = 123;
inputs.push_back(input);
}
require(SendInput((UINT)inputs.size(), inputs.data(), sizeof(INPUT)) == inputs.size(),
"normal typing submitted after snippet completes");
}
break;
case 36:
require(text() == L"prefix rider .\r\nghbdtn привет ", "automatic correction resumes for subsequent normal typing");
finish();
break;
case 20:
if (!captured)
{
@@ -353,7 +425,7 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
}
case 22:
require(text() == L"робить ", "automatic correction selects and converts the whole word across an internal comma");
finish();
stage = 30;
break;
}
}
@@ -477,8 +549,11 @@ int main(int argc, char **argv)
CreateWindowW(L"EDIT", L"", WS_CHILD | WS_VISIBLE | WS_BORDER | ES_MULTILINE | ES_WANTRETURN,
20, 20, 590, 230, host, nullptr, cls.hInstance, nullptr);
deadline = GetTickCount64() + 30000;
SetWindowSubclass(field, observeEnter, 1, 0);
if (argc > 1 && std::string(argv[1]) == "--typing-only")
stage = 20;
if (argc > 1 && std::string(argv[1]) == "--snippets-only")
stage = 30;
SetTimer(host, 1, 100, nullptr);
app->execute();
}
tests/tests.cpp
+6
View File
@@ -301,6 +301,12 @@ int main(int argc, char **argv)
require(ks::transliterate(L"Shchuka") == L"Щука", "reverse transliteration");
require(ks::parseTemplate(L"a{cursor}b").suffix == L"b", "snippet suffix");
require(ks::parseTemplate(L"{{cursor}}").text == L"{cursor}", "escaped cursor");
require(ks::parseTemplate(L"rider .{enter}").text == L"rider ." &&
ks::parseTemplate(L"rider .{enter}").enters == 1, "Enter is an action, not inserted text");
require(ks::parseTemplate(L"a{cursor}b{enter}{enter}").suffix == L"b" &&
ks::parseTemplate(L"a{cursor}b{enter}{enter}").enters == 2, "Enter actions preserve cursor suffix");
require(ks::parseTemplate(L"{{enter}}").text == L"{enter}" &&
ks::parseTemplate(L"{{enter}}").enters == 0, "escaped Enter is literal");
require(ks::parseTemplate(L"{cursor}{cursor}").cursors == 2, "duplicate cursor detection");
require(ks::Hotkey::parse(L"Ctrl+Alt+Shift+Space")->key == VK_SPACE, "hotkey parse");
require(!ks::Hotkey::parse(L"Ctrl+F25"), "invalid function key");