Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
346af2256f | ||
|
|
99db99e603 | ||
|
|
63b7b879a3 | ||
|
|
727dc96908 | ||
|
|
ede4ce47c0 | ||
|
|
3b8b8f26fe | ||
|
|
19f1e4531c | ||
|
|
a124e030ab | ||
|
|
c18148a574 | ||
|
|
15197da548 | ||
|
|
66e24b5efc |
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.24)
|
cmake_minimum_required(VERSION 3.24)
|
||||||
project(KSwitcher VERSION 0.6.49 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()
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -202,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.
|
||||||
@@ -272,6 +293,11 @@ thumbnails and source labels aligned with the scaled fonts and spacing.
|
|||||||
|
|
||||||
### Chat language profiles — v0.6.48
|
### 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.
|
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.
|
Switching tabs preserves edits; Save, Cancel, Import and Export stay available below every page.
|
||||||
|
|
||||||
@@ -291,14 +317,8 @@ Matching uses the application and visible chat name, not a unique account/contac
|
|||||||
Identically named chats in one application share a profile; renamed chats need a new
|
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
|
profile. Telegram unread counters are ignored. Teams currently recognizes the desktop
|
||||||
`Chat | name | Microsoft Teams` title format; other Teams title formats are not supported.
|
`Chat | name | Microsoft Teams` title format; other Teams title formats are not supported.
|
||||||
From v0.6.49, experimental Viber header OCR is supported using an installed
|
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.
|
||||||
Tesseract 5 and the languages selected in OCR options. Open a non-minimized Viber chat
|
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.
|
||||||
before opening the profile dialog. Recognition runs locally; message text is not sent
|
|
||||||
to OCR and screenshots are not saved. Allow about two seconds after entering a chat.
|
|
||||||
An unreadable or changing header does not produce a profile match. OCR mistakes,
|
|
||||||
truncated names and Viber UI changes can affect matching. Viber support starts with v0.6.49.
|
|
||||||
Profiles stay on this PC (excluded from cloud sync), and are included in manual settings
|
|
||||||
export/import. Available from v0.6.48.
|
|
||||||
|
|
||||||
**Українською.** Налаштування розділено на вкладки General, Languages, Shortcuts, Clipboard
|
**Українською.** Налаштування розділено на вкладки General, Languages, Shortcuts, Clipboard
|
||||||
і Tools. Перехід між ними зберігає незбережені зміни; Save, Cancel, Import і Export доступні
|
і Tools. Перехід між ними зберігає незбережені зміни; Save, Cancel, Import і Export доступні
|
||||||
@@ -313,15 +333,36 @@ for a chat…**. Вибери чат і потрібні мови, натисн
|
|||||||
Зіставлення виконується за програмою та назвою чату: однакові назви в одній програмі
|
Зіставлення виконується за програмою та назвою чату: однакові назви в одній програмі
|
||||||
мають спільний профіль, після перейменування потрібен новий. Лічильник непрочитаних
|
мають спільний профіль, після перейменування потрібен новий. Лічильник непрочитаних
|
||||||
Telegram ігнорується. Teams підтримує зазначений вище формат заголовка.
|
Telegram ігнорується. Teams підтримує зазначений вище формат заголовка.
|
||||||
З v0.6.49 Viber експериментально визначається через локальний OCR заголовка:
|
Експериментальні профілі Viber із v0.6.49 вимкнено у v0.6.50 через затримки від повторного OCR. Фонове розпізнавання, OCR при перемиканні мов та відкритті профілів більше не запускаються. Профілі Viber збережені й позначені як неактивні; системне перемикання та Next layout у Viber використовують звичайну поведінку й загальний набір. OCR буфера та зображень не змінено.
|
||||||
потрібен Tesseract 5 із мовами, вибраними в OCR options. Перед відкриттям профілів
|
|
||||||
відкрий чат у незгорнутому Viber. Після переходу в чат зачекай приблизно дві секунди.
|
|
||||||
Текст повідомлень не передається в OCR, знімки не зберігаються. Нечитабельний або
|
|
||||||
мінливий заголовок не дає збігу; помилки OCR, обрізані імена та зміни інтерфейсу Viber
|
|
||||||
можуть впливати на визначення. Підтримка Viber доступна з v0.6.49.
|
|
||||||
Профілі локальні, входять до ручного експорту/імпорту, але не до
|
Профілі локальні, входять до ручного експорту/імпорту, але не до
|
||||||
хмарної синхронізації. Доступно з v0.6.48.
|
хмарної синхронізації. Доступно з 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
|
### 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.
|
||||||
|
|||||||
Binary file not shown.
+7
-9
@@ -1,22 +1,20 @@
|
|||||||
# Latest Windows release
|
# Latest Windows release
|
||||||
|
|
||||||
## v0.6.49 — 2026-11-05
|
## v0.6.55 — 2026-11-06
|
||||||
|
|
||||||
## Changes
|
## Changes
|
||||||
- Add experimental Viber chat language profiles using local OCR of the chat header. Requires a separate Tesseract 5 installation and the language packs selected in OCR options; Tesseract is not bundled.
|
- 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.
|
||||||
- Open a non-minimized Viber chat, then **Settings → Languages → Languages for a chat...**. Select its Viber entry, choose languages, and click **Use languages → Save**.
|
- 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.
|
||||||
- Apply the profile to **Alt+Shift**, **Win+Space**, reverse **Win+Shift+Space**, and KSwitcher's **Next layout** conversion. Allow about 1–2 seconds after switching chats. OCR runs outside the keyboard hook; the header is checked again before a profile-based system switch.
|
- 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.
|
||||||
- Match by application and recognized name. Identical names share a profile; renamed chats need a new profile. Unreadable or changing headers produce no match. OCR errors, truncated names, scaling and future Viber UI changes can affect recognition. Telegram and Teams profiles retain their existing behavior.
|
|
||||||
- Recognition is local: only the cropped header is passed to OCR, screenshots are not saved, and no message text is submitted to OCR. Profiles remain local, are included in manual export/import, and excluded from OpenBao synchronization.
|
|
||||||
|
|
||||||
## Validation
|
## Validation
|
||||||
Passed 653 chat-profile/UI checks (including Viber profile persistence), 332 native checks, 564 input checks, 105 sync checks, complete dictionary equivalence (140,939 words), wheel, StayHere, Utilities, screenshot UI/save/registration, 54 updater checks and updater progress checks. Live Viber header recognition correctly identified a Ukrainian contact; the user confirmed the development integration works. Release binaries, archive, manifest and published downloads are checked during publication.
|
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.
|
||||||
|
|
||||||
## Upgrade
|
## Upgrade and compatibility
|
||||||
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 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.
|
For manual installation, exit KSwitcher, close its configurator and screenshot editors, and extract the entire ZIP into its installation folder. Keep personal `data/`, customized dictionaries and your own tools. Keep the three KSwitcher executables together; StayHere runs independently.
|
||||||
|
|
||||||
When synchronizing phrase replacements across PCs, update each participating PC to v0.6.47 or newer. Chat language profiles do not synchronize. A settings file containing Viber profiles requires v0.6.49 or newer; retain a backup before downgrading.
|
**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.
|
Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. The package contains no personal settings, credentials or clipboard history.
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
3c99e7d6b7f3ea059bf9cbff2266eb89f7cbba32287b7ce52a3ac65596131962 KSwitcher-win-x64.zip
|
42ffb2ea131983134897bf8a4e74a56ec2716cdc411930e417739fa35c95e6b2 KSwitcher-win-x64.zip
|
||||||
+31
-31
@@ -1,81 +1,81 @@
|
|||||||
{
|
{
|
||||||
"version": "0.6.49",
|
|
||||||
"schema": 1,
|
"schema": 1,
|
||||||
|
"version": "0.6.55",
|
||||||
"files": [
|
"files": [
|
||||||
{
|
{
|
||||||
"size": 1841152,
|
"sha256": "30f7942d26f049a6abac6a36778696cc285888d31ad42a5ed2b53097aeda72d5",
|
||||||
"path": "KSwitcher.exe",
|
"path": "KSwitcher.exe",
|
||||||
"sha256": "e64518d5224055c4bf09df0e32493ecfe50a1d225436117e56d102cddd7506e0"
|
"size": 1850368
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 1704960,
|
"sha256": "1cf6d8f1b5b8a4299edaf8a28cbaede9264b667edbe095c1e5156eedf0ef2089",
|
||||||
"path": "KSwitcher.Config.exe",
|
"path": "KSwitcher.Config.exe",
|
||||||
"sha256": "c3cb3163c9bd4683362154ec2be1d3fb95e72df879a18b356ad89d37bfdd444f"
|
"size": 1718784
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 2892800,
|
"sha256": "daa58f6800b21a6f50f5e0ceb32505ede0637e05aad57c383d8845ccec2420f1",
|
||||||
"path": "KSwitcher.Screenshot.exe",
|
"path": "KSwitcher.Screenshot.exe",
|
||||||
"sha256": "4785c3cfb4b3ee9783703040237a000a387569100828d239615039fd417f1855"
|
"size": 2903040
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 4401,
|
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
|
||||||
"path": "LICENSE",
|
"path": "LICENSE",
|
||||||
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c"
|
"size": 4401
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 1096,
|
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831",
|
||||||
"path": "json-LICENSE.txt",
|
"path": "json-LICENSE.txt",
|
||||||
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831"
|
"size": 1096
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 69715,
|
"sha256": "3c9947f562fae119b058c7a1230874bf3430145d8ac8d7bfc5fa89ae708f6a89",
|
||||||
"path": "README.md",
|
"path": "README.md",
|
||||||
"sha256": "2ac72789dc57c42303859956eb3f2a31b69bc5eea06e71ccf0588d6f08135948"
|
"size": 78153
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 732485,
|
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9",
|
||||||
"path": "dictionaries/en.txt",
|
"path": "dictionaries/en.txt",
|
||||||
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9"
|
"size": 732485
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 20566,
|
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5",
|
||||||
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
|
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
|
||||||
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5"
|
"size": 20566
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 2265,
|
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311",
|
||||||
"path": "dictionaries/README.md",
|
"path": "dictionaries/README.md",
|
||||||
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311"
|
"size": 2265
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 1109134,
|
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849",
|
||||||
"path": "dictionaries/ru.txt",
|
"path": "dictionaries/ru.txt",
|
||||||
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849"
|
"size": 1109134
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 1280,
|
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408",
|
||||||
"path": "dictionaries/sources.json",
|
"path": "dictionaries/sources.json",
|
||||||
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408"
|
"size": 1280
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 940799,
|
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf",
|
||||||
"path": "dictionaries/uk.txt",
|
"path": "dictionaries/uk.txt",
|
||||||
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf"
|
"size": 940799
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 993,
|
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a",
|
||||||
"path": "tools/README.txt",
|
"path": "tools/README.txt",
|
||||||
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a"
|
"size": 993
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 134656,
|
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376",
|
||||||
"path": "tools/StayHere.exe",
|
"path": "tools/StayHere.exe",
|
||||||
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376"
|
"size": 134656
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size": 2796,
|
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413",
|
||||||
"path": "tools/StayHere-README.md",
|
"path": "tools/StayHere-README.md",
|
||||||
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413"
|
"size": 2796
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+3
-3
@@ -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,49,0
|
FILEVERSION 0,6,55,0
|
||||||
PRODUCTVERSION 0,6,49,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.49"
|
VALUE "FileVersion", "0.6.55"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|||||||
+17
-18
@@ -559,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);
|
||||||
@@ -918,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)
|
||||||
{
|
{
|
||||||
@@ -974,11 +978,11 @@ void App::switchChatLayout(bool reverse)
|
|||||||
auto cycle = chatCycle(settings, key, layouts);
|
auto cycle = chatCycle(settings, key, layouts);
|
||||||
auto available = layouts;
|
auto available = layouts;
|
||||||
resetInput();
|
resetInput();
|
||||||
enqueue([this, target, key, cycle, available, reverse, options = settings]
|
enqueue([this, target, key, cycle, available, reverse]
|
||||||
{
|
{
|
||||||
struct Reset { std::atomic<bool> &busy; ~Reset() { busy = false; } } reset{busy};
|
struct Reset { std::atomic<bool> &busy; ~Reset() { busy = false; } } reset{busy};
|
||||||
auto valid = [&] { return GetForegroundWindow() == target && windowChatKey(target) == key; };
|
auto valid = [&] { return GetForegroundWindow() == target && windowChatKey(target) == key; };
|
||||||
if (key.starts_with(L"viber\n") && recognizeViberChat(target, options) != key) return;
|
if (key.starts_with(L"telegram-web\n") && readChromeChat(target) != key) return;
|
||||||
if (!valid()) return;
|
if (!valid()) return;
|
||||||
auto next = nextChatLayout(cycle, available, windowLayout(target), reverse);
|
auto next = nextChatLayout(cycle, available, windowLayout(target), reverse);
|
||||||
if (next) switchWindowLayout(target, next, valid);
|
if (next) switchWindowLayout(target, next, valid);
|
||||||
@@ -1276,8 +1280,7 @@ void App::transform(int command, int snippet)
|
|||||||
}
|
}
|
||||||
} reset{busy, window, preDeferred};
|
} reset{busy, window, preDeferred};
|
||||||
auto effectiveChat = requestedChat;
|
auto effectiveChat = requestedChat;
|
||||||
if (lower(processName(target)) == L"viber")
|
if (lower(processName(target)) == L"chrome") effectiveChat = readChromeChat(target);
|
||||||
effectiveChat = recognizeViberChat(target, config);
|
|
||||||
config.cycle = chatCycle(config, effectiveChat, available);
|
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";
|
||||||
@@ -1473,6 +1476,7 @@ 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;
|
result = parseTemplate(sn.text).text;
|
||||||
@@ -1486,11 +1490,17 @@ void App::transform(int command, int snippet)
|
|||||||
}
|
}
|
||||||
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";
|
||||||
|
if (farSnippet)
|
||||||
|
{
|
||||||
|
if (!tx.select(sn.trigger.size())) return;
|
||||||
text = tx.copy();
|
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;
|
||||||
automatic = true;
|
automatic = true;
|
||||||
@@ -2182,17 +2192,6 @@ LRESULT CALLBACK App::windowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
case WM_TIMER:
|
case WM_TIMER:
|
||||||
if (wp == 7)
|
|
||||||
{
|
|
||||||
static std::atomic<bool> pending{false};
|
|
||||||
auto target = GetForegroundWindow();
|
|
||||||
if (!app->settings.chatCycles.empty() && lower(processName(target)) == L"viber" && !pending.exchange(true))
|
|
||||||
{
|
|
||||||
auto options = app->settings;
|
|
||||||
app->enqueue([target, options] { recognizeViberChat(target, options); pending = false; });
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (wp == 6)
|
if (wp == 6)
|
||||||
{
|
{
|
||||||
if (app->notificationRegistration && WaitForSingleObject(app->notificationRegistration, 0) == WAIT_OBJECT_0)
|
if (app->notificationRegistration && WaitForSingleObject(app->notificationRegistration, 0) == WAIT_OBJECT_0)
|
||||||
@@ -2332,8 +2331,8 @@ 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, 7, 750, nullptr);
|
|
||||||
if (!smoke) SetTimer(window, 6, 1000, nullptr);
|
if (!smoke) SetTimer(window, 6, 1000, nullptr);
|
||||||
SetThreadExecutionState(ES_CONTINUOUS |
|
SetThreadExecutionState(ES_CONTINUOUS |
|
||||||
(settings.awake ? (ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED) : 0));
|
(settings.awake ? (ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED) : 0));
|
||||||
|
|||||||
@@ -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;}
|
||||||
|
}
|
||||||
+26
-3
@@ -4,8 +4,31 @@
|
|||||||
|
|
||||||
namespace ks
|
namespace ks
|
||||||
{
|
{
|
||||||
std::wstring cachedViberChat(HWND);
|
inline std::wstring telegramWebKey(std::wstring url)
|
||||||
std::wstring recognizeViberChat(HWND, const Settings &);
|
{
|
||||||
|
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
|
struct ChatSwitchHook
|
||||||
{
|
{
|
||||||
bool pressed[256]{};
|
bool pressed[256]{};
|
||||||
@@ -66,7 +89,7 @@ inline std::wstring chatKey(std::wstring process, std::wstring title)
|
|||||||
}
|
}
|
||||||
inline std::wstring windowChatKey(HWND window)
|
inline std::wstring windowChatKey(HWND window)
|
||||||
{
|
{
|
||||||
if (window && lower(processName(window)) == L"viber") return cachedViberChat(window);
|
if (window && lower(processName(window)) == L"chrome") return cachedChromeChat(window);
|
||||||
return window ? chatKey(processName(window), chatTitle(window)) : L"";
|
return window ? chatKey(processName(window), chatTitle(window)) : L"";
|
||||||
}
|
}
|
||||||
inline std::vector<std::wstring> chatCycle(const Settings &settings, const std::wstring &key,
|
inline std::vector<std::wstring> chatCycle(const Settings &settings, const std::wstring &key,
|
||||||
|
|||||||
@@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -429,4 +429,3 @@ std::wstring recognizeText(const Clip &clip, const Settings &s)
|
|||||||
return wide(text.get());
|
return wide(text.get());
|
||||||
}
|
}
|
||||||
} // namespace ks
|
} // namespace ks
|
||||||
#include "viber_ocr.inc"
|
|
||||||
+3
-1
@@ -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
@@ -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
@@ -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; }
|
||||||
|
|||||||
+29
-4
@@ -67,7 +67,7 @@ void validateSettings(const Settings &s)
|
|||||||
auto separator = key.find(L'\n');
|
auto separator = key.find(L'\n');
|
||||||
if (separator == key.npos || separator + 1 == key.size() || key.size() > 1024 ||
|
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.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" && 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");
|
throw std::runtime_error("Invalid chat language profile");
|
||||||
if (cycle.empty() || cycle.size() > 64) throw std::runtime_error("Select at least one chat language");
|
if (cycle.empty() || cycle.size() > 64) throw std::runtime_error("Select at least one chat language");
|
||||||
std::vector<std::wstring> seen;
|
std::vector<std::wstring> seen;
|
||||||
@@ -169,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");
|
||||||
@@ -281,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));
|
||||||
}
|
}
|
||||||
@@ -354,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();
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
+7
-3
@@ -219,8 +219,7 @@ Bytes sharedSyncSettings(const Settings &s)
|
|||||||
return a.at("layoutId").get<std::string>() < b.at("layoutId").get<std::string>();
|
return a.at("layoutId").get<std::string>() < b.at("layoutId").get<std::string>();
|
||||||
});
|
});
|
||||||
for (auto key : {"startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract",
|
for (auto key : {"startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract",
|
||||||
"historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock",
|
"historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock"}) j.erase(key);
|
||||||
"chatCycles"}) j.erase(key); // Chat names and matching rules stay on this PC.
|
|
||||||
return bytes(canonicalProfile(j));
|
return bytes(canonicalProfile(j));
|
||||||
}
|
}
|
||||||
Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const std::vector<Layout> &layouts, bool keepLocalLayouts)
|
Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const std::vector<Layout> &layouts, bool keepLocalLayouts)
|
||||||
@@ -230,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.");
|
||||||
@@ -295,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); }
|
||||||
|
|||||||
+24
-2
@@ -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,9 +169,15 @@ 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 (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); }
|
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) {
|
||||||
if (!text.is_string()) return;
|
if (!text.is_string()) return;
|
||||||
@@ -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));
|
||||||
|
|||||||
+112
-19
@@ -968,7 +968,9 @@ struct SettingsView
|
|||||||
int selection = -1;
|
int selection = -1;
|
||||||
bool filling{};
|
bool filling{};
|
||||||
std::vector<std::vector<HWND>> pages;
|
std::vector<std::vector<HWND>> pages;
|
||||||
|
bool ready{}, refreshing{};
|
||||||
};
|
};
|
||||||
|
void updateSettingsState(HWND w, SettingsView *v);
|
||||||
void selectSettingsPage(HWND w, SettingsView *v)
|
void selectSettingsPage(HWND w, SettingsView *v)
|
||||||
{
|
{
|
||||||
int selected = TabCtrl_GetCurSel(GetDlgItem(w, 260));
|
int selected = TabCtrl_GetCurSel(GetDlgItem(w, 260));
|
||||||
@@ -1013,7 +1015,7 @@ LRESULT CALLBACK chatLanguagesProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
|||||||
{
|
{
|
||||||
int selected = (int)SendDlgItemMessageW(w, 710, LB_GETCURSEL, 0, 0);
|
int selected = (int)SendDlgItemMessageW(w, 710, LB_GETCURSEL, 0, 0);
|
||||||
if (selected < 0 || selected >= (int)v->keys.size())
|
if (selected < 0 || selected >= (int)v->keys.size())
|
||||||
throw std::runtime_error("Open a Telegram, Teams or Viber chat, then reopen this dialog. Viber requires Tesseract.");
|
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;
|
auto next = v->settings->draft;
|
||||||
if (id == 713) next.chatCycles.erase(v->keys[selected]);
|
if (id == 713) next.chatCycles.erase(v->keys[selected]);
|
||||||
else
|
else
|
||||||
@@ -1055,8 +1057,7 @@ void showChatLanguages(HWND parent, SettingsView *settings)
|
|||||||
{
|
{
|
||||||
if (!IsWindowVisible(candidate)) return TRUE;
|
if (!IsWindowVisible(candidate)) return TRUE;
|
||||||
auto &data = *(Context *)context;
|
auto &data = *(Context *)context;
|
||||||
auto key = lower(processName(candidate)) == L"viber"
|
auto key = lower(processName(candidate)) == L"chrome" ? readChromeChat(candidate) : windowChatKey(candidate);
|
||||||
? recognizeViberChat(candidate, data.settings) : windowChatKey(candidate);
|
|
||||||
if (!key.empty()) data.keys.insert(std::move(key));
|
if (!key.empty()) data.keys.insert(std::move(key));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}, (LPARAM)&context);
|
}, (LPARAM)&context);
|
||||||
@@ -1064,13 +1065,13 @@ void showChatLanguages(HWND parent, SettingsView *settings)
|
|||||||
auto *v = new ChatLanguagesView{parent, settings, {keys.begin(), keys.end()}};
|
auto *v = new ChatLanguagesView{parent, settings, {keys.begin(), keys.end()}};
|
||||||
SetWindowLongPtrW(w, GWLP_HWNDPARENT, (LONG_PTR)parent);
|
SetWindowLongPtrW(w, GWLP_HWNDPARENT, (LONG_PTR)parent);
|
||||||
SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR)v);
|
SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR)v);
|
||||||
label(w, L"Telegram / Teams / Viber (experimental OCR) chat profiles", 18, 16, 604);
|
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,
|
control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER,
|
||||||
710, 18, 44, 604, 140);
|
710, 18, 44, 604, 140);
|
||||||
for (const auto &key : v->keys)
|
for (const auto &key : v->keys)
|
||||||
{
|
{
|
||||||
auto split = key.find(L'\n');
|
auto split = key.find(L'\n');
|
||||||
auto name = std::wstring(key.starts_with(L"telegram\n") ? L"Telegram: " : key.starts_with(L"viber\n") ? L"Viber: " : L"Teams: ") + key.substr(split + 1);
|
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());
|
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);
|
control(w, L"STATIC", L"Open a chat, then reopen this dialog to add it.", 0, 712, 18, 194, 604, 26);
|
||||||
@@ -1170,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)
|
||||||
{
|
{
|
||||||
@@ -1299,6 +1301,9 @@ 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());
|
||||||
|
// 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.autoWords[language] = std::move(words);
|
||||||
}
|
}
|
||||||
draft.autoExcluded = parseCommaList(value(w, 404));
|
draft.autoExcluded = parseCommaList(value(w, 404));
|
||||||
@@ -1536,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))
|
||||||
@@ -1584,6 +1610,12 @@ 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:
|
case WM_NOTIFY:
|
||||||
if (((NMHDR *)lp)->idFrom == 260 && ((NMHDR *)lp)->code == TCN_SELCHANGE)
|
if (((NMHDR *)lp)->idFrom == 260 && ((NMHDR *)lp)->code == TCN_SELCHANGE)
|
||||||
{
|
{
|
||||||
@@ -1593,6 +1625,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
|||||||
break;
|
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)
|
||||||
{
|
{
|
||||||
@@ -1628,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));
|
||||||
@@ -1713,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);
|
||||||
@@ -1733,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)
|
||||||
@@ -1759,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);
|
||||||
@@ -1804,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;
|
||||||
@@ -1989,7 +2067,7 @@ void showSettings(App &app, bool visible)
|
|||||||
label(w, L"Backspace / Delete clears it", 454, 270, 230);
|
label(w, L"Backspace / Delete clears it", 454, 270, 230);
|
||||||
button(w, L"Re&fresh layouts", 253, 454, 322, 230);
|
button(w, L"Re&fresh layouts", 253, 454, 322, 230);
|
||||||
button(w, L"Languages for a &chat...", 259, 24, 378, 230);
|
button(w, L"Languages for a &chat...", 259, 24, 378, 230);
|
||||||
label(w, L"Chat languages: Telegram, Teams, Viber (OCR).", 272, 382, 412);
|
label(w, L"Telegram / Telegram Web (Chrome) / Teams", 272, 382, 412);
|
||||||
page();
|
page();
|
||||||
|
|
||||||
label(w, L"Click a shortcut field and press the desired keys", 24, 76, 660);
|
label(w, L"Click a shortcut field and press the desired keys", 24, 76, 660);
|
||||||
@@ -2027,11 +2105,14 @@ void showSettings(App &app, bool visible)
|
|||||||
checkbox(w, L"Write lo&g", 208, 24, 378, 210);
|
checkbox(w, L"Write lo&g", 208, 24, 378, 210);
|
||||||
page();
|
page();
|
||||||
|
|
||||||
|
control(w, L"STATIC", L"No unsaved changes.", 0, 261, 18, 430, 684, 24);
|
||||||
button(w, L"Impo&rt...", 250, 18, 466, 125);
|
button(w, L"Impo&rt...", 250, 18, 466, 125);
|
||||||
button(w, L"&Export...", 251, 155, 466, 125);
|
button(w, L"&Export...", 251, 155, 466, 125);
|
||||||
button(w, L"&Save", IDOK, 490, 466, 100);
|
button(w, L"&Save", IDOK, 490, 466, 100);
|
||||||
button(w, L"&Cancel", IDCANCEL, 602, 466, 100);
|
button(w, L"&Cancel", IDCANCEL, 602, 466, 100);
|
||||||
fillSettings(w, v);
|
fillSettings(w, v);
|
||||||
|
v->ready = true;
|
||||||
|
updateSettingsState(w, v);
|
||||||
TabCtrl_SetCurSel(tabs, 0);
|
TabCtrl_SetCurSel(tabs, 0);
|
||||||
selectSettingsPage(w, v);
|
selectSettingsPage(w, v);
|
||||||
if (visible)
|
if (visible)
|
||||||
@@ -2047,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
@@ -2,7 +2,7 @@
|
|||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
namespace ks
|
namespace ks
|
||||||
{
|
{
|
||||||
inline constexpr wchar_t AppVersion[] = L"0.6.49";
|
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;
|
||||||
|
|||||||
+120
-3
@@ -14,6 +14,31 @@ void require(bool ok, const char *message)
|
|||||||
}
|
}
|
||||||
void contextChecks()
|
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)");
|
const auto key = ks::chatKey(L"Telegram.exe", L"\u200eТестовий чат \u2013 (12)");
|
||||||
require(key == L"telegram\nТестовий чат", "Telegram unread suffix");
|
require(key == L"telegram\nТестовий чат", "Telegram unread suffix");
|
||||||
require(ks::chatKey(L"Telegram", L"Тестовий чат") == key, "stable unread profile");
|
require(ks::chatKey(L"Telegram", L"Тестовий чат") == key, "stable unread profile");
|
||||||
@@ -28,6 +53,7 @@ void contextChecks()
|
|||||||
settings.cycle = {L"win:04090409", L"win:04220422", L"win:04190419"};
|
settings.cycle = {L"win:04090409", L"win:04220422", L"win:04190419"};
|
||||||
settings.chatCycles[key] = {settings.cycle[1], settings.cycle[0]};
|
settings.chatCycles[key] = {settings.cycle[1], settings.cycle[0]};
|
||||||
settings.chatCycles[L"viber\nТестовий контакт"] = {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);
|
std::vector<ks::Layout> installed(3);
|
||||||
for (size_t i = 0; i < installed.size(); ++i)
|
for (size_t i = 0; i < installed.size(); ++i)
|
||||||
{
|
{
|
||||||
@@ -48,9 +74,9 @@ void contextChecks()
|
|||||||
require(ks::decodeSettings({}, installed).chatCycles.empty(), "old defaults without profiles");
|
require(ks::decodeSettings({}, installed).chatCycles.empty(), "old defaults without profiles");
|
||||||
auto withoutProfiles = settings;
|
auto withoutProfiles = settings;
|
||||||
withoutProfiles.chatCycles.clear();
|
withoutProfiles.chatCycles.clear();
|
||||||
require(ks::sharedSyncSettings(settings) == ks::sharedSyncSettings(withoutProfiles), "profiles excluded from sync");
|
require(ks::sharedSyncSettings(settings) != ks::sharedSyncSettings(withoutProfiles), "profiles included in sync");
|
||||||
auto restored = ks::restoreSyncSettings(ks::sharedSyncSettings(settings), settings, installed, false);
|
auto restored = ks::restoreSyncSettings(ks::sharedSyncSettings(settings), withoutProfiles, installed, false);
|
||||||
require(restored.chatCycles == settings.chatCycles, "sync preserves local profiles");
|
require(restored.chatCycles == settings.chatCycles, "sync transfers chat profiles to another PC");
|
||||||
settings.chatCycles[key] = {settings.cycle[1]};
|
settings.chatCycles[key] = {settings.cycle[1]};
|
||||||
require(ks::chatCycle(settings, key, installed).size() == 1, "one-language profile");
|
require(ks::chatCycle(settings, key, installed).size() == 1, "one-language profile");
|
||||||
settings.chatCycles[key] = {L"win:04070407"};
|
settings.chatCycles[key] = {L"win:04070407"};
|
||||||
@@ -96,6 +122,52 @@ int main()
|
|||||||
app.settings.chatCycles[key] = {app.layouts[0].id};
|
app.settings.chatCycles[key] = {app.layouts[0].id};
|
||||||
ks::showSettings(app);
|
ks::showSettings(app);
|
||||||
HWND parent = app.settingsWindow;
|
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);
|
HWND tabs = GetDlgItem(parent, 260);
|
||||||
require(tabs && TabCtrl_GetItemCount(tabs) == 5, "five settings categories");
|
require(tabs && TabCtrl_GetItemCount(tabs) == 5, "five settings categories");
|
||||||
for (int page = 0; page < 5; ++page)
|
for (int page = 0; page < 5; ++page)
|
||||||
@@ -126,6 +198,7 @@ int main()
|
|||||||
TabCtrl_SetCurSel(tabs, 1);
|
TabCtrl_SetCurSel(tabs, 1);
|
||||||
NMHDR notification{tabs, 260, TCN_SELCHANGE};
|
NMHDR notification{tabs, 260, TCN_SELCHANGE};
|
||||||
SendMessageW(parent, WM_NOTIFY, 260, (LPARAM)¬ification);
|
SendMessageW(parent, WM_NOTIFY, 260, (LPARAM)¬ification);
|
||||||
|
require(!saveEnabled(),"changing tabs leaves Settings clean");
|
||||||
SendMessageW(parent, WM_COMMAND, 259, 0);
|
SendMessageW(parent, WM_COMMAND, 259, 0);
|
||||||
HWND dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
|
HWND dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
|
||||||
require(dialog && !IsWindowEnabled(parent), "chat dialog opens with disabled parent");
|
require(dialog && !IsWindowEnabled(parent), "chat dialog opens with disabled parent");
|
||||||
@@ -144,6 +217,7 @@ int main()
|
|||||||
SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
|
SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
|
||||||
SendMessageW(dialog, WM_COMMAND, IDCANCEL, 0);
|
SendMessageW(dialog, WM_COMMAND, IDCANCEL, 0);
|
||||||
require(!IsWindow(dialog) && IsWindowEnabled(parent), "cancel closes dialog");
|
require(!IsWindow(dialog) && IsWindowEnabled(parent), "cancel closes dialog");
|
||||||
|
require(!saveEnabled(),"cancelled chat edits do not enable Save");
|
||||||
SendMessageW(parent, WM_COMMAND, 259, 0);
|
SendMessageW(parent, WM_COMMAND, 259, 0);
|
||||||
dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
|
dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
|
||||||
index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
|
index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
|
||||||
@@ -153,19 +227,62 @@ int main()
|
|||||||
SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
|
SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
|
||||||
SendMessageW(dialog, WM_COMMAND, IDOK, 0);
|
SendMessageW(dialog, WM_COMMAND, IDOK, 0);
|
||||||
require(!IsWindow(dialog) && IsWindowEnabled(parent), "profile applies to settings draft");
|
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);
|
SendMessageW(parent, WM_COMMAND, IDOK, 0);
|
||||||
require(!app.settingsWindow && app.settings.chatCycles.at(key).size() == app.layouts.size(), "settings saves selected languages");
|
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");
|
require(ks::loadSettings(root / L"settings.json", app.layouts).chatCycles == app.settings.chatCycles, "profile saved to disk");
|
||||||
ks::showSettings(app);
|
ks::showSettings(app);
|
||||||
parent = app.settingsWindow;
|
parent = app.settingsWindow;
|
||||||
|
require(!saveEnabled(),"reopened saved Settings is clean");
|
||||||
SendMessageW(parent, WM_COMMAND, 259, 0);
|
SendMessageW(parent, WM_COMMAND, 259, 0);
|
||||||
dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
|
dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
|
||||||
index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
|
index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
|
||||||
SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0);
|
SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0);
|
||||||
SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0);
|
SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0);
|
||||||
SendMessageW(dialog, WM_COMMAND, 713, 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);
|
SendMessageW(parent, WM_COMMAND, IDOK, 0);
|
||||||
require(!app.settings.chatCycles.contains(key), "remove profile restores default");
|
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::filesystem::remove_all(root);
|
||||||
std::cout << "Passed " << passed << " chat profile checks\n";
|
std::cout << "Passed " << passed << " chat profile checks\n";
|
||||||
|
|||||||
@@ -26,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);
|
||||||
@@ -130,6 +141,19 @@ int main(int argc, char **argv) {
|
|||||||
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…");
|
||||||
|
|||||||
+24
-3
@@ -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;
|
||||||
@@ -588,10 +589,29 @@ 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 62:
|
case 64:
|
||||||
saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
|
saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
|
||||||
captured = true;
|
captured = true;
|
||||||
app->ownSequence = ks::writeClipboard(app->window, ks::textClip(sentinel));
|
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}"}};
|
app->settings.snippets = {{L";r", L"unexpected{enter}"}};
|
||||||
ActivateKeyboardLayout(app->layouts[en].handle, 0);
|
ActivateKeyboardLayout(app->layouts[en].handle, 0);
|
||||||
prepare(L"prefix ", false);
|
prepare(L"prefix ", false);
|
||||||
@@ -1038,8 +1058,9 @@ 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 = 62;
|
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);
|
auto forwarding = SetWindowsHookExW(WH_KEYBOARD_LL,forwardingHook,GetModuleHandleW(nullptr),0);
|
||||||
require(forwarding!=nullptr,"downstream forwarding fixture installed before application hook");
|
require(forwarding!=nullptr,"downstream forwarding fixture installed before application hook");
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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");
|
||||||
}
|
}
|
||||||
@@ -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");
|
||||||
|
|||||||
Reference in new issue
Block a user