diff --git a/CMakeLists.txt b/CMakeLists.txt index eb6cede..952f9a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.24) -project(KSwitcher VERSION 0.6.47 LANGUAGES CXX RC) +project(KSwitcher VERSION 0.6.48 LANGUAGES CXX RC) if(NOT WIN32) message(FATAL_ERROR "KSwitcher uses native Windows APIs") endif() @@ -89,6 +89,15 @@ else() target_link_options(KSwitcherOcrTests PRIVATE -static -static-libgcc -static-libstdc++) endif() enable_testing() +add_executable(KSwitcherChatProfileTests tests/chat_profiles.cpp src/screenshot_launcher.cpp src/screenshot_activation.cpp src/app.cpp src/screenshot_notifications.cpp src/screenshot.cpp src/configuration.cpp src/ui.cpp resources/app.rc) +target_link_libraries(KSwitcherChatProfileTests PRIVATE kscore) +if(MSVC) + target_compile_options(KSwitcherChatProfileTests PRIVATE /utf-8) + set_property(TARGET KSwitcherChatProfileTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +else() + target_link_options(KSwitcherChatProfileTests PRIVATE -static -static-libgcc -static-libstdc++) +endif() +add_test(NAME chat-profile-regressions COMMAND KSwitcherChatProfileTests) add_executable(KSwitcherHistoryHostTests tests/history_host.cpp) target_link_libraries(KSwitcherHistoryHostTests PRIVATE kscore psapi) set_target_properties(KSwitcherHistoryHostTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/history-host-fixture-$") diff --git a/README.md b/README.md index 5e51db5..a385bd2 100644 --- a/README.md +++ b/README.md @@ -270,6 +270,48 @@ thumbnails and source labels aligned with the scaled fonts and spacing. ## Implemented +### Chat language profiles — v0.6.48 + +Settings separates General, Languages, Shortcuts, Clipboard and Tools into native tabs. +Switching tabs preserves edits; Save, Cancel, Import and Export stay available below every page. + +Open the desired chat in Telegram Desktop or Microsoft Teams, then open Settings → Languages → +**Languages for a chat…**. Select the chat and click the languages to include. Choose +**Use languages**, then **Save** in Settings. The subset order is saved from the main +layout list when editing the profile; one-language profiles are supported. **Remove profile** restores default behavior. + +For a matching chat, **Alt+Shift**, **Win+Space** (and reverse **Win+Shift+Space**) cycle +through that subset. KSwitcher's **Next layout** conversion uses the same subset. +Explicit KSwitcher hotkey bindings take precedence. Without a matching profile, +Windows shortcuts keep their normal behavior and Next layout uses the global cycle. +Unavailable layouts are skipped; if none remain installed, the global cycle is used. +Direct layout shortcuts are unchanged. Profiles do not change Windows' installed languages. + +Matching uses the application and visible chat name, not a unique account/contact ID. +Identically named chats in one application share a profile; renamed chats need a new +profile. Telegram unread counters are ignored. Teams currently recognizes the desktop +`Chat | name | Microsoft Teams` title format; other title formats and Viber are not supported. +Profiles stay on this PC (excluded from cloud sync), and are included in manual settings +export/import. Available from v0.6.48. + +**Українською.** Налаштування розділено на вкладки General, Languages, Shortcuts, Clipboard +і Tools. Перехід між ними зберігає незбережені зміни; Save, Cancel, Import і Export доступні +на кожній вкладці. Відкрий потрібний чат у Telegram або Teams, потім **Settings → Languages → Languages +for a chat…**. Вибери чат і потрібні мови, натисни **Use languages**, а потім **Save**. +Набір діє для **Alt+Shift**, **Win+Space**, **Win+Shift+Space** та **Next layout** KSwitcher. +Можна вибрати й одну мову; порядок зберігається із загального списку під час редагування профілю. **Remove profile** +повертає звичайну поведінку. Без профілю системні комбінації працюють як раніше, +а Next layout використовує загальний набір. Видалені з Windows розкладки пропускаються; +якщо доступних мов профілю не залишилося, використовується загальний набір. +Прямі комбінації мов не змінюються; явно задані комбінації KSwitcher мають пріоритет. +Зіставлення виконується за програмою та назвою чату: однакові назви в одній програмі +мають спільний профіль, після перейменування потрібен новий. Лічильник непрочитаних +Telegram ігнорується. Teams підтримує зазначений вище формат заголовка; Viber поки +не підтримується. Профілі локальні, входять до ручного експорту/імпорту, але не до +хмарної синхронізації. Доступно з v0.6.48. + +### Existing features + - Installed Windows keyboard layouts, configurable cycle/order and direct shortcuts; IMEs are switch-only. Text conversion cycles skip layouts that leave the text unchanged and use the next enabled layout that changes it. If none changes the text, the operation keeps the text and advances one layout. @@ -544,9 +586,9 @@ Protocol and conflict regressions run with `build.ps1 -Test` or CMake's `sync-re ## Portable utilities -The tray menu's **Utilities** submenu lists `.exe` files in a `tools` folder beside +The tray menu's **Tools** submenu lists `.exe` files in a `tools` folder beside `KSwitcher.exe`, sorted by filename. For example, place `StayHere.exe` at -`tools/StayHere.exe` and choose **Utilities → StayHere** to launch it manually. +`tools/StayHere.exe` and choose **Tools → StayHere** to launch it manually. The folder is rescanned whenever the menu opens; no configuration or restart is needed. Only files directly in `tools` are listed (not subfolders, shortcuts, or KSwitcher's own executables beside the main program). Utilities start with `tools` as their working @@ -559,7 +601,7 @@ utility files. Updates preserve personal utilities and refresh bundled StayHere documentation. Repository development scripts are not included in the portable tools folder. -Choose **Utilities → StayHere** to start the bundled activity utility. It starts +Choose **Tools → StayHere** to start the bundled activity utility. It starts enabled; left-click its tray icon to pause/resume or right-click for Exit. While enabled it prevents automatic sleep and, after three minutes without input, sends F15 on its 15-second check. It does not move the mouse, bypass locking, start with diff --git a/Release/KSwitcher-win-x64.zip b/Release/KSwitcher-win-x64.zip index 2b6fe1f..43c001b 100644 Binary files a/Release/KSwitcher-win-x64.zip and b/Release/KSwitcher-win-x64.zip differ diff --git a/Release/README.md b/Release/README.md index 1361d8b..4884f2f 100644 --- a/Release/README.md +++ b/Release/README.md @@ -1,21 +1,22 @@ # Latest Windows release -## v0.6.47 — 2026-11-05 +## v0.6.48 — 2026-11-05 ## Changes -- Custom auto-correction replacements now accept several words on the correction side, for example `мамамила=мама мила`. The source remains a single word of 1–32 letters; the correction supports up to 32 characters including single spaces between words, in the same supported language. -- Preserve initial capitalization, surrounding punctuation, the current layout and Undo when splitting joined words. Subsequent typing is preserved. Updated validation messages and the options hint explain support for spaces. -- Enable **Automatic correction (experimental)** and **Use custom replacements**, enter one `typo=correction` pair per line, then click **OK → Save**. Existing language, minimum-length and exclusion settings still apply; defaults are unchanged. -- Retain bundled StayHere and all earlier fixes. The tray menu remains **Utilities → StayHere**. +- Add manually configured language subsets for Telegram Desktop and Microsoft Teams chats. Open **Settings → Languages → Languages for a chat...**, choose a chat and one or more languages, then **Use languages → Save**. +- Apply the matching profile to **Alt+Shift**, **Win+Space**, reverse **Win+Shift+Space**, and KSwitcher's **Next layout** conversion. Explicit shortcut bindings take precedence. Without a matching profile, normal Windows behavior and the global KSwitcher cycle remain available. Direct layout shortcuts retain their targets. +- Match the application and visible chat name; ignore Telegram unread badges. Same-name chats share a profile, renamed chats need a new one, and Teams currently supports `Chat | name | Microsoft Teams` desktop titles. Profiles are local, included in manual export/import and excluded from OpenBao sync. Viber is not included. +- Organize Settings into **General, Languages, Shortcuts, Clipboard and Tools** tabs. Remove overlapping controls, reduce the window height and preserve drafts across tabs. Save, Cancel, Import and Export remain available on every tab; existing preferences and shortcut defaults are preserved. +- Rename the tray **Utilities** menu to **Tools**. Keep bundled StayHere and the v0.6.47 multi-word replacement behavior. ## Validation -Passed 332 native regression checks, 574 input/settings checks and focused auto-correction integration checks, including phrase replacement, capitalization/punctuation, Undo and immediate subsequent typing. Also passed 105 synchronization checks and 54 updater regression checks. Release binaries, package manifest and SHA-256 checksums are verified; published assets are read back before completion. +Passed 653 chat-profile/UI checks (including visible-control overlap checks on all five tabs), 332 native checks, 564 input checks, 105 sync checks, complete dictionary equivalence (140,939 words), shared wheel regressions, isolated StayHere lifecycle and Utilities checks, screenshot UI/save/registration checks, 54 updater checks and updater progress UI checks. Development visual checks covered the five tabs at 250% scaling; the release fixture also passed at 100%. Release binary versions, archive contents, manifest hashes and published downloads are verified as part of publication. ## Upgrade Choose **Update** in the tray menu. Legacy v0.3.0–v0.4.1 clients first receive the v0.4.2 compatibility bridge, then the current full release. v0.2.3 and earlier require manual installation. For manual installation, exit KSwitcher, close its configurator and screenshot editors, and extract the entire ZIP into its installation folder. Keep personal `data/`, customized dictionaries and your own tools. Keep the three KSwitcher executables together; StayHere runs independently. -When synchronizing phrase replacements across PCs, update each participating PC to v0.6.47 or newer: older versions reject spaces in replacement pairs. +When synchronizing phrase replacements across PCs, update each participating PC to v0.6.47 or newer: older versions reject spaces in replacement pairs. Chat language profiles do not synchronize. Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. The package contains no personal settings, credentials or clipboard history. diff --git a/Release/SHA256SUMS.txt b/Release/SHA256SUMS.txt index f938fea..e1f86e9 100644 --- a/Release/SHA256SUMS.txt +++ b/Release/SHA256SUMS.txt @@ -1 +1 @@ -c15371f89ea86410267d96c909739b44c207cd76256cd29dc7b5f40b04ac7ffb KSwitcher-win-x64.zip +8c6cd9d5f531e5492ef320f1861ba5e84b5631fa7bac42aa97b2c006fe0abc7c KSwitcher-win-x64.zip diff --git a/Release/release-files.json b/Release/release-files.json new file mode 100644 index 0000000..9d73297 --- /dev/null +++ b/Release/release-files.json @@ -0,0 +1,81 @@ +{ + "version": "0.6.48", + "files": [ + { + "sha256": "386b85b62ada4cfea1bd379246e91a3b4976dc37e7e625483821724b58ca4bd5", + "path": "KSwitcher.exe", + "size": 1833984 + }, + { + "sha256": "b47864f6dc7653af9b882403a0316fa48ab258d7ee667715a70d4511ca6d1abd", + "path": "KSwitcher.Config.exe", + "size": 1697792 + }, + { + "sha256": "1dce2939a245370d09ef9e80202027a5b88b9f7e6aac0314dd1b5a62e53c4363", + "path": "KSwitcher.Screenshot.exe", + "size": 2885120 + }, + { + "sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c", + "path": "LICENSE", + "size": 4401 + }, + { + "sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831", + "path": "json-LICENSE.txt", + "size": 1096 + }, + { + "sha256": "a3266c023b5705ad1d14506cc39cc6548d20531878c17804a659cabbb7bbf56b", + "path": "README.md", + "size": 68424 + }, + { + "sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9", + "path": "dictionaries/en.txt", + "size": 732485 + }, + { + "sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5", + "path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt", + "size": 20566 + }, + { + "sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311", + "path": "dictionaries/README.md", + "size": 2265 + }, + { + "sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849", + "path": "dictionaries/ru.txt", + "size": 1109134 + }, + { + "sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408", + "path": "dictionaries/sources.json", + "size": 1280 + }, + { + "sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf", + "path": "dictionaries/uk.txt", + "size": 940799 + }, + { + "sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a", + "path": "tools/README.txt", + "size": 993 + }, + { + "sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376", + "path": "tools/StayHere.exe", + "size": 134656 + }, + { + "sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413", + "path": "tools/StayHere-README.md", + "size": 2796 + } + ], + "schema": 1 +} diff --git a/build.ps1 b/build.ps1 index 3b0f1a7..b460f36 100644 --- a/build.ps1 +++ b/build.ps1 @@ -75,6 +75,10 @@ try { if ($LASTEXITCODE) { throw 'Input test build failed' } & .\build\KSwitcherInputTests.exe if ($LASTEXITCODE) { throw 'Input tests failed' } + & $compiler @common tests/chat_profiles.cpp build/core.o build/platform.o build/autostart.o build/autocorrect.o build/storage.o build/sync.o build/ocr.o build/richtext.o build/update.o build/screenshot.o build/screenshot_launcher.o build/screenshot_activation.o build/screenshot_notifications.o build/app.o build/configuration.o build/ui.o build/screenshot-res.o @libs -static -s -o build/KSwitcherChatProfileTests.exe + if ($LASTEXITCODE) { throw 'Chat profile test build failed' } + & .\build\KSwitcherChatProfileTests.exe + if ($LASTEXITCODE) { throw 'Chat profile tests failed' } & $compiler @common tests/screenshot_ui.cpp build/core.o build/platform.o build/ocr.o build/screenshot-res.o @libs -static -s -o build/KSwitcherScreenshotUITests.exe if ($LASTEXITCODE) { throw 'Screenshot UI test build failed' } & .\build\KSwitcherScreenshotUITests.exe diff --git a/resources/app.rc b/resources/app.rc index 7fed0a0..1a71b33 100644 --- a/resources/app.rc +++ b/resources/app.rc @@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur" 1 RT_MANIFEST "app.manifest" 201 RCDATA "update.ps1" 1 VERSIONINFO - FILEVERSION 0,6,47,0 - PRODUCTVERSION 0,6,47,0 + FILEVERSION 0,6,48,0 + PRODUCTVERSION 0,6,48,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -20,7 +20,7 @@ BEGIN BEGIN VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility" VALUE "ProductName", "KSwitcher" - VALUE "FileVersion", "0.6.47" + VALUE "FileVersion", "0.6.48" END END BLOCK "VarFileInfo" diff --git a/resources/portable-tools-README.txt b/resources/portable-tools-README.txt index 53b59fe..d86881b 100644 --- a/resources/portable-tools-README.txt +++ b/resources/portable-tools-README.txt @@ -1,14 +1,14 @@ KSwitcher portable utilities Put your trusted portable .exe utilities directly in this tools folder, -beside this README.txt. Right-click the KSwitcher tray icon and open Utilities. -For example: tools/StayHere.exe appears as Utilities > StayHere. +beside this README.txt. Right-click the KSwitcher tray icon and open Tools. +For example: tools/StayHere.exe appears as Tools > StayHere. The list refreshes each time the tray menu opens. Subfolders and shortcuts are not listed. Utilities start only when you choose them, with this folder as their working directory. Closing KSwitcher does not close a utility. -StayHere.exe is bundled. Choose Utilities > StayHere to start it; it starts +StayHere.exe is bundled. Choose Tools > StayHere to start it; it starts enabled, prevents automatic sleep, and sends F15 after 3 minutes of inactivity. Left-click its tray icon to pause/resume; right-click for Exit. See StayHere-README.md. It does not start automatically with KSwitcher or bypass Windows locking. diff --git a/src/app.cpp b/src/app.cpp index 99b460f..bf4bda9 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -958,6 +958,31 @@ void App::keyboard(const KBDLLHOOKSTRUCT &k, UINT mods) } } } +void App::refreshChatContext() +{ + HWND target = GetForegroundWindow(); + chatWindow = target; + activeChatTitle = chatTitle(target); + activeChat = settings.chatCycles.empty() ? L"" : chatKey(processName(target), activeChatTitle); +} +void App::switchChatLayout(bool reverse) +{ + HWND target = chatWindow; + auto key = activeChat; + if (!target || target != GetForegroundWindow() || key.empty() || windowChatKey(target) != key || + !settings.chatCycles.contains(key) || busy.exchange(true)) return; + auto cycle = chatCycle(settings, key, layouts); + auto available = layouts; + resetInput(); + enqueue([this, target, key, cycle, available, reverse] + { + struct Reset { std::atomic &busy; ~Reset() { busy = false; } } reset{busy}; + auto valid = [&] { return GetForegroundWindow() == target && windowChatKey(target) == key; }; + if (!valid()) return; + auto next = nextChatLayout(cycle, available, windowLayout(target), reverse); + if (next) switchWindowLayout(target, next, valid); + }); +} bool App::handleKeyboard(const KBDLLHOOKSTRUCT &key, bool down, UINT mods) { // Filter before capture, hotkey latching and typing history. External injected @@ -1008,6 +1033,23 @@ bool App::handleKeyboard(const KBDLLHOOKSTRUCT &key, bool down, UINT mods) return 1; // Record the chord without executing a global shortcut or typing into an editor. } } + bool chatEnabled = false; + if (down && ChatSwitchHook::candidate(key.vkCode, mods) && !settings.chatCycles.empty() && + !isHotkey(key.vkCode, mods)) + { + refreshChatContext(); + chatEnabled = !activeChat.empty() && settings.chatCycles.contains(activeChat); + } + const int chatAction = chatSwitchHook.update(key.vkCode, down, mods, chatEnabled); + if (chatAction) + { + if (chatAction > 0) + { + chord(0xE8); // Suppress the shell's bare Alt/Win action. + switchChatLayout(chatAction == 2); // Captures this chat before another keyboard event. + } + return true; + } if (down) { auto action = hotkeyHook.update(key.vkCode, true, mods, hookBindings); @@ -1215,6 +1257,8 @@ void App::transform(int command, int snippet) available = layouts; version = inputVersion; } + const auto requestedChat = config.chatCycles.empty() ? L"" : windowChatKey(target); + config.cycle = chatCycle(config, requestedChat, available); enqueue( [this, target, recent, previous, config, available, version, command, snippet, attempt, manual, requestedAt, preDeferred] { @@ -1520,9 +1564,9 @@ void App::transform(int command, int snippet) for (int i = 0; i < (int)available.size(); ++i) if (available[i].id == id && available[i].convertible) cycle.push_back(i); - if (cycle.size() < 2) + if (cycle.empty()) { - reason = L"cycle-has-fewer-than-two-layouts"; + reason = L"cycle-has-no-layouts"; if (automatic && tx.valid()) chord(VK_RIGHT); return; @@ -1839,7 +1883,7 @@ void App::trayMenu() if (utilities.empty()) AppendMenuW(utilityMenu, MF_STRING | MF_GRAYED, 0, utilitiesError ? L"Cannot read tools folder" : L"No utilities in tools folder"); - AppendMenuW(menu, MF_POPUP, (UINT_PTR)utilityMenu, L"&Utilities"); + AppendMenuW(menu, MF_POPUP, (UINT_PTR)utilityMenu, L"&Tools"); AppendMenuW(menu, MF_SEPARATOR, 0, nullptr); AppendMenuW(menu, MF_STRING | (settings.awake ? MF_CHECKED : 0), 14, L"Keep screen a&wake"); HMENU pause = CreatePopupMenu(); diff --git a/src/app.h b/src/app.h index 9f81934..b9814fa 100644 --- a/src/app.h +++ b/src/app.h @@ -3,6 +3,7 @@ #include "storage.h" #include "update.h" #include "sync.h" +#include "chat_context.h" #include #include #include @@ -134,6 +135,11 @@ class App int previousAttemptCommand{}, repeatAttempts{}; std::vector> hookBindings; HotkeyHook hotkeyHook; + ChatSwitchHook chatSwitchHook; + HWND chatWindow{}; + std::wstring activeChat, activeChatTitle; + void refreshChatContext(); + void switchChatLayout(bool reverse); HWND typingTarget{}; bool autoPending{}; int snippetPending = -1; diff --git a/src/chat_context.h b/src/chat_context.h new file mode 100644 index 0000000..d019992 --- /dev/null +++ b/src/chat_context.h @@ -0,0 +1,93 @@ +#pragma once +#include "platform.h" +#include + +namespace ks +{ +struct ChatSwitchHook +{ + bool pressed[256]{}; + static bool candidate(UINT key, UINT mods) + { + bool shift = key == VK_SHIFT || key == VK_LSHIFT || key == VK_RSHIFT; + bool alt = key == VK_MENU || key == VK_LMENU || key == VK_RMENU; + return (key == VK_SPACE && (mods == MOD_WIN || mods == (MOD_WIN | MOD_SHIFT))) || + (shift && mods == MOD_ALT) || (alt && mods == MOD_SHIFT); + } + // 1 forward, 2 backward, -1 consumed repeat/release, 0 ordinary input. + int update(UINT key, bool down, UINT mods, bool enabled) + { + if (key >= 256) return 0; + if (pressed[key]) { if (!down) pressed[key] = false; return -1; } + if (!down || !enabled) return 0; + if (!candidate(key, mods)) return 0; + pressed[key] = true; + return key == VK_SPACE && (mods & MOD_SHIFT) ? 2 : 1; + } +}; +inline std::wstring chatTitle(HWND window) +{ + wchar_t title[1024]{}; + if (!window) return {}; + int length = GetWindowTextW(window, title, std::size(title)); + if (!length || length >= (int)std::size(title) - 1) return {}; + return title; +} +inline std::wstring chatKey(std::wstring process, std::wstring title) +{ + process = lower(process); + if (process.ends_with(L".exe")) process.resize(process.size() - 4); + while (!title.empty() && (title.front() == 0x200e || title.front() == 0x200f)) title.erase(0, 1); + if (process == L"telegram") + { + // Telegram's unread badge is not part of the contact name. + auto badge = title.rfind(L" \u2013 ("); + if (badge != title.npos && title.back() == L')') + { + auto digits = title.substr(badge + 4, title.size() - badge - 5); + if (!digits.empty() && digits.find_first_not_of(L"0123456789") == digits.npos) + title.resize(badge); + } + if (title.empty() || title == L"Telegram" || title.starts_with(L"Telegram (")) return {}; + } + else if (process == L"ms-teams") + { + // Only the observed chat title format; meetings/search are not chats. + const std::wstring prefix = L"Chat | ", suffix = L" | Microsoft Teams"; + if (!title.starts_with(prefix) || !title.ends_with(suffix) || + title.size() <= prefix.size() + suffix.size()) return {}; + title = title.substr(prefix.size(), title.size() - prefix.size() - suffix.size()); + if (title.empty()) return {}; + } + else return {}; + return process + L"\n" + title; +} +inline std::wstring windowChatKey(HWND window) +{ + return window ? chatKey(processName(window), chatTitle(window)) : L""; +} +inline std::vector chatCycle(const Settings &settings, const std::wstring &key, + const std::vector &layouts) +{ + auto found = settings.chatCycles.find(key); + if (key.empty() || found == settings.chatCycles.end()) return settings.cycle; + std::vector result; + for (const auto &id : found->second) + if (std::any_of(layouts.begin(), layouts.end(), [&](const Layout &l) { return l.id == id; })) + result.push_back(id); + return result.empty() ? settings.cycle : result; +} +inline HKL nextChatLayout(const std::vector &cycle, const std::vector &layouts, + HKL current, bool reverse) +{ + std::vector handles; + for (const auto &id : cycle) + for (const auto &layout : layouts) + if (layout.id == id) handles.push_back(layout.handle); + if (handles.empty()) return nullptr; + auto found = std::find(handles.begin(), handles.end(), current); + if (found == handles.end()) return handles.front(); + auto next = (size_t(found - handles.begin()) + (reverse ? handles.size() - 1 : 1)) % handles.size(); + return handles[next]; +} +} diff --git a/src/core.h b/src/core.h index 0ea1b6b..b43c101 100644 --- a/src/core.h +++ b/src/core.h @@ -76,6 +76,8 @@ struct Settings translit = L"Ctrl+Alt+Shift+T", undo = L"Ctrl+Alt+Shift+Z", clipboard = L"Win+V", screenshot = L"Win+Shift+S"; std::vector cycle, direct, directIds; + // Exact application + visible chat name; an absent entry uses the global cycle. + std::map> chatCycles; std::vector excluded{L"KeePass", L"KeePassXC", L"1Password", L"Bitwarden"}; std::vector snippets; std::vector snippetTombstones; diff --git a/src/storage.cpp b/src/storage.cpp index dd740e2..85e2b75 100644 --- a/src/storage.cpp +++ b/src/storage.cpp @@ -61,6 +61,25 @@ bool validId(const std::wstring &id) } // namespace void validateSettings(const Settings &s) { + if (s.chatCycles.size() > 1000) throw std::runtime_error("Too many chat language profiles"); + for (const auto &[key, cycle] : s.chatCycles) + { + auto separator = key.find(L'\n'); + if (separator == key.npos || separator + 1 == key.size() || key.size() > 1024 || + key.find(L'\n', separator + 1) != key.npos || key.find(L'\r') != key.npos || + (key.substr(0, separator) != L"telegram" && key.substr(0, separator) != L"ms-teams")) + throw std::runtime_error("Invalid chat language profile"); + if (cycle.empty() || cycle.size() > 64) throw std::runtime_error("Select at least one chat language"); + std::vector seen; + for (const auto &id : cycle) + { + if (id.size() != 12 || !id.starts_with(L"win:") || + id.find_first_not_of(L"0123456789abcdefABCDEF", 4) != id.npos || + std::find(seen.begin(), seen.end(), id) != seen.end()) + throw std::runtime_error("Invalid or duplicate chat layout"); + seen.push_back(id); + } + } if (s.tesseractPath.size() > 32700 || s.tesseractPath.find_first_of(L"\r\n\"") != s.tesseractPath.npos) throw std::runtime_error("Invalid Tesseract executable path"); if (s.tesseractLanguages.empty() || s.tesseractLanguages.size() > 128 || @@ -234,6 +253,16 @@ Settings decodeSettings(const Bytes &bytes, const std::vector &layouts) s.cycle.push_back(w); } } + if (j.contains("chatCycles")) + { + if (!j.at("chatCycles").is_object()) throw std::runtime_error("Invalid chat profiles object"); + for (const auto &[key, cycle] : j.at("chatCycles").items()) + { + if (!cycle.is_array() || cycle.empty()) throw std::runtime_error("Empty chat language profile"); + for (const auto &id : cycle) + s.chatCycles[wide(key)].push_back(wide(id.get())); + } + } if (j.contains("layoutHotkeys")) { std::fill(s.direct.begin(), s.direct.end(), L""); @@ -290,6 +319,9 @@ Bytes encodeSettings(const Settings &s) {"screenshotHotkey", utf8(s.screenshot)}, {"screenshotAutoOpenEditor", s.screenshotAutoOpenEditor}}; j["layouts"] = Json::array(); + j["chatCycles"] = Json::object(); + for (const auto &[key, cycle] : s.chatCycles) + for (const auto &id : cycle) j["chatCycles"][utf8(key)].push_back(utf8(id)); for (auto &id : s.cycle) j["layouts"].push_back(utf8(id)); j["autoCorrectLayout"] = s.autoCorrect; diff --git a/src/sync.cpp b/src/sync.cpp index f0fe890..5616f92 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -219,7 +219,8 @@ Bytes sharedSyncSettings(const Settings &s) return a.at("layoutId").get() < b.at("layoutId").get(); }); for (auto key : {"startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract", - "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock"}) j.erase(key); + "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock", + "chatCycles"}) j.erase(key); // Chat names and matching rules stay on this PC. return bytes(canonicalProfile(j)); } Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const std::vector &layouts, bool keepLocalLayouts) diff --git a/src/ui.cpp b/src/ui.cpp index 3ddb9bf..040b757 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -967,7 +967,127 @@ struct SettingsView std::vector order; int selection = -1; bool filling{}; + std::vector> pages; }; +void selectSettingsPage(HWND w, SettingsView *v) +{ + int selected = TabCtrl_GetCurSel(GetDlgItem(w, 260)); + for (size_t page = 0; page < v->pages.size(); ++page) + for (HWND child : v->pages[page]) ShowWindow(child, (int)page == selected ? SW_SHOWNA : SW_HIDE); + InvalidateRect(w, nullptr, TRUE); +} +struct ChatLanguagesView +{ + HWND parent{}; + SettingsView *settings{}; + std::vector keys; +}; +void fillChatLanguages(HWND w, ChatLanguagesView *v) +{ + int index = (int)SendDlgItemMessageW(w, 710, LB_GETCURSEL, 0, 0); + if (index < 0 || index >= (int)v->keys.size()) return; + const auto &draft = v->settings->draft; + auto saved = draft.chatCycles.find(v->keys[index]); + const auto &cycle = saved == draft.chatCycles.end() ? draft.cycle : saved->second; + for (size_t i = 0; i < v->settings->order.size(); ++i) + { + auto &layout = v->settings->app->layouts[v->settings->order[i]]; + SendDlgItemMessageW(w, 711, LB_SETSEL, + std::find(cycle.begin(), cycle.end(), layout.id) != cycle.end(), i); + } + value(w, 712, saved == draft.chatCycles.end() ? L"No profile yet. Select the languages for this chat." : + L"Saved profile. Select languages, or remove it to use the defaults."); + EnableWindow(GetDlgItem(w, 713), saved != draft.chatCycles.end()); +} +LRESULT CALLBACK chatLanguagesProc(HWND w, UINT msg, WPARAM wp, LPARAM lp) +{ + auto *v = (ChatLanguagesView *)GetWindowLongPtrW(w, GWLP_USERDATA); + if (!v) return DefWindowProcW(w, msg, wp, lp); + try + { + if (msg == WM_COMMAND) + { + int id = LOWORD(wp); + if (id == 710 && HIWORD(wp) == LBN_SELCHANGE) { fillChatLanguages(w, v); return 0; } + if (id == IDOK || id == 713) + { + int selected = (int)SendDlgItemMessageW(w, 710, LB_GETCURSEL, 0, 0); + if (selected < 0 || selected >= (int)v->keys.size()) + throw std::runtime_error("Open a Telegram or Teams chat, then reopen this dialog."); + auto next = v->settings->draft; + if (id == 713) next.chatCycles.erase(v->keys[selected]); + else + { + std::vector cycle; + for (size_t i = 0; i < v->settings->order.size(); ++i) + if (SendDlgItemMessageW(w, 711, LB_GETSEL, i, 0) > 0) + cycle.push_back(v->settings->app->layouts[v->settings->order[i]].id); + if (cycle.empty()) throw std::runtime_error("Select at least one language."); + next.chatCycles[v->keys[selected]] = std::move(cycle); + } + validateSettings(next); + v->settings->draft.chatCycles = std::move(next.chatCycles); + DestroyWindow(w); + return 0; + } + if (id == IDCANCEL) { DestroyWindow(w); return 0; } + } + if (msg == WM_CLOSE) { DestroyWindow(w); return 0; } + if (msg == WM_DPICHANGED) { resizeForDpi(w, wp, lp); return 0; } + if (msg == WM_NCDESTROY) + { + EnableWindow(v->parent, TRUE); + SetForegroundWindow(v->parent); + disposeFont(w); + delete v; + SetWindowLongPtrW(w, GWLP_USERDATA, 0); + } + } + catch (const std::exception &e) { error(w, e); } + return DefWindowProcW(w, msg, wp, lp); +} +void showChatLanguages(HWND parent, SettingsView *settings) +{ + std::set keys; + for (const auto &[key, cycle] : settings->draft.chatCycles) keys.insert(key); + EnumWindows([](HWND candidate, LPARAM context) -> BOOL + { + if (!IsWindowVisible(candidate)) return TRUE; + auto key = windowChatKey(candidate); + if (!key.empty()) ((std::set *)context)->insert(std::move(key)); + return TRUE; + }, (LPARAM)&keys); + HWND w = makeWindow(*settings->app, L"KSwitcher.ChatLanguages", L"Languages for a chat", chatLanguagesProc, 640, 524); + auto *v = new ChatLanguagesView{parent, settings, {keys.begin(), keys.end()}}; + SetWindowLongPtrW(w, GWLP_HWNDPARENT, (LONG_PTR)parent); + SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR)v); + label(w, L"Saved profiles and currently open Telegram / Teams chats", 18, 16, 604); + control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, + 710, 18, 44, 604, 140); + for (const auto &key : v->keys) + { + auto split = key.find(L'\n'); + auto name = std::wstring(key.starts_with(L"telegram\n") ? L"Telegram: " : L"Teams: ") + key.substr(split + 1); + SendDlgItemMessageW(w, 710, LB_ADDSTRING, 0, (LPARAM)name.c_str()); + } + control(w, L"STATIC", L"Open a chat, then reopen this dialog to add it.", 0, 712, 18, 194, 604, 26); + label(w, L"Click languages to include (saved in the order shown)", 18, 228, 604); + control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_BORDER, + 711, 18, 256, 604, 132); + for (int i : settings->order) + SendDlgItemMessageW(w, 711, LB_ADDSTRING, 0, (LPARAM)settings->app->layouts[i].name.c_str()); + label(w, L"Applies to Alt+Shift, Win+Space and KSwitcher Next layout.", 18, 402, 604); + label(w, L"Matched by chat name. Identical names share a profile. Then Save settings.", 18, 430, 604); + button(w, L"&Remove profile", 713, 18, 476, 170); + button(w, L"&Use languages", IDOK, 300, 476, 170); + button(w, L"&Cancel", IDCANCEL, 486, 476, 136); + EnableWindow(GetDlgItem(w, IDOK), !keys.empty()); + EnableWindow(GetDlgItem(w, 713), FALSE); + if (!keys.empty()) { SendDlgItemMessageW(w, 710, LB_SETCURSEL, 0, 0); fillChatLanguages(w, v); } + EnableWindow(parent, FALSE); + showRequestedWindow(w); + SetFocus(GetDlgItem(w, 710)); +} void collectLayout(HWND w, SettingsView *v) { if (v->selection < 0 || v->selection >= (int)v->order.size()) @@ -1461,6 +1581,13 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) { + case WM_NOTIFY: + if (((NMHDR *)lp)->idFrom == 260 && ((NMHDR *)lp)->code == TCN_SELCHANGE) + { + selectSettingsPage(w, v); + return 0; + } + break; case WM_COMMAND: { int id = LOWORD(wp); @@ -1477,6 +1604,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp) } if (id == 257) { showOcrOptions(w, v); return 0; } if (id == 258) { showSyncOptions(w, *v->app); return 0; } + if (id == 259) { collectLayout(w, v); showChatLanguages(w, v); return 0; } if (id == 230) { collectLayout(w, v); @@ -1815,56 +1943,94 @@ void showSettings(App &app, bool visible) activateWindow(target); return; } - HWND w = makeWindow(app, L"KSwitcher.Settings", L"KSwitcher settings", settingsProc, 780, 660, 0, false); + HWND w = makeWindow(app, L"KSwitcher.Settings", L"KSwitcher settings", settingsProc, 720, 510, 0, false); app.settingsWindow = w; - label(w, L"Text conversion", 18, 16); - checkbox(w, L"Con&vert recently typed text when nothing is selected", 201, 18, 43, 390); - checkbox(w, L"Switch Windows input &layout after conversion", 202, 18, 70, 390); - checkbox(w, L"Record clip&board history", 203, 18, 106); - checkbox(w, L"Start with &Windows", 204, 18, 133); - checkbox(w, L"Start with Windows as ad&ministrator", 206, 18, 160, 395); - checkbox(w, L"&Keep screen awake", 205, 18, 184, 210); - checkbox(w, L"Write lo&g", 208, 240, 184, 160); - label(w, L"Click a shortcut and press the desired keys", 420, 16, 350); - const wchar_t *names[] = {L"Next layout", L"Change case", L"Transliterate", L"Undo", - L"Clipboard history", L"Screen capture"}; + auto *v = (SettingsView *)GetWindowLongPtrW(w, GWLP_USERDATA); + INITCOMMONCONTROLSEX tabsInit{sizeof(tabsInit), ICC_TAB_CLASSES}; + InitCommonControlsEx(&tabsInit); + HWND tabs = control(w, WC_TABCONTROLW, L"", WS_TABSTOP, 260, 18, 16, 684, 32); + const wchar_t *tabNames[] = {L"General", L"Languages", L"Shortcuts", L"Clipboard", L"Tools"}; + for (int i = 0; i < 5; ++i) + { + TCITEMW item{}; item.mask = TCIF_TEXT; item.pszText = const_cast(tabNames[i]); + TabCtrl_InsertItem(tabs, i, &item); + } + size_t start = windowLayoutState(w)->controls.size(); + auto page = [&] + { + std::vector children; + const auto &controls = windowLayoutState(w)->controls; + for (size_t i = start; i < controls.size(); ++i) children.push_back(controls[i].first); + v->pages.push_back(std::move(children)); + start = controls.size(); + }; + label(w, L"Text conversion", 24, 76, 650); + checkbox(w, L"Con&vert recently typed text when nothing is selected", 201, 24, 110, 660); + checkbox(w, L"Switch Windows input &layout after conversion", 202, 24, 146, 660); + checkbox(w, L"Automatic correction (e&xperimental)", 207, 24, 182, 390); + button(w, L"&Correction options...", 255, 454, 180, 230); + label(w, L"Windows integration", 24, 254, 650); + checkbox(w, L"Start with &Windows", 204, 24, 288, 660); + checkbox(w, L"Start with Windows as ad&ministrator", 206, 24, 324, 660); + checkbox(w, L"&Keep screen awake", 205, 24, 360, 660); + page(); + + label(w, L"Default language cycle — top to bottom", 24, 76, 650); + control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, + 220, 24, 108, 410, 240); + button(w, L"Move u&p", 232, 454, 108, 110); + button(w, L"Move &down", 233, 574, 108, 110); + checkbox(w, L"&Include in cycle", 230, 454, 154, 230); + label(w, L"Direct layout shortcut", 454, 206, 230); + hotkeyEdit(app, w, 231, 454, 234, 230); + label(w, L"Backspace / Delete clears it", 454, 270, 230); + button(w, L"Re&fresh layouts", 253, 454, 322, 230); + button(w, L"Languages for a &chat...", 259, 24, 378, 230); + label(w, L"Choose a separate set for each Telegram or Teams chat.", 272, 382, 412); + page(); + + label(w, L"Click a shortcut field and press the desired keys", 24, 76, 660); + const wchar_t *names[] = {L"Next layout", L"Change case", L"Transliterate", L"Undo", L"Clipboard history", L"Screen capture"}; for (int i = 0; i < 6; ++i) { - label(w, names[i], 420, 48 + i * 30, 115); - hotkeyEdit(app, w, 210 + i, 540, 44 + i * 30, 220); + label(w, names[i], 24, 116 + i * 40, 180); + hotkeyEdit(app, w, 210 + i, 230, 112 + i * 40, 454); } - checkbox(w, L"Open editor after screen capt&ure", 209, 420, 224, 340); - checkbox(w, L"Automatic correction (e&xperimental)", 207, 18, 210, 395); - label(w, L"Layout cycle — top to bottom", 18, 240, 400); - control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, 220, - 18, 262, 470, 172); - button(w, L"Move u&p", 232, 504, 262, 120); - button(w, L"Move &down", 233, 632, 262, 128); - checkbox(w, L"&Include in cycle", 230, 504, 300, 240); - label(w, L"Direct layout shortcut", 504, 332, 240); - hotkeyEdit(app, w, 231, 504, 356, 256); - label(w, L"Backspace / Delete clears a shortcut", 504, 382, 256); - button(w, L"Re&fresh layouts", 253, 504, 408, 150); - label(w, L"History limits", 18, 444); - label(w, L"Items", 18, 478, 50); - edit(w, 240, 70, 474, 90); - label(w, L"Total MiB", 180, 478, 75); - edit(w, 241, 260, 474, 90); - label(w, L"Per item MiB", 370, 478, 100); - edit(w, 242, 475, 474, 80); - button(w, L"Clear &history…", 254, 580, 474, 180); - label(w, L"Exclude applications (process names, comma-separated)", 18, 516, 700); - edit(w, 243, 18, 544, 742); - button(w, L"&Auto-correction options…", 255, 18, 575, 240); - button(w, L"View l&og…", 256, 278, 575, 220); - button(w, L"OCR op&tions…", 257, 518, 575, 242); - button(w, L"Impo&rt settings…", 250, 18, 606, 145); - button(w, L"&Export settings…", 251, 173, 606, 145); - button(w, L"S&nippets…", 252, 328, 606, 110); - button(w, L"S&ync...", 258, 448, 606, 90); - button(w, L"&Save", IDOK, 548, 606, 100); - button(w, L"&Cancel", IDCANCEL, 660, 606, 100); - fillSettings(w, (SettingsView *)GetWindowLongPtrW(w, GWLP_USERDATA)); + checkbox(w, L"Open editor after screen capt&ure", 209, 24, 378, 660); + page(); + + checkbox(w, L"Record clip&board history", 203, 24, 80, 660); + label(w, L"History limits", 24, 140, 660); + label(w, L"Items", 24, 176, 180); + label(w, L"Total MiB", 254, 176, 180); + label(w, L"Per item MiB", 484, 176, 180); + edit(w, 240, 24, 204, 200); + edit(w, 241, 254, 204, 200); + edit(w, 242, 484, 204, 200); + button(w, L"Clear &history...", 254, 24, 258, 200); + label(w, L"Exclude applications (process names, comma-separated)", 24, 330, 660); + edit(w, 243, 24, 362, 660); + page(); + + label(w, L"Additional tools and preferences", 24, 76, 660); + button(w, L"S&nippets...", 252, 24, 116, 210); + label(w, L"Manage reusable text and expansion triggers.", 254, 120, 430); + button(w, L"OCR op&tions...", 257, 24, 180, 210); + label(w, L"Configure text recognition from images.", 254, 184, 430); + button(w, L"S&ync...", 258, 24, 244, 210); + label(w, L"Synchronize preferences between computers.", 254, 248, 430); + button(w, L"View l&og...", 256, 24, 308, 210); + label(w, L"Inspect recent operations and diagnostics.", 254, 312, 430); + checkbox(w, L"Write lo&g", 208, 24, 378, 210); + page(); + + button(w, L"Impo&rt...", 250, 18, 466, 125); + button(w, L"&Export...", 251, 155, 466, 125); + button(w, L"&Save", IDOK, 490, 466, 100); + button(w, L"&Cancel", IDCANCEL, 602, 466, 100); + fillSettings(w, v); + TabCtrl_SetCurSel(tabs, 0); + selectSettingsPage(w, v); if (visible) { showRequestedWindow(w); diff --git a/src/update.h b/src/update.h index 65309e2..f4a1d6d 100644 --- a/src/update.h +++ b/src/update.h @@ -2,7 +2,7 @@ #include "platform.h" namespace ks { -inline constexpr wchar_t AppVersion[] = L"0.6.47"; +inline constexpr wchar_t AppVersion[] = L"0.6.48"; inline constexpr UINT UpdateMessage = WM_APP + 7; inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000; inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000; diff --git a/tests/chat_profiles.cpp b/tests/chat_profiles.cpp new file mode 100644 index 0000000..97a98aa --- /dev/null +++ b/tests/chat_profiles.cpp @@ -0,0 +1,175 @@ +#include "app.h" +#include "ocr.h" +#include "screenshot.h" +#include +#include + +namespace +{ +int passed{}; +void require(bool ok, const char *message) +{ + if (!ok) throw std::runtime_error(message); + ++passed; +} +void contextChecks() +{ + const auto key = ks::chatKey(L"Telegram.exe", L"\u200eТестовий чат \u2013 (12)"); + require(key == L"telegram\nТестовий чат", "Telegram unread suffix"); + require(ks::chatKey(L"Telegram", L"Тестовий чат") == key, "stable unread profile"); + require(ks::chatKey(L"Telegram", L"Team (2026)") == L"telegram\nTeam (2026)", "preserve parentheses"); + require(ks::chatKey(L"Telegram", L"Telegram").empty(), "no profile on home"); + require(ks::chatKey(L"Viber", L"Rakuten Viber").empty(), "unsupported app"); + require(ks::chatKey(L"ms-teams", L"Chat | Alice | Microsoft Teams") == L"ms-teams\nAlice", "Teams chat"); + require(ks::chatKey(L"ms-teams", L"Calendar | Alice | Microsoft Teams").empty(), "Teams calendar excluded"); + require(ks::chatKey(L"ms-teams", L"Chat | Microsoft Teams").empty(), "Teams chat home excluded"); + require(ks::chatKey(L"other", L"Chat | Alice | Microsoft Teams").empty(), "app identity required"); + ks::Settings settings; + settings.cycle = {L"win:04090409", L"win:04220422", L"win:04190419"}; + settings.chatCycles[key] = {settings.cycle[1], settings.cycle[0]}; + std::vector installed(3); + for (size_t i = 0; i < installed.size(); ++i) + { + installed[i].id = settings.cycle[i]; + installed[i].handle = (HKL)(uintptr_t)(i + 1); + } + auto subset = settings.chatCycles[key]; + require(ks::nextChatLayout(subset, installed, installed[1].handle, false) == installed[0].handle, "cycle within subset"); + require(ks::nextChatLayout(subset, installed, installed[0].handle, false) == installed[1].handle, "wrap skips excluded language"); + require(ks::nextChatLayout(subset, installed, installed[2].handle, false) == installed[1].handle, "outside subset enters first language"); + require(ks::nextChatLayout(settings.cycle, installed, installed[0].handle, true) == installed[2].handle, "reverse wraps"); + require(ks::nextChatLayout({settings.cycle[1]}, installed, installed[0].handle, false) == installed[1].handle, "single language selects allowed layout"); + require(!ks::nextChatLayout({L"win:04070407"}, installed, installed[0].handle, false), "missing layout is not activated"); + require(ks::nextConversionLayout(L"", installed, {1}, 0) == 1, "conversion uses single allowed language"); + require(ks::chatCycle(settings, key, installed) == settings.chatCycles[key], "profile order"); + require(ks::chatCycle(settings, L"telegram\nOther", installed) == settings.cycle, "unknown fallback"); + require(ks::decodeSettings(ks::encodeSettings(settings), installed).chatCycles == settings.chatCycles, "Unicode roundtrip"); + require(ks::decodeSettings({}, installed).chatCycles.empty(), "old defaults without profiles"); + auto withoutProfiles = settings; + withoutProfiles.chatCycles.clear(); + require(ks::sharedSyncSettings(settings) == ks::sharedSyncSettings(withoutProfiles), "profiles excluded from sync"); + auto restored = ks::restoreSyncSettings(ks::sharedSyncSettings(settings), settings, installed, false); + require(restored.chatCycles == settings.chatCycles, "sync preserves local profiles"); + settings.chatCycles[key] = {settings.cycle[1]}; + require(ks::chatCycle(settings, key, installed).size() == 1, "one-language profile"); + settings.chatCycles[key] = {L"win:04070407"}; + require(ks::chatCycle(settings, key, installed) == settings.cycle, "missing layouts fallback"); + settings.chatCycles[key] = {}; + bool rejected = false; + try { ks::encodeSettings(settings); } catch (...) { rejected = true; } + require(rejected, "empty profile rejected"); + settings.chatCycles[key] = {settings.cycle[0], settings.cycle[0]}; + rejected = false; + try { ks::encodeSettings(settings); } catch (...) { rejected = true; } + require(rejected, "duplicate profile layout rejected"); + ks::ChatSwitchHook hook; + require(hook.update(VK_SPACE, true, MOD_WIN, false) == 0, "unprofiled Win+Space passes"); + require(hook.update(VK_SPACE, true, MOD_WIN, true) == 1, "Win+Space forward"); + require(hook.update(VK_SPACE, true, MOD_WIN, true) == -1, "consume repeat"); + require(hook.update(VK_SPACE, false, 0, false) == -1, "release after profile change"); + require(hook.update(VK_SPACE, true, MOD_WIN | MOD_SHIFT, true) == 2, "reverse cycle"); + hook.update(VK_SPACE, false, 0, true); + require(hook.update(VK_LSHIFT, true, MOD_ALT, true) == 1, "Alt then Shift"); + hook.update(VK_LSHIFT, false, 0, true); + require(hook.update(VK_LMENU, true, MOD_SHIFT, true) == 1, "Shift then Alt"); + hook.update(VK_LMENU, false, 0, true); + require(hook.update(VK_LSHIFT, true, MOD_ALT | MOD_CONTROL, true) == 0, "do not consume Ctrl+Alt+Shift"); + require(hook.update('A', true, MOD_ALT, true) == 0, "ordinary keys pass"); +} +} +int main() +{ + CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + auto root = std::filesystem::temp_directory_path() / (L"KSwitcher-chat-tests-" + std::to_wstring(GetCurrentProcessId())); + try + { + contextChecks(); + { + ks::App app(GetModuleHandleW(nullptr), true, root); + require(!app.layouts.empty(), "installed layouts available"); + app.settings.toggle = app.settings.casing = app.settings.translit = app.settings.undo = L""; + app.settings.clipboard = app.settings.screenshot = L""; + app.settings.direct.assign(app.layouts.size(), L""); + app.settings.history = app.settings.autoCorrect = false; + const std::wstring key = L"telegram\n! Fixture chat"; + app.settings.chatCycles[key] = {app.layouts[0].id}; + ks::showSettings(app); + HWND parent = app.settingsWindow; + HWND tabs = GetDlgItem(parent, 260); + require(tabs && TabCtrl_GetItemCount(tabs) == 5, "five settings categories"); + for (int page = 0; page < 5; ++page) + { + TabCtrl_SetCurSel(tabs, page); + NMHDR notification{tabs, 260, TCN_SELCHANGE}; + SendMessageW(parent, WM_NOTIFY, 260, (LPARAM)¬ification); + std::vector boxes; + for (HWND child = GetWindow(parent, GW_CHILD); child; child = GetWindow(child, GW_HWNDNEXT)) + { + if (!(GetWindowLongPtrW(child, GWL_STYLE) & WS_VISIBLE)) continue; + RECT rect{}; GetWindowRect(child, &rect); + for (const auto &other : boxes) + { + RECT overlap{}; + require(!IntersectRect(&overlap, &rect, &other), "visible settings controls never overlap"); + } + boxes.push_back(rect); + } + RedrawWindow(parent, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN); + RECT rect{}; GetClientRect(parent, &rect); + HDC dc = GetDC(parent); + auto clip = ks::screenshotClip(dc, rect.right, rect.bottom, {}); + ReleaseDC(parent, dc); + ks::atomicWrite(std::filesystem::path(ks::executable()).parent_path() / (L"settings-tab-" + std::to_wstring(page) + L".png"), + ks::encodePng(ks::decodeImage(clip))); + } + TabCtrl_SetCurSel(tabs, 1); + NMHDR notification{tabs, 260, TCN_SELCHANGE}; + SendMessageW(parent, WM_NOTIFY, 260, (LPARAM)¬ification); + SendMessageW(parent, WM_COMMAND, 259, 0); + HWND dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr); + require(dialog && !IsWindowEnabled(parent), "chat dialog opens with disabled parent"); + int index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat"); + require(index >= 0, "saved chat listed"); + SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0); + SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0); + require(SendDlgItemMessageW(dialog, 711, LB_GETSELCOUNT, 0, 0) == 1, "saved single language selected"); + RedrawWindow(dialog, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN); + RECT rect{}; GetClientRect(dialog, &rect); + HDC dc = GetDC(dialog); + auto clip = ks::screenshotClip(dc, rect.right, rect.bottom, {}); + ReleaseDC(dialog, dc); + ks::atomicWrite(std::filesystem::path(ks::executable()).parent_path() / L"chat-languages.png", + ks::encodePng(ks::decodeImage(clip))); + SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1); + SendMessageW(dialog, WM_COMMAND, IDCANCEL, 0); + require(!IsWindow(dialog) && IsWindowEnabled(parent), "cancel closes dialog"); + SendMessageW(parent, WM_COMMAND, 259, 0); + dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr); + index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat"); + SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0); + SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0); + require(SendDlgItemMessageW(dialog, 711, LB_GETSELCOUNT, 0, 0) == 1, "cancel discards language edits"); + SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1); + SendMessageW(dialog, WM_COMMAND, IDOK, 0); + require(!IsWindow(dialog) && IsWindowEnabled(parent), "profile applies to settings draft"); + SendMessageW(parent, WM_COMMAND, IDOK, 0); + require(!app.settingsWindow && app.settings.chatCycles.at(key).size() == app.layouts.size(), "settings saves selected languages"); + require(ks::loadSettings(root / L"settings.json", app.layouts).chatCycles == app.settings.chatCycles, "profile saved to disk"); + ks::showSettings(app); + parent = app.settingsWindow; + SendMessageW(parent, WM_COMMAND, 259, 0); + dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr); + index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat"); + SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0); + SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0); + SendMessageW(dialog, WM_COMMAND, 713, 0); + SendMessageW(parent, WM_COMMAND, IDOK, 0); + require(!app.settings.chatCycles.contains(key), "remove profile restores default"); + } + std::filesystem::remove_all(root); + std::cout << "Passed " << passed << " chat profile checks\n"; + CoUninitialize(); + return 0; + } + catch (const std::exception &e) { std::cerr << "FAIL: " << e.what() << '\n'; CoUninitialize(); return 1; } +} diff --git a/tests/input.cpp b/tests/input.cpp index 804536f..f710775 100644 --- a/tests/input.cpp +++ b/tests/input.cpp @@ -1021,6 +1021,9 @@ int main(int argc, char **argv) { require(SendDlgItemMessageW(settings,209,BM_GETCHECK,0,0)==BST_UNCHECKED,"automatic screenshot editor checkbox defaults off"); require(settings&&!IsWindowVisible(settings),"settings layout tested without changing user focus"); for(auto pair:{std::pair{209,215},std::pair{209,207},std::pair{209,220},std::pair{209,232},std::pair{207,215},std::pair{207,232},std::pair{207,220},std::pair{232,230},std::pair{230,231},std::pair{231,253}}) { + // Controls on different settings tabs intentionally share the page area. + if (!(GetWindowLongPtrW(GetDlgItem(settings,pair.first),GWL_STYLE)&WS_VISIBLE) || + !(GetWindowLongPtrW(GetDlgItem(settings,pair.second),GWL_STYLE)&WS_VISIBLE)) continue; RECT first{},second{},overlap{}; GetWindowRect(GetDlgItem(settings,pair.first),&first); GetWindowRect(GetDlgItem(settings,pair.second),&second); require(!IntersectRect(&overlap,&first,&second),"capture hotkey and layout controls do not overlap"); diff --git a/utilities/StayHere/README.md b/utilities/StayHere/README.md index 19a100f..c6e9717 100644 --- a/utilities/StayHere/README.md +++ b/utilities/StayHere/README.md @@ -2,7 +2,7 @@ Маленька портативна утиліта для Windows, без .NET та інсталяції. -У KSwitcher v0.6.46 і новіших виберіть **Utilities → StayHere** у меню трея +Виберіть **Tools → StayHere** у меню трея (у v0.6.46 цей пункт називається Utilities) або запустіть `tools/StayHere.exe` поруч із KSwitcher.exe. Зелена крапка в треї означає, що підтримка активності ввімкнена. Клацання лівою кнопкою перемикає режим; правою — відкриває меню з перемикачем і виходом.