Compare commits

..
Author SHA1 Message Date
agrynco 346af2256f Release v0.6.55: reliable snippet selection in desktop chats 2026-11-06 15:04:00 +02:00
agrynco 99db99e603 Fix partial snippet selection in desktop chat editors 2026-11-06 14:58:24 +02:00
agrynco 63b7b879a3 Release v0.6.54: adjustable pencil smoothing and unsaved settings state 2026-11-06 14:46:53 +02:00
agrynco 727dc96908 Release v0.6.53: synchronize chat language profiles 2026-11-06 12:39:00 +02:00
agrynco ede4ce47c0 Release v0.6.52: add Arc tool to screenshot editor 2026-11-06 12:32:27 +02:00
agrynco 3b8b8f26fe Release v0.6.51: Telegram Web and application-scoped snippets 2026-11-06 10:47:31 +02:00
agrynco 19f1e4531c Center Add app button against the application selector 2026-11-06 10:41:21 +02:00
agrynco a124e030ab Add application-scoped snippets with global fallback and scope-aware sync 2026-11-06 10:37:01 +02:00
agrynco c18148a574 Add event-driven Telegram Web K chat profiles for Chrome 2026-11-06 10:26:42 +02:00
agrynco 15197da548 Release v0.6.50: disable Viber chat OCR 2026-11-06 00:21:39 +02:00
agrynco 66e24b5efc Disable Viber chat OCR while preserving saved profiles 2026-11-06 00:18:04 +02:00
agrynco 178573233b Release v0.6.49: Viber chat language profiles with local OCR 2026-11-05 23:52:50 +02:00
agrynco 4e7a683c47 Release v0.6.48: chat language profiles and tabbed settings 2026-11-05 23:25:33 +02:00
agrynco e33387c2d5 Release v0.6.47: allow multi-word auto-correction replacements 2026-11-05 22:51:57 +02:00
agrynco 5de5b791bf Release v0.6.46: bundle StayHere activity utility 2026-11-05 12:50:37 +02:00
agrynco c109408a98 Release v0.6.45: fix Far snippets and ship portable Utilities folder 2026-11-05 12:35:44 +02:00
agrynco 90b2e0841f Release v0.6.44: select newest item when opening clipboard history 2026-11-05 00:15:54 +02:00
agrynco 6621a49022 Release v0.6.43: fix forwarded input and verify snippet pastes 2026-11-04 21:18:39 +02:00
42 changed files with 2772 additions and 166 deletions

No files matched your search

+41 -1
View File
@@ -1,10 +1,24 @@
cmake_minimum_required(VERSION 3.24) cmake_minimum_required(VERSION 3.24)
project(KSwitcher VERSION 0.6.42 LANGUAGES CXX RC) project(KSwitcher VERSION 0.6.55 LANGUAGES CXX RC)
if(NOT WIN32) if(NOT WIN32)
message(FATAL_ERROR "KSwitcher uses native Windows APIs") message(FATAL_ERROR "KSwitcher uses native Windows APIs")
endif() endif()
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_executable(StayHere WIN32 utilities/StayHere/main.cpp)
add_executable(StayHereTest WIN32 utilities/StayHere/main.cpp)
target_compile_definitions(StayHereTest PRIVATE STAYHERE_TEST_INSTANCE)
set_target_properties(StayHere PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tools")
foreach(utilityTarget StayHere StayHereTest)
target_compile_definitions(${utilityTarget} PRIVATE UNICODE _UNICODE _WIN32_WINNT=0x0A00)
target_link_libraries(${utilityTarget} PRIVATE user32 shell32 gdi32 wtsapi32)
if(MSVC)
target_compile_options(${utilityTarget} PRIVATE /utf-8)
set_property(TARGET ${utilityTarget} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
else()
target_link_options(${utilityTarget} PRIVATE -municode -static -static-libgcc -static-libstdc++)
endif()
endforeach()
add_library(kscore src/core.cpp src/platform.cpp src/autostart.cpp src/autocorrect.cpp src/storage.cpp src/ocr.cpp src/richtext.cpp src/update.cpp src/sync.cpp) add_library(kscore src/core.cpp src/platform.cpp src/autostart.cpp src/autocorrect.cpp src/storage.cpp src/ocr.cpp src/richtext.cpp src/update.cpp src/sync.cpp)
target_include_directories(kscore PUBLIC src PRIVATE vendor) target_include_directories(kscore PUBLIC src PRIVATE vendor)
target_compile_definitions(kscore PUBLIC UNICODE _UNICODE WIN32_LEAN_AND_MEAN NOMINMAX _WIN32_WINNT=0x0A00) target_compile_definitions(kscore PUBLIC UNICODE _UNICODE WIN32_LEAN_AND_MEAN NOMINMAX _WIN32_WINNT=0x0A00)
@@ -30,6 +44,15 @@ target_link_libraries(KSwitcherScrollTests PRIVATE kscore)
target_link_libraries(KSwitcherTests PRIVATE kscore) target_link_libraries(KSwitcherTests PRIVATE kscore)
add_executable(KSwitcherIntegration tests/integration.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) add_executable(KSwitcherIntegration tests/integration.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(KSwitcherIntegration PRIVATE kscore) target_link_libraries(KSwitcherIntegration PRIVATE kscore)
# Opt-in interactive fixture: requires an installed Far Manager.
add_executable(KSwitcherFarSnippetTests WIN32 tests/far_snippets.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(KSwitcherFarSnippetTests PRIVATE kscore)
if(MSVC)
target_compile_options(KSwitcherFarSnippetTests PRIVATE /utf-8)
set_property(TARGET KSwitcherFarSnippetTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
else()
target_link_options(KSwitcherFarSnippetTests PRIVATE -municode -static -static-libgcc -static-libstdc++)
endif()
add_executable(KSwitcherInputTests tests/input.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) add_executable(KSwitcherInputTests tests/input.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(KSwitcherInputTests PRIVATE kscore) target_link_libraries(KSwitcherInputTests PRIVATE kscore)
target_compile_definitions(KSwitcherInputTests PRIVATE KS_SCREENSHOT_RESOURCES) target_compile_definitions(KSwitcherInputTests PRIVATE KS_SCREENSHOT_RESOURCES)
@@ -66,6 +89,15 @@ else()
target_link_options(KSwitcherOcrTests PRIVATE -static -static-libgcc -static-libstdc++) target_link_options(KSwitcherOcrTests PRIVATE -static -static-libgcc -static-libstdc++)
endif() endif()
enable_testing() 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$<$<CONFIG:Debug>: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) add_executable(KSwitcherHistoryHostTests tests/history_host.cpp)
target_link_libraries(KSwitcherHistoryHostTests PRIVATE kscore psapi) target_link_libraries(KSwitcherHistoryHostTests PRIVATE kscore psapi)
set_target_properties(KSwitcherHistoryHostTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/history-host-fixture-$<CONFIG>") set_target_properties(KSwitcherHistoryHostTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/history-host-fixture-$<CONFIG>")
@@ -111,6 +143,14 @@ add_test(NAME dictionary-regressions COMMAND KSwitcherDictionaryTests)
set_tests_properties(dictionary-regressions PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") set_tests_properties(dictionary-regressions PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_test(NAME sync-regressions COMMAND KSwitcherSyncTests) add_test(NAME sync-regressions COMMAND KSwitcherSyncTests)
add_test(NAME native-regressions COMMAND KSwitcherTests) add_test(NAME native-regressions COMMAND KSwitcherTests)
add_executable(KSwitcherUtilitiesTests tests/utilities.cpp)
if(MSVC)
set_property(TARGET KSwitcherUtilitiesTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
else()
target_link_options(KSwitcherUtilitiesTests PRIVATE -static -static-libgcc -static-libstdc++)
endif()
add_test(NAME utilities-regressions COMMAND KSwitcherUtilitiesTests)
add_test(NAME stayhere-lifecycle COMMAND powershell -NoProfile -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_SOURCE_DIR}/tests/stayhere.ps1" -Executable "$<TARGET_FILE:StayHereTest>")
add_test(NAME scroll-regressions COMMAND KSwitcherScrollTests) add_test(NAME scroll-regressions COMMAND KSwitcherScrollTests)
add_test(NAME input-regressions COMMAND KSwitcherInputTests) add_test(NAME input-regressions COMMAND KSwitcherInputTests)
add_test(NAME screenshot-ui-regressions COMMAND KSwitcherScreenshotUITests) add_test(NAME screenshot-ui-regressions COMMAND KSwitcherScreenshotUITests)
+144 -3
View File
@@ -19,6 +19,11 @@ Double-click the tray icon to open Settings, the bold default menu item.
Closing Settings with unsaved changes (including accepted auto-correction or OCR options) Closing Settings with unsaved changes (including accepted auto-correction or OCR options)
asks whether to save, discard changes, or keep editing. Unchanged settings close without a prompt. asks whether to save, discard changes, or keep editing. Unchanged settings close without a prompt.
If saving fails, the window stays open with your edits intact. If saving fails, the window stays open with your edits intact.
Settings displays **No unsaved changes** with **Save** disabled until an edit is made.
**Unsaved changes — click Save to apply** appears for pending edits, including accepted
chat-language, auto-correction and OCR changes. Cancelling a child dialog or restoring
the original values clears its pending changes. Snippets saved in their own window
remain saved independently; the Settings indicator reflects any other pending edits.
Menus support access keys: press the underlined letter while the menu is open (for example, Menus support access keys: press the underlined letter while the menu is open (for example,
S for Settings or X for Exit in the tray menu). In forms, press Alt+the underlined letter S for Settings or X for Exit in the tray menu). In forms, press Alt+the underlined letter
to activate a button, toggle a checkbox or focus a labeled field. Dialog underline visibility to activate a button, toggle a checkbox or focus a labeled field. Dialog underline visibility
@@ -75,6 +80,9 @@ Ctrl+Alt+Delete and Win+L; these cannot be assigned.
Keyboard and mouse input forwarded by Microsoft Mouse Without Borders follows the same input Keyboard and mouse input forwarded by Microsoft Mouse Without Borders follows the same input
path as a local keyboard/mouse, including shortcuts, recent-word conversion and snippets. path as a local keyboard/mouse, including shortcuts, recent-word conversion and snippets.
On the sending computer, KSwitcher ignores keyboard events consumed by another keyboard hook
(including Mouse Without Borders forwarding). The receiving computer still processes delivered
input normally, so both computers can run KSwitcher without starting duplicate snippet operations.
KSwitcher marks its own generated input so copy/paste, selection, modifier releases and shell-mask KSwitcher marks its own generated input so copy/paste, selection, modifier releases and shell-mask
keys cannot trigger recursive commands or overwrite the recorded typing run. Other injected input keys cannot trigger recursive commands or overwrite the recorded typing run. Other injected input
is accepted, including key-up events and VK-only keyboard events. Unicode packets do not provide is accepted, including key-up events and VK-only keyboard events. Unicode packets do not provide
@@ -199,6 +207,22 @@ snapping and shape constraints are unchanged.
Both drawn and recognized triangles have three independent vertex handles instead of bounding-box Both drawn and recognized triangles have three independent vertex handles instead of bounding-box
resize handles. Drag any vertex to reshape the triangle while keeping the other two fixed, even resize handles. Drag any vertex to reshape the triangle while keeping the other two fixed, even
after rotation. Vertex edits support undo/redo, and the rotation and thickness handles remain available. after rotation. Vertex edits support undo/redo, and the rotation and thickness handles remain available.
**Arc (U)** draws an open half ellipse inside the dragged rectangle. Use the corner handles
to resize it and the round handle to rotate it (Shift snaps to 15 degrees). Arcs support
color, thickness, line style, moving, cloning, undo/redo and PNG export.
**Smoothing (0–100%)** on the screenshot toolbar adjusts pencil paths. With a pencil
stroke selected it affects that stroke; otherwise it sets the default for new strokes
(initially 25%). **Apply to all strokes** applies the displayed amount to all pencil
strokes in the current image and sets the default for new ones. Shapes, text and
highlights are unchanged. Zero restores the original path; higher values reduce more
jitter. The original samples are retained through moving, endpoint editing and cloning,
so lowering the amount does not accumulate distortion. Each slider drag or bulk change
is one undo step, and PNG export uses the displayed geometry. Very short strokes remain
unchanged. Shift-constrained and linked strokes start without automatic smoothing;
you can explicitly adjust them afterwards. Shape/straight-line recognition is separate
and does not turn recognized shapes back into pencil strokes.
**Trapezoid (B)** on the toolbar creates a trapezoid with parallel bases. Pencil recognition also **Trapezoid (B)** on the toolbar creates a trapezoid with parallel bases. Pencil recognition also
fits nearly parallel, unequal bases into a clean trapezoid. Trapezoids support bounding-box resizing, fits nearly parallel, unequal bases into a clean trapezoid. Trapezoids support bounding-box resizing,
rotation, styling and undo/redo; Ctrl+Z after recognition restores the original pencil stroke. rotation, styling and undo/redo; Ctrl+Z after recognition restores the original pencil stroke.
@@ -267,6 +291,80 @@ thumbnails and source labels aligned with the scaled fonts and spacing.
## Implemented ## Implemented
### Chat language profiles — v0.6.48
> From v0.6.50: Viber chat OCR is temporarily disabled. Saved Viber profiles are retained but inactive. Telegram and Teams profiles are unchanged; clipboard/image OCR remains available.
>
> З v0.6.50: OCR чатів Viber тимчасово вимкнений. Збережені профілі Viber залишаються, але не діють. Профілі Telegram і Teams та OCR зображень/буфера працюють як раніше.
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 Teams title formats are not supported.
Experimental Viber profiles introduced in v0.6.49 are disabled in v0.6.50 because repeated OCR caused delays. There is no background Viber OCR, recognition during language switching, or recognition when opening profiles. Saved Viber profiles are retained and marked inactive; Windows switching and Next layout use their normal/global behavior in Viber. Clipboard and image OCR are unchanged.
From v0.6.53, chat profiles (application, visible chat name and ordered language IDs) are included in settings synchronization and manual export/import. Update every synchronizing PC to v0.6.53 or newer first: older clients reject this shared field. Profiles for different chats merge independently; conflicting edits or deletion versus editing of one chat require a choice. Missing Windows layouts stay saved and are skipped during switching, with global-cycle fallback if none are installed. Keep this PC's layouts preserves the global cycle and shortcuts while chat profiles still synchronize. Downloading a pre-v0.6.53 profile preserves existing chat profiles. Chat matching is unchanged; Viber profiles remain inactive.
**Українською.** Налаштування розділено на вкладки 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.49 вимкнено у v0.6.50 через затримки від повторного OCR. Фонове розпізнавання, OCR при перемиканні мов та відкритті профілів більше не запускаються. Профілі Viber збережені й позначені як неактивні; системне перемикання та Next layout у Viber використовують звичайну поведінку й загальний набір. OCR буфера та зображень не змінено.
Профілі локальні, входять до ручного експорту/імпорту, але не до
хмарної синхронізації. Доступно з v0.6.48.
### Telegram Web in Chrome — v0.6.51
Open a chat in Telegram Web K (`https://web.telegram.org/k/`) in Chrome, then use **Settings → Languages → Languages for a chat...** and select **Telegram Web: name**. Choose languages, then **Use languages → Save**. The same subset applies to Alt+Shift, Win+Space, Win+Shift+Space and Next layout. Web profiles are separate from desktop Telegram profiles. Same-name chats across browser profiles/accounts share a web profile.
Recognition uses Chrome accessibility: the address bar and active document must both identify a Telegram chat, then the visible header supplies the name. The app watches foreground/focus and address/header-change events; it does not use OCR, a polling timer, an extension, or message-history extraction. The address bar, home page and unsupported URLs do not match. Web A and other browsers have not been validated and are not advertised as supported. Page or accessibility changes can make a chat unavailable instead of guessing.
**Українською.** З v0.6.51 підтримано Telegram Web K у Chrome. Відкрий чат, потім **Settings → Languages → Languages for a chat...**, вибери **Telegram Web: ім’я**, мови та **Use languages → Save**. Набір діє для Alt+Shift, Win+Space, Win+Shift+Space і Next layout. Вебпрофілі окремі від Telegram Desktop; однакові назви в різних акаунтах/профілях браузера мають спільний вебпрофіль. Адреса й назва беруться через accessibility, без OCR, таймера, розширення та читання історії повідомлень. В адресному рядку, на головній сторінці й для непідтримуваних адрес профіль не діє. Web A та інші браузери не перевірені й не заявлені як підтримувані.
### Desktop chat snippet selection — v0.6.55
ChatGPT and Codex desktop editors use paced selection for snippet triggers. If only a verified suffix is selected, KSwitcher extends the selection and verifies the full trigger before replacement. Unrelated text or changed focus cancels the operation. Triggers remain recognized across keyboard layouts. One snippet can target multiple applications: add each with **Add app**, or enter comma-separated process names. These existing application scopes also synchronize.
**Українською.** У настільних ChatGPT і Codex тригер виділяється з паузами між натисканнями. Якщо виділилася лише перевірена кінцева частина, KSwitcher доповнює виділення й перевіряє весь тригер перед заміною. Інший текст або зміна фокусу скасовують операцію. Тригери розпізнаються в різних розкладках. Один сніпет можна прив’язати до кількох програм через **Add app** або назви процесів через кому; ці прив’язки вже підтримують синхронізацію.
### Application-specific snippets — v0.6.51
In **Tools → Snippets**, select a snippet and enable **Only in these applications**. Enter executable names separated by commas, or select a currently open application's process and choose **Add app**. For example: `ms-teams.exe, outlook.exe`. Uncheck the option for a global snippet. A checked but empty restriction cannot be saved. Save applies the changes; Cancel discards them.
A matching application-specific snippet takes precedence over a global snippet with the same trigger. The same trigger can be used for different applications; overlapping scopes for the same trigger are rejected. Existing snippets without a scope remain global. Matching is case-insensitive by process name, with or without `.exe`, and is checked before insertion. No OCR or timer is involved. Chrome scope means the entire browser, not one website.
Scopes are saved with snippets and included in manual import/export and synchronization; merge conflicts consider the application scopes. Use v0.6.51 or newer on every synchronizing PC before sharing scoped snippets: older versions do not understand the restriction and may treat the snippet as global.
**Українською.** У **Tools → Snippets** вибери сніпет, увімкни **Only in these applications** та задай назви процесів через кому або вибери відкриту програму зі списку й натисни **Add app**. Наприклад: `ms-teams.exe, outlook.exe`. Вимкнений прапорець означає всі програми. Увімкнений прапорець із порожнім списком не можна зберегти. **Save** зберігає, **Cancel** відкидає зміни.
Сніпет конкретної програми має пріоритет над глобальним із тим самим тригером. Для різних програм однакові тригери дозволені, для перетинних областей — ні. Старі сніпети залишаються глобальними. Зіставлення за назвою процесу не залежить від регістру та суфікса `.exe`; OCR і таймерів немає. Для Chrome це весь браузер, а не окремий сайт. Обмеження входять до експорту/імпорту та синхронізації. Перед синхронізацією онови всі ПК до v0.6.51 або новішої: старі версії не розуміють обмеження та можуть застосувати сніпет глобально.
### Existing features
- Installed Windows keyboard layouts, configurable cycle/order and direct shortcuts; IMEs are switch-only. - 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 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. that changes it. If none changes the text, the operation keeps the text and advances one layout.
@@ -274,10 +372,24 @@ thumbnails and source labels aligned with the scaled fonts and spacing.
of the complete expected text. Browser/editor compatibility depends on its handling of simulated input. of the complete expected text. Browser/editor compatibility depends on its handling of simulated input.
- Selection conversion and verified recent input (physical scan codes, 2-second typing-run boundary). - Selection conversion and verified recent input (physical scan codes, 2-second typing-run boundary).
- Same-process clipboard ownership plus verified WebView2 descendants, including the Teams fix. - Same-process clipboard ownership plus verified WebView2 descendants, including the Teams fix.
Clipboard synchronizers such as Mouse Without Borders may republish a copy only when
KSwitcher first observed it owned by the target application and the selection text and
editor selection metadata remain identical. Unobserved or altered foreign copies are rejected.
Snippets normally require accessibility verification of their selected trigger and pasted text,
even with logging disabled. If verification is unavailable or the paste differs, expansion
stops without running cursor or Enter actions. Clipboard changes during paste also cancel actions.
Far Manager uses its native Alt+Shift+Arrow selection, Ctrl+Insert copy and Shift+Insert
paste commands instead: both the trigger and inserted text must match verified clipboard
copies from Far. Cancellation restores the full temporary selection, not one cursor step.
Far supports nonempty single-line replacements up to 4096 caret steps, including
`{cursor}` and verified `{enter}` actions. Empty or multiline replacements are rejected
before selection; pasting a newline could execute a command before it can be verified.
- Teams recent-word conversion uses a single word-selection command and validates the copied range. - Teams recent-word conversion uses a single word-selection command and validates the copied range.
If the editor's word boundary differs from the recorded typing, it falls back to paced character If the editor's word boundary differs from the recorded typing, it falls back to paced character
selection: Teams can coalesce a burst of Shift+Left events into just one character. selection: Teams can coalesce a burst of Shift+Left events into just one character.
- Clipboard snapshot/restoration with concurrent-copy, foreground and input-version checks. - Clipboard snapshot/restoration with concurrent-copy, foreground and input-version checks.
A snapshot interrupted by a concurrent clipboard publication is retried up to three total
attempts before selection starts, provided the foreground and input context remain unchanged.
A silently dropped copy is retried up to three total attempts while the clipboard and input A silently dropped copy is retried up to three total attempts while the clipboard and input
context remain unchanged. Temporary transaction contents are excluded from Windows clipboard context remain unchanged. Temporary transaction contents are excluded from Windows clipboard
history and cloud synchronization. Paste is not blindly retried: with manual paste readback history and cloud synchronization. Paste is not blindly retried: with manual paste readback
@@ -525,6 +637,30 @@ OpenBao administrator setup:
and UI integration, so another service can be added without replacing the synchronization logic. and UI integration, so another service can be added without replacing the synchronization logic.
Protocol and conflict regressions run with `build.ps1 -Test` or CMake's `sync-regressions` test. Protocol and conflict regressions run with `build.ps1 -Test` or CMake's `sync-regressions` test.
## Portable utilities
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 **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
directory and are never started automatically. Their lifetime is independent of KSwitcher.
An absent or empty folder displays a disabled placeholder; launch errors are reported.
From v0.6.45, the release includes `tools/README.txt`, so extracting the ZIP or
installing an update creates the folder. Add your own trusted portable executables;
StayHere is bundled from v0.6.46, and settings synchronization does not transfer
utility files. Updates preserve personal utilities and refresh bundled StayHere and
documentation. Repository development scripts
are not included in the portable tools folder.
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
KSwitcher automatically, or directly control Teams status. Locked/disconnected
sessions do not receive simulated activity. See `tools/StayHere-README.md`.
## Build ## Build
The easiest reproducible local route uses the pinned portable w64devkit toolchain: The easiest reproducible local route uses the pinned portable w64devkit toolchain:
@@ -558,8 +694,10 @@ default and require the main **Automatic correction (experimental)** checkbox to
- **Use custom replacements**: enter one `typo=correction` pair per line, for example - **Use custom replacements**: enter one `typo=correction` pair per line, for example
`првиіт=привіт` or `helo=hello`. Entries are normalized to lowercase; duplicate source words `првиіт=привіт` or `helo=hello`. Entries are normalized to lowercase; duplicate source words
are rejected. Each side must contain 1–32 letters of the same supported language, without are rejected. The typo must contain 1–32 letters. The correction may contain several words
spaces or punctuation. Explicit pairs take priority over dictionary recognition, including separated by single spaces, for example `мамамила=мама мила`, up to 32 characters including
spaces. Both sides must use the same supported language, without punctuation; leading,
trailing and repeated spaces are not allowed. Explicit pairs take priority over dictionary recognition, including
already valid words, and do not require dictionary membership or satisfy the frequency limit. already valid words, and do not require dictionary membership or satisfy the frequency limit.
- **Correct spelling typos using dictionaries**: checks unknown words in the current language - **Correct spelling typos using dictionaries**: checks unknown words in the current language
after no layout correction is found. It accepts exactly one dictionary candidate reachable after no layout correction is found. It accepts exactly one dictionary candidate reachable
@@ -575,6 +713,8 @@ ALL CAPS, mixed-case identifiers, numbers, URLs and email addresses are skipped.
is applied once, without chaining. Click **OK**, then **Save** in Settings; pairs and switches is applied once, without chaining. Click **OK**, then **Save** in Settings; pairs and switches
are included in settings export/import and synchronization. Undo restores the original word are included in settings export/import and synchronization. Undo restores the original word
and suppresses its correction until restart. and suppresses its correction until restart.
When synchronizing phrase replacements, update all participating PCs to v0.6.47 or newer;
older clients reject spaces in replacement pairs.
### Layout correction and shared options ### Layout correction and shared options
@@ -648,6 +788,7 @@ Run `./package.ps1 -PublishRelease` after building and testing to refresh the tr
.\build.ps1 -Test # Pure/native regression checks; does not touch the user's clipboard .\build.ps1 -Test # Pure/native regression checks; does not touch the user's clipboard
.\build.ps1 -Ocr # Render a synthetic image, decode it with WIC and recognize it with Windows OCR .\build.ps1 -Ocr # Render a synthetic image, decode it with WIC and recognize it with Windows OCR
.\build.ps1 -Integration # Interactive, isolated test editor; avoid input for about 10 seconds .\build.ps1 -Integration # Interactive, isolated test editor; avoid input for about 10 seconds
.\build.ps1 -Far # Explicit integration test using an isolated Far Manager profile
.\tests\configuration.ps1 # Separate-process settings tests; close KSwitcher first .\tests\configuration.ps1 # Separate-process settings tests; close KSwitcher first
``` ```
@@ -726,7 +867,7 @@ Check **★ Pinned only** beside the history search box to show only pinned entr
### History process and clipboard memory — v0.6.40 ### History process and clipboard memory — v0.6.40
History opens in a separate, short-lived instance of **KSwitcher.exe**. **Esc** closes it even when focus is on the window or an action button, releasing Windows UI allocations with the process. The resident keeps keyboard hooks, clipboard capture and history storage. Search, selection and the top entry are preserved in encrypted view state. If a full-text item viewer is still open, the helper stays alive until the last viewer closes. Pin/delete, formatted/plain paste and OCR remain available; settings and default shortcuts are unchanged. History opens in a separate, short-lived instance of **KSwitcher.exe**. **Esc** closes it even when focus is on the window or an action button, releasing Windows UI allocations with the process. The resident keeps keyboard hooks, clipboard capture and history storage. Search and the pinned-only filter are preserved in encrypted view state. Each fresh opening selects and reveals the newest matching entry; background refreshes preserve the selected record while browsing. If a full-text item viewer is still open, the helper stays alive until the last viewer closes. Pin/delete, formatted/plain paste and OCR remain available; settings and default shortcuts are unchanged.
Image thumbnails are decoded in **KSwitcher.Screenshot.exe**, returning only bounded preview pixels. Image clipboard backup/restore also uses that helper and encrypted temporary files, with clipboard-sequence checks before restoring. Selection reads avoid loading image formats. Keep all three executables together; no fourth executable is required. Paste allows a brief foreground handoff after history closes while preserving cancellation checks. UI Automation remains in the resident. Image thumbnails are decoded in **KSwitcher.Screenshot.exe**, returning only bounded preview pixels. Image clipboard backup/restore also uses that helper and encrypted temporary files, with clipboard-sequence checks before restoring. Selection reads avoid loading image formats. Keep all three executables together; no fourth executable is required. Paste allows a brief foreground handoff after history closes while preserving cancellation checks. UI Automation remains in the resident.
Binary file not shown.
+10 -10
View File
@@ -1,21 +1,21 @@
# Latest Windows release # Latest Windows release
## v0.6.42 — 2026-11-04 ## v0.6.55 — 2026-11-06
## Changes ## Changes
- Replaced the history filter dropdown with a one-click **★ Pinned only** checkbox. Checked shows pinned entries; unchecked shows all entries. - Fix long snippets failing in ChatGPT and Codex desktop editors when only part of the trigger was selected. Selection now uses paced key events in these applications.
- The checkbox sits on the left, with the search field immediately alongside it. The search field keeps its right edge aligned with the history list when the window is resized. - Recover a partial snippet selection only when the copied text matches a suffix of the trigger in a recognized keyboard layout. Verify the complete trigger before replacing it; preserve surrounding text and restore the clipboard. Far Manager keeps its dedicated selection path.
- Existing filter state, search, Unpin behavior and persistence across Esc are preserved. No shortcut or default changed. Clear history still deletes every entry after confirmation, including hidden entries. - Existing cross-layout trigger recognition and binding one snippet to multiple applications remain supported. Clarify these behaviors in the bilingual snippet guide; no new syntax or settings are required.
## Validation ## Validation
The dedicated 500-entry history integration suite verifies checkbox clicks, combined search/filter, removal after Unpin, remembered state after helper restart, text/image paste and helper shutdown. The compact layout was checked visually in the installed development build. Passed targeted native partial-selection recovery, including the ChatGPT process selection policy, 776 settings/chat-profile checks, 568 input checks, 332 native checks, 126 sync checks, dictionary equivalence (140,939 words), wheel, StayHere, Utilities, screenshot UI/save/registration, 54 updater checks and updater progress checks. The reporter confirmed successful expansion in the actual chat, including typing in another layout. The broader snippet suite encountered foreground loss in its buffered Enter scenario; that run is not counted as passing. Release package, version, checksum, updater and published Wiki verification are performed as part of publication.
The release build also passed dictionary equivalence (140,939 words), 105 sync checks, 315 native checks, 561 input checks, screenshot UI/save/registration, 48 updater checks and updater progress UI. ## Upgrade and compatibility
## 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. 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 screenshot editors and extract the entire ZIP into its installation folder. Keep personal `data/` and customized dictionaries. 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.
Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. Keep all three executables together; history uses another instance of KSwitcher.exe, so no fourth executable is required. The package contains no personal settings, credentials or clipboard history. **Update every synchronizing PC to v0.6.51 or newer before sharing application-specific snippets. Older versions do not understand application restrictions and may treat scoped snippets as global.** Keep a backup before downgrading. Settings with Telegram Web profiles require v0.6.51 or newer. Chat profiles now synchronize from v0.6.53. Update every synchronizing PC to v0.6.53 or newer before syncing: older clients reject the chat-profile field. Synchronization stores application names, visible chat names and language IDs on your configured OpenBao server. No message contents are included.
Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. The package contains no personal settings, credentials or clipboard history.
Publish stable `release-vX.Y.Z` tags matching the executable version. Keep `v0.4.2` as the last legacy tag. Publish stable `release-vX.Y.Z` tags matching the executable version. Keep `v0.4.2` as the last legacy tag.
+1 -1
View File
@@ -1 +1 @@
67cb67d4c08a8722fdd91bb513a9254d781cbee524d2e2eb39721251503b01c9 KSwitcher-win-x64.zip 42ffb2ea131983134897bf8a4e74a56ec2716cdc411930e417739fa35c95e6b2 KSwitcher-win-x64.zip
+81
View File
@@ -0,0 +1,81 @@
{
"schema": 1,
"version": "0.6.55",
"files": [
{
"sha256": "30f7942d26f049a6abac6a36778696cc285888d31ad42a5ed2b53097aeda72d5",
"path": "KSwitcher.exe",
"size": 1850368
},
{
"sha256": "1cf6d8f1b5b8a4299edaf8a28cbaede9264b667edbe095c1e5156eedf0ef2089",
"path": "KSwitcher.Config.exe",
"size": 1718784
},
{
"sha256": "daa58f6800b21a6f50f5e0ceb32505ede0637e05aad57c383d8845ccec2420f1",
"path": "KSwitcher.Screenshot.exe",
"size": 2903040
},
{
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
"path": "LICENSE",
"size": 4401
},
{
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831",
"path": "json-LICENSE.txt",
"size": 1096
},
{
"sha256": "3c9947f562fae119b058c7a1230874bf3430145d8ac8d7bfc5fa89ae708f6a89",
"path": "README.md",
"size": 78153
},
{
"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
}
]
}
+26 -1
View File
@@ -1,4 +1,4 @@
param([switch]$Test, [switch]$Integration, [switch]$Ocr, [switch]$Stage) param([switch]$Test, [switch]$Integration, [switch]$Ocr, [switch]$Stage, [switch]$Far)
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$root = $PSScriptRoot $root = $PSScriptRoot
$compiler = Join-Path $root '.tools\w64devkit\bin\g++.exe' $compiler = Join-Path $root '.tools\w64devkit\bin\g++.exe'
@@ -16,6 +16,12 @@ Push-Location $root
try { try {
$common = @('-std=c++20','-Os','-DNDEBUG','-DUNICODE','-D_UNICODE','-DWIN32_LEAN_AND_MEAN','-DNOMINMAX','-D_WIN32_WINNT=0x0A00','-Wall','-Wextra','-Wno-missing-field-initializers','-Isrc','-Ivendor','-ffunction-sections','-fdata-sections') $common = @('-std=c++20','-Os','-DNDEBUG','-DUNICODE','-D_UNICODE','-DWIN32_LEAN_AND_MEAN','-DNOMINMAX','-D_WIN32_WINNT=0x0A00','-Wall','-Wextra','-Wno-missing-field-initializers','-Isrc','-Ivendor','-ffunction-sections','-fdata-sections')
$libs = @('-lwinhttp','-luser32','-lshell32','-lshlwapi','-ladvapi32','-lcrypt32','-limm32','-lcomctl32','-lgdi32','-lole32','-loleaut32','-ltaskschd','-lcomdlg32','-luuid','-lwindowscodecs','-lruntimeobject','-luiautomationcore') $libs = @('-lwinhttp','-luser32','-lshell32','-lshlwapi','-ladvapi32','-lcrypt32','-limm32','-lcomctl32','-lgdi32','-lole32','-loleaut32','-ltaskschd','-lcomdlg32','-luuid','-lwindowscodecs','-lruntimeobject','-luiautomationcore')
$utilityDirectory = Join-Path (Split-Path $executablePath) 'tools'
New-Item -ItemType Directory -Force $utilityDirectory,build/release/tools | Out-Null
$stayHere = Join-Path $utilityDirectory 'StayHere.exe'
& $compiler @common -Werror -mwindows -municode -static -s utilities/StayHere/main.cpp -luser32 -lshell32 -lgdi32 -lwtsapi32 -o $stayHere
if ($LASTEXITCODE) { throw 'StayHere build failed' }
Copy-Item -LiteralPath $stayHere -Destination build/release/tools/StayHere.exe -Force
foreach ($name in @('core','platform','autostart','autocorrect','storage','sync','ocr','richtext','update','screenshot','screenshot_main','screenshot_notifications','screenshot_activation','screenshot_launcher','app','ui','main','configuration','config_main')) { foreach ($name in @('core','platform','autostart','autocorrect','storage','sync','ocr','richtext','update','screenshot','screenshot_main','screenshot_notifications','screenshot_activation','screenshot_launcher','app','ui','main','configuration','config_main')) {
& $compiler @common -c "src/$name.cpp" -o "build/$name.o" & $compiler @common -c "src/$name.cpp" -o "build/$name.o"
if ($LASTEXITCODE) { throw "Compilation failed: $name" } if ($LASTEXITCODE) { throw "Compilation failed: $name" }
@@ -41,6 +47,14 @@ try {
if ($LASTEXITCODE) { throw 'Screenshot link failed' } if ($LASTEXITCODE) { throw 'Screenshot link failed' }
Copy-Item -LiteralPath $screenshotPath -Destination build/release/KSwitcher.Screenshot.exe -Force Copy-Item -LiteralPath $screenshotPath -Destination build/release/KSwitcher.Screenshot.exe -Force
if ($Test) { if ($Test) {
& $compiler @common -Werror -DSTAYHERE_TEST_INSTANCE -mwindows -municode -static -s utilities/StayHere/main.cpp -luser32 -lshell32 -lgdi32 -lwtsapi32 -o build/StayHereTest.exe
if ($LASTEXITCODE) { throw 'StayHere fixture build failed' }
& "$env:SystemRoot\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -ExecutionPolicy Bypass -File tests/stayhere.ps1 -Executable (Join-Path $outDir 'StayHereTest.exe')
if ($LASTEXITCODE) { throw 'StayHere lifecycle tests failed' }
& $compiler @common tests/utilities.cpp -static -s -o build/KSwitcherUtilitiesTests.exe
if ($LASTEXITCODE) { throw 'Utilities test build failed' }
& .\build\KSwitcherUtilitiesTests.exe
if ($LASTEXITCODE) { throw 'Utilities tests failed' }
& $compiler @common tests/dictionary.cpp build/core.o build/platform.o build/autocorrect.o @libs -lpsapi -static -s -o build/KSwitcherDictionaryTests.exe & $compiler @common tests/dictionary.cpp build/core.o build/platform.o build/autocorrect.o @libs -lpsapi -static -s -o build/KSwitcherDictionaryTests.exe
if ($LASTEXITCODE) { throw 'Dictionary test build failed' } if ($LASTEXITCODE) { throw 'Dictionary test build failed' }
& .\build\KSwitcherDictionaryTests.exe & .\build\KSwitcherDictionaryTests.exe
@@ -61,6 +75,10 @@ try {
if ($LASTEXITCODE) { throw 'Input test build failed' } if ($LASTEXITCODE) { throw 'Input test build failed' }
& .\build\KSwitcherInputTests.exe & .\build\KSwitcherInputTests.exe
if ($LASTEXITCODE) { throw 'Input tests failed' } 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 & $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' } if ($LASTEXITCODE) { throw 'Screenshot UI test build failed' }
& .\build\KSwitcherScreenshotUITests.exe & .\build\KSwitcherScreenshotUITests.exe
@@ -80,6 +98,13 @@ try {
& "$env:SystemRoot\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -ExecutionPolicy Bypass -File tests/update_progress.ps1 & "$env:SystemRoot\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -ExecutionPolicy Bypass -File tests/update_progress.ps1
if ($LASTEXITCODE) { throw 'Updater progress UI tests failed' } if ($LASTEXITCODE) { throw 'Updater progress UI tests failed' }
} }
if ($Far) {
& $compiler @common tests/far_snippets.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 -mwindows -municode -static -s -o build/KSwitcherFarSnippetTests.exe
if ($LASTEXITCODE) { throw 'Far snippet test build failed' }
$fixture = Start-Process -FilePath (Join-Path $outDir 'KSwitcherFarSnippetTests.exe') -WindowStyle Hidden -Wait -PassThru
Get-Content -LiteralPath (Join-Path $outDir 'far-snippets.log')
if ($fixture.ExitCode) { throw 'Far snippet tests failed' }
}
if ($Integration) { if ($Integration) {
$historyFixture = Join-Path (Resolve-Path build) ('history-host-fixture-' + [guid]::NewGuid().ToString('N')) $historyFixture = Join-Path (Resolve-Path build) ('history-host-fixture-' + [guid]::NewGuid().ToString('N'))
New-Item -ItemType Directory $historyFixture | Out-Null New-Item -ItemType Directory $historyFixture | Out-Null
+15 -2
View File
@@ -10,8 +10,12 @@ Copy-Item -LiteralPath (Join-Path $root 'LICENSE') -Destination $destination
Copy-Item -LiteralPath (Join-Path $root 'vendor\json-LICENSE.txt') -Destination $destination Copy-Item -LiteralPath (Join-Path $root 'vendor\json-LICENSE.txt') -Destination $destination
Copy-Item -LiteralPath (Join-Path $root 'README.md') -Destination $destination Copy-Item -LiteralPath (Join-Path $root 'README.md') -Destination $destination
Copy-Item -LiteralPath (Join-Path $root 'dictionaries') -Destination $destination -Recurse -Force Copy-Item -LiteralPath (Join-Path $root 'dictionaries') -Destination $destination -Recurse -Force
New-Item -ItemType Directory -Force (Join-Path $destination 'tools') | Out-Null
Copy-Item -LiteralPath (Join-Path $root 'resources\portable-tools-README.txt') -Destination (Join-Path $destination 'tools\README.txt') -Force
Copy-Item -LiteralPath (Join-Path $root 'build\release\tools\StayHere.exe') -Destination (Join-Path $destination 'tools\StayHere.exe') -Force
Copy-Item -LiteralPath (Join-Path $root 'utilities\StayHere\README.md') -Destination (Join-Path $destination 'tools\StayHere-README.md') -Force
# Enumerate the distributable files explicitly; do not include a user's data directory. # Enumerate the distributable files explicitly; do not include a user's data directory.
$files = @('KSwitcher.exe','KSwitcher.Config.exe','KSwitcher.Screenshot.exe','LICENSE','json-LICENSE.txt','README.md','dictionaries') | ForEach-Object { Join-Path $destination $_ } $files = @('KSwitcher.exe','KSwitcher.Config.exe','KSwitcher.Screenshot.exe','LICENSE','json-LICENSE.txt','README.md','dictionaries','tools\README.txt','tools\StayHere.exe','tools\StayHere-README.md') | ForEach-Object { Join-Path $destination $_ }
$entries = foreach ($path in $files) { $entries = foreach ($path in $files) {
foreach ($file in @(Get-ChildItem -LiteralPath $path -File -Recurse)) { foreach ($file in @(Get-ChildItem -LiteralPath $path -File -Recurse)) {
@{path=$file.FullName.Substring($destination.Length+1).Replace('\','/'); size=$file.Length; sha256=(Get-FileHash -LiteralPath $file.FullName -Algorithm SHA256).Hash.ToLowerInvariant()} @{path=$file.FullName.Substring($destination.Length+1).Replace('\','/'); size=$file.Length; sha256=(Get-FileHash -LiteralPath $file.FullName -Algorithm SHA256).Hash.ToLowerInvariant()}
@@ -22,7 +26,16 @@ $manifest=Join-Path $destination 'release-files.json'
@{schema=1; version=$version; files=@($entries)} | ConvertTo-Json -Depth 4 | Set-Content -LiteralPath $manifest -Encoding utf8 @{schema=1; version=$version; files=@($entries)} | ConvertTo-Json -Depth 4 | Set-Content -LiteralPath $manifest -Encoding utf8
$files += $manifest $files += $manifest
$archive = Join-Path $root 'dist\KSwitcher-win-x64.zip' $archive = Join-Path $root 'dist\KSwitcher-win-x64.zip'
Compress-Archive -LiteralPath $files -DestinationPath $archive -Force # Archive only manifest-listed files, preserving relative paths. Never sweep up
# personal utilities or leftover developer files from the staging directory.
Add-Type -AssemblyName System.IO.Compression.FileSystem
$stream = [IO.File]::Open($archive,[IO.FileMode]::Create)
$zip = [IO.Compression.ZipArchive]::new($stream,[IO.Compression.ZipArchiveMode]::Create)
try {
foreach ($name in @($entries | ForEach-Object { $_.path }) + @('release-files.json')) {
[IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip,(Join-Path $destination $name),$name,[IO.Compression.CompressionLevel]::Optimal) | Out-Null
}
} finally { $zip.Dispose(); $stream.Dispose() }
Get-FileHash -LiteralPath $archive -Algorithm SHA256 Get-FileHash -LiteralPath $archive -Algorithm SHA256
if ($PublishRelease) { if ($PublishRelease) {
$release = Join-Path $root 'Release' $release = Join-Path $root 'Release'
+3 -3
View File
@@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur"
1 RT_MANIFEST "app.manifest" 1 RT_MANIFEST "app.manifest"
201 RCDATA "update.ps1" 201 RCDATA "update.ps1"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 0,6,42,0 FILEVERSION 0,6,55,0
PRODUCTVERSION 0,6,42,0 PRODUCTVERSION 0,6,55,0
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP
BEGIN BEGIN
@@ -20,7 +20,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility" VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility"
VALUE "ProductName", "KSwitcher" VALUE "ProductName", "KSwitcher"
VALUE "FileVersion", "0.6.42" VALUE "FileVersion", "0.6.55"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
+18
View File
@@ -0,0 +1,18 @@
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 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 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.
Add other utilities separately. Updates preserve your own files in this folder;
bundled StayHere.exe and documentation may be refreshed. Utilities are not
transferred by settings synchronization.
+267 -39
View File
@@ -6,6 +6,7 @@
#include "configuration.h" #include "configuration.h"
#include "diagnostics.h" #include "diagnostics.h"
#include "paste_probe.h" #include "paste_probe.h"
#include "utilities.h"
#include "screenshot_notifications.h" #include "screenshot_notifications.h"
#include <algorithm> #include <algorithm>
#include <commctrl.h> #include <commctrl.h>
@@ -78,19 +79,40 @@ class Transaction
mutable bool invalidLogged{}; mutable bool invalidLogged{};
unsigned copyNumber{}; unsigned copyNumber{};
std::wstring adopted; std::wstring adopted;
Bytes adoptedFormats;
bool trustedContentsObserved{};
std::unique_ptr<PasteProbe> selectionProof; std::unique_ptr<PasteProbe> selectionProof;
std::wstring provenSelection; std::wstring provenSelection;
bool farSnippet{};
size_t farSelectedSteps{};
public: public:
Transaction(App &a, HWND t, uint64_t v) : app(a), target(t), version(v) Transaction(App &a, HWND t, uint64_t v, bool farEditor = false)
: app(a), target(t), version(v), farSnippet(farEditor)
{ {
app.suspended = true; app.suspended = true;
try try
{ {
expected = GetClipboardSequenceNumber(); for (unsigned attempt = 0; ; ++attempt)
snapshot.capture(app.window, expected); {
if (expected != GetClipboardSequenceNumber()) expected = GetClipboardSequenceNumber();
throw std::runtime_error("Clipboard changed while taking snapshot"); try
{
snapshot.capture(app.window, expected);
if (expected != GetClipboardSequenceNumber())
throw std::runtime_error("Clipboard changed while taking snapshot");
break;
}
catch (...)
{
// No selection or clipboard write has happened yet. Recapture
// the latest clipboard after a concurrent publisher settles.
if (attempt >= 2 || !valid() || expected == GetClipboardSequenceNumber())
throw;
diagnosticEvent(L"Snapshot retry: clipboard changed during capture");
Sleep(20);
}
}
captured = true; captured = true;
} }
catch (...) catch (...)
@@ -101,6 +123,7 @@ class Transaction
} }
~Transaction() ~Transaction()
{ {
if (farSnippet) finishSelection(false);
if (captured && GetClipboardSequenceNumber() == expected) if (captured && GetClipboardSequenceNumber() == expected)
try try
{ {
@@ -132,9 +155,19 @@ class Transaction
if (GetClipboardSequenceNumber() != expected) if (GetClipboardSequenceNumber() != expected)
{ {
auto now = GetClipboardSequenceNumber(); auto now = GetClipboardSequenceNumber();
if (adopted.empty() || !ownsClipboard(target) || readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection).text() != adopted || auto current = readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection);
GetClipboardSequenceNumber() != now) const bool sameContents = selectionClipboardIdentity(current) == adoptedFormats;
if (adopted.empty() || (!trustedContentsObserved && !ownsClipboard(target)) ||
!sameContents || GetClipboardSequenceNumber() != now)
{
diagnosticEvent(L"Clipboard check rejected: expectedSequence=" + std::to_wstring(expected) +
L" readSequence=" + std::to_wstring(now) + L" currentSequence=" +
std::to_wstring(GetClipboardSequenceNumber()) + L" owner=" +
std::to_wstring((uintptr_t)GetClipboardOwner()) + L" sameContents=" +
std::to_wstring(sameContents) + L" expectedText=" + diagnosticText(adopted) +
L" currentText=" + diagnosticText(current.text()));
throw std::runtime_error("Operation cancelled: another application changed the clipboard"); throw std::runtime_error("Operation cancelled: another application changed the clipboard");
}
expected = now; expected = now;
} }
} }
@@ -142,6 +175,8 @@ class Transaction
{ {
check(); check();
adopted.clear(); adopted.clear();
adoptedFormats.clear();
trustedContentsObserved = false;
// These are temporary transaction contents, not a user's clipboard entry. // These are temporary transaction contents, not a user's clipboard entry.
// In particular, do not invite the Windows history service to read our // In particular, do not invite the Windows history service to read our
// sentinel while the target editor is trying to open the clipboard. // sentinel while the target editor is trying to open the clipboard.
@@ -164,11 +199,13 @@ class Transaction
const auto number = ++copyNumber; const auto number = ++copyNumber;
if (!valid()) if (!valid())
return {}; return {};
write(textClip(L"\x2063KSwitcher-" + std::to_wstring(GetTickCount64()))); const auto sentinel = L"\x2063KSwitcher-" + std::to_wstring(GetTickCount64());
write(textClip(sentinel));
DWORD before = expected; DWORD before = expected;
diagnosticEvent(L"Copy begin number=" + std::to_wstring(number) + L" sentinelSequence=" + diagnosticEvent(L"Copy begin number=" + std::to_wstring(number) + L" sentinelSequence=" +
std::to_wstring(before) + L" target=" + std::to_wstring((uintptr_t)target)); std::to_wstring(before) + L" target=" + std::to_wstring((uintptr_t)target) +
if (!valid() || !chord(L'C', MOD_CONTROL)) L" sentinel=" + diagnosticText(sentinel));
if (!valid() || !chord(farSnippet ? VK_INSERT : L'C', MOD_CONTROL))
{ {
diagnosticEvent(L"Copy failed: context changed or simulated Ctrl+C blocked"); diagnosticEvent(L"Copy failed: context changed or simulated Ctrl+C blocked");
return {}; return {};
@@ -179,6 +216,7 @@ class Transaction
DWORD changed = before; DWORD changed = before;
ULONGLONG stable = 0; ULONGLONG stable = 0;
bool changedAgain = false; bool changedAgain = false;
std::optional<Bytes> observedTargetCopy;
while (GetTickCount64() < deadline) while (GetTickCount64() < deadline)
{ {
if (!valid()) if (!valid())
@@ -193,6 +231,18 @@ class Transaction
changedAgain |= changed != before; changedAgain |= changed != before;
changed = now; changed = now;
stable = GetTickCount64(); stable = GetTickCount64();
// Clipboard synchronizers can republish a legitimate copy under
// their own HWND. Record provenance before that handoff; an
// unobserved or altered foreign copy must still be rejected.
if (ownsClipboard(target))
{
auto candidate = readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection);
if (GetClipboardSequenceNumber() == now && ownsClipboard(target) && !candidate.text().empty())
{
observedTargetCopy = selectionClipboardIdentity(candidate);
diagnosticEvent(L"Copy: target-owned selection observed number=" + std::to_wstring(number));
}
}
} }
if (changed != before && GetTickCount64() - stable >= 60) if (changed != before && GetTickCount64() - stable >= 60)
break; break;
@@ -205,7 +255,7 @@ class Transaction
check(); check();
if (!valid() || GetClipboardSequenceNumber() != before) if (!valid() || GetClipboardSequenceNumber() != before)
return {}; return {};
if (!chord(L'C', MOD_CONTROL)) if (!chord(farSnippet ? VK_INSERT : L'C', MOD_CONTROL))
return {}; return {};
diagnosticEvent(L"Copy retry: clipboard unchanged after Ctrl+C number=" + std::to_wstring(number) + diagnosticEvent(L"Copy retry: clipboard unchanged after Ctrl+C number=" + std::to_wstring(number) +
L" attempt=" + std::to_wstring(attempts + 1) + L" elapsedMs=" + std::to_wstring(GetTickCount64() - started)); L" attempt=" + std::to_wstring(attempts + 1) + L" elapsedMs=" + std::to_wstring(GetTickCount64() - started));
@@ -224,16 +274,31 @@ class Transaction
L"Copy failed: context changed"); L"Copy failed: context changed");
return {}; return {};
} }
if ((GetClipboardOwner() ? !ownsClipboard(target) : changedAgain) || const bool targetOwned = ownsClipboard(target);
changed != GetClipboardSequenceNumber())
throw std::runtime_error("Operation cancelled: copy did not belong to the target application");
expected = changed;
auto clip = readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection); auto clip = readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection);
const auto formats = selectionClipboardIdentity(clip);
const bool verifiedRelay = observedTargetCopy && *observedTargetCopy == formats;
if (((GetClipboardOwner() ? !targetOwned : changedAgain) && !verifiedRelay) ||
changed != GetClipboardSequenceNumber())
{
diagnosticEvent(L"Copy rejected: observedTarget=" + std::to_wstring(observedTargetCopy.has_value()) +
L" verifiedRelay=" + std::to_wstring(verifiedRelay) + L" expectedSequence=" +
std::to_wstring(changed) + L" currentSequence=" + std::to_wstring(GetClipboardSequenceNumber()) +
L" owner=" + std::to_wstring((uintptr_t)GetClipboardOwner()) + L" targetText=" +
diagnosticText(observedTargetCopy ? decodeClip(*observedTargetCopy).text() : L"") +
L" currentText=" + diagnosticText(clip.text()));
throw std::runtime_error("Operation cancelled: copy did not belong to the target application");
}
if (!targetOwned && verifiedRelay)
diagnosticEvent(L"Copy: identical target selection republished by clipboard synchronizer");
expected = changed;
auto text = clip.text(); auto text = clip.text();
diagnosticEvent(L"Copy result number=" + std::to_wstring(number) + L" attempts=" + diagnosticEvent(L"Copy result number=" + std::to_wstring(number) + L" attempts=" +
std::to_wstring(attempts) + L" elapsedMs=" + std::to_wstring(GetTickCount64() - started) + std::to_wstring(attempts) + L" elapsedMs=" + std::to_wstring(GetTickCount64() - started) +
L" text=" + diagnosticText(text)); L" text=" + diagnosticText(text));
adopted = text; adopted = text;
adoptedFormats = formats;
trustedContentsObserved = targetOwned || verifiedRelay;
check(); check();
for (auto &f : clip.formats) for (auto &f : clip.formats)
{ {
@@ -277,8 +342,44 @@ class Transaction
bool recoveredSelection() const { return selectionProof != nullptr; } bool recoveredSelection() const { return selectionProof != nullptr; }
bool select(size_t n) bool select(size_t n)
{ {
if (farSnippet)
{
if (n > 4096 || farSelectedSteps) return false;
for (size_t i = 0; i < n; ++i)
{
if (!valid() || !chord(VK_LEFT, MOD_ALT | MOD_SHIFT)) return false;
++farSelectedSteps;
}
return valid();
}
return selectPrevious(n, [&] { return valid(); }); return selectPrevious(n, [&] { return valid(); });
} }
bool finishSelection(bool atStart)
{
if (!farSnippet) return valid() && chord(atStart ? VK_LEFT : VK_RIGHT);
if (!farSelectedSteps) return valid();
if (atStart)
{
// Far arrows move one character, rather than collapsing a selection
// to its edge. Move into the nonempty selected range and back.
if (!valid() || !chord(VK_RIGHT)) return false;
farSelectedSteps = 0;
return valid() && chord(VK_LEFT);
}
while (farSelectedSteps && valid())
{
if (!chord(VK_RIGHT, MOD_ALT | MOD_SHIFT)) return false;
--farSelectedSteps;
}
return !farSelectedSteps && valid();
}
std::optional<std::wstring> readFarSnippet(size_t count)
{
if (!farSnippet || !count || !select(count)) return {};
auto observed = copy();
if (!finishSelection(false) || observed.empty()) return {};
return observed;
}
std::wstring copyRange(size_t count, const std::wstring &wordCandidate, std::wstring copyRange(size_t count, const std::wstring &wordCandidate,
const std::function<bool(const std::wstring &)> &matches, const std::function<bool(const std::wstring &)> &matches,
const std::function<bool(const std::wstring &)> &suffixMatches = {}) const std::function<bool(const std::wstring &)> &suffixMatches = {})
@@ -359,6 +460,14 @@ class Transaction
if (!valid()) if (!valid())
return false; return false;
write(clip); write(clip);
// Our verified payload is also trusted across an identical relay. The
// sentinel written by copy() deliberately does not get this allowance.
if (clip.formats.size() == 1 && clip.formats.front().id == CF_UNICODETEXT)
{
adopted = clip.text();
adoptedFormats = selectionClipboardIdentity(clip);
trustedContentsObserved = true;
}
// Viber's Qt editor observes clipboard changes asynchronously. Give it // Viber's Qt editor observes clipboard changes asynchronously. Give it
// a chance to discard the data object from Ctrl+C before requesting paste. // a chance to discard the data object from Ctrl+C before requesting paste.
// Recheck ownership and input below; never retry a possibly applied paste. // Recheck ownership and input below; never retry a possibly applied paste.
@@ -373,9 +482,16 @@ class Transaction
if (!valid()) if (!valid())
return false; return false;
} }
if (!chord(L'V', MOD_CONTROL)) if (!chord(farSnippet ? VK_INSERT : L'V', farSnippet ? MOD_SHIFT : MOD_CONTROL))
throw std::runtime_error("Windows blocked simulated input; check application privilege levels"); throw std::runtime_error("Windows blocked simulated input; check application privilege levels");
// The selected trigger was replaced. Do not restore its old caret range
// if clipboard verification below subsequently rejects a concurrent copy.
if (farSnippet) farSelectedSteps = 0;
Sleep(300); Sleep(300);
// A clipboard synchronizer may replace our payload after Ctrl+V is
// queued but before the editor consumes it. Do not run snippet actions
// (especially Enter) after such a race.
check();
return true; return true;
} }
bool nativeSelectionIs(const std::wstring &original) const bool nativeSelectionIs(const std::wstring &original) const
@@ -443,6 +559,7 @@ App::App(HINSTANCE h, bool test, const std::filesystem::path &dataRoot, HWND ser
} }
App::~App() App::~App()
{ {
stopBrowserChatMonitor();
if (auto host = historyController(historyProcess)) PostMessageW(host, WM_CLOSE, 0, 0); if (auto host = historyController(historyProcess)) PostMessageW(host, WM_CLOSE, 0, 0);
if (historyProcess) CloseHandle(historyProcess); if (historyProcess) CloseHandle(historyProcess);
if (notificationRegistration) CloseHandle(notificationRegistration); if (notificationRegistration) CloseHandle(notificationRegistration);
@@ -802,9 +919,12 @@ void App::keyboard(const KBDLLHOOKSTRUCT &k, UINT mods)
if (busy || settings.snippets.empty()) if (busy || settings.snippets.empty())
return; return;
auto keys = lower(run.keys); auto keys = lower(run.keys);
auto snippetProcess = processName(fg);
for (int priority : {2, 1})
for (size_t i = 0; i < settings.snippets.size(); ++i) for (size_t i = 0; i < settings.snippets.size(); ++i)
{ {
auto &sn = settings.snippets[i]; auto &sn = settings.snippets[i];
if (snippetAppPriority(sn, snippetProcess) != priority) continue;
std::vector<std::wstring> variants{lower(sn.trigger)}; std::vector<std::wstring> variants{lower(sn.trigger)};
for (auto &l : layouts) for (auto &l : layouts)
{ {
@@ -842,6 +962,32 @@ void App::keyboard(const KBDLLHOOKSTRUCT &k, UINT mods)
} }
} }
} }
void App::refreshChatContext()
{
HWND target = GetForegroundWindow();
chatWindow = target;
activeChatTitle = chatTitle(target);
activeChat = settings.chatCycles.empty() ? L"" : windowChatKey(target);
}
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<bool> &busy; ~Reset() { busy = false; } } reset{busy};
auto valid = [&] { return GetForegroundWindow() == target && windowChatKey(target) == key; };
if (key.starts_with(L"telegram-web\n") && readChromeChat(target) != key) return;
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) bool App::handleKeyboard(const KBDLLHOOKSTRUCT &key, bool down, UINT mods)
{ {
// Filter before capture, hotkey latching and typing history. External injected // Filter before capture, hotkey latching and typing history. External injected
@@ -892,6 +1038,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. 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) if (down)
{ {
auto action = hotkeyHook.update(key.vkCode, true, mods, hookBindings); auto action = hotkeyHook.update(key.vkCode, true, mods, hookBindings);
@@ -955,6 +1118,15 @@ void App::replayTyping()
} }
LRESULT CALLBACK App::keyProc(int code, WPARAM wp, LPARAM lp) LRESULT CALLBACK App::keyProc(int code, WPARAM wp, LPARAM lp)
{ {
// MWB suppresses source-machine events that it forwards elsewhere. Let
// downstream hooks route the event before tracking it or starting a snippet.
// Call the chain exactly once; a local event can still be consumed below.
const auto routed = CallNextHookEx(nullptr, code, wp, lp);
return keyboardAfterHooks(code, wp, lp, routed);
}
LRESULT App::keyboardAfterHooks(int code, WPARAM wp, LPARAM lp, LRESULT routed)
{
if (routed) return routed;
if (code == HC_ACTION && current && if (code == HC_ACTION && current &&
(wp == WM_KEYDOWN || wp == WM_SYSKEYDOWN || wp == WM_KEYUP || wp == WM_SYSKEYUP)) (wp == WM_KEYDOWN || wp == WM_SYSKEYDOWN || wp == WM_KEYUP || wp == WM_SYSKEYUP))
{ {
@@ -969,7 +1141,7 @@ LRESULT CALLBACK App::keyProc(int code, WPARAM wp, LPARAM lp)
wp == WM_KEYDOWN || wp == WM_SYSKEYDOWN, mods)) wp == WM_KEYDOWN || wp == WM_SYSKEYDOWN, mods))
return 1; return 1;
} }
return CallNextHookEx(nullptr, code, wp, lp); return routed;
} }
LRESULT CALLBACK App::mouseProc(int code, WPARAM wp, LPARAM lp) LRESULT CALLBACK App::mouseProc(int code, WPARAM wp, LPARAM lp)
{ {
@@ -1090,8 +1262,9 @@ void App::transform(int command, int snippet)
available = layouts; available = layouts;
version = inputVersion; version = inputVersion;
} }
const auto requestedChat = config.chatCycles.empty() ? L"" : windowChatKey(target);
enqueue( enqueue(
[this, target, recent, previous, config, available, version, command, snippet, attempt, manual, requestedAt, preDeferred] [this, target, recent, previous, config, available, version, command, snippet, attempt, manual, requestedAt, preDeferred, requestedChat]() mutable
{ {
struct BusyReset struct BusyReset
{ {
@@ -1106,6 +1279,9 @@ void App::transform(int command, int snippet)
b = false; b = false;
} }
} reset{busy, window, preDeferred}; } reset{busy, window, preDeferred};
auto effectiveChat = requestedChat;
if (lower(processName(target)) == L"chrome") effectiveChat = readChromeChat(target);
config.cycle = chatCycle(config, effectiveChat, available);
auto start = GetTickCount64(); auto start = GetTickCount64();
std::wstring reason = L"cancelled-before-selection"; std::wstring reason = L"cancelled-before-selection";
std::wstring text, result, expected, actual, verification = L"not-attempted"; std::wstring text, result, expected, actual, verification = L"not-attempted";
@@ -1213,14 +1389,16 @@ void App::transform(int command, int snippet)
} }
// Collapse a temporary selection on every failed auto-correction, // Collapse a temporary selection on every failed auto-correction,
// including clipboard exceptions, before queued typing is replayed. // including clipboard exceptions, before queued typing is replayed.
const bool farSnippet = snippet >= 0 && lower(processName(target)) == L"far";
bool autoSelected = false; bool autoSelected = false;
struct SelectionReset struct SelectionReset
{ {
bool &selected; bool &selected;
std::function<bool()> valid; std::function<bool()> valid;
~SelectionReset() { if (selected && valid()) chord(VK_RIGHT); } bool farEditor;
} selectionReset{autoSelected, valid}; ~SelectionReset() { if (selected && !farEditor && valid()) chord(VK_RIGHT); }
Transaction tx(*this, target, version); } selectionReset{autoSelected, valid, farSnippet};
Transaction tx(*this, target, version, farSnippet);
reason = L"selection-unavailable"; reason = L"selection-unavailable";
diagnosticEvent(L"Transform target=" + processName(target) + L" command=" + std::to_wstring(command) + diagnosticEvent(L"Transform target=" + processName(target) + L" command=" + std::to_wstring(command) +
L" recent=" + std::to_wstring(config.recent) + L" keys=" + L" recent=" + std::to_wstring(config.recent) + L" keys=" +
@@ -1298,18 +1476,33 @@ void App::transform(int command, int snippet)
if (snippet >= (int)config.snippets.size() || recent.window != target) if (snippet >= (int)config.snippets.size() || recent.window != target)
return; return;
const auto &sn = config.snippets[snippet]; const auto &sn = config.snippets[snippet];
if (!snippetAppPriority(sn, processName(target))) return;
if (recent.keys.size() < sn.trigger.size()) if (recent.keys.size() < sn.trigger.size())
return; return;
result = parseTemplate(sn.text).text;
// A multiline clipboard paste can execute a console command
// before readback. Only explicit, verified {enter} may do so.
if (farSnippet && (result.empty() || result.find_first_of(L"\r\n") != result.npos ||
caretSteps(result) > 4096))
{
reason = L"far-snippet-template-unsupported";
return;
}
Run tail = recent; Run tail = recent;
tail.keys = tail.keys.substr(tail.keys.size() - sn.trigger.size()); tail.keys = tail.keys.substr(tail.keys.size() - sn.trigger.size());
if (!tx.select(sn.trigger.size()))
return;
autoSelected = true; autoSelected = true;
reason = L"snippet-verification-mismatch"; reason = L"snippet-verification-mismatch";
text = tx.copy(); if (farSnippet)
{
if (!tx.select(sn.trigger.size())) return;
text = tx.copy();
}
else
text = tx.copyRange(sn.trigger.size(), tail.keys,
[&](const std::wstring &candidate) { return tail.match(candidate, available, physicalLayout()) >= 0; },
[&](const std::wstring &candidate) { return tail.matchSuffix(candidate, available, physicalLayout()) >= 0; });
if (tail.match(text, available, physicalLayout()) < 0) if (tail.match(text, available, physicalLayout()) < 0)
return; return;
result = parseTemplate(sn.text).text;
automatic = true; automatic = true;
} }
else if (config.recent && recent.window == target && !recent.keys.empty() && !recent.overflow) else if (config.recent && recent.window == target && !recent.keys.empty() && !recent.overflow)
@@ -1385,9 +1578,9 @@ void App::transform(int command, int snippet)
for (int i = 0; i < (int)available.size(); ++i) for (int i = 0; i < (int)available.size(); ++i)
if (available[i].id == id && available[i].convertible) if (available[i].id == id && available[i].convertible)
cycle.push_back(i); 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()) if (automatic && tx.valid())
chord(VK_RIGHT); chord(VK_RIGHT);
return; return;
@@ -1398,11 +1591,12 @@ void App::transform(int command, int snippet)
} }
} }
bool sent = false; bool sent = false;
const bool requireReadback = tx.recoveredSelection(); const bool requireReadback = tx.recoveredSelection() || snippet >= 0;
PasteProbe probe(((config.writeLog && manual) || requireReadback) && result != text, text, target); PasteProbe probe(!farSnippet && ((config.writeLog && manual) || requireReadback) && result != text, text, target);
if (requireReadback && result != text && probe.status != L"ready") if (requireReadback && !farSnippet && result != text && probe.status != L"ready")
{ {
reason = L"recovered-selection-unavailable"; verification = probe.status;
reason = snippet >= 0 ? L"snippet-verification-unavailable" : L"recovered-selection-unavailable";
std::lock_guard lock(stateMutex); std::lock_guard lock(stateMutex);
last.reset(); last.reset();
run.reset(); run.reset();
@@ -1413,10 +1607,10 @@ void App::transform(int command, int snippet)
if (result != text) if (result != text)
sent = tx.paste(textClip(result)); sent = tx.paste(textClip(result));
else if (automatic && tx.valid()) else if (automatic && tx.valid())
chord(VK_RIGHT); tx.finishSelection(false);
if (requireReadback && result != text && !sent) if (requireReadback && result != text && !sent)
{ {
reason = L"recovered-selection-paste-cancelled"; reason = snippet >= 0 ? L"snippet-paste-cancelled" : L"recovered-selection-paste-cancelled";
std::lock_guard lock(stateMutex); std::lock_guard lock(stateMutex);
last.reset(); last.reset();
run.reset(); run.reset();
@@ -1436,11 +1630,12 @@ void App::transform(int command, int snippet)
verification = probe.status; verification = probe.status;
if (tx.valid()) if (tx.valid())
{ {
auto observed = probe.read((int)caretSteps(result)); auto observed = farSnippet ? tx.readFarSnippet(caretSteps(result)) :
probe.read((int)caretSteps(result));
// A native Edit may silently ignore Ctrl+V while the clipboard is busy. // A native Edit may silently ignore Ctrl+V while the clipboard is busy.
// Retry once only with fresh native proof that the exact original range // Retry once only with fresh native proof that the exact original range
// is still selected. Never retry an unknown or changed editor state. // is still selected. Never retry an unknown or changed editor state.
if (observed && newlines(*observed) == newlines(text) && tx.nativeSelectionIs(text)) if (!farSnippet && observed && newlines(*observed) == newlines(text) && tx.nativeSelectionIs(text))
{ {
diagnosticEvent(L"Paste retry: native Edit still selects the unchanged original"); diagnosticEvent(L"Paste retry: native Edit still selects the unchanged original");
if (tx.paste(textClip(result)) && tx.valid()) if (tx.paste(textClip(result)) && tx.valid())
@@ -1448,7 +1643,8 @@ void App::transform(int command, int snippet)
else else
observed.reset(); observed.reset();
} }
verification = probe.status; verification = farSnippet ? (observed ? L"read-back-via-far-clipboard" :
L"far-readback-unavailable") : probe.status;
if (observed && tx.valid()) if (observed && tx.valid())
{ {
actual = *observed; actual = *observed;
@@ -1492,6 +1688,7 @@ void App::transform(int command, int snippet)
} }
if (snippet >= 0 && sent && tx.valid()) if (snippet >= 0 && sent && tx.valid())
{ {
tx.check();
auto t = parseTemplate(config.snippets[snippet].text); auto t = parseTemplate(config.snippets[snippet].text);
if (!t.suffix.empty()) if (!t.suffix.empty())
{ {
@@ -1500,15 +1697,18 @@ void App::transform(int command, int snippet)
if (!tx.valid()) return; if (!tx.valid()) return;
if (newlines(suffix) != newlines(t.suffix)) if (newlines(suffix) != newlines(t.suffix))
{ {
chord(VK_RIGHT); tx.finishSelection(false);
return; return;
} }
if (!chord(VK_LEFT)) return; if (!tx.finishSelection(true)) return;
} }
// Action markers run after insertion and cursor placement, // Action markers run after insertion and cursor placement,
// before any physical typing buffered during expansion. // before any physical typing buffered during expansion.
for (int i = 0; i < t.enters && tx.valid(); ++i) for (int i = 0; i < t.enters && tx.valid(); ++i)
{
tx.check();
if (!chord(VK_RETURN)) break; if (!chord(VK_RETURN)) break;
}
} }
if (to >= 0 && config.switchLayout && tx.valid() && (sent || result == text)) if (to >= 0 && config.switchLayout && tx.valid() && (sent || result == text))
{ {
@@ -1680,6 +1880,10 @@ void App::recognizeEntry(std::wstring id)
} }
void App::trayMenu() void App::trayMenu()
{ {
constexpr int utilityCommandBase = 1000;
std::error_code utilitiesError;
auto utilities = discoverUtilities(std::filesystem::path(executable()).parent_path() / L"tools", utilitiesError);
if (utilities.size() > 50000) utilities.resize(50000);
HMENU menu = CreatePopupMenu(); HMENU menu = CreatePopupMenu();
AppendMenuW(menu, MF_STRING, 10, L"Clipboard &history"); AppendMenuW(menu, MF_STRING, 10, L"Clipboard &history");
AppendMenuW(menu, MF_STRING, 24, L"&Capture screen region…"); AppendMenuW(menu, MF_STRING, 24, L"&Capture screen region…");
@@ -1687,6 +1891,13 @@ void App::trayMenu()
SetMenuDefaultItem(menu, 11, FALSE); SetMenuDefaultItem(menu, 11, FALSE);
AppendMenuW(menu, MF_STRING, 12, L"S&nippets…"); AppendMenuW(menu, MF_STRING, 12, L"S&nippets…");
AppendMenuW(menu, MF_STRING, 13, L"&Keyboard shortcuts…"); AppendMenuW(menu, MF_STRING, 13, L"&Keyboard shortcuts…");
HMENU utilityMenu = CreatePopupMenu();
for (size_t i = 0; i < utilities.size(); ++i)
AppendMenuW(utilityMenu, MF_STRING, utilityCommandBase + i, utilityMenuLabel(utilities[i]).c_str());
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"&Tools");
AppendMenuW(menu, MF_SEPARATOR, 0, nullptr); AppendMenuW(menu, MF_SEPARATOR, 0, nullptr);
AppendMenuW(menu, MF_STRING | (settings.awake ? MF_CHECKED : 0), 14, L"Keep screen a&wake"); AppendMenuW(menu, MF_STRING | (settings.awake ? MF_CHECKED : 0), 14, L"Keep screen a&wake");
HMENU pause = CreatePopupMenu(); HMENU pause = CreatePopupMenu();
@@ -1713,6 +1924,20 @@ void App::trayMenu()
PostMessageW(window, WM_NULL, 0, 0); PostMessageW(window, WM_NULL, 0, 0);
try try
{ {
if (cmd >= utilityCommandBase && size_t(cmd - utilityCommandBase) < utilities.size())
{
const auto &path = utilities[cmd - utilityCommandBase];
auto command = L"\"" + path.wstring() + L"\"";
STARTUPINFOW startup{sizeof(startup)};
PROCESS_INFORMATION process{};
if (!CreateProcessW(path.c_str(), command.data(), nullptr, nullptr, FALSE, 0, nullptr,
path.parent_path().c_str(), &startup, &process))
throw std::runtime_error(utf8(lastError(L"Cannot start utility " + path.filename().wstring())));
AllowSetForegroundWindow(process.dwProcessId);
CloseHandle(process.hThread);
CloseHandle(process.hProcess);
return;
}
switch (cmd) switch (cmd)
{ {
case 24: case 24:
@@ -1900,7 +2125,9 @@ LRESULT CALLBACK App::windowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
app->replayTyping(); app->replayTyping();
return 0; return 0;
case TrayMessage: case TrayMessage:
if (LOWORD(lp) == WM_CONTEXTMENU) if (LOWORD(lp) == NIN_BALLOONUSERCLICK)
showLogs(*app);
else if (LOWORD(lp) == WM_CONTEXTMENU)
app->trayMenu(); app->trayMenu();
else if (LOWORD(lp) == WM_LBUTTONDBLCLK) else if (LOWORD(lp) == WM_LBUTTONDBLCLK)
// The shell still owns the mouse gesture on the second button-down. // The shell still owns the mouse gesture on the second button-down.
@@ -2104,6 +2331,7 @@ int App::execute()
// Resume pending OCR, including older images without a saved OCR state. // Resume pending OCR, including older images without a saved OCR state.
scheduleHistoryOcr(settings); scheduleHistoryOcr(settings);
addTray(); addTray();
if (!smoke) startBrowserChatMonitor();
SetTimer(window, 1, 60000, nullptr); SetTimer(window, 1, 60000, nullptr);
if (!smoke) SetTimer(window, 6, 1000, nullptr); if (!smoke) SetTimer(window, 6, 1000, nullptr);
SetThreadExecutionState(ES_CONTINUOUS | SetThreadExecutionState(ES_CONTINUOUS |
+7
View File
@@ -3,6 +3,7 @@
#include "storage.h" #include "storage.h"
#include "update.h" #include "update.h"
#include "sync.h" #include "sync.h"
#include "chat_context.h"
#include <atomic> #include <atomic>
#include <condition_variable> #include <condition_variable>
#include <deque> #include <deque>
@@ -134,6 +135,11 @@ class App
int previousAttemptCommand{}, repeatAttempts{}; int previousAttemptCommand{}, repeatAttempts{};
std::vector<std::pair<int, Hotkey>> hookBindings; std::vector<std::pair<int, Hotkey>> hookBindings;
HotkeyHook hotkeyHook; HotkeyHook hotkeyHook;
ChatSwitchHook chatSwitchHook;
HWND chatWindow{};
std::wstring activeChat, activeChatTitle;
void refreshChatContext();
void switchChatLayout(bool reverse);
HWND typingTarget{}; HWND typingTarget{};
bool autoPending{}; bool autoPending{};
int snippetPending = -1; int snippetPending = -1;
@@ -143,6 +149,7 @@ class App
void replayTyping(); void replayTyping();
static LRESULT CALLBACK windowProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK windowProc(HWND, UINT, WPARAM, LPARAM);
static LRESULT CALLBACK keyProc(int, WPARAM, LPARAM); static LRESULT CALLBACK keyProc(int, WPARAM, LPARAM);
static LRESULT keyboardAfterHooks(int, WPARAM, LPARAM, LRESULT);
static LRESULT CALLBACK mouseProc(int, WPARAM, LPARAM); static LRESULT CALLBACK mouseProc(int, WPARAM, LPARAM);
}; };
void showHistory(App &, bool visible = true); void showHistory(App &, bool visible = true);
+1 -1
View File
@@ -257,7 +257,7 @@ std::optional<AutoSuggestion> AutoCorrector::suggest(const std::wstring &typed,
{ {
auto replacement = settings.autoReplacements.find(small); auto replacement = settings.autoReplacements.find(small);
if (replacement != settings.autoReplacements.end() && if (replacement != settings.autoReplacements.end() &&
replacement->second.find_first_not_of(alphabet) == small.npos) replacement->second.find_first_not_of(alphabet + L" ") == small.npos)
return sameLayout(replacement->second); return sameLayout(replacement->second);
} }
auto personal = [&](const std::wstring &language, const std::wstring &candidate) auto personal = [&](const std::wstring &language, const std::wstring &candidate)
+143
View File
@@ -0,0 +1,143 @@
// Chrome Telegram Web integration: native accessibility, no OCR or polling timer.
#include "chat_context.h"
#include <uiautomation.h>
#include <atomic>
#include <thread>
namespace ks {
namespace {
template<class T> struct BrowserCom {
T *p{}; ~BrowserCom(){if(p)p->Release();}
T** out(){return &p;} T* operator->(){return p;}
};
std::wstring browserString(IUIAutomationElement* e, PROPERTYID id) {
VARIANT v;VariantInit(&v);std::wstring s;
if(SUCCEEDED(e->GetCurrentPropertyValue(id,&v)) && v.vt==VT_BSTR && v.bstrVal) s.assign(v.bstrVal,SysStringLen(v.bstrVal));
VariantClear(&v);return s;
}
struct ChromeElements { BrowserCom<IUIAutomationElement> address,document,header; int addresses{},documents{}; };
void findChromeElements(IUIAutomationTreeWalker* walker,IUIAutomationElement* e,ChromeElements& found,int depth,int& budget) {
if(depth>12 || --budget<0)return;
CONTROLTYPEID type{};BOOL offscreen=TRUE;e->get_CurrentControlType(&type);e->get_CurrentIsOffscreen(&offscreen);
if(type==UIA_DocumentControlTypeId){
if(!offscreen && browserString(e,UIA_AutomationIdPropertyId)==L"RootWebArea"){
if(++found.documents==1){e->AddRef();found.document.p=e;}}
return; // Never traverse message content.
}
if(type==UIA_EditControlTypeId && !offscreen && browserString(e,UIA_ClassNamePropertyId)==L"OmniboxViewViews"){
if(++found.addresses==1){e->AddRef();found.address.p=e;}}
BrowserCom<IUIAutomationElement> child;walker->GetFirstChildElement(e,child.out());
while(child.p && budget>0){findChromeElements(walker,child.p,found,depth+1,budget);BrowserCom<IUIAutomationElement> next;walker->GetNextSiblingElement(child.p,next.out());child.p->Release();child.p=next.p;next.p=nullptr;}
}
IUIAutomationElement* chromeHeader(IUIAutomationTreeWalker* walker,IUIAutomationElement* document) {
// Web K's center pane is separate from its chat list and message history.
std::function<IUIAutomationElement*(IUIAutomationElement*,int)> center;
center=[&](IUIAutomationElement* e,int depth)->IUIAutomationElement* {
if(depth>3)return nullptr;
if(browserString(e,UIA_AutomationIdPropertyId)==L"column-center"){e->AddRef();return e;}
auto id=browserString(e,UIA_AutomationIdPropertyId);if(id==L"column-left"||id==L"column-right")return nullptr;
BrowserCom<IUIAutomationElement> c;walker->GetFirstChildElement(e,c.out());int limit=12;
while(c.p && --limit>0){if(auto result=center(c.p,depth+1))return result;BrowserCom<IUIAutomationElement> next;walker->GetNextSiblingElement(c.p,next.out());c.p->Release();c.p=next.p;next.p=nullptr;}return nullptr;
};
BrowserCom<IUIAutomationElement> pane;pane.p=center(document,0);if(!pane.p)return nullptr;
BrowserCom<IUIAutomationElement> header;walker->GetFirstChildElement(pane.p,header.out());if(!header.p)return nullptr;
BrowserCom<IUIAutomationElement> c;walker->GetFirstChildElement(header.p,c.out());int limit=16,buttons=0;IUIAutomationElement* title{};
while(c.p && --limit>0){CONTROLTYPEID type{};c->get_CurrentControlType(&type);if(type==UIA_ButtonControlTypeId)++buttons;
if(type==UIA_TextControlTypeId && !title){title=c.p;title->AddRef();}
BrowserCom<IUIAutomationElement> next;walker->GetNextSiblingElement(c.p,next.out());c.p->Release();c.p=next.p;next.p=nullptr;}
if(buttons<2 && title){title->Release();title=nullptr;}return title;
}
std::wstring chromeTitleKey(IUIAutomationElement* header){
if(!header)return {};
auto name=browserString(header,UIA_NamePropertyId);
if(name.empty()||name.size()>512||name.find_first_of(L"\r\n")!=name.npos)return {};
return L"telegram-web\n"+name;
}
std::wstring chromeSnapshot(IUIAutomation* uia,HWND window,ChromeElements& found) {
if(!IsWindow(window)||IsIconic(window)||lower(processName(window))!=L"chrome")return {};
BrowserCom<IUIAutomationElement> root;BrowserCom<IUIAutomationTreeWalker> walker;
if(FAILED(uia->ElementFromHandle(window,root.out()))||!root.p||FAILED(uia->get_ControlViewWalker(walker.out())))return {};
int budget=250;findChromeElements(walker.p,root.p,found,0,budget);
if(found.addresses!=1||found.documents!=1)return {};
auto address=telegramWebKey(browserString(found.address.p,UIA_ValueValuePropertyId));
auto document=telegramWebKey(browserString(found.document.p,UIA_ValueValuePropertyId));
BOOL editing=FALSE;found.address->get_CurrentHasKeyboardFocus(&editing);
if(editing || address.empty() || address!=document)return {};
found.header.p=chromeHeader(walker.p,found.document.p);
return chromeTitleKey(found.header.p);
}
std::mutex browserMutex;
HWND browserWindow{};std::wstring browserKey;
std::atomic<DWORD> browserThreadId{};
std::atomic<bool> browserPending{}, browserStopping{};
std::thread browserThread;
void invalidateBrowser(){std::lock_guard lock(browserMutex);browserKey.clear();}
void requestBrowser(){invalidateBrowser();auto id=browserThreadId.load();if(id && !browserPending.exchange(true))PostThreadMessageW(id,WM_APP+61,0,0);}
void CALLBACK browserForeground(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD){requestBrowser();}
class BrowserChanged final: public IUIAutomationPropertyChangedEventHandler {
std::atomic<ULONG> refs{1};
public:
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,void** out) override {if(!out)return E_POINTER;*out=nullptr;if(iid==IID_IUnknown||iid==IID_IUIAutomationPropertyChangedEventHandler){*out=static_cast<IUIAutomationPropertyChangedEventHandler*>(this);AddRef();return S_OK;}return E_NOINTERFACE;}
ULONG STDMETHODCALLTYPE AddRef() override{return ++refs;}
ULONG STDMETHODCALLTYPE Release() override{auto n=--refs;if(!n)delete this;return n;}
HRESULT STDMETHODCALLTYPE HandlePropertyChangedEvent(IUIAutomationElement*,PROPERTYID,VARIANT) override {requestBrowser();return S_OK;}
};
}
std::wstring readChromeChat(HWND window) {
auto hr=CoInitializeEx(nullptr,COINIT_MULTITHREADED);
struct Apartment{bool own;~Apartment(){if(own)CoUninitialize();}} apartment{SUCCEEDED(hr)};
BrowserCom<IUIAutomation2> uia;
if(FAILED(CoCreateInstance(CLSID_CUIAutomation8,nullptr,CLSCTX_INPROC_SERVER,IID_IUIAutomation2,(void**)uia.out())))return {};
uia->put_ConnectionTimeout(150);uia->put_TransactionTimeout(150);
ChromeElements elements;return chromeSnapshot(uia.p,window,elements);
}
std::wstring cachedChromeChat(HWND window){std::lock_guard lock(browserMutex);return window==browserWindow?browserKey:L"";}
void startBrowserChatMonitor(){
if(browserThread.joinable())return;
browserStopping=false;
browserThread=std::thread([] {
CoInitializeEx(nullptr,COINIT_MULTITHREADED);MSG message{};PeekMessageW(&message,nullptr,0,0,PM_NOREMOVE);
browserThreadId=GetCurrentThreadId();
auto foreground=SetWinEventHook(EVENT_SYSTEM_FOREGROUND,EVENT_SYSTEM_FOREGROUND,nullptr,browserForeground,0,0,WINEVENT_OUTOFCONTEXT);
// Focus changes cover tab selection and entering/leaving the address bar.
auto focus=SetWinEventHook(EVENT_OBJECT_FOCUS,EVENT_OBJECT_FOCUS,nullptr,browserForeground,0,0,WINEVENT_OUTOFCONTEXT);
BrowserCom<IUIAutomation2> uia;CoCreateInstance(CLSID_CUIAutomation8,nullptr,CLSCTX_INPROC_SERVER,IID_IUIAutomation2,(void**)uia.out());
BrowserCom<IUIAutomationElement> address,document,header;BrowserCom<BrowserChanged> handler;handler.p=new BrowserChanged;
if(uia.p){uia->put_ConnectionTimeout(150);uia->put_TransactionTimeout(150);}
requestBrowser();
if(browserStopping)PostThreadMessageW(GetCurrentThreadId(),WM_QUIT,0,0);
while(GetMessageW(&message,nullptr,0,0)>0){
if(message.message!=WM_APP+61){TranslateMessage(&message);DispatchMessageW(&message);continue;}
browserPending=false;
if(!uia.p)continue;
if(address.p){uia->RemovePropertyChangedEventHandler(address.p,handler.p);address.p->Release();address.p=nullptr;}
if(document.p){uia->RemovePropertyChangedEventHandler(document.p,handler.p);document.p->Release();document.p=nullptr;}
if(header.p){uia->RemovePropertyChangedEventHandler(header.p,handler.p);header.p->Release();header.p=nullptr;}
auto window=GetForegroundWindow();ChromeElements elements;auto key=chromeSnapshot(uia.p,window,elements);
PROPERTYID properties[]={UIA_ValueValuePropertyId};
bool subscribed=elements.address.p && elements.document.p;
if(subscribed){address.p=elements.address.p;elements.address.p=nullptr;document.p=elements.document.p;elements.document.p=nullptr;
subscribed=SUCCEEDED(uia->AddPropertyChangedEventHandlerNativeArray(address.p,TreeScope_Element,nullptr,handler.p,properties,1));
subscribed=SUCCEEDED(uia->AddPropertyChangedEventHandlerNativeArray(document.p,TreeScope_Element,nullptr,handler.p,properties,1)) && subscribed;
if(elements.header.p){header.p=elements.header.p;elements.header.p=nullptr;PROPERTYID nameProperty=UIA_NamePropertyId;
subscribed=SUCCEEDED(uia->AddPropertyChangedEventHandlerNativeArray(header.p,TreeScope_Element,nullptr,handler.p,&nameProperty,1)) && subscribed;}
// Close the read/subscribe race without scanning the content tree.
key=telegramWebKey(browserString(address.p,UIA_ValueValuePropertyId));
if(key.empty() || key!=telegramWebKey(browserString(document.p,UIA_ValueValuePropertyId)))key.clear();
else key=chromeTitleKey(header.p);
BOOL editing=FALSE;address->get_CurrentHasKeyboardFocus(&editing);if(editing)key.clear();
}
std::lock_guard lock(browserMutex);browserWindow=window;browserKey=subscribed && !browserPending && window==GetForegroundWindow()?key:L"";
}
browserThreadId=0;
if(foreground)UnhookWinEvent(foreground);
if(focus)UnhookWinEvent(focus);
if(uia.p){if(header.p)uia->RemovePropertyChangedEventHandler(header.p,handler.p);if(address.p)uia->RemovePropertyChangedEventHandler(address.p,handler.p);if(document.p)uia->RemovePropertyChangedEventHandler(document.p,handler.p);}
invalidateBrowser();
// COM objects release before uninitializing the apartment below.
if(header.p){header.p->Release();header.p=nullptr;}
if(address.p){address.p->Release();address.p=nullptr;}if(document.p){document.p->Release();document.p=nullptr;}
if(uia.p){uia.p->Release();uia.p=nullptr;}CoUninitialize();
});
}
void stopBrowserChatMonitor(){browserStopping=true;auto id=browserThreadId.load();if(id)PostThreadMessageW(id,WM_QUIT,0,0);if(browserThread.joinable())browserThread.join();browserPending=false;}
}
+119
View File
@@ -0,0 +1,119 @@
#pragma once
#include "platform.h"
#include <algorithm>
namespace ks
{
inline std::wstring telegramWebKey(std::wstring url)
{
if (url.starts_with(L"https://")) url.erase(0, 8);
const std::wstring host = L"web.telegram.org/";
if (!url.starts_with(host)) return {};
url.erase(0, host.size());
if (!(url.starts_with(L"k/#") || url.starts_with(L"a/#"))) return {};
auto peer = url.substr(3);
if (peer.empty() || peer.size() > 128) return {};
if (peer.front() == L'@')
{
peer = lower(peer);
if (peer.size() < 2 || peer.find_first_not_of(L"abcdefghijklmnopqrstuvwxyz0123456789_", 1) != peer.npos) return {};
}
else
{
auto first = peer.front() == L'-' ? 1u : 0u;
if (first == peer.size() || peer.find_first_not_of(L"0123456789", first) != peer.npos) return {};
}
return L"telegram-web\n" + peer;
}
std::wstring readChromeChat(HWND);
std::wstring cachedChromeChat(HWND);
void startBrowserChatMonitor();
void stopBrowserChatMonitor();
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)
{
if (window && lower(processName(window)) == L"chrome") return cachedChromeChat(window);
return window ? chatKey(processName(window), chatTitle(window)) : L"";
}
inline std::vector<std::wstring> chatCycle(const Settings &settings, const std::wstring &key,
const std::vector<Layout> &layouts)
{
auto found = settings.chatCycles.find(key);
if (key.empty() || found == settings.chatCycles.end()) return settings.cycle;
std::vector<std::wstring> 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<std::wstring> &cycle, const std::vector<Layout> &layouts,
HKL current, bool reverse)
{
std::vector<HKL> 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];
}
}
+15
View File
@@ -6,6 +6,21 @@
namespace ks namespace ks
{ {
std::wstring snippetAppName(std::wstring name)
{
auto first = name.find_first_not_of(L" \t"), last = name.find_last_not_of(L" \t");
if (first == name.npos) return {};
name = lower(name.substr(first, last - first + 1));
if (name.ends_with(L".exe")) name.resize(name.size() - 4);
return name;
}
int snippetAppPriority(const Snippet &snippet, const std::wstring &process)
{
if (snippet.apps.empty()) return 1;
auto name = snippetAppName(process);
for (const auto &app : snippet.apps) if (snippetAppName(app) == name && !name.empty()) return 2;
return 0;
}
int HotkeyHook::update(UINT key, bool down, UINT modifiers, int HotkeyHook::update(UINT key, bool down, UINT modifiers,
const std::vector<std::pair<int, Hotkey>> &bindings) const std::vector<std::pair<int, Hotkey>> &bindings)
{ {
+5
View File
@@ -32,7 +32,10 @@ struct Snippet
{ {
std::wstring trigger, text; std::wstring trigger, text;
std::wstring id; std::wstring id;
std::vector<std::wstring> apps; // Empty means everywhere; executable names without .exe.
}; };
std::wstring snippetAppName(std::wstring);
int snippetAppPriority(const Snippet &, const std::wstring &process);
std::wstring snippetId(const Snippet &); std::wstring snippetId(const Snippet &);
std::wstring newSnippetId(); std::wstring newSnippetId();
struct Template struct Template
@@ -76,6 +79,8 @@ struct Settings
translit = L"Ctrl+Alt+Shift+T", undo = L"Ctrl+Alt+Shift+Z", clipboard = L"Win+V", translit = L"Ctrl+Alt+Shift+T", undo = L"Ctrl+Alt+Shift+Z", clipboard = L"Win+V",
screenshot = L"Win+Shift+S"; screenshot = L"Win+Shift+S";
std::vector<std::wstring> cycle, direct, directIds; std::vector<std::wstring> cycle, direct, directIds;
// Exact application + visible chat name; an absent entry uses the global cycle.
std::map<std::wstring, std::vector<std::wstring>> chatCycles;
std::vector<std::wstring> excluded{L"KeePass", L"KeePassXC", L"1Password", L"Bitwarden"}; std::vector<std::wstring> excluded{L"KeePass", L"KeePassXC", L"1Password", L"Bitwarden"};
std::vector<Snippet> snippets; std::vector<Snippet> snippets;
std::vector<std::wstring> snippetTombstones; std::vector<std::wstring> snippetTombstones;
+3 -1
View File
@@ -435,7 +435,7 @@ bool needsSelectionDelay(HWND target)
{ {
const auto name = lower(processName(target)); const auto name = lower(processName(target));
return name == L"ms-teams" || name == L"msedgewebview2" || return name == L"ms-teams" || name == L"msedgewebview2" ||
name == L"chrome" || name == L"msedge"; name == L"chrome" || name == L"msedge" || name == L"chatgpt" || name == L"codex";
} }
bool selectPrevious(size_t count, const std::function<bool()> &valid) bool selectPrevious(size_t count, const std::function<bool()> &valid)
{ {
@@ -733,3 +733,5 @@ void log(const std::wstring &message)
} }
} }
} // namespace ks } // namespace ks
#include "browser_chat.inc"
+106 -21
View File
@@ -54,7 +54,7 @@ bool confirmScreenshotClose(HWND owner)
// If Windows cannot display the confirmation, keep the screenshot open. // If Windows cannot display the confirmation, keep the screenshot open.
return SUCCEEDED(result) && button==IDYES; return SUCCEEDED(result) && button==IDYES;
} }
constexpr int ToolIds[]{27,10,11,22,23,24,25,36,37,21,19,26,20,12,18,13}; constexpr int ToolIds[]{27,10,11,22,23,24,25,36,37,38,21,19,26,20,12,18,13};
struct Surface struct Surface
{ {
HDC dc = CreateCompatibleDC(nullptr); HDC dc = CreateCompatibleDC(nullptr);
@@ -124,7 +124,7 @@ bool chooseTextFont(HWND owner,Mark &m)
m.fontWeight=font.lfWeight; m.fontItalic=font.lfItalic!=0; m.fontWeight=font.lfWeight; m.fontItalic=font.lfItalic!=0;
return true; return true;
} }
constexpr int CursorTools[]{10,11,22,23,24,25,36,37,19}; constexpr int CursorTools[]{10,11,22,23,24,25,36,37,38,19};
HCURSOR makeToolCursor(int tool,int size) HCURSOR makeToolCursor(int tool,int size)
{ {
// Monochrome AND/XOR cursor: white outline keeps the glyph visible on dark images. // Monochrome AND/XOR cursor: white outline keeps the glyph visible on dark images.
@@ -148,6 +148,7 @@ HCURSOR makeToolCursor(int tool,int size)
case 22: line(18,29,29,18); break; case 22: line(18,29,29,18); break;
case 23: Rectangle(dc,x(17),y(18),x(30),y(29)); break; case 23: Rectangle(dc,x(17),y(18),x(30),y(29)); break;
case 24: Ellipse(dc,x(17),y(17),x(30),y(30)); break; case 24: Ellipse(dc,x(17),y(17),x(30),y(30)); break;
case 38: Arc(dc,x(16),y(18),x(31),y(38),x(31),y(28),x(16),y(28)); break;
case 25: Ellipse(dc,x(16),y(20),x(31),y(28)); break; case 25: Ellipse(dc,x(16),y(20),x(31),y(28)); break;
case 36: { POINT p[]{{x(23),y(17)},{x(31),y(30)},{x(16),y(30)},{x(23),y(17)}}; Polyline(dc,p,4); break; } case 36: { POINT p[]{{x(23),y(17)},{x(31),y(30)},{x(16),y(30)},{x(23),y(17)}}; Polyline(dc,p,4); break; }
case 37: { POINT p[]{{x(20),y(18)},{x(27),y(18)},{x(31),y(30)},{x(16),y(30)},{x(20),y(18)}}; Polyline(dc,p,5); break; } case 37: { POINT p[]{{x(20),y(18)},{x(27),y(18)},{x(31),y(30)},{x(16),y(30)},{x(20),y(18)}}; Polyline(dc,p,5); break; }
@@ -177,6 +178,8 @@ struct Capture
Mark textDefaults{}; Mark textDefaults{};
ScreenshotShape shape=ScreenshotShape::None; ScreenshotShape shape=ScreenshotShape::None;
LineStyle lineStyle=LineStyle::Solid; LineStyle lineStyle=LineStyle::Solid;
int smoothing=25;
bool smoothingDrag=false;
LineEnds arrowEnds=LineEnds::End, freehandEnds=LineEnds::None; LineEnds arrowEnds=LineEnds::End, freehandEnds=LineEnds::None;
COLORREF currentColor=RGB(225,42,50); COLORREF currentColor=RGB(225,42,50);
COLORREF customColors[16]{}; COLORREF customColors[16]{};
@@ -268,6 +271,7 @@ void updateStatus(Capture &c)
else if(c.textTool) text=L"Text (T): click the image to type | Double-click existing text to edit"; else if(c.textTool) text=L"Text (T): click the image to type | Double-click existing text to edit";
else if(c.highlight) text=L"Highlight (H): drag to paint | Ctrl+drag = paint over an object | V = pointer"; else if(c.highlight) text=L"Highlight (H): drag to paint | Ctrl+drag = paint over an object | V = pointer";
else if(c.freehand) text=L"Freehand (F): auto-smooth / shapes; Ctrl+Z restores original | Shift = 45-degree steps | Ctrl = draw over objects"; else if(c.freehand) text=L"Freehand (F): auto-smooth / shapes; Ctrl+Z restores original | Shift = 45-degree steps | Ctrl = draw over objects";
else if(c.shape==ScreenshotShape::Arc) text=L"Arc (U): drag to draw a half ellipse | Handles = resize / rotate | V = pointer";
else if(c.arrow) text=L"Drag to draw | Ctrl+drag over objects = linked connector | V = pointer"; else if(c.arrow) text=L"Drag to draw | Ctrl+drag over objects = linked connector | V = pointer";
else text=L"Number (N): click to add | V = select and edit | Ctrl+C = copy screenshot"; else text=L"Number (N): click to add | V = select and edit | Ctrl+C = copy screenshot";
text=L"Zoom: "+std::to_wstring(int(std::lround(100.0*(c.view.right-c.view.left)/c.image->width)))+ text=L"Zoom: "+std::to_wstring(int(std::lround(100.0*(c.view.right-c.view.left)/c.image->width)))+
@@ -409,6 +413,14 @@ std::vector<POINT> shapeOutline(const Mark &m)
auto r=region(m.from,m.to); auto r=region(m.from,m.to);
if(m.shape==ScreenshotShape::Rectangle) if(m.shape==ScreenshotShape::Rectangle)
points={{r.left,r.top},{r.right,r.top},{r.right,r.bottom},{r.left,r.bottom},{r.left,r.top}}; points={{r.left,r.top},{r.right,r.top},{r.right,r.bottom},{r.left,r.bottom},{r.left,r.top}};
else if(m.shape==ScreenshotShape::Arc) {
// An open half ellipse spanning the drag rectangle, with no closing chord.
for(int i=0;i<=90;++i) {
double a=i*3.141592653589793/90;
points.push_back({LONG(std::lround((r.left+r.right)/2.0-(r.right-r.left)/2.0*std::cos(a))),
LONG(std::lround(r.bottom-(r.bottom-r.top)*std::sin(a)))});
}
}
else if(m.shape==ScreenshotShape::Triangle) else if(m.shape==ScreenshotShape::Triangle)
points={{(r.left+r.right)/2,r.top},{r.right,r.bottom},{r.left,r.bottom},{(r.left+r.right)/2,r.top}}; points={{(r.left+r.right)/2,r.top},{r.right,r.bottom},{r.left,r.bottom},{(r.left+r.right)/2,r.top}};
else if(m.shape==ScreenshotShape::Trapezoid) else if(m.shape==ScreenshotShape::Trapezoid)
@@ -550,7 +562,7 @@ void drawMarks(HDC dc, const std::vector<Mark> &marks, const Mark *preview = nul
if(m.shape!=ScreenshotShape::None) { if(m.shape!=ScreenshotShape::None) {
auto hollow=SelectObject(dc,GetStockObject(HOLLOW_BRUSH)); auto hollow=SelectObject(dc,GetStockObject(HOLLOW_BRUSH));
auto r=region(m.from,m.to); auto r=region(m.from,m.to);
if(!m.points.empty() || m.rotation!=0 || m.shape==ScreenshotShape::Triangle || m.shape==ScreenshotShape::Trapezoid) { if(!m.points.empty() || m.rotation!=0 || m.shape==ScreenshotShape::Triangle || m.shape==ScreenshotShape::Trapezoid || m.shape==ScreenshotShape::Arc) {
auto points=shapeOutline(m); Polyline(dc,points.data(),int(points.size())); auto points=shapeOutline(m); Polyline(dc,points.data(),int(points.size()));
} }
else if(m.shape==ScreenshotShape::Rectangle) Rectangle(dc,r.left,r.top,r.right+1,r.bottom+1); else if(m.shape==ScreenshotShape::Rectangle) Rectangle(dc,r.left,r.top,r.right+1,r.bottom+1);
@@ -620,6 +632,13 @@ bool selectedLine(const Capture &c)
} }
void syncLineOptions(HWND w,const Capture &c) void syncLineOptions(HWND w,const Capture &c)
{ {
bool pencil=c.selected>=0 && c.marks[c.selected].freehand;
int amount=pencil?c.marks[c.selected].smoothing:c.smoothing;
SendDlgItemMessageW(w,41,TBM_SETPOS,TRUE,amount);
auto smoothingText=L"Smoothing: "+std::to_wstring(amount)+L"%";
SetDlgItemTextW(w,42,smoothingText.c_str());
SetDlgItemTextW(w,43,pencil?L"Selected stroke":L"New pencil strokes");
EnableWindow(GetDlgItem(w,44),std::any_of(c.marks.begin(),c.marks.end(),[](const Mark &m){return m.freehand;}));
EnableWindow(GetDlgItem(w,34),c.textTool || (c.selected>=0 && (c.marks[c.selected].isText() || !c.marks[c.selected].label.empty()))); EnableWindow(GetDlgItem(w,34),c.textTool || (c.selected>=0 && (c.marks[c.selected].isText() || !c.marks[c.selected].label.empty())));
EnableWindow(GetDlgItem(w,35),c.selected>=0 && c.marks[c.selected].isLine()); EnableWindow(GetDlgItem(w,35),c.selected>=0 && c.marks[c.selected].isLine());
bool selected=selectedLine(c),enabled=selected || c.arrow || c.freehand; bool selected=selectedLine(c),enabled=selected || c.arrow || c.freehand;
@@ -668,7 +687,7 @@ void layout(HWND w, Capture &c)
RECT statusRect{}; GetWindowRect(status,&statusRect); RECT statusRect{}; GetWindowRect(status,&statusRect);
c.statusHeight=statusRect.bottom-statusRect.top; c.statusHeight=statusRect.bottom-statusRect.top;
r.bottom-=c.statusHeight; r.bottom-=c.statusHeight;
const int positions[]{8,44,80,116,152,188,224,260,296,332,368,404,440,488,524,572}; const int positions[]{8,44,80,116,152,188,224,260,296,332,368,404,440,476,524,560,608};
static_assert(std::size(positions)==std::size(ToolIds)); static_assert(std::size(positions)==std::size(ToolIds));
for (size_t i = 0; i < std::size(ToolIds); ++i) for (size_t i = 0; i < std::size(ToolIds); ++i)
{ {
@@ -677,10 +696,14 @@ void layout(HWND w, Capture &c)
MulDiv(32,dpi,96),MulDiv(32,dpi,96),TRUE); MulDiv(32,dpi,96),MulDiv(32,dpi,96),TRUE);
} }
SendDlgItemMessageW(w,28,WM_SETFONT,(WPARAM)c.font,TRUE); SendDlgItemMessageW(w,28,WM_SETFONT,(WPARAM)c.font,TRUE);
MoveWindow(GetDlgItem(w,28),MulDiv(612,dpi,96),MulDiv(6,dpi,96), MoveWindow(GetDlgItem(w,28),MulDiv(648,dpi,96),MulDiv(6,dpi,96),
MulDiv(78,dpi,96),MulDiv(32,dpi,96),TRUE); MulDiv(78,dpi,96),MulDiv(32,dpi,96),TRUE);
c.panelHeight=c.unit+MulDiv(40,dpi,96); c.panelHeight=c.unit+MulDiv(80,dpi,96);
for(int id:{30,31,32,33,34,35}) SendDlgItemMessageW(w,id,WM_SETFONT,(WPARAM)c.font,TRUE); for(int id:{30,31,32,33,34,35,41,42,43,44}) SendDlgItemMessageW(w,id,WM_SETFONT,(WPARAM)c.font,TRUE);
MoveWindow(GetDlgItem(w,42),MulDiv(12,dpi,96),c.unit+MulDiv(44,dpi,96),MulDiv(128,dpi,96),MulDiv(24,dpi,96),TRUE);
MoveWindow(GetDlgItem(w,41),MulDiv(142,dpi,96),c.unit+MulDiv(40,dpi,96),MulDiv(200,dpi,96),MulDiv(30,dpi,96),TRUE);
MoveWindow(GetDlgItem(w,43),MulDiv(350,dpi,96),c.unit+MulDiv(44,dpi,96),MulDiv(150,dpi,96),MulDiv(24,dpi,96),TRUE);
MoveWindow(GetDlgItem(w,44),MulDiv(516,dpi,96),c.unit+MulDiv(40,dpi,96),MulDiv(210,dpi,96),MulDiv(30,dpi,96),TRUE);
MoveWindow(GetDlgItem(w,32),MulDiv(12,dpi,96),c.unit+MulDiv(6,dpi,96),MulDiv(64,dpi,96),MulDiv(24,dpi,96),TRUE); MoveWindow(GetDlgItem(w,32),MulDiv(12,dpi,96),c.unit+MulDiv(6,dpi,96),MulDiv(64,dpi,96),MulDiv(24,dpi,96),TRUE);
MoveWindow(GetDlgItem(w,30),MulDiv(80,dpi,96),c.unit+MulDiv(2,dpi,96),MulDiv(150,dpi,96),MulDiv(180,dpi,96),TRUE); MoveWindow(GetDlgItem(w,30),MulDiv(80,dpi,96),c.unit+MulDiv(2,dpi,96),MulDiv(150,dpi,96),MulDiv(180,dpi,96),TRUE);
MoveWindow(GetDlgItem(w,33),MulDiv(248,dpi,96),c.unit+MulDiv(6,dpi,96),MulDiv(40,dpi,96),MulDiv(24,dpi,96),TRUE); MoveWindow(GetDlgItem(w,33),MulDiv(248,dpi,96),c.unit+MulDiv(6,dpi,96),MulDiv(40,dpi,96),MulDiv(24,dpi,96),TRUE);
@@ -771,7 +794,7 @@ HCURSOR toolCursor(const Capture &c)
if(c.pointer) return LoadCursorW(nullptr,IDC_ARROW); if(c.pointer) return LoadCursorW(nullptr,IDC_ARROW);
if(c.textTool) return LoadCursorW(nullptr,IDC_IBEAM); if(c.textTool) return LoadCursorW(nullptr,IDC_IBEAM);
if(c.freehand && c.pencilCursor) return c.pencilCursor; if(c.freehand && c.pencilCursor) return c.pencilCursor;
int tool=c.highlight?19:c.straight?22:c.shape==ScreenshotShape::Trapezoid?37:c.shape==ScreenshotShape::Triangle?36:c.shape!=ScreenshotShape::None?22+int(c.shape):c.arrow?11:10; int tool=c.highlight?19:c.straight?22:c.shape==ScreenshotShape::Arc?38:c.shape==ScreenshotShape::Trapezoid?37:c.shape==ScreenshotShape::Triangle?36:c.shape!=ScreenshotShape::None?22+int(c.shape):c.arrow?11:10;
for(size_t i=0;i<std::size(CursorTools);++i) for(size_t i=0;i<std::size(CursorTools);++i)
if(CursorTools[i]==tool && c.drawingCursors[i]) return c.drawingCursors[i]; if(CursorTools[i]==tool && c.drawingCursors[i]) return c.drawingCursors[i];
return LoadCursorW(nullptr,IDC_CROSS); return LoadCursorW(nullptr,IDC_CROSS);
@@ -883,7 +906,7 @@ void drawTool(const DRAWITEMSTRUCT &item, const Capture &c)
bool active=(item.CtlID==27 && c.pointer)||(item.CtlID==10 && !c.pointer && !c.arrow && !c.highlight && !c.freehand && !c.textTool)||(item.CtlID==11 && c.arrow && !c.straight && c.shape==ScreenshotShape::None)|| bool active=(item.CtlID==27 && c.pointer)||(item.CtlID==10 && !c.pointer && !c.arrow && !c.highlight && !c.freehand && !c.textTool)||(item.CtlID==11 && c.arrow && !c.straight && c.shape==ScreenshotShape::None)||
(item.CtlID==19 && c.highlight)||(item.CtlID==21 && c.freehand)|| (item.CtlID==19 && c.highlight)||(item.CtlID==21 && c.freehand)||
(item.CtlID==22 && c.straight)||(item.CtlID>=23 && item.CtlID<=25 && int(c.shape)==int(item.CtlID)-22)||(item.CtlID==26 && c.textTool)|| (item.CtlID==22 && c.straight)||(item.CtlID>=23 && item.CtlID<=25 && int(c.shape)==int(item.CtlID)-22)||(item.CtlID==26 && c.textTool)||
(item.CtlID==36 && c.shape==ScreenshotShape::Triangle)||(item.CtlID==37 && c.shape==ScreenshotShape::Trapezoid); (item.CtlID==36 && c.shape==ScreenshotShape::Triangle)||(item.CtlID==37 && c.shape==ScreenshotShape::Trapezoid)||(item.CtlID==38 && c.shape==ScreenshotShape::Arc);
bool disabled=item.itemState&ODS_DISABLED; bool disabled=item.itemState&ODS_DISABLED;
POINT mouse; GetCursorPos(&mouse); ScreenToClient(item.hwndItem,&mouse); POINT mouse; GetCursorPos(&mouse); ScreenToClient(item.hwndItem,&mouse);
bool hover=PtInRect(&r,mouse) && !disabled; bool hover=PtInRect(&r,mouse) && !disabled;
@@ -897,13 +920,14 @@ void drawTool(const DRAWITEMSTRUCT &item, const Capture &c)
RoundRect(dc,r.left,r.top,r.right,r.bottom,corner,corner); RoundRect(dc,r.left,r.top,r.right,r.bottom,corner,corner);
SelectObject(dc,oldPen); SelectObject(dc,oldBrush); DeleteObject(pen); DeleteObject(brush); SelectObject(dc,oldPen); SelectObject(dc,oldBrush); DeleteObject(pen); DeleteObject(brush);
int iconIndex=item.CtlID==35?13:item.CtlID==34?14:item.CtlID>=22?int(item.CtlID)-13:item.CtlID==18?5:item.CtlID==19?6:item.CtlID==20?7:item.CtlID==21?8:item.CtlID-10; int iconIndex=item.CtlID==35?13:item.CtlID==34?14:item.CtlID>=22?int(item.CtlID)-13:item.CtlID==18?5:item.CtlID==19?6:item.CtlID==20?7:item.CtlID==21?8:item.CtlID-10;
auto icon=(item.CtlID==36 || item.CtlID==37)?nullptr:item.CtlID==27?(HICON)LoadCursorW(nullptr,IDC_ARROW):c.toolIcons[disabled?2:active?1:0][iconIndex]; auto icon=(item.CtlID==36 || item.CtlID==37 || item.CtlID==38)?nullptr:item.CtlID==27?(HICON)LoadCursorW(nullptr,IDC_ARROW):c.toolIcons[disabled?2:active?1:0][iconIndex];
if(item.CtlID==36 || item.CtlID==37) { if(item.CtlID==36 || item.CtlID==37 || item.CtlID==38) {
int cx=(r.left+r.right)/2,cy=(r.top+r.bottom)/2,s=c.iconSize/2; int cx=(r.left+r.right)/2,cy=(r.top+r.bottom)/2,s=c.iconSize/2;
auto trianglePen=CreatePen(PS_SOLID,std::max(1,MulDiv(2,GetDpiForWindow(item.hwndItem),96)), auto trianglePen=CreatePen(PS_SOLID,std::max(1,MulDiv(2,GetDpiForWindow(item.hwndItem),96)),
disabled?RGB(148,163,184):active?RGB(37,99,235):RGB(51,65,85)); disabled?RGB(148,163,184):active?RGB(37,99,235):RGB(51,65,85));
auto previous=SelectObject(dc,trianglePen); auto previous=SelectObject(dc,trianglePen);
if(item.CtlID==36) { POINT vertices[]{{cx,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx,cy-s}}; Polyline(dc,vertices,4); } if(item.CtlID==38) Arc(dc,cx-s,cy-s,cx+s,cy+3*s,cx+s,cy+s,cx-s,cy+s);
else if(item.CtlID==36) { POINT vertices[]{{cx,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx,cy-s}}; Polyline(dc,vertices,4); }
else { POINT vertices[]{{cx-s/2,cy-s},{cx+s/2,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx-s/2,cy-s}}; Polyline(dc,vertices,5); } else { POINT vertices[]{{cx-s/2,cy-s},{cx+s/2,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx-s/2,cy-s}}; Polyline(dc,vertices,5); }
SelectObject(dc,previous); DeleteObject(trianglePen); SelectObject(dc,previous); DeleteObject(trianglePen);
} }
@@ -1025,7 +1049,7 @@ void edit(HWND w, Capture &c)
InitCommonControlsEx(&statusControls); InitCommonControlsEx(&statusControls);
CreateWindowExW(0,STATUSCLASSNAMEW,L"",WS_CHILD|WS_VISIBLE|SBARS_TOOLTIPS, CreateWindowExW(0,STATUSCLASSNAMEW,L"",WS_CHILD|WS_VISIBLE|SBARS_TOOLTIPS,
0,0,0,0,w,(HMENU)50,c.app.instance,nullptr); 0,0,0,0,w,(HMENU)50,c.app.instance,nullptr);
const wchar_t *labels[]{L"Pointer (V): select and edit objects", L"Number (N)", L"Arrow (A); Ctrl+drag between objects to link", L"Straight line (L); Ctrl+drag between objects to link", L"Rectangle (R)", L"Circle (O)", L"Ellipse (E)", L"Triangle (G): drag to draw; drag each vertex to reshape", L"Trapezoid (B): drag to draw", L"Freehand line (F); Shift for 45-degree steps; move >50 px off line to turn; Ctrl to draw over objects", L"Highlight (H); Ctrl+drag to paint over an object", const wchar_t *labels[]{L"Pointer (V): select and edit objects", L"Number (N)", L"Arrow (A); Ctrl+drag between objects to link", L"Straight line (L); Ctrl+drag between objects to link", L"Rectangle (R)", L"Circle (O)", L"Ellipse (E)", L"Triangle (G): drag to draw; drag each vertex to reshape", L"Trapezoid (B): drag to draw", L"Arc (U): drag to draw a half ellipse; use handles to resize or rotate", L"Freehand line (F); Shift for 45-degree steps; move >50 px off line to turn; Ctrl to draw over objects", L"Highlight (H); Ctrl+drag to paint over an object",
L"Text (T); double-click or F2 to edit", L"Color — selected object and new objects", L"Undo (Ctrl+Z)", L"Redo (Ctrl+Y / Ctrl+Shift+Z)", L"Copy (Ctrl+C)"}; L"Text (T); double-click or F2 to edit", L"Color — selected object and new objects", L"Undo (Ctrl+Z)", L"Redo (Ctrl+Y / Ctrl+Shift+Z)", L"Copy (Ctrl+C)"};
static_assert(std::size(labels)==std::size(ToolIds)); static_assert(std::size(labels)==std::size(ToolIds));
auto saveButton=CreateWindowW(L"BUTTON",L"Save...",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_PUSHBUTTON, auto saveButton=CreateWindowW(L"BUTTON",L"Save...",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_PUSHBUTTON,
@@ -1061,6 +1085,14 @@ void edit(HWND w, Capture &c)
SetWindowSubclass(labelButton,toolHover,1,0); SetWindowSubclass(labelButton,toolHover,1,0);
fontTip.uId=(UINT_PTR)labelButton; fontTip.lpszText=const_cast<wchar_t *>(L"Arrow label (F2 / double-click); drag label to reposition"); fontTip.uId=(UINT_PTR)labelButton; fontTip.lpszText=const_cast<wchar_t *>(L"Arrow label (F2 / double-click); drag label to reposition");
SendMessageW(tips,TTM_ADDTOOLW,0,(LPARAM)&fontTip); SendMessageW(tips,TTM_ADDTOOLW,0,(LPARAM)&fontTip);
INITCOMMONCONTROLSEX sliders{sizeof(sliders),ICC_BAR_CLASSES}; InitCommonControlsEx(&sliders);
CreateWindowW(TRACKBAR_CLASSW,L"Pencil smoothing",WS_CHILD|WS_VISIBLE|WS_TABSTOP|TBS_NOTICKS,
0,0,0,0,w,(HMENU)41,c.app.instance,nullptr);
SendDlgItemMessageW(w,41,TBM_SETRANGE,TRUE,MAKELPARAM(0,100));
SendDlgItemMessageW(w,41,TBM_SETPAGESIZE,0,10);
for(int id:{42,43}) CreateWindowW(L"STATIC",L"",WS_CHILD|WS_VISIBLE,0,0,0,0,w,(HMENU)(INT_PTR)id,c.app.instance,nullptr);
CreateWindowW(L"BUTTON",L"Apply to all strokes",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_PUSHBUTTON,
0,0,0,0,w,(HMENU)44,c.app.instance,nullptr);
c.syncHistory(); c.syncHistory();
auto work = monitor.rcWork; auto work = monitor.rcWork;
SetWindowPos(w,HWND_NOTOPMOST,work.left+20,work.top+20, SetWindowPos(w,HWND_NOTOPMOST,work.left+20,work.top+20,
@@ -1120,7 +1152,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
} }
break; break;
case WM_DRAWITEM: case WM_DRAWITEM:
if((wp>=10 && wp<=13) || (wp>=18 && wp<=27) || wp==34 || wp==35 || wp==36 || wp==37) { drawTool(*reinterpret_cast<DRAWITEMSTRUCT *>(lp),*c); return TRUE; } if((wp>=10 && wp<=13) || (wp>=18 && wp<=27) || wp==34 || wp==35 || wp==36 || wp==37 || wp==38) { drawTool(*reinterpret_cast<DRAWITEMSTRUCT *>(lp),*c); return TRUE; }
break; break;
case WM_CTLCOLORSTATIC: case WM_CTLCOLORSTATIC:
SetBkColor((HDC)wp,RGB(255,255,255)); SetTextColor((HDC)wp,RGB(51,65,85)); SetBkColor((HDC)wp,RGB(255,255,255)); SetTextColor((HDC)wp,RGB(51,65,85));
@@ -1129,6 +1161,21 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
case WM_SETCURSOR: case WM_SETCURSOR:
if ((HWND)wp==w && LOWORD(lp)==HTCLIENT) { captureCursor(w,*c); return TRUE; } if ((HWND)wp==w && LOWORD(lp)==HTCLIENT) { captureCursor(w,*c); return TRUE; }
break; break;
case WM_HSCROLL:
if((HWND)lp==GetDlgItem(w,41) && !c->dragging) {
int amount=int(SendDlgItemMessageW(w,41,TBM_GETPOS,0,0));
bool pencil=c->selected>=0 && c->marks[c->selected].freehand;
if(pencil && c->marks[c->selected].smoothing!=amount) {
if(!c->smoothingDrag) c->remember(c->marks);
setScreenshotSmoothing(c->marks[c->selected],amount);
resolveScreenshotLinks(c->marks);
c->smoothingDrag=LOWORD(wp)==TB_THUMBTRACK;
} else if(!pencil) c->smoothing=amount;
if(LOWORD(wp)!=TB_THUMBTRACK) c->smoothingDrag=false;
syncLineOptions(w,*c); InvalidateRect(w,nullptr,FALSE);
return 0;
}
break;
case WM_COMMAND: case WM_COMMAND:
if(LOWORD(wp)==40) { if(LOWORD(wp)==40) {
if(c->inlineText && HIWORD(wp)==EN_CHANGE) { readInlineText(*c); positionInlineText(*c); } if(c->inlineText && HIWORD(wp)==EN_CHANGE) { readInlineText(*c); positionInlineText(*c); }
@@ -1136,6 +1183,17 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
return 0; return 0;
} }
if (c->dragging) return 0; if (c->dragging) return 0;
if(LOWORD(wp)==44) {
int amount=int(SendDlgItemMessageW(w,41,TBM_GETPOS,0,0));
c->smoothing=amount;
if(std::any_of(c->marks.begin(),c->marks.end(),[&](const Mark &m){return m.freehand && m.smoothing!=amount;})) {
c->remember(c->marks);
for(auto &mark:c->marks) if(mark.freehand) setScreenshotSmoothing(mark,amount);
resolveScreenshotLinks(c->marks);
}
c->smoothingDrag=false; syncLineOptions(w,*c); InvalidateRect(w,nullptr,FALSE);
return 0;
}
if(LOWORD(wp)==35) { if(LOWORD(wp)==35) {
finishInlineText(w,*c,true); finishInlineText(w,*c,true);
if(c->selected>=0 && c->marks[c->selected].isLine()) beginMarkText(w,*c,c->selected); if(c->selected>=0 && c->marks[c->selected].isLine()) beginMarkText(w,*c,c->selected);
@@ -1214,13 +1272,13 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
if(changed) { c->copied=false; c->selected=-1; c->selectedLabel=false; c->wheelDelta=0; c->wheelTarget=-1; } if(changed) { c->copied=false; c->selected=-1; c->selectedLabel=false; c->wheelDelta=0; c->wheelTarget=-1; }
c->syncHistory(); c->syncHistory();
} }
if (LOWORD(wp)==10 || LOWORD(wp)==11 || LOWORD(wp)==19 || LOWORD(wp)==36 || LOWORD(wp)==37 || (LOWORD(wp)>=21 && LOWORD(wp)<=27)) if (LOWORD(wp)==10 || LOWORD(wp)==11 || LOWORD(wp)==19 || LOWORD(wp)==36 || LOWORD(wp)==37 || LOWORD(wp)==38 || (LOWORD(wp)>=21 && LOWORD(wp)<=27))
{ {
c->pointer=LOWORD(wp)==27; c->pointer=LOWORD(wp)==27;
c->arrow = LOWORD(wp)==11 || LOWORD(wp)==36 || LOWORD(wp)==37 || (LOWORD(wp)>=22 && LOWORD(wp)<=25); c->arrow = LOWORD(wp)==11 || LOWORD(wp)==36 || LOWORD(wp)==37 || LOWORD(wp)==38 || (LOWORD(wp)>=22 && LOWORD(wp)<=25);
c->straight=LOWORD(wp)==22; c->straight=LOWORD(wp)==22;
c->textTool=LOWORD(wp)==26; c->textTool=LOWORD(wp)==26;
c->shape=LOWORD(wp)==37?ScreenshotShape::Trapezoid:LOWORD(wp)==36?ScreenshotShape::Triangle:LOWORD(wp)>=23 && LOWORD(wp)<=25?ScreenshotShape(LOWORD(wp)-22):ScreenshotShape::None; c->shape=LOWORD(wp)==38?ScreenshotShape::Arc:LOWORD(wp)==37?ScreenshotShape::Trapezoid:LOWORD(wp)==36?ScreenshotShape::Triangle:LOWORD(wp)>=23 && LOWORD(wp)<=25?ScreenshotShape(LOWORD(wp)-22):ScreenshotShape::None;
c->selected=-1; c->selectedLabel=false; c->selected=-1; c->selectedLabel=false;
c->highlight=LOWORD(wp)==19; c->highlight=LOWORD(wp)==19;
c->freehand=LOWORD(wp)==21; c->freehand=LOWORD(wp)==21;
@@ -1233,6 +1291,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
for(int id=22;id<=27;++id) InvalidateRect(GetDlgItem(w,id),nullptr,FALSE); for(int id=22;id<=27;++id) InvalidateRect(GetDlgItem(w,id),nullptr,FALSE);
InvalidateRect(GetDlgItem(w,36),nullptr,FALSE); InvalidateRect(GetDlgItem(w,36),nullptr,FALSE);
InvalidateRect(GetDlgItem(w,37),nullptr,FALSE); InvalidateRect(GetDlgItem(w,37),nullptr,FALSE);
InvalidateRect(GetDlgItem(w,38),nullptr,FALSE);
} }
SetFocus(w); captureCursor(w,*c); InvalidateRect(w,nullptr,FALSE); return 0; SetFocus(w); captureCursor(w,*c); InvalidateRect(w,nullptr,FALSE); return 0;
@@ -1293,6 +1352,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
if(wp=='E') SendMessageW(w,WM_COMMAND,25,0); if(wp=='E') SendMessageW(w,WM_COMMAND,25,0);
if(wp=='G') SendMessageW(w,WM_COMMAND,36,0); if(wp=='G') SendMessageW(w,WM_COMMAND,36,0);
if(wp=='B') SendMessageW(w,WM_COMMAND,37,0); if(wp=='B') SendMessageW(w,WM_COMMAND,37,0);
if(wp=='U') SendMessageW(w,WM_COMMAND,38,0);
} }
if (wp=='N' || wp=='A') SendMessageW(w,WM_COMMAND,wp=='N'?10:11,0); if (wp=='N' || wp=='A') SendMessageW(w,WM_COMMAND,wp=='N'?10:11,0);
if(wp=='H') SendMessageW(w,WM_COMMAND,19,0); if(wp=='H') SendMessageW(w,WM_COMMAND,19,0);
@@ -1530,6 +1590,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
c->remember(c->marks); c->marks.push_back(std::move(c->stroke)); c->remember(c->marks); c->marks.push_back(std::move(c->stroke));
if(c->freehand) { if(c->freehand) {
auto &mark=c->marks.back(); auto &mark=c->marks.back();
mark.rawPoints=mark.points;
linkScreenshotEndpoint(mark,true,c->start,c->marks,6); linkScreenshotEndpoint(mark,true,c->start,c->marks,6);
linkScreenshotEndpoint(mark,false,c->end,c->marks,6); linkScreenshotEndpoint(mark,false,c->end,c->marks,6);
resolveScreenshotLinks(c->marks); resolveScreenshotLinks(c->marks);
@@ -1540,10 +1601,18 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
ScreenshotShape recognized{}; ScreenshotShape recognized{};
bool straightLine=false; bool straightLine=false;
auto improved=improveScreenshotStroke(c->marks.back().points,&recognized,&straightLine); auto improved=improveScreenshotStroke(c->marks.back().points,&recognized,&straightLine);
if(recognized==ScreenshotShape::None && !straightLine) {
improved=smoothScreenshotStroke(c->marks.back().rawPoints,c->smoothing);
const auto &raw=c->marks.back().rawPoints;
if(improved.size()==raw.size() && std::equal(improved.begin(),improved.end(),raw.begin(),
[](POINT a,POINT b){return a.x==b.x && a.y==b.y;})) improved.clear();
}
if(!improved.empty()) { if(!improved.empty()) {
c->remember(c->marks); c->remember(c->marks);
auto &mark=c->marks.back(); auto &mark=c->marks.back();
mark.points=std::move(improved); if(recognized==ScreenshotShape::None && !straightLine) {
setScreenshotSmoothing(mark,c->smoothing);
} else { mark.points=std::move(improved); mark.rawPoints.clear(); }
mark.from=mark.points.front(); mark.to=mark.points.back(); mark.from=mark.points.front(); mark.to=mark.points.back();
if(straightLine) { mark.points.clear(); mark.freehand=false; } if(straightLine) { mark.points.clear(); mark.freehand=false; }
if(recognized!=ScreenshotShape::None) { if(recognized!=ScreenshotShape::None) {
@@ -1563,7 +1632,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
c->marks.back().style=c->lineStyle; c->marks.back().ends=c->straight || c->shape!=ScreenshotShape::None?LineEnds::None:c->arrowEnds; c->marks.back().style=c->lineStyle; c->marks.back().ends=c->straight || c->shape!=ScreenshotShape::None?LineEnds::None:c->arrowEnds;
c->marks.back().shape=c->shape; c->marks.back().shape=c->shape;
auto &mark=c->marks.back(); auto &mark=c->marks.back();
if(mark.shape==ScreenshotShape::Triangle || mark.shape==ScreenshotShape::Trapezoid) mark.points=shapeOutline(mark); if(mark.shape==ScreenshotShape::Triangle || mark.shape==ScreenshotShape::Trapezoid || mark.shape==ScreenshotShape::Arc) mark.points=shapeOutline(mark);
linkScreenshotEndpoint(mark,true,c->start,c->marks,6); linkScreenshotEndpoint(mark,true,c->start,c->marks,6);
linkScreenshotEndpoint(mark,false,c->end,c->marks,6); linkScreenshotEndpoint(mark,false,c->end,c->marks,6);
resolveScreenshotLinks(c->marks); resolveScreenshotLinks(c->marks);
@@ -1586,7 +1655,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
if (c->editing) if (c->editing)
{ {
auto limits = reinterpret_cast<MINMAXINFO *>(lp); auto limits = reinterpret_cast<MINMAXINFO *>(lp);
limits->ptMinTrackSize = {MulDiv(730,GetDpiForWindow(w),96),MulDiv(240,GetDpiForWindow(w),96)}; limits->ptMinTrackSize = {MulDiv(766,GetDpiForWindow(w),96),MulDiv(240,GetDpiForWindow(w),96)};
return 0; return 0;
} }
break; break;
@@ -1901,7 +1970,14 @@ void resolveScreenshotLinks(std::vector<ScreenshotMark> &marks)
POINT start=from?from->from:m.from, end=to?to->from:m.to; POINT start=from?from->from:m.from, end=to?to->from:m.to;
if(from) m.from=rim(*from,end,true); if(from) m.from=rim(*from,end,true);
if(to) m.to=rim(*to,start,false); if(to) m.to=rim(*to,start,false);
if(m.freehand && !m.points.empty()) { m.points.front()=m.from; m.points.back()=m.to; } if(m.freehand && !m.points.empty()) {
m.points.front()=m.from; m.points.back()=m.to;
if(!m.rawPoints.empty() && (m.rawPoints.front().x!=m.from.x || m.rawPoints.front().y!=m.from.y ||
m.rawPoints.back().x!=m.to.x || m.rawPoints.back().y!=m.to.y)) {
m.rawPoints.front()=m.from; m.rawPoints.back()=m.to;
setScreenshotSmoothing(m,m.smoothing);
}
}
} }
state[index]=2; state[index]=2;
}; };
@@ -2055,10 +2131,15 @@ ScreenshotMark dragScreenshotMark(const ScreenshotMark &original, MarkPart part,
return low<=high?std::clamp(delta,low,high):0L; return low<=high?std::clamp(delta,low,high):0L;
}; };
auto bounds=markBounds(m); auto bounds=markBounds(m);
for(auto p:m.rawPoints) {
bounds.left=std::min(bounds.left,p.x); bounds.right=std::max(bounds.right,p.x);
bounds.top=std::min(bounds.top,p.y); bounds.bottom=std::max(bounds.bottom,p.y);
}
LONG dx=shift(position.x-origin.x,bounds.left,bounds.right,width); LONG dx=shift(position.x-origin.x,bounds.left,bounds.right,width);
LONG dy=shift(position.y-origin.y,bounds.top,bounds.bottom,height); LONG dy=shift(position.y-origin.y,bounds.top,bounds.bottom,height);
m.from.x+=dx; m.to.x+=dx; m.from.y+=dy; m.to.y+=dy; m.from.x+=dx; m.to.x+=dx; m.from.y+=dy; m.to.y+=dy;
for(auto &point:m.points) { point.x+=dx; point.y+=dy; } for(auto &point:m.points) { point.x+=dx; point.y+=dy; }
for(auto &point:m.rawPoints) { point.x+=dx; point.y+=dy; }
} }
else if(part==MarkPart::Start || part==MarkPart::End) else if(part==MarkPart::Start || part==MarkPart::End)
{ {
@@ -2083,6 +2164,10 @@ ScreenshotMark dragScreenshotMark(const ScreenshotMark &original, MarkPart part,
} }
} }
if(m.freehand && !m.points.empty()) (part==MarkPart::Start?m.points.front():m.points.back())=endpoint; if(m.freehand && !m.points.empty()) (part==MarkPart::Start?m.points.front():m.points.back())=endpoint;
if(m.freehand && !m.rawPoints.empty()) {
(part==MarkPart::Start?m.rawPoints.front():m.rawPoints.back())=endpoint;
setScreenshotSmoothing(m,m.smoothing);
}
if(m.shape!=ScreenshotShape::None && m.rotation!=0) { if(m.shape!=ScreenshotShape::None && m.rotation!=0) {
auto fixedBefore=rotateShapePoint(original,part==MarkPart::Start?original.to:original.from); auto fixedBefore=rotateShapePoint(original,part==MarkPart::Start?original.to:original.from);
auto fixedAfter=rotateShapePoint(m,part==MarkPart::Start?m.to:m.from); auto fixedAfter=rotateShapePoint(m,part==MarkPart::Start?m.to:m.from);
+3 -1
View File
@@ -15,7 +15,7 @@ void showScreenshot(ScreenshotHost &);
void showScreenshotEditor(ScreenshotHost &,const Clip &); void showScreenshotEditor(ScreenshotHost &,const Clip &);
enum class LineStyle { Solid, Dotted, Dashed, DashDot }; enum class LineStyle { Solid, Dotted, Dashed, DashDot };
enum class LineEnds { End, Start, Both, None }; enum class LineEnds { End, Start, Both, None };
enum class ScreenshotShape { None, Rectangle, Circle, Ellipse, Triangle, Trapezoid }; enum class ScreenshotShape { None, Rectangle, Circle, Ellipse, Triangle, Trapezoid, Arc };
struct ScreenshotOffset { double x, y; }; struct ScreenshotOffset { double x, y; };
struct ScreenshotLink { struct ScreenshotLink {
unsigned long long target{}; unsigned long long target{};
@@ -39,6 +39,8 @@ struct ScreenshotMark {
bool labelRotationManual=false; bool labelRotationManual=false;
unsigned long long id{}; unsigned long long id{};
ScreenshotLink fromLink, toLink; ScreenshotLink fromLink, toLink;
std::vector<POINT> rawPoints; // Original pencil path for reversible smoothing.
int smoothing=0; // 0..100; applies only to freehand strokes.
bool isText() const { return !text.empty(); } bool isText() const { return !text.empty(); }
bool isHighlight() const { return !points.empty() && !freehand && shape==ScreenshotShape::None; } bool isHighlight() const { return !points.empty() && !freehand && shape==ScreenshotShape::None; }
bool isLine() const { return !number && !isText() && !isHighlight() && shape==ScreenshotShape::None; } bool isLine() const { return !number && !isText() && !isHighlight() && shape==ScreenshotShape::None; }
+78 -5
View File
@@ -61,6 +61,25 @@ bool validId(const std::wstring &id)
} // namespace } // namespace
void validateSettings(const Settings &s) 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" && key.substr(0, separator) != L"viber" && key.substr(0, separator) != L"telegram-web"))
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<std::wstring> 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) if (s.tesseractPath.size() > 32700 || s.tesseractPath.find_first_of(L"\r\n\"") != s.tesseractPath.npos)
throw std::runtime_error("Invalid Tesseract executable path"); throw std::runtime_error("Invalid Tesseract executable path");
if (s.tesseractLanguages.empty() || s.tesseractLanguages.size() > 128 || if (s.tesseractLanguages.empty() || s.tesseractLanguages.size() > 128 ||
@@ -118,9 +137,11 @@ void validateSettings(const Settings &s)
L"абвгдеёжзийклмнопрстуфхцчшщъыьэюя"}) L"абвгдеёжзийклмнопрстуфхцчшщъыьэюя"})
valid |= !from.empty() && !to.empty() && from.size() <= 32 && to.size() <= 32 && valid |= !from.empty() && !to.empty() && from.size() <= 32 && to.size() <= 32 &&
from == lower(from) && to == lower(to) && from != to && from == lower(from) && to == lower(to) && from != to &&
from.find_first_not_of(alphabet) == from.npos && to.find_first_not_of(alphabet) == to.npos; from.find_first_not_of(alphabet) == from.npos &&
to.find_first_not_of(std::wstring(alphabet) + L" ") == to.npos &&
to.front() != L' ' && to.back() != L' ' && to.find(L" ") == to.npos;
if (!valid) if (!valid)
throw std::runtime_error("Replacement pairs must be different lowercase words of 1-32 letters in the same language"); throw std::runtime_error("Use a lowercase typo of 1-32 letters and a different correction of 1-32 characters in the same language. Single spaces between correction words are allowed.");
} }
for (const auto &[language, words] : s.autoWords) for (const auto &[language, words] : s.autoWords)
{ {
@@ -148,8 +169,19 @@ void validateSettings(const Settings &s)
if (snippet.trigger.size() < 2 || snippet.trigger.size() > 64 || if (snippet.trigger.size() < 2 || snippet.trigger.size() > 64 ||
snippet.trigger.find_first_of(L"\r\n\t ") != snippet.trigger.npos) snippet.trigger.find_first_of(L"\r\n\t ") != snippet.trigger.npos)
throw std::runtime_error("Snippet triggers must contain 2–64 characters without whitespace"); throw std::runtime_error("Snippet triggers must contain 2–64 characters without whitespace");
if (!seen.insert(lower(snippet.trigger)).second) if (snippet.apps.size() > 64) throw std::runtime_error("Too many snippet applications");
throw std::runtime_error("Duplicate snippet trigger"); std::vector<std::wstring> scopes;
for (const auto &app : snippet.apps)
{
auto normalized = snippetAppName(app);
if (normalized.empty() || normalized.size() > 250 || normalized.find_first_of(L"\\/:*?\"<>|,\r\n\t") != normalized.npos)
throw std::runtime_error("Use application names such as chrome.exe, not paths or wildcards");
scopes.push_back(normalized);
}
if (scopes.empty()) scopes.push_back(L"");
for (const auto &scope : scopes)
if (!seen.insert(lower(snippet.trigger) + L"\n" + scope).second)
throw std::runtime_error("Duplicate snippet trigger for the same application or global scope");
auto t = parseTemplate(snippet.text); auto t = parseTemplate(snippet.text);
if (t.text.empty() || t.cursors > 1) if (t.text.empty() || t.cursors > 1)
throw std::runtime_error("Each snippet needs text and at most one {cursor} marker"); throw std::runtime_error("Each snippet needs text and at most one {cursor} marker");
@@ -232,6 +264,16 @@ Settings decodeSettings(const Bytes &bytes, const std::vector<Layout> &layouts)
s.cycle.push_back(w); 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<std::string>()));
}
}
if (j.contains("layoutHotkeys")) if (j.contains("layoutHotkeys"))
{ {
std::fill(s.direct.begin(), s.direct.end(), L""); std::fill(s.direct.begin(), s.direct.end(), L"");
@@ -250,6 +292,12 @@ Settings decodeSettings(const Bytes &bytes, const std::vector<Layout> &layouts)
for (auto &sn : j.at("snippets")) for (auto &sn : j.at("snippets"))
{ {
Snippet item{str(sn, "trigger"), str(sn, "text"), str(sn, "id")}; Snippet item{str(sn, "trigger"), str(sn, "text"), str(sn, "id")};
if (sn.contains("apps"))
{
if (!sn.at("apps").is_array()) throw std::runtime_error("Snippet apps must be a list");
for (const auto &app : sn.at("apps")) item.apps.push_back(snippetAppName(wide(app.get<std::string>())));
}
if (item.id.empty() && !item.apps.empty()) item.id = newSnippetId();
item.id = snippetId(item); item.id = snippetId(item);
s.snippets.push_back(std::move(item)); s.snippets.push_back(std::move(item));
} }
@@ -288,6 +336,9 @@ Bytes encodeSettings(const Settings &s)
{"screenshotHotkey", utf8(s.screenshot)}, {"screenshotHotkey", utf8(s.screenshot)},
{"screenshotAutoOpenEditor", s.screenshotAutoOpenEditor}}; {"screenshotAutoOpenEditor", s.screenshotAutoOpenEditor}};
j["layouts"] = Json::array(); 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) for (auto &id : s.cycle)
j["layouts"].push_back(utf8(id)); j["layouts"].push_back(utf8(id));
j["autoCorrectLayout"] = s.autoCorrect; j["autoCorrectLayout"] = s.autoCorrect;
@@ -320,7 +371,15 @@ Bytes encodeSettings(const Settings &s)
j["layoutHotkeys"].push_back({{"layoutId", utf8(s.directIds[i])}, {"hotkey", utf8(s.direct[i])}}); j["layoutHotkeys"].push_back({{"layoutId", utf8(s.directIds[i])}, {"hotkey", utf8(s.direct[i])}});
j["snippets"] = Json::array(); j["snippets"] = Json::array();
for (auto &sn : s.snippets) for (auto &sn : s.snippets)
j["snippets"].push_back({{"trigger", utf8(sn.trigger)}, {"text", utf8(sn.text)}, {"id", utf8(snippetId(sn))}}); {
Json item{{"trigger", utf8(sn.trigger)}, {"text", utf8(sn.text)}, {"id", utf8(snippetId(sn))}};
if (!sn.apps.empty())
{
item["apps"] = Json::array();
for (const auto &app : sn.apps) item["apps"].push_back(utf8(snippetAppName(app)));
}
j["snippets"].push_back(std::move(item));
}
j["snippetTombstones"] = Json::array(); j["snippetTombstones"] = Json::array();
for (const auto &id : s.snippetTombstones) j["snippetTombstones"].push_back(utf8(id)); for (const auto &id : s.snippetTombstones) j["snippetTombstones"].push_back(utf8(id));
j["excludedApps"] = Json::array(); j["excludedApps"] = Json::array();
@@ -344,6 +403,20 @@ Bytes encodeClip(const Clip &clip)
} }
return b; return b;
} }
Bytes selectionClipboardIdentity(const Clip &clip)
{
auto normalized = clip;
// GlobalSize includes allocation slack. A clipboard relay may allocate a
// different-sized block for the same NUL-terminated Unicode string.
for (auto &format : normalized.formats)
if (format.id == CF_UNICODETEXT)
format = textClip(clip.text()).formats.front();
std::sort(normalized.formats.begin(), normalized.formats.end(), [](const Format &a, const Format &b)
{
return std::tie(a.name, a.id) < std::tie(b.name, b.id);
});
return encodeClip(normalized);
}
Clip decodeClip(const Bytes &b) Clip decodeClip(const Bytes &b)
{ {
size_t p = 0; size_t p = 0;
+1
View File
@@ -46,6 +46,7 @@ class History
std::vector<Entry> search(const std::wstring &, bool pinnedOnly = false) const; std::vector<Entry> search(const std::wstring &, bool pinnedOnly = false) const;
}; };
Bytes encodeClip(const Clip &); Bytes encodeClip(const Clip &);
Bytes selectionClipboardIdentity(const Clip &);
Clip decodeClip(const Bytes &); Clip decodeClip(const Bytes &);
bool sameClipboardImage(const Clip &, const Clip &); bool sameClipboardImage(const Clip &, const Clip &);
int runImageHistoryCapture(const std::filesystem::path &request); int runImageHistoryCapture(const std::filesystem::path &request);
+36
View File
@@ -38,6 +38,42 @@ inline double cross(Point a, Point b, Point c) { return (b.x-a.x)*(c.y-a.y)-(b.y
} }
namespace ks { namespace ks {
// Filter by distance along the path, not mouse-event count. Always start from
// the original path so lowering the amount restores detail without drift.
inline std::vector<POINT> smoothScreenshotStroke(const std::vector<POINT> &input, int amount) {
amount=std::clamp(amount,0,100);
if(!amount || input.size()<5) return input;
using namespace stroke_detail;
std::vector<Point> raw;
for(auto p:input) if(raw.empty() || distance(raw.back(),{double(p.x),double(p.y)})>0)
raw.push_back({double(p.x),double(p.y)});
double total=length(raw);
if(raw.size()<5 || total<16) return input;
auto points=sample(raw,size_t(std::clamp(std::ceil(total/2)+1,3.0,4096.0)));
double step=total/(points.size()-1),radius=0.5+32*std::pow(amount/100.0,2);
int reach=std::max(1,int(std::ceil(radius/step)));
std::vector<POINT> result;
for(size_t i=0;i<points.size();++i) {
Point sum{}; double weights=0;
for(int j=std::max(0,int(i)-reach);j<=std::min(int(points.size())-1,int(i)+reach);++j) {
double d=(j-double(i))*step,weight=std::exp(-2*d*d/(radius*radius));
sum.x+=points[j].x*weight; sum.y+=points[j].y*weight; weights+=weight;
}
double blend=std::min(1.0,std::min(i,points.size()-1-i)*step/radius);
POINT p{LONG(std::lround(points[i].x+blend*(sum.x/weights-points[i].x))),
LONG(std::lround(points[i].y+blend*(sum.y/weights-points[i].y)))};
if(result.empty() || p.x!=result.back().x || p.y!=result.back().y) result.push_back(p);
}
result.front()=input.front(); result.back()=input.back();
return result;
}
inline void setScreenshotSmoothing(ScreenshotMark &mark,int amount) {
if(!mark.freehand || mark.shape!=ScreenshotShape::None || mark.points.empty()) return;
if(mark.rawPoints.empty()) mark.rawPoints=mark.points;
mark.smoothing=std::clamp(amount,0,100);
mark.points=smoothScreenshotStroke(mark.rawPoints,mark.smoothing);
mark.from=mark.points.front(); mark.to=mark.points.back();
}
// Returns a replacement path; an empty result means no visible improvement. // Returns a replacement path; an empty result means no visible improvement.
// Report recognized geometry separately from a smoothed freehand path. // Report recognized geometry separately from a smoothed freehand path.
inline std::vector<POINT> improveScreenshotStroke(const std::vector<POINT> &input, ScreenshotShape *shape=nullptr, inline std::vector<POINT> improveScreenshotStroke(const std::vector<POINT> &input, ScreenshotShape *shape=nullptr,
+6 -1
View File
@@ -229,6 +229,9 @@ Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const s
if (!j.contains("autoCorrectReplace")) j["autoCorrectReplace"] = false; if (!j.contains("autoCorrectReplace")) j["autoCorrectReplace"] = false;
if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false; if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false;
if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object(); if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object();
// Profiles uploaded before v0.6.53 do not participate in chat synchronization.
// An explicit empty object from a newer client does mean remove all profiles.
if (!j.contains("chatCycles")) j["chatCycles"] = original.at("chatCycles");
auto allowed = parse(sharedSyncSettings(local)); auto allowed = parse(sharedSyncSettings(local));
if (!j.is_object() || j.value("format", "") != "kswitcher-settings" || j.value("schemaVersion", 0) != 1) if (!j.is_object() || j.value("format", "") != "kswitcher-settings" || j.value("schemaVersion", 0) != 1)
throw std::runtime_error("Unsupported synchronized settings format."); throw std::runtime_error("Unsupported synchronized settings format.");
@@ -294,7 +297,9 @@ SyncResult synchronize(SyncProvider &provider, const Bytes &base, const Bytes &l
if (action == SyncAction::Automatic) merged = mergeSyncProfile(mergeBase, mergeLocal, remote.settings, choices); if (action == SyncAction::Automatic) merged = mergeSyncProfile(mergeBase, mergeLocal, remote.settings, choices);
else else
{ {
auto selected = bytes(normalizeProfile(parse(action == SyncAction::Download ? remote.settings : mergeLocal))); auto profile = parse(action == SyncAction::Download ? remote.settings : mergeLocal);
if (!profile.contains("chatCycles")) profile["chatCycles"] = parse(local).value("chatCycles", Json::object());
auto selected = bytes(normalizeProfile(profile));
merged = {selected, selected, selected, {}}; merged = {selected, selected, selected, {}};
} }
if (validate) { validate(merged.local); validate(merged.remote); } if (validate) { validate(merged.local); validate(merged.remote); }
+25 -3
View File
@@ -8,6 +8,7 @@ Json normalizeProfile(Json j)
if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false; if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false;
if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object(); if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object();
if (!j.contains("snippetTombstones")) j["snippetTombstones"] = Json::array(); if (!j.contains("snippetTombstones")) j["snippetTombstones"] = Json::array();
if (!j.contains("chatCycles")) j["chatCycles"] = Json::object();
for (auto &sn : j.at("snippets")) for (auto &sn : j.at("snippets"))
if (!sn.contains("id")) sn["id"] = utf8(snippetId({wide(sn.at("trigger").get<std::string>()), L""})); if (!sn.contains("id")) sn["id"] = utf8(snippetId({wide(sn.at("trigger").get<std::string>()), L""}));
return j; return j;
@@ -53,6 +54,10 @@ Json flatProfile(Json j)
for (auto it = replacements.begin(); it != replacements.end();) for (auto it = replacements.begin(); it != replacements.end();)
if (it.value().is_null()) it = replacements.erase(it); if (it.value().is_null()) it = replacements.erase(it);
else ++it; else ++it;
auto &chats = j["chatCycles"];
for (auto it = chats.begin(); it != chats.end();)
if (it.value().is_null()) it = chats.erase(it);
else ++it;
Json snippets = Json::array(), deleted = Json::array(); Json snippets = Json::array(), deleted = Json::array();
for (const auto &[id, item] : j.at("snippets").items()) for (const auto &[id, item] : j.at("snippets").items())
{ {
@@ -94,6 +99,7 @@ std::wstring fieldLabel(const std::string &key)
{"translitHotkey", L"Transliteration shortcut"}, {"undoHotkey", L"Undo shortcut"}, {"translitHotkey", L"Transliteration shortcut"}, {"undoHotkey", L"Undo shortcut"},
{"clipboardHotkey", L"Clipboard shortcut"}, {"screenshotHotkey", L"Screenshot shortcut"}, {"clipboardHotkey", L"Clipboard shortcut"}, {"screenshotHotkey", L"Screenshot shortcut"},
{"layouts", L"Layout cycle order"}, {"layoutHotkeys", L"Layout shortcuts"}, {"layouts", L"Layout cycle order"}, {"layoutHotkeys", L"Layout shortcuts"},
{"chatCycles", L"Chat languages"},
{"convertLastWord", L"Convert recent word"}, {"switchSystemLayout", L"Switch system layout"}, {"convertLastWord", L"Convert recent word"}, {"switchSystemLayout", L"Switch system layout"},
{"autoCorrectMinLength", L"Minimum word length"}, {"autoCorrectMaxRank", L"Maximum word rank"}, {"autoCorrectMinLength", L"Minimum word length"}, {"autoCorrectMaxRank", L"Maximum word rank"},
{"autoCorrectLayout", L"Automatic layout correction"}, {"autoCorrectLanguages", L"Dictionary languages"}, {"autoCorrectLayout", L"Automatic layout correction"}, {"autoCorrectLanguages", L"Dictionary languages"},
@@ -141,6 +147,11 @@ MergeNode mergeNode(const Json &b, const Json &l, const Json &r, const std::stri
auto item = get(l); if (item.is_null() || tombstone(item)) item = get(r); auto item = get(l); if (item.is_null() || tombstone(item)) item = get(r);
childLabel = L"Snippet: " + wide(item.is_object() ? item.value("trigger", key) : key); childLabel = L"Snippet: " + wide(item.is_object() ? item.value("trigger", key) : key);
} }
if (path == "/chatCycles") {
auto name = key;
if (auto separator = name.find('\n'); separator != name.npos) name.replace(separator, 1, " / ");
childLabel = L"Chat languages: " + wide(name);
}
auto child = mergeNode(get(b), get(l), get(r), path + "/" + pointerKey(key), childLabel, choices, conflicts, forced); auto child = mergeNode(get(b), get(l), get(r), path + "/" + pointerKey(key), childLabel, choices, conflicts, forced);
// Keep nulls in the ancestor so deletion conflicts survive restarts. // Keep nulls in the ancestor so deletion conflicts survive restarts.
out.local[key] = child.local; out.remote[key] = child.remote; out.base[key] = child.base; out.local[key] = child.local; out.remote[key] = child.remote; out.base[key] = child.base;
@@ -158,8 +169,14 @@ void collisionPaths(const Json &j, std::set<std::string> &paths)
if (sn.is_null() || tombstone(sn)) continue; if (sn.is_null() || tombstone(sn)) continue;
auto path = "/snippets/" + pointerKey(id); auto path = "/snippets/" + pointerKey(id);
auto key = lower(wide(sn.at("trigger").get<std::string>())); auto key = lower(wide(sn.at("trigger").get<std::string>()));
auto [it, inserted] = triggers.emplace(key, path); std::vector<std::wstring> scopes;
if (!inserted) { paths.insert(path); paths.insert(it->second); } if (sn.contains("apps")) for (const auto &app : sn.at("apps")) scopes.push_back(snippetAppName(wide(app.get<std::string>())));
if (scopes.empty()) scopes.push_back(L"");
for (const auto &scope : scopes)
{
auto [it, inserted] = triggers.emplace(key + L"\n" + scope, path);
if (!inserted) { paths.insert(path); paths.insert(it->second); }
}
} }
std::map<std::pair<UINT, UINT>, std::string> shortcuts; std::map<std::pair<UINT, UINT>, std::string> shortcuts;
auto add = [&](const Json &text, const std::string &path) { auto add = [&](const Json &text, const std::string &path) {
@@ -175,7 +192,12 @@ void collisionPaths(const Json &j, std::set<std::string> &paths)
} }
SyncMerge mergeSyncProfile(const Bytes &base, const Bytes &local, const Bytes &remote, const std::vector<SyncChoice> &choices) SyncMerge mergeSyncProfile(const Bytes &base, const Bytes &local, const Bytes &remote, const std::vector<SyncChoice> &choices)
{ {
auto l = treeProfile(parse(local)), r = treeProfile(parse(remote)); auto localProfile = parse(local), remoteProfile = parse(remote);
// Absence in an older client is not a deletion. Preserve the participating
// client's chat profiles until both copies understand this field.
if (!remoteProfile.contains("chatCycles")) remoteProfile["chatCycles"] = localProfile.value("chatCycles", Json::object());
if (!localProfile.contains("chatCycles")) localProfile["chatCycles"] = remoteProfile.at("chatCycles");
auto l = treeProfile(localProfile), r = treeProfile(remoteProfile);
// With no common history, union independent entries; differing scalar values // With no common history, union independent entries; differing scalar values
// remain on their respective devices until the user resolves the conflict. // remain on their respective devices until the user resolves the conflict.
auto b = base.empty() ? Json::object() : treeProfile(parse(base)); auto b = base.empty() ? Json::object() : treeProfile(parse(base));
+336 -61
View File
@@ -493,6 +493,7 @@ struct HistoryView
std::set<std::wstring> pending; std::set<std::wstring> pending;
bool scrolling{}; bool scrolling{};
bool closed{}; bool closed{};
bool selectFirstOnResults{};
}; };
bool selectedImage(HWND w, HistoryView *v) bool selectedImage(HWND w, HistoryView *v)
{ {
@@ -816,6 +817,14 @@ LRESULT CALLBACK historyProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
int top=(int)SendDlgItemMessageW(w,102,LB_GETTOPINDEX,0,0); int top=(int)SendDlgItemMessageW(w,102,LB_GETTOPINDEX,0,0);
auto topId=top>=0 && top<(int)v->items.size()?v->items[top].id:L""; auto topId=top>=0 && top<(int)v->items.size()?v->items[top].id:L"";
if (topId.empty()) topId = v->rememberedTop; if (topId.empty()) topId = v->rememberedTop;
if (v->selectFirstOnResults)
{
old.clear();
topId.clear();
v->rememberedSelection.clear();
v->rememberedTop.clear();
v->selectFirstOnResults = false;
}
v->items = std::move(result->items); v->items = std::move(result->items);
SendDlgItemMessageW(w, 102, WM_SETREDRAW, FALSE, 0); SendDlgItemMessageW(w, 102, WM_SETREDRAW, FALSE, 0);
SendDlgItemMessageW(w, 102, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(w, 102, LB_RESETCONTENT, 0, 0);
@@ -958,7 +967,131 @@ struct SettingsView
std::vector<int> order; std::vector<int> order;
int selection = -1; int selection = -1;
bool filling{}; bool filling{};
std::vector<std::vector<HWND>> pages;
bool ready{}, refreshing{};
}; };
void updateSettingsState(HWND w, SettingsView *v);
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<std::wstring> 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 Telegram, Telegram Web K in Chrome, or Teams, then reopen this dialog. Viber OCR is disabled.");
auto next = v->settings->draft;
if (id == 713) next.chatCycles.erase(v->keys[selected]);
else
{
std::vector<std::wstring> 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<std::wstring> keys;
for (const auto &[key, cycle] : settings->draft.chatCycles) keys.insert(key);
struct Context { std::set<std::wstring> &keys; const Settings &settings; } context{keys, settings->draft};
EnumWindows([](HWND candidate, LPARAM context) -> BOOL
{
if (!IsWindowVisible(candidate)) return TRUE;
auto &data = *(Context *)context;
auto key = lower(processName(candidate)) == L"chrome" ? readChromeChat(candidate) : windowChatKey(candidate);
if (!key.empty()) data.keys.insert(std::move(key));
return TRUE;
}, (LPARAM)&context);
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"Telegram / Telegram Web (Chrome) / Teams; Viber inactive", 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: " : key.starts_with(L"telegram-web\n") ? L"Telegram Web: " : key.starts_with(L"viber\n") ? L"Viber (inactive): " : 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) void collectLayout(HWND w, SettingsView *v)
{ {
if (v->selection < 0 || v->selection >= (int)v->order.size()) if (v->selection < 0 || v->selection >= (int)v->order.size())
@@ -1038,6 +1171,7 @@ void fillSettings(HWND w, SettingsView *v)
v->selection = 0; v->selection = 0;
fillLayouts(w, v); fillLayouts(w, v);
v->filling = false; v->filling = false;
updateSettingsState(w, v);
} }
int integer(HWND w, int id) int integer(HWND w, int id)
{ {
@@ -1167,7 +1301,10 @@ LRESULT CALLBACK autoOptionsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
auto words = parseCommaList(text); auto words = parseCommaList(text);
std::sort(words.begin(), words.end()); std::sort(words.begin(), words.end());
words.erase(std::unique(words.begin(), words.end()), words.end()); words.erase(std::unique(words.begin(), words.end()), words.end());
draft.autoWords[language] = std::move(words); // Opening and accepting an untouched empty dictionary must not
// introduce a new entry and mark Settings as changed.
if (!words.empty() || draft.autoWords.contains(language))
draft.autoWords[language] = std::move(words);
} }
draft.autoExcluded = parseCommaList(value(w, 404)); draft.autoExcluded = parseCommaList(value(w, 404));
draft.autoPrefixChars = value(w, 408); draft.autoPrefixChars = value(w, 408);
@@ -1276,7 +1413,7 @@ void showAutoOptions(HWND parent, SettingsView *v)
label(w, L"Enter punctuation without spaces or separators. These characters are kept.", 18, 530, 525); label(w, L"Enter punctuation without spaces or separators. These characters are kept.", 18, 530, 525);
checkbox(w, L"Use custom &replacements (take priority over dictionaries)", 414, 18, 562, 524); checkbox(w, L"Use custom &replacements (take priority over dictionaries)", 414, 18, 562, 524);
check(w, 414, v->draft.autoReplace); check(w, 414, v->draft.autoReplace);
label(w, L"One pair per line: typo=correction (same language, letters only)", 18, 592, 525); label(w, L"One pair per line: typo=correction (same language; correction may contain spaces)", 18, 592, 525);
edit(w, 416, 18, 618, 524, 70, ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN); edit(w, 416, 18, 618, 524, 70, ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN);
std::wstring pairs; std::wstring pairs;
for (const auto &[from, to] : v->draft.autoReplacements) pairs += from + L"=" + to + L"\r\n"; for (const auto &[from, to] : v->draft.autoReplacements) pairs += from + L"=" + to + L"\r\n";
@@ -1404,6 +1541,27 @@ bool settingsChanged(HWND w, SettingsView *v)
return true; return true;
} }
} }
void updateSettingsState(HWND w, SettingsView *v)
{
if (!v || !v->ready || v->filling || v->refreshing) return;
v->refreshing = true;
bool changed = settingsChanged(w, v);
EnableWindow(GetDlgItem(w, IDOK), changed);
const wchar_t *text = changed ? L"Unsaved changes — click Save to apply." : L"No unsaved changes.";
if (value(w, 261) != text) value(w, 261, text);
v->refreshing = false;
}
// Refresh after commands have updated controls/drafts, including early returns.
// Saving can destroy Settings, so retrieve its state only if it still exists.
struct SettingsStateRefresh
{
HWND window;
~SettingsStateRefresh()
{
if (IsWindow(window))
updateSettingsState(window, reinterpret_cast<SettingsView *>(GetWindowLongPtrW(window, GWLP_USERDATA)));
}
};
void closeSettings(HWND w, SettingsView *v) void closeSettings(HWND w, SettingsView *v)
{ {
if (settingsChanged(w, v)) if (settingsChanged(w, v))
@@ -1452,8 +1610,22 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
{ {
switch (msg) switch (msg)
{ {
case WM_ENABLE:
if (wp) updateSettingsState(w, v);
break;
case WM_ACTIVATE:
if (LOWORD(wp) != WA_INACTIVE) updateSettingsState(w, v);
break;
case WM_NOTIFY:
if (((NMHDR *)lp)->idFrom == 260 && ((NMHDR *)lp)->code == TCN_SELCHANGE)
{
selectSettingsPage(w, v);
return 0;
}
break;
case WM_COMMAND: case WM_COMMAND:
{ {
SettingsStateRefresh refresh{w};
int id = LOWORD(wp); int id = LOWORD(wp);
if (id == 220 && HIWORD(wp) == LBN_SELCHANGE && !v->filling) if (id == 220 && HIWORD(wp) == LBN_SELCHANGE && !v->filling)
{ {
@@ -1468,6 +1640,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
} }
if (id == 257) { showOcrOptions(w, v); return 0; } if (id == 257) { showOcrOptions(w, v); return 0; }
if (id == 258) { showSyncOptions(w, *v->app); 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) if (id == 230)
{ {
collectLayout(w, v); collectLayout(w, v);
@@ -1488,6 +1661,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
} }
if (id == IDOK) if (id == IDOK)
{ {
if (!settingsChanged(w, v)) return 0;
if (v->app->busy) if (v->app->busy)
throw std::runtime_error("Wait for the current text operation to finish"); throw std::runtime_error("Wait for the current text operation to finish");
v->app->applySettings(collectSettings(w, v)); v->app->applySettings(collectSettings(w, v));
@@ -1573,14 +1747,27 @@ void updateSnippetEditor(HWND w, SnippetView *v)
bool selected = v->selection >= 0 && v->selection < (int)v->snippets.size(); bool selected = v->selection >= 0 && v->selection < (int)v->snippets.size();
value(w, 302, selected ? v->snippets[v->selection].trigger : L""); value(w, 302, selected ? v->snippets[v->selection].trigger : L"");
value(w, 303, selected ? v->snippets[v->selection].text : L""); value(w, 303, selected ? v->snippets[v->selection].text : L"");
for (int id : {302, 303, 311, 312, 313}) std::wstring apps;
if (selected) for (const auto &app : v->snippets[v->selection].apps)
{
if (!apps.empty()) apps += L", ";
if (!app.empty()) apps += app + L".exe";
}
value(w, 315, apps);
bool restricted = selected && !v->snippets[v->selection].apps.empty();
CheckDlgButton(w, 314, restricted ? BST_CHECKED : BST_UNCHECKED);
for (int id : {302, 303, 311, 312, 313, 314})
EnableWindow(GetDlgItem(w, id), selected); EnableWindow(GetDlgItem(w, id), selected);
for (int id : {315, 316, 317}) EnableWindow(GetDlgItem(w, id), selected && restricted);
} }
void fillSnippets(HWND w, SnippetView *v) void fillSnippets(HWND w, SnippetView *v)
{ {
SendDlgItemMessageW(w, 301, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(w, 301, LB_RESETCONTENT, 0, 0);
for (auto &sn : v->snippets) for (auto &sn : v->snippets)
SendDlgItemMessageW(w, 301, LB_ADDSTRING, 0, (LPARAM)sn.trigger.c_str()); {
auto label = sn.trigger + (sn.apps.empty() ? L" [All apps]" : L" [" + sn.apps.front() + (sn.apps.size() > 1 ? L", ...]" : L"]"));
SendDlgItemMessageW(w, 301, LB_ADDSTRING, 0, (LPARAM)label.c_str());
}
if (v->selection >= 0) if (v->selection >= 0)
SendDlgItemMessageW(w, 301, LB_SETCURSEL, v->selection, 0); SendDlgItemMessageW(w, 301, LB_SETCURSEL, v->selection, 0);
updateSnippetEditor(w, v); updateSnippetEditor(w, v);
@@ -1593,6 +1780,18 @@ void collectSnippet(HWND w, SnippetView *v)
if (snippet.id.empty()) snippet.id = snippetId(snippet); if (snippet.id.empty()) snippet.id = snippetId(snippet);
snippet.trigger = value(w, 302); snippet.trigger = value(w, 302);
snippet.text = value(w, 303); snippet.text = value(w, 303);
snippet.apps.clear();
if (IsDlgButtonChecked(w, 314) == BST_CHECKED)
{
std::wistringstream input(value(w, 315)); std::wstring item;
while (std::getline(input, item, L','))
{
auto app = snippetAppName(item);
if (!app.empty()) snippet.apps.push_back(app);
}
// An explicitly restricted but empty list must not become global.
if (snippet.apps.empty()) snippet.apps.push_back(L"");
}
} }
} }
LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp) LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
@@ -1619,6 +1818,24 @@ LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
case WM_COMMAND: case WM_COMMAND:
{ {
int id = LOWORD(wp); int id = LOWORD(wp);
if (id == 314)
{
bool restricted = IsDlgButtonChecked(w, 314) == BST_CHECKED;
for (int field : {315, 316, 317}) EnableWindow(GetDlgItem(w, field), restricted);
return 0;
}
if (id == 317)
{
auto app = value(w, 316);
if (!app.empty())
{
auto current = value(w, 315);
std::wistringstream input(current); std::wstring entry;
while (std::getline(input, entry, L',')) if (snippetAppName(entry) == snippetAppName(app)) return 0;
value(w, 315, current.empty() ? app : current + L", " + app);
}
return 0;
}
if (id == 301 && HIWORD(wp) == LBN_SELCHANGE) if (id == 301 && HIWORD(wp) == LBN_SELCHANGE)
{ {
collectSnippet(w, v); collectSnippet(w, v);
@@ -1664,6 +1881,7 @@ LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
{ {
auto *parent = (SettingsView *)GetWindowLongPtrW(v->app->settingsWindow, GWLP_USERDATA); auto *parent = (SettingsView *)GetWindowLongPtrW(v->app->settingsWindow, GWLP_USERDATA);
parent->draft.snippets = s.snippets; parent->draft.snippets = s.snippets;
updateSettingsState(v->app->settingsWindow, parent);
} }
DestroyWindow(w); DestroyWindow(w);
return 0; return 0;
@@ -1771,6 +1989,10 @@ void showHistory(App &app, bool visible)
} }
} }
if (!visible) return; if (!visible) return;
// A fresh invocation starts at the newest matching item. Background search
// and OCR refreshes still preserve the user's selection while browsing.
auto *view = (HistoryView *)GetWindowLongPtrW(app.historyWindow, GWLP_USERDATA);
view->selectFirstOnResults = true;
POINT cursor; POINT cursor;
GetCursorPos(&cursor); GetCursorPos(&cursor);
MONITORINFO monitor{sizeof(monitor)}; MONITORINFO monitor{sizeof(monitor)};
@@ -1802,56 +2024,97 @@ void showSettings(App &app, bool visible)
activateWindow(target); activateWindow(target);
return; 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; app.settingsWindow = w;
label(w, L"Text conversion", 18, 16); auto *v = (SettingsView *)GetWindowLongPtrW(w, GWLP_USERDATA);
checkbox(w, L"Con&vert recently typed text when nothing is selected", 201, 18, 43, 390); INITCOMMONCONTROLSEX tabsInit{sizeof(tabsInit), ICC_TAB_CLASSES};
checkbox(w, L"Switch Windows input &layout after conversion", 202, 18, 70, 390); InitCommonControlsEx(&tabsInit);
checkbox(w, L"Record clip&board history", 203, 18, 106); HWND tabs = control(w, WC_TABCONTROLW, L"", WS_TABSTOP, 260, 18, 16, 684, 32);
checkbox(w, L"Start with &Windows", 204, 18, 133); const wchar_t *tabNames[] = {L"General", L"Languages", L"Shortcuts", L"Clipboard", L"Tools"};
checkbox(w, L"Start with Windows as ad&ministrator", 206, 18, 160, 395); for (int i = 0; i < 5; ++i)
checkbox(w, L"&Keep screen awake", 205, 18, 184, 210); {
checkbox(w, L"Write lo&g", 208, 240, 184, 160); TCITEMW item{}; item.mask = TCIF_TEXT; item.pszText = const_cast<wchar_t *>(tabNames[i]);
label(w, L"Click a shortcut and press the desired keys", 420, 16, 350); TabCtrl_InsertItem(tabs, i, &item);
const wchar_t *names[] = {L"Next layout", L"Change case", L"Transliterate", L"Undo", }
L"Clipboard history", L"Screen capture"}; size_t start = windowLayoutState(w)->controls.size();
auto page = [&]
{
std::vector<HWND> 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"Telegram / Telegram Web (Chrome) / Teams", 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) for (int i = 0; i < 6; ++i)
{ {
label(w, names[i], 420, 48 + i * 30, 115); label(w, names[i], 24, 116 + i * 40, 180);
hotkeyEdit(app, w, 210 + i, 540, 44 + i * 30, 220); 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"Open editor after screen capt&ure", 209, 24, 378, 660);
checkbox(w, L"Automatic correction (e&xperimental)", 207, 18, 210, 395); page();
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, checkbox(w, L"Record clip&board history", 203, 24, 80, 660);
18, 262, 470, 172); label(w, L"History limits", 24, 140, 660);
button(w, L"Move u&p", 232, 504, 262, 120); label(w, L"Items", 24, 176, 180);
button(w, L"Move &down", 233, 632, 262, 128); label(w, L"Total MiB", 254, 176, 180);
checkbox(w, L"&Include in cycle", 230, 504, 300, 240); label(w, L"Per item MiB", 484, 176, 180);
label(w, L"Direct layout shortcut", 504, 332, 240); edit(w, 240, 24, 204, 200);
hotkeyEdit(app, w, 231, 504, 356, 256); edit(w, 241, 254, 204, 200);
label(w, L"Backspace / Delete clears a shortcut", 504, 382, 256); edit(w, 242, 484, 204, 200);
button(w, L"Re&fresh layouts", 253, 504, 408, 150); button(w, L"Clear &history...", 254, 24, 258, 200);
label(w, L"History limits", 18, 444); label(w, L"Exclude applications (process names, comma-separated)", 24, 330, 660);
label(w, L"Items", 18, 478, 50); edit(w, 243, 24, 362, 660);
edit(w, 240, 70, 474, 90); page();
label(w, L"Total MiB", 180, 478, 75);
edit(w, 241, 260, 474, 90); label(w, L"Additional tools and preferences", 24, 76, 660);
label(w, L"Per item MiB", 370, 478, 100); button(w, L"S&nippets...", 252, 24, 116, 210);
edit(w, 242, 475, 474, 80); label(w, L"Manage reusable text and expansion triggers.", 254, 120, 430);
button(w, L"Clear &history…", 254, 580, 474, 180); button(w, L"OCR op&tions...", 257, 24, 180, 210);
label(w, L"Exclude applications (process names, comma-separated)", 18, 516, 700); label(w, L"Configure text recognition from images.", 254, 184, 430);
edit(w, 243, 18, 544, 742); button(w, L"S&ync...", 258, 24, 244, 210);
button(w, L"&Auto-correction options…", 255, 18, 575, 240); label(w, L"Synchronize preferences between computers.", 254, 248, 430);
button(w, L"View l&og…", 256, 278, 575, 220); button(w, L"View l&og...", 256, 24, 308, 210);
button(w, L"OCR op&tions…", 257, 518, 575, 242); label(w, L"Inspect recent operations and diagnostics.", 254, 312, 430);
button(w, L"Impo&rt settings…", 250, 18, 606, 145); checkbox(w, L"Write lo&g", 208, 24, 378, 210);
button(w, L"&Export settings…", 251, 173, 606, 145); page();
button(w, L"S&nippets…", 252, 328, 606, 110);
button(w, L"S&ync...", 258, 448, 606, 90); control(w, L"STATIC", L"No unsaved changes.", 0, 261, 18, 430, 684, 24);
button(w, L"&Save", IDOK, 548, 606, 100); button(w, L"Impo&rt...", 250, 18, 466, 125);
button(w, L"&Cancel", IDCANCEL, 660, 606, 100); button(w, L"&Export...", 251, 155, 466, 125);
fillSettings(w, (SettingsView *)GetWindowLongPtrW(w, GWLP_USERDATA)); button(w, L"&Save", IDOK, 490, 466, 100);
button(w, L"&Cancel", IDCANCEL, 602, 466, 100);
fillSettings(w, v);
v->ready = true;
updateSettingsState(w, v);
TabCtrl_SetCurSel(tabs, 0);
selectSettingsPage(w, v);
if (visible) if (visible)
{ {
showRequestedWindow(w); showRequestedWindow(w);
@@ -1865,22 +2128,34 @@ void showSnippets(App &app)
SetForegroundWindow(app.snippetsWindow); SetForegroundWindow(app.snippetsWindow);
return; return;
} }
HWND w = makeWindow(app, L"KSwitcher.Snippets", L"Text snippets", snippetProc, 740, 520); HWND w = makeWindow(app, L"KSwitcher.Snippets", L"Text snippets", snippetProc, 740, 620);
app.snippetsWindow = w; app.snippetsWindow = w;
label(w, L"Triggers", 16, 16); label(w, L"Triggers", 16, 16);
control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, 301, control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, 301,
16, 44, 200, 380); 16, 44, 200, 480);
button(w, L"&Add", 310, 16, 438, 90); button(w, L"&Add", 310, 16, 538, 90);
button(w, L"&Delete", 311, 116, 438, 100); button(w, L"&Delete", 311, 116, 538, 100);
label(w, L"&Trigger (for example ;addr)", 236, 16, 470); label(w, L"&Trigger (for example ;addr)", 236, 16, 470);
edit(w, 302, 236, 44, 488); edit(w, 302, 236, 44, 488);
label(w, L"&Replacement text", 236, 82, 480); control(w, L"BUTTON", L"Only in these &applications (unchecked: everywhere)", WS_TABSTOP | BS_AUTOCHECKBOX, 314, 236, 82, 488, 24);
edit(w, 303, 236, 110, 488, 270, ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL); edit(w, 315, 236, 112, 488);
control(w, L"STATIC", L"{cursor}: caret; {enter}: press Enter after insertion.\nUse {{cursor}} / {{enter}} for literal markers.", 0, 0, 236, 392, 488, 36); control(w, L"COMBOBOX", L"", WS_TABSTOP | CBS_DROPDOWNLIST | WS_VSCROLL, 316, 236, 148, 364, 200);
button(w, L"Insert cursor &marker", 312, 236, 430, 190); button(w, L"Add a&pp", 317, 612, 145, 112);
button(w, L"Insert &Enter marker", 313, 436, 430, 190); std::set<std::wstring> apps;
button(w, L"&Save", IDOK, 510, 478, 100); EnumWindows([](HWND candidate, LPARAM context)->BOOL {
button(w, L"&Cancel", IDCANCEL, 624, 478, 100); if (IsWindowVisible(candidate)) { auto name = processName(candidate); if (!name.empty()) ((std::set<std::wstring>*)context)->insert(lower(name) + L".exe"); }
return TRUE;
}, (LPARAM)&apps);
for (const auto &name : apps) SendDlgItemMessageW(w, 316, CB_ADDSTRING, 0, (LPARAM)name.c_str());
SendDlgItemMessageW(w, 316, CB_SETCURSEL, 0, 0);
label(w, L"Process names, comma-separated; e.g. chrome.exe, ms-teams.exe", 236, 182, 488);
label(w, L"&Replacement text", 236, 212, 480);
edit(w, 303, 236, 240, 488, 240, ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL);
control(w, L"STATIC", L"{cursor}: caret; {enter}: press Enter after insertion.\nUse {{cursor}} / {{enter}} for literal markers.", 0, 0, 236, 492, 488, 36);
button(w, L"Insert cursor &marker", 312, 236, 530, 190);
button(w, L"Insert &Enter marker", 313, 436, 530, 190);
button(w, L"&Save", IDOK, 510, 578, 100);
button(w, L"&Cancel", IDCANCEL, 624, 578, 100);
fillSnippets(w, (SnippetView *)GetWindowLongPtrW(w, GWLP_USERDATA)); fillSnippets(w, (SnippetView *)GetWindowLongPtrW(w, GWLP_USERDATA));
showRequestedWindow(w); showRequestedWindow(w);
SetForegroundWindow(w); SetForegroundWindow(w);
+1 -1
View File
@@ -2,7 +2,7 @@
#include "platform.h" #include "platform.h"
namespace ks namespace ks
{ {
inline constexpr wchar_t AppVersion[] = L"0.6.42"; inline constexpr wchar_t AppVersion[] = L"0.6.55";
inline constexpr UINT UpdateMessage = WM_APP + 7; inline constexpr UINT UpdateMessage = WM_APP + 7;
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000; inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000; inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
+41
View File
@@ -0,0 +1,41 @@
#pragma once
#include <algorithm>
#include <cwchar>
#include <filesystem>
#include <string>
#include <vector>
namespace ks
{
// Scan each time the menu opens, relative to the resident executable, not its working directory.
inline std::vector<std::filesystem::path> discoverUtilities(const std::filesystem::path &folder,
std::error_code &error)
{
error.clear();
std::vector<std::filesystem::path> result;
std::filesystem::directory_iterator it(folder, error), end;
if (error == std::errc::no_such_file_or_directory) error.clear();
while (!error && it != end)
{
std::error_code entryError;
if (_wcsicmp(it->path().extension().c_str(), L".exe") == 0 && it->is_regular_file(entryError))
result.push_back(it->path());
it.increment(error);
}
if (error) result.clear();
std::sort(result.begin(), result.end(), [](const auto &a, const auto &b) {
return _wcsicmp(a.filename().c_str(), b.filename().c_str()) < 0;
});
return result;
}
inline std::wstring utilityMenuLabel(const std::filesystem::path &path)
{
std::wstring label;
for (wchar_t ch : path.stem().wstring())
{
label += ch;
if (ch == L'&') label += ch; // Win32 uses ampersands for access keys.
}
return label;
}
}
+82
View File
@@ -0,0 +1,82 @@
// Experimental Viber header OCR; never called on the keyboard hook thread.
#include <uiautomation.h>
#include <mutex>
namespace ks {
namespace {
std::mutex viberMutex;
HWND viberWindow{};
std::wstring viberKey;
ULONGLONG viberTime{};
std::wstring elementClass(IUIAutomationElement *e) {
BSTR s{}; e->get_CurrentClassName(&s); std::wstring out=s?s:L""; SysFreeString(s); return out;
}
bool findViberHeader(IUIAutomationTreeWalker *walker,IUIAutomationElement *e,RECT &pane,RECT &search,int depth,int &budget) {
if(depth>5 || --budget<0) return false;
bool stack=elementClass(e).starts_with(L"StackView_");
Com<IUIAutomationElement> child;walker->GetFirstChildElement(e,child.out());
bool found=false,info=false;
while(child.p && --budget>0) {
if(stack) {
auto name=elementClass(child.p);
if(name.starts_with(L"SearchButton_")){child->get_CurrentBoundingRectangle(&search);found=true;}
if(name.starts_with(L"InfoButton_")) info=true;
} else if(findViberHeader(walker,child.p,pane,search,depth+1,budget)) return true;
Com<IUIAutomationElement> next;walker->GetNextSiblingElement(child.p,next.out());
child.p->Release();child.p=next.p;next.p=nullptr;
}
if(found && info){e->get_CurrentBoundingRectangle(&pane);return true;}
return false;
}
Pixels viberHeader(HWND window) {
if(!IsWindow(window)||IsIconic(window)) return {};
Com<IUIAutomation2> automation;
check(CoCreateInstance(CLSID_CUIAutomation8,nullptr,CLSCTX_INPROC_SERVER,IID_IUIAutomation2,(void**)automation.out()));
automation->put_ConnectionTimeout(200);automation->put_TransactionTimeout(200);
Com<IUIAutomationElement> root;check(automation->ElementFromHandle(window,root.out()));
Com<IUIAutomationTreeWalker> walker;check(automation->get_RawViewWalker(walker.out()));
RECT pane{},search{},rect{};int budget=160;
if(!findViberHeader(walker.p,root.p,pane,search,0,budget)||!GetWindowRect(window,&rect)) return {};
double scale=GetDpiForWindow(window)/96.0;
int x=pane.left+int(76*scale)-rect.left,y=search.top-int(12*scale)-rect.top;
int width=search.left-int(12*scale)-rect.left-x,height=int(28*scale);
int ww=rect.right-rect.left,wh=rect.bottom-rect.top;
if(width<30||height<10||x<0||y<0||x+width>ww||y+height>wh||uint64_t(ww)*wh>16000000) return {};
HDC dc=CreateCompatibleDC(nullptr);BITMAPINFO bi{};bi.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
bi.bmiHeader.biWidth=ww;bi.bmiHeader.biHeight=-wh;bi.bmiHeader.biPlanes=1;bi.bmiHeader.biBitCount=32;
void *bits{};HBITMAP bitmap=CreateDIBSection(dc,&bi,DIB_RGB_COLORS,&bits,nullptr,0);
if(!bitmap){DeleteDC(dc);return {};}
auto old=SelectObject(dc,bitmap);Pixels p;
if(PrintWindow(window,dc,2)) {
p.width=width;p.height=height;p.bgra.resize(size_t(width)*height*4);
for(int row=0;row<height;++row) memcpy(p.bgra.data()+size_t(row)*width*4,(BYTE*)bits+(size_t(y+row)*ww+x)*4,size_t(width)*4);
}
SelectObject(dc,old);DeleteObject(bitmap);DeleteDC(dc);return p;
}
}
std::wstring cachedViberChat(HWND window) {
std::lock_guard lock(viberMutex);
return window==viberWindow && GetTickCount64()-viberTime<2000 ? viberKey : L"";
}
std::wstring recognizeViberChat(HWND window,const Settings &settings) {
std::wstring key;
try {
auto hr=CoInitializeEx(nullptr,COINIT_MULTITHREADED);
struct Apartment {bool owned;~Apartment(){if(owned)CoUninitialize();}} apartment{SUCCEEDED(hr)};
auto context=SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
struct Dpi {DPI_AWARENESS_CONTEXT old;~Dpi(){if(old)SetThreadDpiAwarenessContext(old);}} dpi{context};
auto before=viberHeader(window);
if(!before.bgra.empty()) {
Settings options=settings;options.useTesseract=true;
Clip clip;clip.formats.push_back(imageDib(before));
auto title=recognizeText(clip,options);
while(!title.empty() && iswspace(title.back())) title.pop_back();
while(!title.empty() && iswspace(title.front())) title.erase(0,1);
auto after=viberHeader(window);
if(!title.empty() && title.size()<512 && title.find_first_of(L"\r\n")==title.npos && before.width==after.width && before.height==after.height && before.bgra==after.bgra)
key=L"viber\n"+title;
}
} catch(...) {}
{std::lock_guard lock(viberMutex);viberWindow=window;viberKey=key;viberTime=GetTickCount64();}
return key;
}
}
+293
View File
@@ -0,0 +1,293 @@
#include "app.h"
#include "ocr.h"
#include "screenshot.h"
#include <iostream>
#include <commctrl.h>
namespace
{
int passed{};
void require(bool ok, const char *message)
{
if (!ok) throw std::runtime_error(message);
++passed;
}
void contextChecks()
{
ks::Settings scoped;
scoped.snippets = {{L";sig", L"Global", L"global"},
{L";sig", L"Work", L"teams", {L"MS-Teams.EXE", L"OUTLOOK.exe"}},
{L";sig", L"Personal", L"telegram", {L"telegram"}}};
ks::validateSettings(scoped);
require(ks::snippetAppPriority(scoped.snippets[1], L"ms-teams") > ks::snippetAppPriority(scoped.snippets[0], L"ms-teams"), "app snippet precedes global regardless of list order");
require(ks::snippetAppPriority(scoped.snippets[1], L"Telegram.exe") == 0, "restricted snippet cannot run in another app");
require(ks::snippetAppPriority(scoped.snippets[1], L"Outlook.EXE") == 2, "restricted snippet also runs in its second application");
require(ks::snippetAppPriority(scoped.snippets[0], L"") == 1, "legacy/global snippets remain available");
auto scopedRoundtrip = ks::decodeSettings(ks::encodeSettings(scoped), {});
require(scopedRoundtrip.snippets[1].apps == std::vector<std::wstring>{L"ms-teams", L"outlook"}, "scopes normalize and persist");
require(scopedRoundtrip.snippets[0].apps.empty(), "absent scope remains global");
auto collision = scoped; collision.snippets.push_back({L";SIG", L"Ambiguous", L"other", {L"outlook.exe"}});
bool collisionRejected=false;try { ks::validateSettings(collision); } catch(...) { collisionRejected=true; }
require(collisionRejected, "overlapping app lists with same trigger rejected");
auto emptyScope = scoped; emptyScope.snippets[1].apps={L""};
bool emptyRejected=false;try { ks::validateSettings(emptyScope); } catch(...) { emptyRejected=true; }
require(emptyRejected, "empty explicit restriction cannot become global");
require(ks::telegramWebKey(L"https://web.telegram.org/k/#@Example") == L"telegram-web\n@example", "Telegram Web username normalized");
require(ks::telegramWebKey(L"web.telegram.org/a/#-123456") == L"telegram-web\n-123456", "Telegram Web numeric peer");
for (const auto *url : {L"https://web.telegram.org/k/", L"https://web.telegram.org.evil/k/#@example",
L"http://web.telegram.org/k/#@example", L"https://evil/web.telegram.org/k/#@example",
L"https://web.telegram.org/k/#@example?foo", L"https://web.telegram.org/k/#@",
L"https://web.telegram.org/k/#-", L"https://web.telegram.org/k/#settings"})
require(ks::telegramWebKey(url).empty(), "Reject non-chat or untrusted Telegram Web URL");
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(), "Viber generic window title is not a chat");
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]};
settings.chatCycles[L"viber\nТестовий контакт"] = {settings.cycle[1], settings.cycle[0]};
settings.chatCycles[L"telegram-web\n@example"] = {settings.cycle[0], settings.cycle[1]};
std::vector<ks::Layout> 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 included in sync");
auto restored = ks::restoreSyncSettings(ks::sharedSyncSettings(settings), withoutProfiles, installed, false);
require(restored.chatCycles == settings.chatCycles, "sync transfers chat profiles to another PC");
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;
auto saveEnabled=[&] { return IsWindowEnabled(GetDlgItem(parent,IDOK))!=FALSE; };
auto status=[&] { wchar_t text[256]{}; GetDlgItemTextW(parent,261,text,256); return std::wstring(text); };
require(!saveEnabled() && status()==L"No unsaved changes.","new Settings shows clean state with Save disabled");
SendMessageW(parent,WM_COMMAND,IDOK,0);
require(IsWindow(parent),"Save command with no changes does not apply or close Settings");
bool originalLog=IsDlgButtonChecked(parent,208)==BST_CHECKED;
CheckDlgButton(parent,208,originalLog?BST_UNCHECKED:BST_CHECKED);
SendMessageW(parent,WM_COMMAND,MAKEWPARAM(208,BN_CLICKED),0);
require(saveEnabled() && status().find(L"Unsaved changes") == 0,"checkbox edit immediately marks Settings dirty");
CheckDlgButton(parent,208,originalLog?BST_CHECKED:BST_UNCHECKED);
SendMessageW(parent,WM_COMMAND,MAKEWPARAM(208,BN_CLICKED),0);
require(!saveEnabled(),"reverting checkbox disables Save again");
wchar_t originalLimit[32]{}; GetDlgItemTextW(parent,240,originalLimit,32);
SetDlgItemTextW(parent,240,L"invalid");
require(saveEnabled(),"invalid text remains an unsaved edit");
SetDlgItemTextW(parent,240,originalLimit);
require(!saveEnabled(),"restoring valid original text clears dirty state");
SendMessageW(parent,WM_COMMAND,257,0);
HWND ocr=FindWindowW(L"KSwitcher.OcrOptions",nullptr);
require(ocr!=nullptr,"OCR preferences open");
wchar_t languages[128]{}; GetDlgItemTextW(ocr,503,languages,128);
SetDlgItemTextW(ocr,503,L"eng");
SendMessageW(ocr,WM_COMMAND,IDCANCEL,0);
require(!saveEnabled(),"cancelled child changes leave Settings clean");
SendMessageW(parent,WM_COMMAND,257,0);
ocr=FindWindowW(L"KSwitcher.OcrOptions",nullptr);
SetDlgItemTextW(ocr,503,std::wstring(languages)==L"eng"?L"ukr":L"eng");
SendMessageW(ocr,WM_COMMAND,IDOK,0);
require(!IsWindow(ocr) && saveEnabled(),"accepted OCR edits enable parent Save");
SendMessageW(parent,WM_COMMAND,257,0);
ocr=FindWindowW(L"KSwitcher.OcrOptions",nullptr);
SetDlgItemTextW(ocr,503,languages);
SendMessageW(ocr,WM_COMMAND,IDOK,0);
require(!saveEnabled(),"reverting OCR draft in child clears parent dirty state");
SendMessageW(parent,WM_COMMAND,255,0);
HWND automatic=FindWindowW(L"KSwitcher.AutoOptions",nullptr);
require(automatic!=nullptr,"automatic correction preferences open");
bool replace=IsDlgButtonChecked(automatic,414)==BST_CHECKED;
CheckDlgButton(automatic,414,replace?BST_UNCHECKED:BST_CHECKED);
SendMessageW(automatic,WM_COMMAND,IDOK,0);
require(!IsWindow(automatic) && saveEnabled(),"accepted auto-correction edits enable Save");
SendMessageW(parent,WM_COMMAND,255,0);
automatic=FindWindowW(L"KSwitcher.AutoOptions",nullptr);
CheckDlgButton(automatic,414,replace?BST_CHECKED:BST_UNCHECKED);
SendMessageW(automatic,WM_COMMAND,IDOK,0);
require(!saveEnabled(),"reverting auto-correction draft disables Save");
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)&notification);
std::vector<RECT> 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)&notification);
require(!saveEnabled(),"changing tabs leaves Settings clean");
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");
require(!saveEnabled(),"cancelled chat edits do not enable Save");
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");
require(saveEnabled() == (app.layouts.size()>1),"accepted chat edits refresh Save immediately");
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;
require(!saveEnabled(),"reopened saved Settings is clean");
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);
require(saveEnabled() && status().find(L"Unsaved changes")==0,"removing child profile immediately marks parent dirty");
RedrawWindow(parent,nullptr,nullptr,RDW_INVALIDATE|RDW_UPDATENOW|RDW_ALLCHILDREN);
GetClientRect(parent,&rect); dc=GetDC(parent);
clip=ks::screenshotClip(dc,rect.right,rect.bottom,{}); ReleaseDC(parent,dc);
ks::atomicWrite(std::filesystem::path(ks::executable()).parent_path()/L"settings-unsaved.png",
ks::encodePng(ks::decodeImage(clip)));
SendMessageW(parent, WM_COMMAND, IDOK, 0);
require(!app.settings.chatCycles.contains(key), "remove profile restores default");
app.settings.snippets = {{L";scope", L"Example", L"scope-fixture"}};
ks::showSettings(app); parent=app.settingsWindow;
require(!saveEnabled(),"Settings starts clean before separately saved snippet edit");
ks::showSnippets(app);
HWND snippets = app.snippetsWindow;
SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
SendMessageW(snippets,WM_COMMAND,MAKEWPARAM(301,LBN_SELCHANGE),0);
require(IsDlgButtonChecked(snippets,314)==BST_UNCHECKED, "old snippet shows everywhere");
CheckDlgButton(snippets,314,BST_CHECKED);
SendMessageW(snippets,WM_COMMAND,314,0);
SetDlgItemTextW(snippets,315,L"Notepad.exe");
auto secondApp = SendDlgItemMessageW(snippets,316,CB_ADDSTRING,0,(LPARAM)L"MS-Teams.EXE");
SendDlgItemMessageW(snippets,316,CB_SETCURSEL,secondApp,0);
SendMessageW(snippets,WM_COMMAND,317,0);
SendMessageW(snippets,WM_COMMAND,317,0);
wchar_t appList[128]{};
GetDlgItemTextW(snippets,315,appList,128);
require(std::wstring(appList)==L"Notepad.exe, MS-Teams.EXE", "Add app appends a second application without duplicates");
SendMessageW(snippets,WM_COMMAND,IDOK,0);
require(!app.snippetsWindow && app.settings.snippets[0].apps==std::vector<std::wstring>{L"notepad",L"ms-teams"}, "snippet editor saves selected applications");
require(!saveEnabled() && status()==L"No unsaved changes.","separately saved snippet edit leaves Settings clean");
SendMessageW(parent,WM_COMMAND,IDCANCEL,0);
ks::showSnippets(app);snippets=app.snippetsWindow;
SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
SendMessageW(snippets,WM_COMMAND,MAKEWPARAM(301,LBN_SELCHANGE),0);
require(IsDlgButtonChecked(snippets,314)==BST_CHECKED, "scope restored when reopening editor");
RedrawWindow(snippets,nullptr,nullptr,RDW_INVALIDATE|RDW_UPDATENOW|RDW_ALLCHILDREN);
RECT snippetRect{};GetClientRect(snippets,&snippetRect);
HDC snippetDc=GetDC(snippets);
auto snippetImage=ks::screenshotClip(snippetDc,snippetRect.right,snippetRect.bottom,{});
ReleaseDC(snippets,snippetDc);
ks::atomicWrite(std::filesystem::path(ks::executable()).parent_path()/L"snippet-scopes.png",ks::encodePng(ks::decodeImage(snippetImage)));
SetDlgItemTextW(snippets,315,L"chrome.exe");
SendMessageW(snippets,WM_COMMAND,IDCANCEL,0);
require(app.settings.snippets[0].apps==std::vector<std::wstring>{L"notepad",L"ms-teams"}, "cancel preserves existing scope");
}
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; }
}
+133
View File
@@ -0,0 +1,133 @@
// Explicit Windows integration test. Opens an isolated Far profile and never
// types into an existing Far window. Requires Far Manager at its default path.
#include "app.h"
#include <cstdlib>
#include <cwctype>
#include <fstream>
#include <future>
namespace ks {
struct InputRegressionAccess {
static void runQueued(App &app) {
std::function<void()> job;
{ std::lock_guard lock(app.jobsMutex);
if (app.jobs.empty()) throw std::runtime_error("snippet did not queue");
job=std::move(app.jobs.front());app.jobs.pop_front(); }
auto future=std::async(std::launch::async,[job=std::move(job)] {
CoInitializeEx(nullptr,COINIT_APARTMENTTHREADED);job();CoUninitialize();
});
while(future.wait_for(std::chrono::milliseconds(5))!=std::future_status::ready) {
MSG message{};while(PeekMessageW(&message,nullptr,0,0,PM_REMOVE)) {
TranslateMessage(&message);DispatchMessageW(&message);
}
}
future.get();app.replayTyping();
}
};
}
int WINAPI wWinMain(HINSTANCE instance,HINSTANCE,PWSTR,int) {
auto base=std::filesystem::path(ks::executable()).parent_path();
std::ofstream log(base/L"far-snippets.log");
int checks=0;
auto require=[&](bool ok,const char *message) {
if(!ok)throw std::runtime_error(message);
++checks;log<<"PASS "<<message<<'\n';log.flush();
};
auto folder=std::filesystem::temp_directory_path()/(L"ks-far-snippets-"+ks::newSnippetId());
std::filesystem::create_directories(folder);
CoInitializeEx(nullptr,COINIT_APARTMENTTHREADED);
ks::Clip saved;bool captured=false;PROCESS_INFORMATION child{};
HANDLE input=INVALID_HANDLE_VALUE,output=INVALID_HANDLE_VALUE;
HWND farWindow{};
HWND owner=CreateWindowExW(0,L"STATIC",L"Far snippet fixture clipboard",0,0,0,0,0,HWND_MESSAGE,nullptr,instance,nullptr);
auto originalForeground=GetForegroundWindow();
int result=1;
try {
saved=ks::readClipboard(owner,128*1024*1024);captured=true;
auto sentinel=ks::textClip(L"KSwitcher Far fixture clipboard");
sentinel.formats.push_back({0,L"ExcludeClipboardContentFromMonitorProcessing",ks::Bytes{0}});
ks::writeClipboard(owner,sentinel);
const auto programFiles=_wgetenv(L"ProgramFiles");
if(!programFiles)throw std::runtime_error("ProgramFiles is unavailable");
auto farExecutable=std::filesystem::path(programFiles)/L"Far Manager/Far.exe";
std::wstring command=L"\""+farExecutable.wstring()+L"\" -m -p -s \""+folder.wstring()+L"\\profile\"";
// A GUID-length working directory can horizontally scroll Far's command
// line, making absolute cursor-cell assertions invalid. Keep the prompt
// short; profile and application data still live in the unique fixture.
auto workingDirectory=folder.root_path();
STARTUPINFOW startup{sizeof(startup)};startup.dwFlags=STARTF_USESHOWWINDOW;startup.wShowWindow=SW_HIDE;
require(CreateProcessW(nullptr,command.data(),nullptr,nullptr,FALSE,CREATE_NEW_CONSOLE,nullptr,workingDirectory.c_str(),&startup,&child),"start isolated Far without plugins/macros");
CloseHandle(child.hThread);Sleep(1800);
require(AttachConsole(child.dwProcessId),"attach isolated console for test-only input and observation");
input=CreateFileW(L"CONIN$",GENERIC_READ|GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,nullptr,OPEN_EXISTING,0,nullptr);
output=CreateFileW(L"CONOUT$",GENERIC_READ|GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,nullptr,OPEN_EXISTING,0,nullptr);
require(input!=INVALID_HANDLE_VALUE && output!=INVALID_HANDLE_VALUE,"open isolated console buffers");
auto target=GetConsoleWindow();farWindow=target;ShowWindow(target,SW_SHOW);
require(ks::activateWindow(target),"activate only the isolated Far window");
auto key=[&](WORD vk,wchar_t c=0,DWORD mods=0) {
INPUT_RECORD records[2]{};
for(int i=0;i<2;++i) {
auto &r=records[i];r.EventType=KEY_EVENT;
r.Event.KeyEvent={BOOL(i==0),1,vk,WORD(MapVirtualKeyW(vk,MAPVK_VK_TO_VSC)),{c},mods};
}
DWORD written{};
if(!WriteConsoleInputW(input,records,2,&written)||written!=2)throw std::runtime_error("test input failed");
Sleep(60);
};
auto position=[&] {CONSOLE_SCREEN_BUFFER_INFO info{};if(!GetConsoleScreenBufferInfo(output,&info))throw std::runtime_error("console position unavailable");return info.dwCursorPosition;};
auto row=[&] {
CONSOLE_SCREEN_BUFFER_INFO info{};GetConsoleScreenBufferInfo(output,&info);
std::wstring text(info.dwSize.X,L' ');DWORD count{};
if(!ReadConsoleOutputCharacterW(output,text.data(),DWORD(text.size()),{0,info.dwCursorPosition.Y},&count))throw std::runtime_error("console row unavailable");
return text;
};
{
ks::App app(instance,false,folder/L"data");app.window=owner;
app.settings.history=false;app.settings.autoCorrect=false;app.settings.writeLog=true;
auto prepare=[&](wchar_t last=L'r') {
if(!ks::activateWindow(target))throw std::runtime_error("isolated Far lost foreground");
key(VK_ESCAPE);key('Y',0,LEFT_CTRL_PRESSED);key(VK_OEM_1,L':',SHIFT_PRESSED);key(WORD(towupper(last)),last);
app.run.reset();app.run.window=target;app.run.layout=ks::windowLayout(target);
app.run.at=GetTickCount64();app.run.keys=L":r";
};
auto expand=[&](const std::wstring &replacement) {
app.settings.snippets={{L":r",replacement}};
app.transform(0,0);ks::InputRegressionAccess::runQueued(app);Sleep(120);
};
for(int panels=0;panels<2;++panels) {
prepare();auto before=position();auto original=row();expand(L"rider .");
auto expected=original;expected.replace(before.X-2,2,L"rider .");expected.resize(original.size());
// Far's rightmost scroll indicator is redrawn rather than shifted.
require(row().substr(0,before.X+5)==expected.substr(0,before.X+5),"actual snippet replaces :r with rider .");
require(position().X==before.X+5,"successful expansion leaves cursor after replacement");
require(ks::readClipboard(owner).text()==sentinel.text(),"snippet restores original clipboard");
prepare(L'x');before=position();original=row();expand(L"rider .{enter}");
require(row()==original && position().X==before.X,"mismatched trigger restores original caret and never executes Enter");
prepare();before=position();original=row();expand(L"left{cursor}right");
require(row().substr(before.X-2,9)==L"leftright" && position().X==before.X+2,"cursor marker uses Far selection semantics");
prepare();before=position();original=row();expand(L"first\nsecond{enter}");
require(row()==original && position().X==before.X,"multiline console template rejected before changing text or caret");
prepare();before=position();original=row();expand(L"echo KSWITCHER_FAR_FIXTURE{enter}");
for(int wait=0;wait<30 && position().X!=before.X-2;++wait)Sleep(100);
require(position().X==before.X-2 && row().substr(before.X-2,2)==L" ",
"verified Enter runs only the harmless fixture echo and returns to an empty command line");
key('O',0,LEFT_CTRL_PRESSED);
}
app.window=nullptr;
}
log<<"Passed "<<checks<<" Far snippet integration checks\n";result=0;
}catch(const std::exception &e){log<<"FAIL "<<e.what()<<" win32="<<GetLastError()<<'\n';}
// A real user or clipboard synchronizer can copy during this explicit test.
// Never replace that newer content with the fixture's original snapshot.
const auto restoreSequence=GetClipboardSequenceNumber();
const bool restoreClipboard=GetClipboardOwner()==owner || (farWindow && ks::ownsClipboard(farWindow));
if(input!=INVALID_HANDLE_VALUE)CloseHandle(input);
if(output!=INVALID_HANDLE_VALUE)CloseHandle(output);
FreeConsole();
if(child.hProcess){TerminateProcess(child.hProcess,0);WaitForSingleObject(child.hProcess,5000);CloseHandle(child.hProcess);}
if(captured && restoreClipboard && GetClipboardSequenceNumber()==restoreSequence)
try{ks::writeClipboard(owner,saved);}catch(...){result=1;}
DestroyWindow(owner);
if(IsWindow(originalForeground))ks::activateWindow(originalForeground);
CoUninitialize();return result;
}
+66 -3
View File
@@ -2,6 +2,7 @@
#include "ui_scroll.h" #include "ui_scroll.h"
#include "ui_geometry.h" #include "ui_geometry.h"
#include "screenshot.h" #include "screenshot.h"
#include "ocr.h"
#include <commctrl.h> #include <commctrl.h>
#include <iostream> #include <iostream>
#include <cmath> #include <cmath>
@@ -25,6 +26,17 @@ LRESULT CALLBACK countControlMoves(HWND w, UINT message, WPARAM wp, LPARAM lp, U
} }
namespace ks { namespace ks {
struct InputRegressionAccess { struct InputRegressionAccess {
static int snippetChoice(App &a, const std::vector<Snippet> &snippets) {
a.settings.snippets=snippets; a.settings.autoCorrect=false; a.busy=false;
a.snippetPending=-1; a.typingTarget=nullptr; a.snippetTyping=false;
auto target=GetForegroundWindow();
a.run.keys=L";si"; a.run.window=target; a.run.layout=windowLayout(target); a.run.at=GetTickCount64();
KBDLLHOOKSTRUCT key{};key.vkCode='G';key.scanCode=0x22;
a.keyboard(key,0);
int chosen=a.snippetPending;
a.busy=false;a.snippetPending=-1;a.typingTarget=nullptr;a.snippetTyping=false;
return chosen;
}
static bool idleUndo(App &a) { static bool idleUndo(App &a) {
a.last=LastTransform{}; a.last->at=100; a.last=LastTransform{}; a.last->at=100;
a.releaseIdleMemory(120100); a.releaseIdleMemory(120100);
@@ -94,6 +106,9 @@ struct InputRegressionAccess {
} }
static void notificationSetup(App &a) { a.updateNotifier = notify; } static void notificationSetup(App &a) { a.updateNotifier = notify; }
static void setup(App &a) { a.hookBindings = {{Toggle,{MOD_CONTROL,VK_F12}}, {Case,{MOD_CONTROL|MOD_SHIFT,'U'}}}; } static void setup(App &a) { a.hookBindings = {{Toggle,{MOD_CONTROL,VK_F12}}, {Case,{MOD_CONTROL|MOD_SHIFT,'U'}}}; }
static LRESULT routedKey(int code, UINT message, const KBDLLHOOKSTRUCT &key, LRESULT routed) {
return App::keyboardAfterHooks(code,message,(LPARAM)&key,routed);
}
static bool updateTimer(App &a) { static bool updateTimer(App &a) {
a.updateRunning=true; // Exercise timer scheduling without launching a network request. a.updateRunning=true; // Exercise timer scheduling without launching a network request.
App::windowProc(a.window,WM_TIMER,5,0); App::windowProc(a.window,WM_TIMER,5,0);
@@ -120,12 +135,25 @@ int main(int argc, char **argv) {
return result.state == L"current" || result.state == L"available" ? 0 : 1; return result.state == L"current" || result.state == L"available" ? 0 : 1;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; } } catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
} }
auto temp=std::filesystem::temp_directory_path()/(L"KSwitcher-input-tests-"+std::to_wstring(GetCurrentProcessId())); auto temp=std::filesystem::temp_directory_path()/(L"KSwitcher-input-tests-"+ks::newSnippetId());
int checks=0; int checks=0;
auto require=[&](bool ok,const char* text) { if(!ok) throw std::runtime_error(text); ++checks; }; auto require=[&](bool ok,const char* text) { if(!ok) throw std::runtime_error(text); ++checks; };
try { try {
INITCOMMONCONTROLSEX controls{sizeof(controls),ICC_STANDARD_CLASSES|ICC_LISTVIEW_CLASSES}; INITCOMMONCONTROLSEX controls{sizeof(controls),ICC_STANDARD_CLASSES|ICC_LISTVIEW_CLASSES};
InitCommonControlsEx(&controls); InitCommonControlsEx(&controls);
{
ks::App app(GetModuleHandleW(nullptr),true,temp/L"snippet-scopes");
app.window=CreateWindowExW(0,L"STATIC",L"Snippet scope test",0,0,0,0,0,HWND_MESSAGE,nullptr,GetModuleHandleW(nullptr),nullptr);
auto process=ks::processName(GetForegroundWindow());
require(!process.empty(),"scope test has foreground process");
std::vector<ks::Snippet> snippets{{L";sig",L"global",L"global"},{L";sig",L"scoped",L"scoped",{process}}};
require(ks::InputRegressionAccess::snippetChoice(app,snippets)==1,"app-specific trigger wins even when global is first");
snippets[1].apps={L"kswitcher-no-such-process"};
require(ks::InputRegressionAccess::snippetChoice(app,snippets)==0,"unmatched app falls back to global snippet");
snippets.erase(snippets.begin());
require(ks::InputRegressionAccess::snippetChoice(app,snippets)==-1,"scoped snippet is not queued in another application");
DestroyWindow(app.window);app.window=nullptr;
}
{ {
HMENU menu = CreatePopupMenu(), child = CreatePopupMenu(); HMENU menu = CreatePopupMenu(), child = CreatePopupMenu();
AppendMenuW(menu,MF_STRING | MF_CHECKED,1,L"&Settings…"); AppendMenuW(menu,MF_STRING | MF_CHECKED,1,L"&Settings…");
@@ -648,6 +676,22 @@ int main(int argc, char **argv) {
}; };
auto commands=[&] { MSG m{}; int n=0; while(PeekMessageW(&m,app.window,WM_HOTKEY,WM_HOTKEY,PM_REMOVE)) ++n; return n; }; auto commands=[&] { MSG m{}; int n=0; while(PeekMessageW(&m,app.window,WM_HOTKEY,WM_HOTKEY,PM_REMOVE)) ++n; return n; };
auto f12=event(VK_F12); auto f12=event(VK_F12);
{
const auto before = app.inputVersion.load();
const auto recorded = app.run.keys;
for (UINT message : {WM_KEYDOWN, WM_KEYUP, WM_SYSKEYDOWN, WM_SYSKEYUP})
require(ks::InputRegressionAccess::routedKey(HC_ACTION,message,event('A',30),7)==7,
"forwarded keyboard events preserve downstream suppression");
require(app.inputVersion==before && app.run.keys==recorded && commands()==0,
"forwarded events never track text, invalidate transactions or dispatch shortcuts");
require(ks::InputRegressionAccess::routedKey(-1,WM_KEYDOWN,event('A',30),0)==0 &&
app.inputVersion==before,"negative hook codes do not process keyboard input");
require(ks::InputRegressionAccess::routedKey(HC_ACTION,WM_KEYDOWN,event('A',30,true),0)==0 &&
app.inputVersion==before,"own input remains excluded after downstream routing");
require(ks::InputRegressionAccess::routedKey(HC_ACTION,WM_KEYDOWN,event('A',30),0)==0 &&
app.inputVersion>before,"delivered remote input is still processed on the receiver");
app.run.reset();
}
require(!app.handleKeyboard(event(VK_LCONTROL),true,0),"remote modifier passes through"); require(!app.handleKeyboard(event(VK_LCONTROL),true,0),"remote modifier passes through");
require(app.handleKeyboard(f12,true,MOD_CONTROL),"remote Ctrl+F12 handled"); require(app.handleKeyboard(f12,true,MOD_CONTROL),"remote Ctrl+F12 handled");
require(app.handleKeyboard(f12,true,MOD_CONTROL),"remote repeat suppressed"); require(app.handleKeyboard(f12,true,MOD_CONTROL),"remote repeat suppressed");
@@ -881,7 +925,7 @@ int main(int argc, char **argv) {
"personal dictionary field fits options window"); "personal dictionary field fits options window");
} }
SetDlgItemTextW(autoOptions,412,L"Релізик\r\nрелізик, словечко"); SetDlgItemTextW(autoOptions,412,L"Релізик\r\nрелізик, словечко");
SetDlgItemTextW(autoOptions,416,L" Првиіт = Привіт\r\nhelo=hello"); SetDlgItemTextW(autoOptions,416,L" Првиіт = Привіт\r\nhelo=hello\r\n Мамамила = Мама мила ");
SendDlgItemMessageW(autoOptions,414,BM_SETCHECK,BST_CHECKED,0); SendDlgItemMessageW(autoOptions,414,BM_SETCHECK,BST_CHECKED,0);
SendDlgItemMessageW(autoOptions,415,BM_SETCHECK,BST_CHECKED,0); SendDlgItemMessageW(autoOptions,415,BM_SETCHECK,BST_CHECKED,0);
SendMessageW(autoOptions,WM_COMMAND,IDOK,0); SendMessageW(autoOptions,WM_COMMAND,IDOK,0);
@@ -903,7 +947,7 @@ int main(int argc, char **argv) {
"personal dictionary normalizes case, newlines and duplicate words"); "personal dictionary normalizes case, newlines and duplicate words");
wchar_t pairs[128]{}; wchar_t pairs[128]{};
GetDlgItemTextW(autoOptions,416,pairs,128); GetDlgItemTextW(autoOptions,416,pairs,128);
require(std::wstring(pairs)==L"helo=hello\r\nпрвиіт=привіт\r\n" && require(std::wstring(pairs)==L"helo=hello\r\nмамамила=мама мила\r\nпрвиіт=привіт\r\n" &&
SendDlgItemMessageW(autoOptions,414,BM_GETCHECK,0,0)==BST_CHECKED && SendDlgItemMessageW(autoOptions,414,BM_GETCHECK,0,0)==BST_CHECKED &&
SendDlgItemMessageW(autoOptions,415,BM_GETCHECK,0,0)==BST_CHECKED, SendDlgItemMessageW(autoOptions,415,BM_GETCHECK,0,0)==BST_CHECKED,
"typo options and normalized replacement pairs survive reopening"); "typo options and normalized replacement pairs survive reopening");
@@ -961,6 +1005,22 @@ int main(int argc, char **argv) {
require(pumpUntil(2),"history reloads after releasing hidden rows"); require(pumpUntil(2),"history reloads after releasing hidden rows");
require(SendDlgItemMessageW(history,102,LB_GETCURSEL,0,0)==1, require(SendDlgItemMessageW(history,102,LB_GETCURSEL,0,0)==1,
"history retains selected record across close and reload"); "history retains selected record across close and reload");
SendMessageW(history,WM_CLOSE,0,0);
ks::Pixels screenshot{2,2,ks::Bytes(16,255)};
app.history->add(ks::Clip{{ks::imageDib(screenshot)}},L"screenshot",app.settings);
require(app.history->entries().front().image,"new screenshot is the newest history entry");
ks::showHistory(app);
require(pumpUntil(3),"reopening history loads the new screenshot");
require(SendDlgItemMessageW(history,102,LB_GETCURSEL,0,0)==0 &&
SendDlgItemMessageW(history,102,LB_GETTOPINDEX,0,0)==0,
"fresh history invocation selects and reveals newest screenshot instead of saved selection");
SendDlgItemMessageW(history,102,LB_SETCURSEL,2,0);
app.history->add(ks::textClip(L"background clipboard update"),L"test",app.settings);
ks::refreshHistory(app);
require(pumpUntil(4),"background refresh loads a new item");
require(SendDlgItemMessageW(history,102,LB_GETCURSEL,0,0)==3,
"background refresh preserves the selected record while browsing");
ShowWindow(history,SW_HIDE);
} }
auto childRect=[&](int id) { RECT r{}; GetWindowRect(GetDlgItem(history,id),&r); MapWindowPoints(nullptr,history,(POINT*)&r,2); return r; }; auto childRect=[&](int id) { RECT r{}; GetWindowRect(GetDlgItem(history,id),&r); MapWindowPoints(nullptr,history,(POINT*)&r,2); return r; };
RECT historyFrame{}; GetWindowRect(history,&historyFrame); RECT historyFrame{}; GetWindowRect(history,&historyFrame);
@@ -985,6 +1045,9 @@ int main(int argc, char **argv) {
require(SendDlgItemMessageW(settings,209,BM_GETCHECK,0,0)==BST_UNCHECKED,"automatic screenshot editor checkbox defaults off"); 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"); 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}}) { 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{}; RECT first{},second{},overlap{};
GetWindowRect(GetDlgItem(settings,pair.first),&first); GetWindowRect(GetDlgItem(settings,pair.second),&second); 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"); require(!IntersectRect(&overlap,&first,&second),"capture hotkey and layout controls do not overlap");
+84 -6
View File
@@ -22,6 +22,7 @@ namespace
ks::App *app{}; ks::App *app{};
HWND host{}, field{}; HWND host{}, field{};
ks::Clip saved; ks::Clip saved;
bool snippetRecoveryOnly = false;
bool captured = false, failed = false; bool captured = false, failed = false;
bool conversionOnly = false; bool conversionOnly = false;
bool typosOnly = false; bool typosOnly = false;
@@ -33,6 +34,17 @@ bool trimCopiedSpaces = false;
int trimmedCopies = 0; int trimmedCopies = 0;
bool temporaryClipboardExcluded = true; bool temporaryClipboardExcluded = true;
bool clipboardAccessTimedOut = false; bool clipboardAccessTimedOut = false;
uint64_t forwardedVersion{};
int forwardedEvents{};
LRESULT CALLBACK forwardingHook(int code, WPARAM wp, LPARAM lp)
{
if (code == HC_ACTION && reinterpret_cast<KBDLLHOOKSTRUCT *>(lp)->dwExtraInfo == 456)
{
++forwardedEvents;
return 1; // Model MWB consuming source input routed to another machine.
}
return CallNextHookEx(nullptr, code, wp, lp);
}
LRESULT CALLBACK observeEnter(HWND w, UINT message, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR) LRESULT CALLBACK observeEnter(HWND w, UINT message, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR)
{ {
if (message == WM_KEYDOWN && wp == VK_LEFT && droppedSelectionKeys > 0 && if (message == WM_KEYDOWN && wp == VK_LEFT && droppedSelectionKeys > 0 &&
@@ -577,10 +589,60 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
require(ks::readClipboard(app->window).text() == sentinel, "selected and repeated conversions restore clipboard"); require(ks::readClipboard(app->window).text() == sentinel, "selected and repeated conversions restore clipboard");
finish(); finish();
break; break;
case 64:
saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
captured = true;
app->ownSequence = ks::writeClipboard(app->window, ks::textClip(sentinel));
app->settings.snippets = {{L";repo-changes-jira", L"expanded{cursor}"}};
ActivateKeyboardLayout(app->layouts[en].handle, 0);
prepare(L"prefix ;repo-changes-jira", false);
record(L";repo-changes-jira");
droppedSelectionKeys = 10;
enterPresses = 0;
app->transform(0, 0);
break;
case 65:
require(text() == L"prefix expanded", "long snippet recovers partial selection and preserves prefix");
require(droppedSelectionKeys == 0 && enterPresses == 0, "snippet recovery consumes missing arrows without Enter");
require(ks::readClipboard(app->window).text() == sentinel, "snippet recovery restores clipboard");
if (snippetRecoveryOnly) { finish(); break; }
stage = 62;
break;
case 62:
if (!captured) saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
captured = true;
app->ownSequence = ks::writeClipboard(app->window, ks::textClip(sentinel));
app->settings.snippets = {{L";r", L"unexpected{enter}"}};
ActivateKeyboardLayout(app->layouts[en].handle, 0);
prepare(L"prefix ", false);
forwardedVersion = app->inputVersion.load();
copyRequests = forwardedEvents = 0;
{
std::vector<INPUT> inputs;
for (WORD key : {WORD(VK_OEM_1), WORD('R')})
for (DWORD flags : {DWORD(0), DWORD(KEYEVENTF_KEYUP)})
{
auto input = ks::keyboardInput(key, flags);
input.ki.dwExtraInfo = 456;
inputs.push_back(input);
}
require(SendInput((UINT)inputs.size(),inputs.data(),sizeof(INPUT))==inputs.size(),
"forwarded snippet input submitted to real hook chain");
}
break;
case 63:
require(forwardedEvents==4,"downstream forwarding hook consumed every key event");
require(app->inputVersion==forwardedVersion && copyRequests==0,
"forwarded snippet does not start tracking or clipboard work on source computer");
require(text()==L"prefix " && ks::readClipboard(app->window).text()==sentinel,
"forwarded snippet leaves source editor and clipboard untouched");
stage = 30;
break;
case 30: case 30:
case 32: case 32:
case 34: case 34:
case 37: case 37:
case 60:
// Earlier password/word tests replace the original multiline // Earlier password/word tests replace the original multiline
// editor with a single-line EDIT. Restore the snippet fixture: // editor with a single-line EDIT. Restore the snippet fixture:
// a single-line control cannot insert the tested Enter action. // a single-line control cannot insert the tested Enter action.
@@ -609,6 +671,11 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
enterPresses = 0; enterPresses = 0;
copyRequests = 0; copyRequests = 0;
copyFailuresRemaining = stage == 38 ? 10 : stage == 33 ? 1 : 0; copyFailuresRemaining = stage == 38 ? 10 : stage == 33 ? 1 : 0;
if (stage == 61)
{
pasteBehavior = 2; // Editor inserts unrelated clipboard text.
app->settings.writeLog = false;
}
temporaryClipboardExcluded = true; temporaryClipboardExcluded = true;
ActivateKeyboardLayout(app->layouts[en].handle, 0); ActivateKeyboardLayout(app->layouts[en].handle, 0);
prepare(L"prefix ", false); prepare(L"prefix ", false);
@@ -672,6 +739,13 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
require(ks::readClipboard(app->window).text() == sentinel, require(ks::readClipboard(app->window).text() == sentinel,
"exhausted copy retries restore the clipboard"); "exhausted copy retries restore the clipboard");
copyFailuresRemaining = 0; copyFailuresRemaining = 0;
stage = 60;
break;
case 61:
require(text() == L"prefix other! x", "incorrect snippet paste preserves following typing");
require(enterPresses == 0, "unverified snippet never submits Enter even without logging");
require(ks::readClipboard(app->window).text() == sentinel, "rejected snippet restores clipboard");
pasteBehavior = 0;
finish(); finish();
break; break;
case 20: case 20:
@@ -748,14 +822,14 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
case 22: case 22:
require(text() == L"робить ", "automatic correction selects and converts the whole word across an internal comma"); require(text() == L"робить ", "automatic correction selects and converts the whole word across an internal comma");
app->settings.autoReplace = true; app->settings.autoReplace = true;
app->settings.autoReplacements = {{L"helo", L"hello"}}; app->settings.autoReplacements = {{L"helo", L"hello world"}};
ActivateKeyboardLayout(app->layouts[en].handle, 0); ActivateKeyboardLayout(app->layouts[en].handle, 0);
prepare(L"(Helo)! ", false); prepare(L"(Helo)! ", false);
record(L"(Helo)! "); record(L"(Helo)! ");
app->transform(ks::AutoCorrect); app->transform(ks::AutoCorrect);
break; break;
case 23: case 23:
require(text() == L"(Hello)! ", "explicit typo pair replaces verified text with punctuation and capital"); require(text() == L"(Hello world)! ", "explicit phrase pair replaces verified text with punctuation and capital");
app->transform(ks::Undo); app->transform(ks::Undo);
break; break;
case 24: case 24:
@@ -781,7 +855,7 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
case 27: case 27:
require(text() == L"kswithcer ", "Undo suppresses the rejected spelling correction"); require(text() == L"kswithcer ", "Undo suppresses the rejected spelling correction");
app->settings.autoReplace = true; app->settings.autoReplace = true;
app->settings.autoReplacements = {{L"tehh", L"the"}}; app->settings.autoReplacements = {{L"tehh", L"the word"}};
app->autoPredictor.configure(L"dictionaries", app->settings.autoLanguages); app->autoPredictor.configure(L"dictionaries", app->settings.autoLanguages);
prepare(L"", false); prepare(L"", false);
{ {
@@ -798,7 +872,7 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
} }
break; break;
case 28: case 28:
require(text() == L"the x", "custom replacement through keyboard hook preserves subsequent typing"); require(text() == L"the word x", "custom phrase replacement through keyboard hook preserves subsequent typing");
app->settings.autoReplace = false; app->settings.autoReplace = false;
app->settings.autoTypos = false; app->settings.autoTypos = false;
if (typosOnly) { finish(); break; } if (typosOnly) { finish(); break; }
@@ -984,10 +1058,14 @@ int main(int argc, char **argv)
SetWindowSubclass(field, observeEnter, 1, 0); SetWindowSubclass(field, observeEnter, 1, 0);
if (typosOnly || (argc > 1 && std::string(argv[1]) == "--typing-only")) if (typosOnly || (argc > 1 && std::string(argv[1]) == "--typing-only"))
stage = 20; stage = 20;
if (argc > 1 && std::string(argv[1]) == "--snippets-only") snippetRecoveryOnly = argc > 1 && std::string(argv[1]) == "--snippet-recovery-only";
stage = 30; if (snippetRecoveryOnly || (argc > 1 && std::string(argv[1]) == "--snippets-only"))
stage = 64;
SetTimer(host, 1, 100, nullptr); SetTimer(host, 1, 100, nullptr);
auto forwarding = SetWindowsHookExW(WH_KEYBOARD_LL,forwardingHook,GetModuleHandleW(nullptr),0);
require(forwarding!=nullptr,"downstream forwarding fixture installed before application hook");
app->execute(); app->execute();
UnhookWindowsHookEx(forwarding);
} }
std::filesystem::remove_all(root); std::filesystem::remove_all(root);
} }
+79
View File
@@ -83,6 +83,53 @@ int main(int argc, char **argv)
require(c.pencilCursor!=nullptr,"pencil drawing cursor loads"); require(c.pencilCursor!=nullptr,"pencil drawing cursor loads");
require(c.freehand && !c.pointer && ks::toolCursor(c)==c.pencilCursor, require(c.freehand && !c.pointer && ks::toolCursor(c)==c.pencilCursor,
"new screenshot editor starts with the pencil tool"); "new screenshot editor starts with the pencil tool");
{
require(GetDlgItem(window,41) && GetDlgItem(window,44),"smoothing slider and Apply to all exist");
auto adjust=[&](int value,int code=TB_THUMBPOSITION) {
SendDlgItemMessageW(window,41,TBM_SETPOS,TRUE,value);
SendMessageW(window,WM_HSCROLL,MAKEWPARAM(code,0),(LPARAM)GetDlgItem(window,41));
};
adjust(70); require(c.smoothing==70 && c.marks.empty(),"no selection changes default smoothing");
ks::Mark pencil{{40,80},{240,80},0}; pencil.freehand=true;
for(int i=0;i<=100;++i) pencil.points.push_back({40+i*2,80+(i%2?5:0)});
ks::Mark rectangle{{40,130},{240,210},0}; rectangle.shape=ks::ScreenshotShape::Rectangle;
c.marks={pencil,pencil,rectangle}; c.selected=0;
auto rawImage=ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,c.marks)).bgra;
adjust(40,TB_THUMBTRACK); adjust(90,TB_THUMBTRACK); adjust(90,TB_ENDTRACK);
require(c.marks[0].smoothing==90 && c.marks[1].smoothing==0 && c.smoothing==70,
"selected stroke smoothing leaves other objects and default alone");
SendMessageW(window,WM_COMMAND,12,0);
require(c.marks[0].smoothing==0,"one undo reverses an entire slider drag");
SendMessageW(window,WM_COMMAND,18,0);
require(c.marks[0].smoothing==90,"redo restores smoothing amount and path");
c.selected=0; ks::syncLineOptions(window,c);
SendMessageW(window,WM_COMMAND,44,0);
require(c.marks[0].smoothing==90 && c.marks[1].smoothing==90 && c.smoothing==90 &&
c.marks[2].shape==ks::ScreenshotShape::Rectangle && c.marks[2].rawPoints.empty(),
"Apply to all updates pencil strokes and default without changing shapes");
require(ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,c.marks)).bgra!=rawImage,
"PNG export uses the smoothed geometry");
SendMessageW(window,WM_COMMAND,12,0);
require(c.marks[0].smoothing==90 && c.marks[1].smoothing==0,"bulk smoothing is one undo step");
c.selected=0; adjust(0);
require(c.marks[0].points.size()==pencil.points.size() && c.marks[0].points[1].y==85,
"selected zero smoothing restores exact original path");
require(ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,c.marks)).bgra==rawImage,
"restoring zero smoothing restores the exact original exported pixels");
c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{};
adjust(75);
auto mouse=[&](UINT message,POINT p) {
int x=c.view.left+MulDiv(p.x,c.view.right-c.view.left,c.image->width);
int y=c.view.top+MulDiv(p.y,c.view.bottom-c.view.top,c.image->height);
SendMessageW(window,message,message==WM_LBUTTONUP?0:MK_LBUTTON,MAKELPARAM(x,y));
};
mouse(WM_LBUTTONDOWN,{40,90});
for(int i=1;i<=100;++i) mouse(WM_MOUSEMOVE,{40+i*2,90+LONG(std::lround(35*std::sin(i*.04)+3*std::sin(i*1.7)))});
mouse(WM_LBUTTONUP,{240,64});
require(c.marks.size()==1 && c.marks[0].freehand && c.marks[0].smoothing==75 && !c.marks[0].rawPoints.empty(),
"new curved pencil stroke uses toolbar default and retains original samples");
c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{}; c.smoothing=25;
}
{ {
require(GetDlgItem(window,36)!=nullptr,"triangle has a dedicated toolbar button"); require(GetDlgItem(window,36)!=nullptr,"triangle has a dedicated toolbar button");
SendMessageW(window,WM_KEYDOWN,'G',0); SendMessageW(window,WM_KEYDOWN,'G',0);
@@ -141,6 +188,38 @@ int main(int argc, char **argv)
SendMessageW(window,WM_COMMAND,12,0); require(c.marks.empty(),"undo trapezoid creation"); SendMessageW(window,WM_COMMAND,12,0); require(c.marks.empty(),"undo trapezoid creation");
SendMessageW(window,WM_COMMAND,18,0); require(c.marks[0].shape==ks::ScreenshotShape::Trapezoid,"redo trapezoid creation"); SendMessageW(window,WM_COMMAND,18,0); require(c.marks[0].shape==ks::ScreenshotShape::Trapezoid,"redo trapezoid creation");
c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{}; c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{};
require(GetDlgItem(window,38)!=nullptr,"arc has a dedicated toolbar button");
SendMessageW(window,WM_KEYDOWN,'U',0);
require(c.shape==ks::ScreenshotShape::Arc && c.arrow && !c.freehand,"U selects arc tool");
mouse(WM_LBUTTONDOWN,{60,70}); mouse(WM_LBUTTONUP,{240,180});
require(c.marks.size()==1 && c.marks[0].shape==ks::ScreenshotShape::Arc && !c.marks[0].isHighlight(),
"arc tool creates an editable shape");
auto arc=c.marks[0];
require(ks::hitScreenshotMark(arc,{150,70},3)==ks::MarkPart::Body &&
ks::hitScreenshotMark(arc,{150,180},3)==ks::MarkPart::None,
"arc selects its curve but has no closing chord");
ks::Surface rendered(320,240); PatBlt(rendered.dc,0,0,320,240,WHITENESS);
ks::drawMarks(rendered.dc,{arc});
require(GetPixel(rendered.dc,150,70)==arc.color && GetPixel(rendered.dc,150,180)==RGB(255,255,255),
"arc renders an open curve without a closing chord");
auto exported=ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,{arc}));
auto channel=[&](int x,int y,int component){return exported.bgra[(y*exported.width+x)*4+component];};
require(channel(150,70,2)==GetRValue(arc.color) && channel(150,70,1)==GetGValue(arc.color) &&
channel(150,180,0)==255 && channel(150,180,1)==255 && channel(150,180,2)==255,
"PNG export preserves the arc and its open chord");
mouse(WM_LBUTTONDOWN,arc.to); mouse(WM_LBUTTONUP,{260,200});
require(c.marks[0].to.x==260 && c.marks[0].points.back().y==200,"arc resizes with its bounds");
auto arcGrip=ks::screenshotShapeRotationHandle(arc);
auto turned=ks::dragScreenshotMark(arc,ks::MarkPart::Rotation,arcGrip,{280,135},320,240);
require(turned.rotation!=0 && ks::hitScreenshotMark(turned,ks::rotateShapePoint(turned,{150,70}),3)==ks::MarkPart::Body,
"rotated arc remains selectable");
std::vector<ks::Mark> linked{arc}; ks::Mark connector{{10,10},{150,70},0};
ks::linkScreenshotEndpoint(connector,false,{150,70},linked,4);
require(connector.toLink.target!=0,"connector can attach to the arc curve");
SendMessageW(window,WM_COMMAND,12,0); require(c.marks[0].to.x==240,"undo arc resize");
SendMessageW(window,WM_COMMAND,12,0); require(c.marks.empty(),"undo arc creation");
SendMessageW(window,WM_COMMAND,18,0); require(c.marks[0].shape==ks::ScreenshotShape::Arc,"redo arc creation");
c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{};
SendMessageW(window,WM_COMMAND,21,0); SendMessageW(window,WM_COMMAND,21,0);
} }
{ {
+29
View File
@@ -0,0 +1,29 @@
param([Parameter(Mandatory=$true)][string]$Executable)
$ErrorActionPreference='Stop'
function Command([string]$Argument) {
$commandProcess=Start-Process -FilePath $Executable -ArgumentList $Argument -WindowStyle Hidden -PassThru
try {
$null=$commandProcess.Handle
$commandProcess.WaitForExit()
return $commandProcess.ExitCode
} finally { $commandProcess.Dispose() }
}
if ((Command '--status') -ne 3) { throw 'An isolated StayHere test instance is already running' }
$process=Start-Process -FilePath $Executable -WindowStyle Hidden -PassThru
$null=$process.Handle
try {
$ready=$false
for($i=0;$i -lt 20;$i++) {
if((Command '--status') -eq 1){$ready=$true;break}
Start-Sleep -Milliseconds 50
}
if(!$ready){throw 'StayHere did not start enabled'}
if((Command '--pause') -ne 0 -or (Command '--status') -ne 2){throw 'StayHere pause failed'}
if((Command '--resume') -ne 0 -or (Command '--status') -ne 1){throw 'StayHere resume failed'}
if((Command '--exit') -ne 0 -or !$process.WaitForExit(3000)){throw 'StayHere exit failed'}
if((Command '--status') -ne 3){throw 'StayHere instance remained after exit'}
Write-Output 'Passed isolated StayHere start/status/pause/resume/exit checks'
} finally {
if(!$process.HasExited){$null=Command '--exit';if(!$process.WaitForExit(3000)){$process.Kill()}}
$process.Dispose()
}
+27
View File
@@ -122,4 +122,31 @@ inline void testStrokeImprovement() {
double deviation=0; for(auto p:smooth) deviation+=std::abs(p.y-100); double deviation=0; for(auto p:smooth) deviation+=std::abs(p.y-100);
require(deviation/smooth.size()<1.5 && smooth.front().y==jitter.front().y && smooth.back().y==jitter.back().y, require(deviation/smooth.size()<1.5 && smooth.front().y==jitter.front().y && smooth.back().y==jitter.back().y,
"smoothing reduces jitter and preserves endpoints"); "smoothing reduces jitter and preserves endpoints");
auto equal=[](const auto &a,const auto &b){return a.size()==b.size() && std::equal(a.begin(),a.end(),b.begin(),
[](POINT x,POINT y){return x.x==y.x && x.y==y.y;});};
require(equal(ks::smoothScreenshotStroke(jitter,0),jitter),"zero smoothing preserves exact mouse samples");
std::vector<POINT> waves;
for(int i=0;i<=200;++i) waves.push_back({30+i,100+LONG(std::lround(6*std::sin(i*.5)))});
auto roughness=[](const auto &p){double total=0; for(size_t i=1;i<p.size();++i) total+=std::abs(p[i].y-p[i-1].y); return total;};
auto low=ks::smoothScreenshotStroke(waves,25),high=ks::smoothScreenshotStroke(waves,100);
require(roughness(high)<roughness(low) && roughness(low)<roughness(waves),"higher smoothing removes more jitter");
require(high.front().x==waves.front().x && high.front().y==waves.front().y &&
high.back().x==waves.back().x && high.back().y==waves.back().y,"smoothing preserves both endpoints");
ks::ScreenshotMark mark{waves.front(),waves.back(),0}; mark.freehand=true; mark.points=waves;
ks::setScreenshotSmoothing(mark,100); ks::setScreenshotSmoothing(mark,25);
require(equal(mark.points,low),"lowering smoothing recomputes from original instead of accumulating filters");
ks::setScreenshotSmoothing(mark,0);
require(equal(mark.points,waves),"zero restores original after multiple adjustments");
ks::setScreenshotSmoothing(mark,100);
auto moved=ks::dragScreenshotMark(mark,ks::MarkPart::Body,{0,0},{10,15},500,500);
ks::setScreenshotSmoothing(moved,0);
require(moved.points[40].x==waves[40].x+10 && moved.points[40].y==waves[40].y+15,
"moving preserves the original path in moved coordinates");
auto resized=ks::dragScreenshotMark(mark,ks::MarkPart::End,mark.to,{260,130},500,500);
ks::setScreenshotSmoothing(resized,0);
require(resized.points.back().x==260 && resized.points.back().y==130,"endpoint editing survives smoothing changes");
auto duplicate=ks::cloneScreenshotMark(mark,{mark},500,500);
ks::setScreenshotSmoothing(duplicate,0);
require(duplicate.points[40].x==waves[40].x+16 && duplicate.points[40].y==waves[40].y+16,
"cloning retains independent original geometry");
} }
+85
View File
@@ -70,6 +70,91 @@ int main()
reordered.directIds = {L"00000422", L"00000409"}; reordered.direct = {L"Ctrl+2", L"Ctrl+1"}; reordered.directIds = {L"00000422", L"00000409"}; reordered.direct = {L"Ctrl+2", L"Ctrl+1"};
require(sharedSyncSettings(ordered) == sharedSyncSettings(reordered), "layout enumeration does not cause sync churn"); require(sharedSyncSettings(ordered) == sharedSyncSettings(reordered), "layout enumeration does not cause sync churn");
auto j = parse(base); auto j = parse(base);
{
const std::wstring chat=L"telegram\nРобота / ~test";
const auto chatKey=utf8(chat);
Settings chats=local;
chats.chatCycles[chat]={L"win:00000422",L"win:00000409"};
chats.chatCycles[L"telegram-web\nРобота / ~test"]={L"win:00000409"};
chats.chatCycles[L"ms-teams\nTeam"]={L"win:00000422"};
chats.chatCycles[L"viber\nSaved inactive"]={L"win:00000409"};
auto shared=sharedSyncSettings(chats);
require(restoreSyncSettings(shared,local,{},true).chatCycles==chats.chatCycles,
"sync transfers all chat applications, Unicode names and ordered layout IDs even when not installed");
auto legacy=j; legacy.erase("chatCycles");
require(restoreSyncSettings(bytes(legacy),chats,{},true).chatCycles==chats.chatCycles,
"legacy profile without chat field preserves existing profiles");
require(restoreSyncSettings(base,chats,{},true).chatCycles.empty(),
"explicit empty chat map clears synchronized profiles");
auto l=j,r=j;
l["chatCycles"][chatKey]=Json::array({"win:00000422","win:00000409"});
r["chatCycles"]["ms-teams\nOther"]=Json::array({"win:00000409"});
auto first=mergeSyncProfile({},bytes(l),bytes(r));
require(first.conflicts.empty() && parse(first.local)["chatCycles"].size()==2 && first.local==first.remote,
"first sync unions profiles for different chats");
auto ancestor=first.local;
l=r=parse(ancestor);
l["chatCycles"][chatKey]=Json::array({"win:00000409","win:00000422"});
r["chatCycles"]["ms-teams\nOther"]=Json::array({"win:00000422"});
auto independent=mergeSyncProfile(ancestor,bytes(l),bytes(r));
require(independent.conflicts.empty() && parse(independent.local)["chatCycles"]==
Json({{chatKey,l["chatCycles"][chatKey]},{"ms-teams\nOther",r["chatCycles"]["ms-teams\nOther"]}}),
"independent chat edits merge without losing language order");
r["chatCycles"][chatKey]=Json::array({"win:00000422"});
auto conflict=mergeSyncProfile(ancestor,bytes(l),bytes(r));
require(conflict.conflicts.size()==1 && conflict.conflicts[0].key.find("~1")!=std::string::npos &&
conflict.conflicts[0].label.find(L"Chat languages: telegram / ")==0,
"same-chat edit conflict has readable name and escaped pointer");
auto again=mergeSyncProfile(conflict.base,conflict.local,conflict.remote);
require(again.conflicts.size()==1,"chat conflict survives persisted merge ancestor");
auto resolved=mergeSyncProfile(again.base,again.local,again.remote,{{again.conflicts[0],false}});
require(resolved.conflicts.empty() && parse(resolved.local)["chatCycles"][chatKey]==r["chatCycles"][chatKey],
"choose remote languages for one chat");
l=r=parse(ancestor); l["chatCycles"].erase(chatKey);
auto removed=mergeSyncProfile(ancestor,bytes(l),bytes(r));
require(removed.conflicts.empty() && !restoreSyncSettings(removed.local,local,{},true).chatCycles.contains(chat),
"chat deletion propagates and merged profile remains loadable");
r["chatCycles"][chatKey]=Json::array({"win:00000409"});
auto deletion=mergeSyncProfile(ancestor,bytes(l),bytes(r));
require(deletion.conflicts.size()==1,"chat deletion versus edit requires a choice");
auto erase=mergeSyncProfile(deletion.base,deletion.local,deletion.remote,{{deletion.conflicts[0],true}});
require(erase.conflicts.empty() && !parse(erase.remote)["chatCycles"].contains(chatKey),
"choosing deletion removes chat without leaving null entries");
auto stale=mergeSyncProfile(ancestor,bytes(l),bytes(legacy));
require(stale.conflicts.empty() && parse(stale.local)["chatCycles"]==l["chatCycles"],
"older remote missing chat field cannot delete or resurrect local chat profiles");
auto validate=[&](const Bytes &value){restoreSyncSettings(value,chats,{},true);};
FakeProvider provider; provider.remote={1,bytes(legacy)};
auto download=synchronize(provider,{},shared,SyncAction::Download,validate,{},true);
require(provider.writes==0 && restoreSyncSettings(download.settings,local,{},true).chatCycles==chats.chatCycles,
"download from older server profile preserves chat settings");
provider.remote={1,base};
download=synchronize(provider,{},shared,SyncAction::Download,validate,{},true);
require(restoreSyncSettings(download.settings,local,{},true).chatCycles.empty(),
"download explicit empty chat map removes local profiles");
provider.remote={1,bytes(legacy)};
auto upload=synchronize(provider,{},shared,SyncAction::Upload,validate,{},true);
require(provider.writes==1 && restoreSyncSettings(provider.remote.settings,local,{},true).chatCycles==chats.chatCycles,
"upload publishes chat profiles while keeping PC layout settings separate");
auto invalid=j; invalid["chatCycles"][chatKey]=Json::array();
rejects([&]{restoreSyncSettings(bytes(invalid),local,{},true);},"reject empty synchronized chat cycle");
invalid["chatCycles"][chatKey]=Json::array({"not-a-layout"});
rejects([&]{restoreSyncSettings(bytes(invalid),local,{},true);},"reject invalid synchronized layout ID");
invalid["chatCycles"]=Json::object({{"unknown\nChat",Json::array({"win:00000409"})}});
rejects([&]{restoreSyncSettings(bytes(invalid),local,{},true);},"reject unknown synchronized chat application");
}
{
Settings scoped = local;
scoped.snippets.push_back({L"test", L"Work apps", L"teams-scope", {L"ms-teams", L"outlook"}});
auto wire=sharedSyncSettings(scoped);
require(restoreSyncSettings(wire, local, {}).snippets[1].apps==std::vector<std::wstring>{L"ms-teams", L"outlook"}, "sync preserves multiple app scopes");
auto leftScope=j,rightScope=j;
leftScope["snippets"].push_back({{"id","left-scope"},{"trigger","same"},{"text","left"},{"apps",Json::array({"notepad"})}});
rightScope["snippets"].push_back({{"id","right-scope"},{"trigger","same"},{"text","right"},{"apps",Json::array({"ms-teams"})}});
require(parse(mergeSyncSettings(base,bytes(leftScope),bytes(rightScope)))["snippets"].size()==3, "same trigger in different apps merges");
rightScope["snippets"].back()["apps"]=Json::array({"NOTEPAD.exe"});
rejects([&]{mergeSyncSettings(base,bytes(leftScope),bytes(rightScope));}, "sync detects overlapping application scopes");
}
require(!j.contains("startWithSystem") && !j.contains("tesseractPath") && !j.contains("historyEnabled"), "local-only fields excluded"); require(!j.contains("startWithSystem") && !j.contains("tesseractPath") && !j.contains("historyEnabled"), "local-only fields excluded");
auto restored = restoreSyncSettings(base, local, {}); auto restored = restoreSyncSettings(base, local, {});
require(restored.autostart && restored.elevatedAutostart && !restored.history && restored.tesseractPath == local.tesseractPath, "preserve device settings"); require(restored.autostart && restored.elevatedAutostart && !restored.history && restored.tesseractPath == local.tesseractPath, "preserve device settings");
+32 -2
View File
@@ -517,6 +517,24 @@ int main(int argc, char **argv)
auto encoded = ks::encodeClip(clip); auto encoded = ks::encodeClip(clip);
require(ks::decodeClip(encoded).text() == clip.text(), "clipboard Unicode roundtrip"); require(ks::decodeClip(encoded).text() == clip.text(), "clipboard Unicode roundtrip");
require(ks::decodeClip(encoded).formats[1].name == L"HTML Format", "registered format identity"); require(ks::decodeClip(encoded).formats[1].name == L"HTML Format", "registered format identity");
auto selection = ks::textClip(L";pa");
selection.formats.push_back({0, L"vscode-editor-data", {1, 2, 3}});
auto relayed = selection;
relayed.formats.front().data.resize(128, 0xab);
std::reverse(relayed.formats.begin(), relayed.formats.end());
require(ks::selectionClipboardIdentity(selection) == ks::selectionClipboardIdentity(relayed),
"clipboard relay tolerates Unicode allocation slack and format order");
relayed.formats.front().data[0] ^= 1;
require(ks::selectionClipboardIdentity(selection) != ks::selectionClipboardIdentity(relayed),
"clipboard relay rejects changed editor metadata");
relayed = selection;
relayed.formats.pop_back();
require(ks::selectionClipboardIdentity(selection) != ks::selectionClipboardIdentity(relayed),
"clipboard relay rejects missing editor metadata");
relayed = selection;
relayed.formats.front() = ks::textClip(L";pb").formats.front();
require(ks::selectionClipboardIdentity(selection) != ks::selectionClipboardIdentity(relayed),
"clipboard relay rejects changed Unicode text");
auto encrypted = ks::protect(encoded); auto encrypted = ks::protect(encoded);
require(encrypted != encoded, "history ciphertext differs"); require(encrypted != encoded, "history ciphertext differs");
require(ks::unprotect(encrypted) == encoded, "Windows DPAPI roundtrip"); require(ks::unprotect(encrypted) == encoded, "Windows DPAPI roundtrip");
@@ -572,6 +590,12 @@ int main(int argc, char **argv)
options.autoNever = {L"hlelo"}; options.autoNever = {L"hlelo"};
require(!edited.suggest(L"hlelo ", 0, layouts, options), "never-correct overrides explicit pairs"); require(!edited.suggest(L"hlelo ", 0, layouts, options), "never-correct overrides explicit pairs");
options.autoNever.clear(); options.autoNever.clear();
options.autoReplacements[L"мамамила"] = L"мама мила";
correction = edited.suggest(L"(Мамамила)! ", 2, layouts, options);
require(correction && correction->text == L"(Мама мила)! " && correction->target == 2,
"joined words split while preserving capitalization, punctuation and layout");
edited.reject(L"мамамила ", options);
require(!edited.suggest(L"мамамила ", 2, layouts, options), "undo suppresses phrase replacements");
edited.reject(L"(Hlelo)! ", options); edited.reject(L"(Hlelo)! ", options);
require(!edited.suggest(L"hlelo ", 0, layouts, options), "undo rejection suppresses custom replacements"); require(!edited.suggest(L"hlelo ", 0, layouts, options), "undo rejection suppresses custom replacements");
options.autoReplace = false; options.autoReplace = false;
@@ -693,7 +717,7 @@ int main(int argc, char **argv)
settings.elevatedAutostart = true; settings.elevatedAutostart = true;
settings.autoCorrect = true; settings.autoCorrect = true;
settings.autoReplace = settings.autoTypos = true; settings.autoReplace = settings.autoTypos = true;
settings.autoReplacements = {{L"првиіт", L"привіт"}, {L"helo", L"hello"}}; settings.autoReplacements = {{L"првиіт", L"привіт"}, {L"helo", L"hello"}, {L"мамамила", L"мама мила"}};
settings.autoMaxRank = 10000; settings.autoMaxRank = 10000;
settings.autoMinLength = 5; settings.autoMinLength = 5;
settings.autoPrefixChars = L"(#"; settings.autoPrefixChars = L"(#";
@@ -708,7 +732,13 @@ int main(int argc, char **argv)
require(restored.autoWords == settings.autoWords, "personal dictionaries survive settings roundtrip"); require(restored.autoWords == settings.autoWords, "personal dictionaries survive settings roundtrip");
require(restored.autoReplace && restored.autoTypos && restored.autoReplacements == settings.autoReplacements, require(restored.autoReplace && restored.autoTypos && restored.autoReplacements == settings.autoReplacements,
"typo options and Unicode pairs survive settings roundtrip"); "typo options and Unicode pairs survive settings roundtrip");
for (const auto &pair : {std::pair{L"hello", L"привіт"}, {L"hello", L"hello"}, {L"hi!", L"hello"}}) for (const auto &pair : {std::pair{L"hello", L"привіт"}, {L"hello", L"hello"}, {L"hi!", L"hello"},
{L"helloworld", L" hello world"}, {L"helloworld", L"hello world "},
{L"helloworld", L"hello world"}, {L"helloworld", L"hello\tworld"},
{L"helloworld", L"hello\nworld"}, {L"hello world", L"helloworld"},
{L"helloworld", L"hello світ"}, {L"helloworld", L"hello world!"},
{L"helloworld", L"hello Hello"}, {L"helloworld", L""},
{L"helloworld", L"abcdefghijklmnopqrstuvwxyz abcdef"}})
{ {
auto invalid = settings; auto invalid = settings;
invalid.autoReplacements = {{pair.first, pair.second}}; invalid.autoReplacements = {{pair.first, pair.second}};
+18
View File
@@ -50,6 +50,9 @@ try {
foreach ($name in @('LICENSE','json-LICENSE.txt','README.md')) { [IO.File]::WriteAllText((Join-Path $source $name),'fixture') } foreach ($name in @('LICENSE','json-LICENSE.txt','README.md')) { [IO.File]::WriteAllText((Join-Path $source $name),'fixture') }
[IO.Directory]::CreateDirectory((Join-Path $source 'dictionaries')) | Out-Null [IO.Directory]::CreateDirectory((Join-Path $source 'dictionaries')) | Out-Null
[IO.File]::WriteAllText((Join-Path $source 'dictionaries/en.txt'),'new dictionary') [IO.File]::WriteAllText((Join-Path $source 'dictionaries/en.txt'),'new dictionary')
[IO.Directory]::CreateDirectory((Join-Path $source 'tools')) | Out-Null
[IO.File]::WriteAllText((Join-Path $source 'tools/README.txt'),'portable utilities instructions')
[IO.File]::WriteAllText((Join-Path $source 'tools/StayHere.exe'),'bundled StayHere fixture')
function Write-TestManifest($Folder) { function Write-TestManifest($Folder) {
$entries=@(Get-ChildItem -LiteralPath $Folder -File -Recurse | Where-Object Name -ne 'release-files.json' | ForEach-Object { $entries=@(Get-ChildItem -LiteralPath $Folder -File -Recurse | Where-Object Name -ne 'release-files.json' | ForEach-Object {
@{path=$_.FullName.Substring($Folder.Length+1).Replace('\','/');size=$_.Length;sha256=(Get-FileHash -LiteralPath $_.FullName).Hash} @{path=$_.FullName.Substring($Folder.Length+1).Replace('\','/');size=$_.Length;sha256=(Get-FileHash -LiteralPath $_.FullName).Hash}
@@ -92,8 +95,18 @@ try {
$null=$z.CreateEntry('undeclared.dll'); $z.Dispose() $null=$z.CreateEntry('undeclared.dll'); $z.Dispose()
Reject { Expand-Release $extra (Join-Path $root 'extrastage') $binaryVersion } 'undeclared file rejected' Reject { Expand-Release $extra (Join-Path $root 'extrastage') $binaryVersion } 'undeclared file rejected'
$target=Join-Path $root 'install'; $backup=Join-Path $root 'backup' $target=Join-Path $root 'install'; $backup=Join-Path $root 'backup'
$freshTarget=Join-Path $root 'fresh-install'
[IO.Directory]::CreateDirectory($freshTarget) | Out-Null
$freshChanges=[Collections.Generic.List[string]]::new()
$freshStage=Join-Path $root 'fresh-stage'
Copy-Item -LiteralPath $stage -Destination $freshStage -Recurse
Install-Files $freshStage $freshTarget (Join-Path $root 'fresh-backup') $freshChanges
Assert (Test-Path -LiteralPath (Join-Path $freshTarget 'tools/README.txt')) 'update creates portable tools folder'
[IO.Directory]::CreateDirectory((Join-Path $target 'data')) | Out-Null [IO.Directory]::CreateDirectory((Join-Path $target 'data')) | Out-Null
[IO.Directory]::CreateDirectory((Join-Path $target 'dictionaries')) | Out-Null [IO.Directory]::CreateDirectory((Join-Path $target 'dictionaries')) | Out-Null
[IO.Directory]::CreateDirectory((Join-Path $target 'tools')) | Out-Null
[IO.File]::WriteAllText((Join-Path $target 'tools/Personal.exe'),'personal utility fixture')
[IO.File]::WriteAllText((Join-Path $target 'tools/StayHere.exe'),'older StayHere fixture')
[IO.File]::WriteAllText((Join-Path $target 'data/settings.json'),'personal settings') [IO.File]::WriteAllText((Join-Path $target 'data/settings.json'),'personal settings')
[IO.File]::WriteAllText((Join-Path $target 'dictionaries/en.txt'),'personal dictionary') [IO.File]::WriteAllText((Join-Path $target 'dictionaries/en.txt'),'personal dictionary')
[IO.File]::WriteAllText((Join-Path $target 'KSwitcher.exe'),'old binary fixture') [IO.File]::WriteAllText((Join-Path $target 'KSwitcher.exe'),'old binary fixture')
@@ -105,9 +118,14 @@ try {
} }
Assert ([IO.File]::ReadAllText((Join-Path $target 'future-tool.exe')) -eq 'future companion fixture') 'new companion name installs without changing updater' Assert ([IO.File]::ReadAllText((Join-Path $target 'future-tool.exe')) -eq 'future companion fixture') 'new companion name installs without changing updater'
Assert ([IO.File]::ReadAllText((Join-Path $target 'data/settings.json')) -eq 'personal settings') 'settings preserved' Assert ([IO.File]::ReadAllText((Join-Path $target 'data/settings.json')) -eq 'personal settings') 'settings preserved'
Assert ([IO.File]::ReadAllText((Join-Path $target 'tools/Personal.exe')) -eq 'personal utility fixture') 'personal utilities preserved'
Assert ([IO.File]::ReadAllText((Join-Path $target 'tools/README.txt')) -eq 'portable utilities instructions') 'bundled tools documentation installed'
Assert ([IO.File]::ReadAllText((Join-Path $target 'tools/StayHere.exe')) -eq 'bundled StayHere fixture') 'bundled StayHere updated'
Assert ([IO.File]::ReadAllText((Join-Path $target 'dictionaries/en.txt')) -eq 'personal dictionary') 'dictionary preserved' Assert ([IO.File]::ReadAllText((Join-Path $target 'dictionaries/en.txt')) -eq 'personal dictionary') 'dictionary preserved'
Undo-Files $target $backup $changed Undo-Files $target $backup $changed
Assert ([IO.File]::ReadAllText((Join-Path $target 'KSwitcher.exe')) -eq 'old binary fixture') 'rollback restores original' Assert ([IO.File]::ReadAllText((Join-Path $target 'KSwitcher.exe')) -eq 'old binary fixture') 'rollback restores original'
Assert ([IO.File]::ReadAllText((Join-Path $target 'tools/Personal.exe')) -eq 'personal utility fixture') 'rollback preserves personal utilities'
Assert ([IO.File]::ReadAllText((Join-Path $target 'tools/StayHere.exe')) -eq 'older StayHere fixture') 'rollback restores previous StayHere'
Assert (!(Test-Path -LiteralPath (Join-Path $target 'README.md'))) 'rollback removes newly introduced files' Assert (!(Test-Path -LiteralPath (Join-Path $target 'README.md'))) 'rollback removes newly introduced files'
Assert (!(Test-Path -LiteralPath (Join-Path $target 'KSwitcher.Config.exe'))) 'rollback removes newly introduced configurator' Assert (!(Test-Path -LiteralPath (Join-Path $target 'KSwitcher.Config.exe'))) 'rollback removes newly introduced configurator'
Assert (!(Test-Path -LiteralPath (Join-Path $target 'KSwitcher.Screenshot.exe'))) 'rollback removes newly introduced screenshot editor' Assert (!(Test-Path -LiteralPath (Join-Path $target 'KSwitcher.Screenshot.exe'))) 'rollback removes newly introduced screenshot editor'
+43
View File
@@ -0,0 +1,43 @@
#include <windows.h>
#include "../src/utilities.h"
#include <fstream>
#include <iostream>
#include <stdexcept>
int main()
{
namespace fs = std::filesystem;
auto root = fs::temp_directory_path() / (L"KSwitcher-utilities-" + std::to_wstring(GetCurrentProcessId()));
try
{
std::error_code error;
if (!ks::discoverUtilities(root / L"missing", error).empty() || error)
throw std::runtime_error("Missing folder must be empty, not an error");
fs::create_directories(root / L"tools" / L"nested");
fs::create_directory(root / L"tools" / L"directory.exe");
for (auto name : {L"Zed.exe", L"alpha.EXE", L"A & B.exe", L"readme.txt", L"shortcut.lnk"})
std::ofstream(root / L"tools" / name).put('x');
std::ofstream(root / L"tools" / L"nested" / L"hidden.exe").put('x');
auto found = ks::discoverUtilities(root / L"tools", error);
if (error || found.size() != 3 || found[0].filename() != L"A & B.exe" ||
found[1].filename() != L"alpha.EXE" || found[2].filename() != L"Zed.exe")
throw std::runtime_error("Scan must filter direct executable files and sort names");
if (ks::utilityMenuLabel(found[0]) != L"A && B")
throw std::runtime_error("Ampersand must be displayed literally");
fs::remove(found[1]);
if (ks::discoverUtilities(root / L"tools", error).size() != 2)
throw std::runtime_error("Scan must refresh after a file is removed");
ks::discoverUtilities(root / L"tools" / L"readme.txt", error);
if (!error) throw std::runtime_error("Non-directory must report an error");
fs::remove_all(root);
std::cout << "Utilities regression tests passed\n";
return 0;
}
catch (const std::exception &e)
{
std::error_code ignored;
fs::remove_all(root, ignored);
std::cerr << e.what() << '\n';
return 1;
}
}
+31
View File
@@ -0,0 +1,31 @@
# StayHere
Маленька портативна утиліта для Windows, без .NET та інсталяції.
Виберіть **Tools → StayHere** у меню трея (у v0.6.46 цей пункт називається Utilities)
або запустіть `tools/StayHere.exe` поруч із KSwitcher.exe.
Зелена крапка в треї означає, що підтримка активності ввімкнена.
Клацання лівою кнопкою перемикає режим; правою — відкриває меню з перемикачем і виходом.
Після кожного запуску режим увімкнений. Автозапуск не додається.
Раз на 15 секунд перевіряється час бездіяльності. Після 3 хвилин без вводу
надсилається натискання й відпускання F15. Поки ви працюєте, клавіші не надсилаються.
Курсор миші не рухається. Увімкнений режим також утримує екран і систему від
автоматичного сну. На заблокованому екрані та у відключеному сеансі активність
не імітується. Ручне блокування Windows не обходиться.
Механізм перенесено за поведінкою з Typlo. Він підтримує системну активність,
але не керує статусом Teams через API: статус залежить також від Teams,
календаря, інших пристроїв та політик організації. F15 може мати власне
призначення в окремих програмах. На підвищених вікнах Windows може блокувати ввід;
тоді підказка іконки показує помилку. Утиліта не запитує права адміністратора.
## Збірка
У репозиторії KSwitcher виконайте `./build.ps1 -Stage` з кореня проєкту.
Утиліта збирається з `utilities/StayHere/main.cpp` у `build/staged/tools/StayHere.exe`
і включається пакувальником у реліз. CMake також має ціль `StayHere`.
Для запуску достатньо одного `StayHere.exe`; .NET не потрібний.
CLI: `--pause`, `--resume`, `--exit` керують запущеним екземпляром.
`--status` повертає код 1 для активного режиму, 2 для паузи, 3 якщо утиліта не запущена.
+238
View File
@@ -0,0 +1,238 @@
#include <windows.h>
#include <shellapi.h>
#include <wtsapi32.h>
#include <cwchar>
#include <initializer_list>
#include <string>
namespace {
#ifdef STAYHERE_TEST_INSTANCE
constexpr wchar_t ClassName[] = L"StayHere.Test.Tray.1";
constexpr wchar_t MutexName[] = L"Local\\StayHere.Test.Tray.1";
#else
constexpr wchar_t ClassName[] = L"StayHere.Tray.1";
constexpr wchar_t MutexName[] = L"Local\\StayHere.Tray.1";
#endif
constexpr UINT TrayMessage = WM_APP + 1;
constexpr UINT ControlMessage = WM_APP + 2;
constexpr UINT Toggle = 1, Quit = 2, Pause = 3, Resume = 4, Status = 5;
constexpr DWORD IdleThreshold = 180000;
bool enabled = true;
bool sessionLocked = false;
bool powerOk = true;
bool inputOk = true;
UINT taskbarCreated;
HICON activeIcon, pausedIcon;
NOTIFYICONDATAW tray{};
constexpr bool shouldSignal(bool active, bool unlocked, DWORD now, DWORD lastInput) {
return active && unlocked && DWORD(now - lastInput) >= IdleThreshold;
}
static_assert(!shouldSignal(true, true, 179999, 0));
static_assert(shouldSignal(true, true, 180000, 0));
static_assert(!shouldSignal(false, true, 180000, 0));
static_assert(!shouldSignal(true, false, 180000, 0));
static_assert(shouldSignal(true, true, 179000, 0xfffffc18)); // tick counter wrap
bool interactiveDesktop() {
if (sessionLocked) return false;
HDESK desktop = OpenInputDesktop(0, FALSE, DESKTOP_READOBJECTS);
if (!desktop) return false;
wchar_t name[128]{};
DWORD needed = 0;
bool ok = GetUserObjectInformationW(desktop, UOI_NAME, name, sizeof(name), &needed)
&& _wcsicmp(name, L"Default") == 0;
CloseDesktop(desktop);
if (!ok) return false;
DWORD session;
LPWSTR buffer = nullptr;
DWORD bytes = 0;
if (!ProcessIdToSessionId(GetCurrentProcessId(), &session)) return false;
if (!WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, session, WTSConnectState, &buffer, &bytes)) return false;
ok = bytes >= sizeof(WTS_CONNECTSTATE_CLASS)
&& *reinterpret_cast<WTS_CONNECTSTATE_CLASS*>(buffer) == WTSActive;
WTSFreeMemory(buffer);
return ok;
}
HICON makeIcon(COLORREF color) {
HDC screen = GetDC(nullptr);
HDC dc = CreateCompatibleDC(screen);
HBITMAP bitmap = CreateCompatibleBitmap(screen, 32, 32);
HGDIOBJ previous = SelectObject(dc, bitmap);
RECT rect{0, 0, 32, 32};
FillRect(dc, &rect, static_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
HBRUSH brush = CreateSolidBrush(color);
HGDIOBJ oldBrush = SelectObject(dc, brush);
HGDIOBJ oldPen = SelectObject(dc, GetStockObject(NULL_PEN));
Ellipse(dc, 3, 3, 29, 29);
SelectObject(dc, oldBrush);
SelectObject(dc, oldPen);
DeleteObject(brush);
SelectObject(dc, previous);
HBITMAP mask = CreateBitmap(32, 32, 1, 1, nullptr);
HGDIOBJ maskPrevious = SelectObject(dc, mask);
PatBlt(dc, 0, 0, 32, 32, WHITENESS);
oldBrush = SelectObject(dc, GetStockObject(BLACK_BRUSH));
oldPen = SelectObject(dc, GetStockObject(NULL_PEN));
Ellipse(dc, 3, 3, 29, 29);
SelectObject(dc, oldPen);
SelectObject(dc, oldBrush);
SelectObject(dc, maskPrevious);
ICONINFO info{TRUE, 0, 0, mask, bitmap};
HICON icon = CreateIconIndirect(&info);
DeleteObject(bitmap);
DeleteObject(mask);
DeleteDC(dc);
ReleaseDC(nullptr, screen);
return icon;
}
void updateTray() {
tray.hIcon = enabled ? activeIcon : pausedIcon;
const wchar_t* tip = !enabled ? L"StayHere — призупинено"
: !powerOk ? L"StayHere — помилка утримання від сну"
: !inputOk ? L"StayHere — не вдалося надіслати F15"
: L"StayHere — активно (F15 після 3 хв простою)";
lstrcpynW(tray.szTip, tip, ARRAYSIZE(tray.szTip));
Shell_NotifyIconW(NIM_MODIFY, &tray);
}
void setEnabled(bool value) {
enabled = value;
inputOk = true;
powerOk = SetThreadExecutionState(ES_CONTINUOUS |
(enabled && interactiveDesktop() ? ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED : 0)) != 0;
updateTray();
}
void tick() {
const bool unlocked = interactiveDesktop();
powerOk = SetThreadExecutionState(ES_CONTINUOUS |
(enabled && unlocked ? ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED : 0)) != 0;
LASTINPUTINFO idle{sizeof(idle), 0};
if (GetLastInputInfo(&idle) && shouldSignal(enabled, unlocked, GetTickCount(), idle.dwTime)) {
// Avoid inserting a key into a chord being held while the user is away.
for (int key : {VK_SHIFT, VK_CONTROL, VK_MENU, VK_LWIN, VK_RWIN,
VK_LBUTTON, VK_RBUTTON, VK_MBUTTON}) {
if (GetAsyncKeyState(key) & 0x8000) return;
}
INPUT input[2]{};
input[0].type = input[1].type = INPUT_KEYBOARD;
input[0].ki.wVk = input[1].ki.wVk = VK_F15;
input[1].ki.dwFlags = KEYEVENTF_KEYUP;
inputOk = SendInput(2, input, sizeof(INPUT)) == 2;
if (!inputOk) { // If only key-down succeeded, make a best effort to release it.
SendInput(1, &input[1], sizeof(INPUT));
}
}
updateTray();
}
void showMenu(HWND window) {
HMENU menu = CreatePopupMenu();
AppendMenuW(menu, MF_STRING | (enabled ? MF_CHECKED : 0), Toggle, L"Підтримувати активність");
AppendMenuW(menu, MF_SEPARATOR, 0, nullptr);
AppendMenuW(menu, MF_STRING, Quit, L"Вийти");
POINT pos;
GetCursorPos(&pos);
SetForegroundWindow(window);
UINT command = TrackPopupMenu(menu, TPM_RETURNCMD | TPM_RIGHTBUTTON, pos.x, pos.y, 0, window, nullptr);
DestroyMenu(menu);
if (command) SendMessageW(window, ControlMessage, command, 0);
PostMessageW(window, WM_NULL, 0, 0);
}
LRESULT CALLBACK windowProc(HWND window, UINT message, WPARAM wp, LPARAM lp) {
if (message == taskbarCreated) {
Shell_NotifyIconW(NIM_ADD, &tray);
return 0;
}
switch (message) {
case TrayMessage:
if (lp == WM_RBUTTONUP || lp == WM_CONTEXTMENU) showMenu(window);
else if (lp == WM_LBUTTONUP) setEnabled(!enabled);
return 0;
case ControlMessage:
if (wp == Status) return enabled ? 1 : 2;
if (wp == Toggle) setEnabled(!enabled);
else if (wp == Pause) setEnabled(false);
else if (wp == Resume) setEnabled(true);
else if (wp == Quit) DestroyWindow(window);
return 0;
case WM_TIMER: tick(); return 0;
case WM_WTSSESSION_CHANGE:
if (wp == WTS_SESSION_LOCK || wp == WTS_REMOTE_DISCONNECT || wp == WTS_CONSOLE_DISCONNECT)
sessionLocked = true;
else if (wp == WTS_SESSION_UNLOCK || wp == WTS_REMOTE_CONNECT || wp == WTS_CONSOLE_CONNECT)
sessionLocked = false;
setEnabled(enabled);
return 0;
case WM_DESTROY:
KillTimer(window, 1);
WTSUnRegisterSessionNotification(window);
SetThreadExecutionState(ES_CONTINUOUS);
Shell_NotifyIconW(NIM_DELETE, &tray);
PostQuitMessage(0);
return 0;
}
return DefWindowProcW(window, message, wp, lp);
}
}
int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int) {
int argc{};
auto argv=CommandLineToArgvW(GetCommandLineW(),&argc);
if(!argv)return 10;
const std::wstring argument=argc==2?argv[1]:L"";
LocalFree(argv);
if(argc>2)return 10;
const auto commandLine=argument.c_str();
UINT command = 0;
if (wcscmp(commandLine, L"--pause") == 0) command = Pause;
else if (wcscmp(commandLine, L"--resume") == 0) command = Resume;
else if (wcscmp(commandLine, L"--exit") == 0) command = Quit;
else if (wcscmp(commandLine, L"--status") == 0) command = Status;
else if (*commandLine) return 10;
HWND existing = FindWindowW(ClassName, nullptr);
if (command) {
if (!existing) return 3;
DWORD_PTR result = 0;
if (!SendMessageTimeoutW(existing, ControlMessage, command, 0, SMTO_ABORTIFHUNG, 2000, &result)) return 4;
return command == Status ? static_cast<int>(result) : 0;
}
HANDLE mutex = CreateMutexW(nullptr, FALSE, MutexName);
if (!mutex) return 5;
if (GetLastError() == ERROR_ALREADY_EXISTS) { CloseHandle(mutex); return 0; }
taskbarCreated = RegisterWindowMessageW(L"TaskbarCreated");
activeIcon = makeIcon(RGB(40, 185, 100));
pausedIcon = makeIcon(RGB(135, 140, 150));
WNDCLASSW wc{};
wc.lpfnWndProc = windowProc;
wc.hInstance = instance;
wc.lpszClassName = ClassName;
if (!RegisterClassW(&wc)) return 6;
HWND window = CreateWindowExW(0, ClassName, L"StayHere", WS_OVERLAPPED,
0, 0, 0, 0, nullptr, nullptr, instance, nullptr);
if (!window) return 7;
tray.cbSize = sizeof(tray);
tray.hWnd = window;
tray.uID = 1;
tray.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
tray.uCallbackMessage = TrayMessage;
tray.hIcon = activeIcon;
lstrcpyW(tray.szTip, L"StayHere");
if (!Shell_NotifyIconW(NIM_ADD, &tray)) { DestroyWindow(window); return 8; }
WTSRegisterSessionNotification(window, NOTIFY_FOR_THIS_SESSION);
setEnabled(true);
if (!SetTimer(window, 1, 15000, nullptr)) { DestroyWindow(window); return 9; }
MSG msg{};
while (GetMessageW(&msg, nullptr, 0, 0) > 0) {
TranslateMessage(&msg);
DispatchMessageW(&msg);
}
DestroyIcon(activeIcon);
DestroyIcon(pausedIcon);
CloseHandle(mutex);
return 0;
}