Compare commits

..
Author SHA1 Message Date
agrynco 05a3f7a8f4 Record the package manifest for KSwitcher v0.6.110 2026-11-17 14:15:41 +02:00
agrynco 12b8f5090c Release KSwitcher v0.6.110 with panel repaint and uppercase correction fixes
Refresh only the affected panel after folder navigation. Preserve uppercase when the target is in the personal dictionary.
2026-11-17 14:10:59 +02:00
agrynco 19d574edcf Release KSwitcher v0.6.109 (#55)
Digit-specific folder shortcuts and support for hyphenated personal words.

Refs #23
2026-11-17 13:31:18 +02:00
agrynco 3840744819 Record the package manifest for KSwitcher v0.6.109 2026-11-17 13:30:44 +02:00
agrynco 94e8ba4304 Release KSwitcher v0.6.109 with digit-specific folder shortcuts
Use Ctrl+0–9 to open each folder group and Ctrl+F1/F2 for panel modes. Allow internal hyphens in personal dictionary entries. Synchronize the rendered Files tests with asynchronous directory scans.

Refs #23
2026-11-17 13:28:25 +02:00
agrynco edb1440be0 Release KSwitcher v0.6.108 (#53)
Wake-on-LAN for offline paired PCs in KSwitcher Files.
2026-11-17 10:56:54 +02:00
agrynco 8ef13ca9bd Record the package manifest for KSwitcher v0.6.108 2026-11-17 10:56:21 +02:00
agrynco c0eca89738 Release KSwitcher v0.6.108 with Wake-on-LAN in Files 2026-11-17 10:55:01 +02:00
agrynco 0b6709495b Release KSwitcher v0.6.107 (#52)
Files command suggestions, contextual Windows help, and the FAR-style icon.
2026-11-16 23:12:42 +02:00
27 changed files with 793 additions and 204 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.24)
project(KSwitcher VERSION 0.6.107 LANGUAGES CXX RC)
project(KSwitcher VERSION 0.6.110 LANGUAGES CXX RC)
if(NOT WIN32)
message(FATAL_ERROR "KSwitcher uses native Windows APIs")
endif()
+14 -6
View File
@@ -102,6 +102,15 @@ Warning і початковий фокус на No.
**Options → Command line → Command history → Allow paired PCs to hibernate this PC**.
Дозвіл за замовчуванням вимкнений і діє лише для спарених ПК. Для цієї дії
потрібні оновлення на обох ПК і ввімкнена гібернація Windows.
- У **Change drive** (Alt+F1 або Alt+F2) підкреслена дія **Wake** є праворуч
від стану офлайн-ПК. Клік по слову або Enter з фокусом на дії надсилає пакет.
Статус відображається на тлі списку. Для текстових дій усередині рядків
використовуй спільний компонент `InlineListAction` для малювання, фокуса
й обробки кліків. KSwitcher
має зберегти MAC-адресу мережевого адаптера. Оновіть KSwitcher та дайте
обом ПК побачити один одного в локальній мережі. На цільовому ПК потрібна
підтримка Wake-on-LAN у прошивці та налаштуваннях адаптера. Рядок стану
повідомляє про надсилання пакета або відсутність збереженої MAC-адреси.
- **F9 → Commands → Update remote KSwitcher** запускає штатне оновлення для
ПК активної LAN-панелі. Підтвердження з іменем ПК показується у Files
відправника. На цільовому ПК потрібен дозвіл **Options → Command line →
@@ -118,7 +127,9 @@ Warning і початковий фокус на No.
за тими ж правилами вставлення й лапок. Рядок `..` пропускається.
- Локальні й LAN-каталоги скануються у фоновому потоці. Під час переходу
активна панель показує «Loading folder…» і зберігає попередній список до
завершення сканування. Якщо надійшов новіший запит, результат попереднього
завершення сканування. Після переходу оновлюються шлях і список цієї панелі
та командний рядок. Сусідня панель не перемальовується через цей перехід.
Якщо надійшов новіший запит, результат попереднього
сканування пропускається. Після підтвердження UAC очікування списку
від підвищеного процесу теж відбувається у фоні.
- Ctrl+R перечитує поточну папку активної панелі. Позиція курсора й позначки
@@ -177,7 +188,8 @@ Warning і початковий фокус на No.
- Глобальне скорочення повертає до відкритого вікна Files у поточній сесії Windows або запускає Files, якщо такого вікна немає. Пункт **Files** у треї відкриває нове вікно.
- Ctrl+Shift+0–9 відкриває діалог Title і Path із поточною папкою. OK додає запис без дублювання, Escape скасовує. Title необов’язковий, порожнє значення показує шлях. Записи LAN зберігають ID ПК, а редагування Path залишає запис на тому самому ПК.
- Ctrl+0–9 одразу відкриває єдину папку. Для кількох папок відкривається компактний попап Far з одним заголовком Folder shortcuts у подвійній рамці та коротким рядом клавіш у нижній рамці. Ширина залежить від найдовшого запису й обмежується розміром вікна, а висота — кількістю видимих рядків. Нижня рамка показує Ins Del F4 Ctrl+Up Ctrl+Down. Insert додає поточну папку через Title і Path, Delete відв’язує, F4 редагує, Ctrl+Up і Ctrl+Down змінюють і зберігають порядок. Enter відкриває папку. Escape або клік у Files поза попапом закриває його й повертає фокус до панелі. Commands → Folder shortcuts дає вибрати зайняту цифру й відкрити той самий попап навіть для єдиного запису. Brief і Wide доступні в меню Left/Right та Options.
- Ctrl+0–9 відкриває лише папки, призначені натиснутій цифрі. Єдина папка відкривається одразу. Для кількох папок відкривається компактний попап Far з одним заголовком Folder shortcuts у подвійній рамці та коротким рядом клавіш у нижній рамці. Ширина залежить від найдовшого запису й обмежується розміром вікна, а висота — кількістю видимих рядків. Нижня рамка показує Ins Del F4 Ctrl+Up Ctrl+Down. Insert додає поточну папку через Title і Path, Delete відв’язує, F4 редагує, Ctrl+Up і Ctrl+Down змінюють і зберігають порядок. Enter відкриває папку. Escape або клік у Files поза попапом закриває його й повертає фокус до панелі. Commands → Folder shortcuts дає вибрати зайняту цифру й відкрити той самий попап навіть для єдиного запису.
- Ctrl+F1 вмикає Brief, Ctrl+F2 вмикає Wide для активної панелі. Ctrl+F3–F12 зарезервовані для інших режимів панелей. Brief і Wide також доступні в меню Left/Right та Options.
## Налаштування Files
@@ -305,10 +317,6 @@ Warning і початковий фокус на No.
у відкритих локальних папках. Фокус залишається там, де був, а курсор
лишається на поточному елементі, якщо той ще існує.
- Ctrl+8 відкриває список усіх ярликів папок. Кожен рядок показує групу
й назву або шлях. Enter відкриває папку в активній панелі, F4 редагує
ярлик, а Delete прибирає його зі списку.
- У Change drive повідомлення No paired computers з’являється після
успішної відповіді з порожнім списком. Збої локального запиту до
KSwitcher відображаються окремо.
+6 -3
View File
@@ -873,7 +873,8 @@ after Space, not immediately after a punctuation key. Save Settings to apply cha
only to words with a rank at or below that number (for example, 10000). All dictionary words still
protect already valid input, and ambiguous alternatives remain unchanged regardless of this limit.
**My dictionary** provides separate English, Ukrainian and Russian fields for correct words missing
from the bundled dictionaries. Enter words separated by commas or new lines, then click OK and Save
from the bundled dictionaries. A hyphen is allowed between letters, as in `test-mt` or `dev-mt`.
Enter words separated by commas or new lines, then click OK and Save
in Settings. Case and duplicates are normalized automatically; no file editing or ranks are needed.
The v0.6.23 bundled Ukrainian dictionary includes `поточні`. The updater preserves existing dictionary files;
if upgrading from an older dictionary, add this word in My dictionary → Ukrainian and click OK → Save.
@@ -897,8 +898,10 @@ language in the configured dictionary order (the UI uses English, Ukrainian, Rus
Different valid spellings remain ambiguous and are left unchanged.
**Minimum word length** defaults to 3 and can be set from 1 to 32 letters. Surrounding punctuation
does not count toward this minimum; the maximum word length is 32 letters.
Known words, ambiguous alternatives, ALL CAPS, mixed-case identifiers, numbers, URLs and email
addresses are left unchanged. Short trailing punctuation is retained when the editor selects it
Known words, ambiguous alternatives, mixed-case identifiers, numbers, URLs and email addresses
are left unchanged. Fully uppercase words can be corrected when the target is in **My dictionary**.
For example, add `qa` under English and set the minimum word length to 2 or lower to correct
`ЙФ` to `QA` after Space. Short trailing punctuation is retained when the editor selects it
together with the word. Actual selected text is verified before replacement. Layout switching follows
the existing switch-layout setting. The configured Undo shortcut restores the original and suppresses
that word for the rest of the session (until restart).
+36
View File
@@ -1,5 +1,41 @@
# Latest Windows release
## v0.6.110 — 2026-11-17
Entering a folder or returning to its parent in KSwitcher Files refreshes the affected panel and the command line without repainting the other panel.
Auto-correction can preserve all uppercase letters when correcting to a word in **My dictionary**. With `qa` in the English personal dictionary and **Minimum word length** set to 2 or lower, typing `ЙФ` and pressing Space yields `QA`.
**Українською.**
Під час входу в папку або повернення до батьківської папки KSwitcher Files оновлює потрібну панель і командний рядок. Сусідня панель більше не перемальовується через цей перехід.
Автокорекція зберігає верхній регістр для слів з **My dictionary**. Якщо в особистому словнику English є `qa`, а **Minimum word length** дорівнює 2 або менше, після пробілу `ЙФ` виправиться на `QA`.
## v0.6.109 — 2026-11-17
**Ctrl+0–9** in KSwitcher Files opens the assigned folder or shows only the folders assigned to that digit. **Ctrl+F1** selects Brief and **Ctrl+F2** selects Wide in the active panel. **Ctrl+F3–F12** are reserved for other panel modes. If command history used a Ctrl+function shortcut, set a new binding under **Options → Command line → Command history**.
**My dictionary** accepts hyphens between letters, for example `test-mt` and `dev-mt`. Enter the correct spelling in the dictionary for its language, then click **OK → Save**. Update all PCs that share settings before syncing hyphenated entries.
**Українською.**
У KSwitcher Files **Ctrl+0–9** відкриває призначену папку або показує лише папки, призначені натиснутій цифрі. **Ctrl+F1** вмикає Brief, а **Ctrl+F2** вмикає Wide в активній панелі. **Ctrl+F3–F12** зарезервовані для інших режимів панелей. Якщо історія команд використовувала Ctrl із функціональною клавішею, задайте нову комбінацію в **Options → Command line → Command history**.
**My dictionary** приймає дефіси між літерами, наприклад `test-mt` і `dev-mt`. Введіть правильне написання у словник відповідної мови й натисніть **OK → Save**. Перед синхронізацією слів із дефісами оновіть усі ПК, які обмінюються налаштуваннями.
## v0.6.108 — 2026-11-17
KSwitcher Files adds **Wake** beside the offline status of a paired PC in **Change drive** (Alt+F1 or Alt+F2). Click **Wake** or focus it with the arrow keys and press **Enter**. The status bar reports whether KSwitcher sent the Wake-on-LAN packet.
Update both PCs and let them discover each other once while the target is online so KSwitcher can save its network adapter’s MAC address. Enable Wake-on-LAN on the target. Ethernet is the most reliable option. Wi-Fi requires compatible Wake on Wireless LAN hardware and drivers.
**Українською.**
У KSwitcher Files біля статусу спареного офлайн-ПК у меню **Change drive** (Alt+F1 або Alt+F2) є дія **Wake**. Клацніть **Wake** або виберіть її стрілками й натисніть **Enter**. Рядок стану повідомить, чи вдалося надіслати пакет Wake-on-LAN.
Оновіть обидва ПК і дайте їм один раз побачити один одного, поки цільовий ПК увімкнено, щоб KSwitcher зберіг MAC-адресу його мережевого адаптера. Увімкніть Wake-on-LAN на цільовому ПК. Найнадійніше підключення через Ethernet. Для Wi-Fi потрібна підтримка Wake on Wireless LAN з боку обладнання й драйвера.
## v0.6.107 — 2026-11-16
KSwitcher Files suggests recent commands, PowerShell commands and parameters, and paths as you type. The list works with the panes visible or hidden. Use **Up** or **Down** to select, **Tab** or **Enter** on a selected suggestion to insert it, and **Escape** to close the list. Press **F1** in the command line to open the Microsoft Learn article for a documented Windows command or subcommand.
+1 -1
View File
@@ -1 +1 @@
1f817ebc455d579b42e2e6f822107b7c2341c9cd5dcbb60b023fb41b0ebd6266 KSwitcher-win-x64.zip
6b25873e86443d57a6bc669170c64d30c79d1a41849739b685b8d0f94f2f4576 KSwitcher-win-x64.zip
+65 -65
View File
@@ -1,166 +1,166 @@
{
"version": "0.6.110",
"files": [
{
"path": "KSwitcher.exe",
"size": 2369536,
"sha256": "b23677961181dc430c3e22b44acd3aa4abc07c4876b8d2e7e50e47b93eb732a4"
"sha256": "eab543bf53474e7cd0523a96441b0054dbfad8e4b3119f73b552d311233b30da",
"size": 2373632
},
{
"path": "KSwitcher.Config.exe",
"size": 2366464,
"sha256": "475c12d6ed8a74ae09f6ca6b974ee98767a900e4c0023a86c87eccb2bb63b091"
"sha256": "85da336ddec715bfe1660e36969729c83a20f39d5e0cddb4b5091a2c6fa9ce64",
"size": 2370560
},
{
"path": "KSwitcher.Screenshot.exe",
"size": 3346432,
"sha256": "3b3752d56c70267a1da5ba5c5665d24248254b98ec68188f39abbfc713f2d6b1"
"sha256": "8e4a38e2b058e6442a8fc40ade9434e771389fceadc3a32bb4ef5287d84fd6f0",
"size": 3350016
},
{
"path": "KSwitcher.Files.exe",
"size": 4022784,
"sha256": "fc741a294166ca1b27efeb393d4d236ac043320186fdcbd3ce558f0ab48de80a"
"sha256": "3640e0612d8a54d523b63e2a9f8a6281047679ead9b47058a8d6274cf04b175a",
"size": 4208128
},
{
"path": "WebView2Loader.dll",
"size": 194912,
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6"
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6",
"size": 194912
},
{
"path": "terminal/addon-fit-LICENSE.txt",
"size": 1103,
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f"
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f",
"size": 1103
},
{
"path": "terminal/addon-fit.js",
"size": 1521,
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527"
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527",
"size": 1521
},
{
"path": "terminal/index.html",
"size": 527,
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef"
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef",
"size": 527
},
{
"path": "terminal/markdown-it-LICENSE.txt",
"size": 1073,
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473"
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473",
"size": 1073
},
{
"path": "terminal/markdown-it.js",
"size": 100786,
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e"
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e",
"size": 100786
},
{
"path": "terminal/markdown.html",
"size": 3530,
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c"
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c",
"size": 3530
},
{
"path": "terminal/markdown.js",
"size": 14987,
"sha256": "5d1e824df1c3570877e985de0cfaae3f2984ceef7fe23bf4c5ade3c890a93223"
"sha256": "5d1e824df1c3570877e985de0cfaae3f2984ceef7fe23bf4c5ade3c890a93223",
"size": 14987
},
{
"path": "terminal/mermaid-LICENSE.txt",
"size": 1089,
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80"
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80",
"size": 1089
},
{
"path": "terminal/mermaid.js",
"size": 5537838,
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3"
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3",
"size": 5537838
},
{
"path": "terminal/terminal.js",
"size": 5033,
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a"
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a",
"size": 5033
},
{
"path": "terminal/xterm-LICENSE.txt",
"size": 1261,
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd"
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd",
"size": 1261
},
{
"path": "terminal/xterm.css",
"size": 7112,
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6"
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6",
"size": 7112
},
{
"path": "terminal/xterm.js",
"size": 488663,
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972"
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972",
"size": 488663
},
{
"path": "LICENSE",
"size": 4401,
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c"
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
"size": 4401
},
{
"path": "json-LICENSE.txt",
"size": 1096,
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831"
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831",
"size": 1096
},
{
"path": "files-text-license.txt",
"size": 883,
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625"
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625",
"size": 883
},
{
"path": "README.md",
"size": 94908,
"sha256": "12d8b55a2d2f26060b2a614bd52e6e0ffe4a8f140e62cc454a47fc8f246cb81f"
"sha256": "eb9cc6aa8f764cb0e1bdf2aa073e4e3d2623a7afc51ed9c6a0aba4046fc7f74c",
"size": 95168
},
{
"path": "LAN-PREVIEW.md",
"size": 11577,
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930"
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930",
"size": 11577
},
{
"path": "dictionaries/en.txt",
"size": 732485,
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9"
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9",
"size": 732485
},
{
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
"size": 20566,
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5"
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5",
"size": 20566
},
{
"path": "dictionaries/README.md",
"size": 2265,
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311"
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311",
"size": 2265
},
{
"path": "dictionaries/ru.txt",
"size": 1109134,
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849"
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849",
"size": 1109134
},
{
"path": "dictionaries/sources.json",
"size": 1280,
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408"
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408",
"size": 1280
},
{
"path": "dictionaries/uk.txt",
"size": 940799,
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf"
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf",
"size": 940799
},
{
"path": "tools/README.txt",
"size": 993,
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a"
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a",
"size": 993
},
{
"path": "tools/StayHere.exe",
"size": 134656,
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376"
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376",
"size": 134656
},
{
"path": "tools/StayHere-README.md",
"size": 2796,
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413"
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413",
"size": 2796
}
],
"version": "0.6.107",
"schema": 1
}
+3 -3
View File
@@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur"
1 RT_MANIFEST "app.manifest"
201 RCDATA "update.ps1"
1 VERSIONINFO
FILEVERSION 0,6,107,0
PRODUCTVERSION 0,6,107,0
FILEVERSION 0,6,110,0
PRODUCTVERSION 0,6,110,0
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
BEGIN
@@ -20,7 +20,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility"
VALUE "ProductName", "KSwitcher"
VALUE "FileVersion", "0.6.107"
VALUE "FileVersion", "0.6.110"
END
END
BLOCK "VarFileInfo"
+11 -4
View File
@@ -34,13 +34,14 @@ std::wstring layoutLanguage(const Layout &layout)
return {};
}
}
bool safeAutoWord(const std::wstring &word, int minimumLength)
bool safeAutoWord(const std::wstring &word, int minimumLength, bool allowUppercase)
{
if (minimumLength < 1 || minimumLength > 32 || word.size() < (size_t)minimumLength || word.size() > 32 ||
!std::all_of(word.begin(), word.end(), letter))
return false;
auto small = lower(word);
return word == small || (word.substr(1) == small.substr(1) && word != upper(word));
const bool allUppercase = word == upper(word);
return word == small || (allUppercase ? allowUppercase : word.substr(1) == small.substr(1));
}
namespace {
constexpr size_t DictionaryBlockWords = 32;
@@ -289,9 +290,15 @@ std::optional<AutoSuggestion> AutoCorrector::suggest(const std::wstring &typed,
if (dictionary == dictionaries.end())
continue;
auto converted = convert(word, layouts[source], layouts[i], true);
if (converted == word || !safeAutoWord(converted, settings.autoMinLength))
if (converted == word)
continue;
int rank = personal(dictionary->first, converted) ? 1 : dictionary->second->rank(converted);
const bool knownPersonal = personal(dictionary->first, converted);
auto letters = converted;
if (knownPersonal)
std::erase(letters, L'-');
if (!safeAutoWord(letters, settings.autoMinLength, knownPersonal))
continue;
int rank = knownPersonal ? 1 : dictionary->second->rank(converted);
if (!rank)
continue;
if (matchedText && *matchedText != converted)
+1 -1
View File
@@ -12,7 +12,7 @@ struct AutoSuggestion
std::wstring text;
};
std::wstring layoutLanguage(const Layout &);
bool safeAutoWord(const std::wstring &, int minimumLength = 3);
bool safeAutoWord(const std::wstring &, int minimumLength = 3, bool allowUppercase = false);
bool autoClosingSelection(const std::wstring &, const Settings & = {});
int matchAutoInput(const Run &, const std::wstring &, const std::vector<Layout> &, const Layout &,
const Settings & = {});
+12 -2
View File
@@ -3,6 +3,7 @@
#include <cwctype>
#include <map>
#include <stdexcept>
#include <string_view>
namespace ks
{
@@ -21,20 +22,29 @@ int snippetAppPriority(const Snippet &snippet, const std::wstring &process)
for (const auto &app : snippet.apps) if (snippetAppName(app) == name && !name.empty()) return 2;
return 0;
}
bool validAutoCorrection(const std::wstring &text, const std::wstring &alphabet)
static bool validSeparatedWord(const std::wstring &text, const std::wstring &alphabet,
std::wstring_view separators)
{
if (text.empty() || text.size() > 32) return false;
auto isLetter = [&](wchar_t c) { return alphabet.find(c) != alphabet.npos; };
for (size_t i = 0; i < text.size(); ++i)
{
if (isLetter(text[i])) continue;
if (text[i] != L' ' && text[i] != L'\'' && text[i] != L'\u2019' && text[i] != L'\u02bc')
if (separators.find(text[i]) == separators.npos)
return false;
if (i == 0 || i + 1 == text.size() || !isLetter(text[i - 1]) || !isLetter(text[i + 1]))
return false;
}
return true;
}
bool validAutoCorrection(const std::wstring &text, const std::wstring &alphabet)
{
return validSeparatedWord(text, alphabet, L" '\u2019\u02bc");
}
bool validPersonalWord(const std::wstring &text, const std::wstring &alphabet)
{
return validSeparatedWord(lower(text), alphabet, L"-");
}
bool validAutoReplacementSource(const std::wstring &text, const std::wstring &alphabet)
{
return text.find(L' ') == text.npos && text.find_first_of(alphabet) != text.npos &&
+1
View File
@@ -22,6 +22,7 @@ struct Layout
bool letter(wchar_t ch);
bool validAutoCorrection(const std::wstring &text, const std::wstring &alphabet);
bool validAutoReplacementSource(const std::wstring &text, const std::wstring &alphabet);
bool validPersonalWord(const std::wstring &text, const std::wstring &alphabet);
std::wstring lower(std::wstring text);
std::wstring upper(std::wstring text);
std::wstring convert(const std::wstring &, const Layout &, const Layout &, bool force = false);
+1 -1
View File
@@ -12,7 +12,7 @@ bool validHistoryKeys(const std::array<WORD,2> &keys)
const bool function=key>=VK_F1 && key<=VK_F12;
if(!letter && !function) return false;
if(modifiers==HOTKEYF_CONTROL)
return (letter && key!='C' && key!='F' && key!='R' && key!='V' && key!='X' && key!='A' && key!='Z' && key!='Y') || function;
return letter && key!='C' && key!='F' && key!='R' && key!='V' && key!='X' && key!='A' && key!='Z' && key!='Y';
if(modifiers==HOTKEYF_ALT) return function && key!=VK_F1 && key!=VK_F2 && key!=VK_F4 && key!=VK_F10;
return false;
});
+8 -29
View File
@@ -187,8 +187,6 @@ struct FolderShortcutView
std::vector<int> digits;
int rowHeight{};
Panel *panel{};
bool all{};
std::vector<std::pair<int,size_t>> entries;
};
std::wstring shortcutLabel(const FolderShortcut &entry)
@@ -201,7 +199,6 @@ void layoutQuickFolders(HWND dialog,FolderShortcutView &view,int selection)
const auto list=GetDlgItem(dialog,shortcutList);
SendMessageW(list,LB_RESETCONTENT,0,0);
view.digits.clear();
view.entries.clear();
const auto owner=GetWindow(dialog,GW_OWNER);
const auto dc=GetDC(dialog);
const auto font=SelectObject(dc,mono);
@@ -219,23 +216,14 @@ void layoutQuickFolders(HWND dialog,FolderShortcutView &view,int selection)
GetTextExtentPoint32W(dc,label.data(),static_cast<int>(label.size()),&size);
return static_cast<int>(size.cx);
};
int width=std::max(measure(L"Folder shortcuts"),measure(view.all?L"Del F4":view.digit<0?L"Enter Esc":quickFolderHints))+3*cellWidth;
int width=std::max(measure(L"Folder shortcuts"),measure(view.digit<0?L"Enter Esc":quickFolderHints))+3*cellWidth;
const int textInset=dialogRowTextInset(cellWidth);
const auto add=[&](const std::wstring &label)
{
width=std::max(width,measure(label)+2*textInset);
SendMessageW(list,LB_ADDSTRING,0,reinterpret_cast<LPARAM>(label.c_str()));
};
if(view.all)
{
for(int digit=0;digit<static_cast<int>(folderShortcuts.size());++digit)
for(size_t index=0;index<folderShortcuts[digit].size();++index)
{
view.entries.emplace_back(digit,index);
add(std::to_wstring(digit)+L" "+shortcutLabel(folderShortcuts[digit][index]));
}
}
else if(view.digit<0)
if(view.digit<0)
{
for(int digit=0;digit<10;++digit)
if(!folderShortcuts[digit].empty())
@@ -322,7 +310,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
const auto bounds=paintDialogFrame(dc,client,dialogFrameMetrics(GetDpiForWindow(dialog)),teal,frame);
DeleteObject(frame);
paintDialogFrameCaptions(dc,client,bounds,L"Folder shortcuts",teal,colors[Text],mono,
view->all?L"Del F4":view->digit<0?L"Enter Esc":quickFolderHints);
view->digit<0?L"Enter Esc":quickFolderHints);
EndPaint(dialog,&ps);
return TRUE;
}
@@ -349,7 +337,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
if(action!=quickRemove && action!=quickEdit && action!=quickInsert && action!=quickMoveUp &&
action!=quickMoveDown && action!=IDOK && !(action==shortcutList && HIWORD(wp)==LBN_DBLCLK)) return FALSE;
const auto row=SendDlgItemMessageW(dialog,shortcutList,LB_GETCURSEL,0,0);
if(!view->all && view->digit<0)
if(view->digit<0)
{
if((action==IDOK || action==shortcutList) && row>=0 && static_cast<size_t>(row)<view->digits.size())
{
@@ -358,16 +346,8 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
}
return TRUE;
}
int digit=view->digit;
size_t index=static_cast<size_t>(row);
if(view->all)
{
if(index>=view->entries.size() || action==quickInsert ||
action==quickMoveUp || action==quickMoveDown) return TRUE;
const auto &entry=view->entries[index];
digit=entry.first;
index=entry.second;
}
const auto digit=view->digit;
const auto index=static_cast<size_t>(row);
const auto &group=folderShortcuts[digit];
if(action==quickInsert)
{
@@ -414,7 +394,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
}
folderShortcuts=std::move(updated);
notifyFilesPreferences(GetAncestor(dialog,GA_ROOTOWNER));
if(view->all?view->entries.size()==1:folderShortcuts[digit].empty()) FilesModalDialog::finish(dialog,IDCANCEL);
if(folderShortcuts[digit].empty()) FilesModalDialog::finish(dialog,IDCANCEL);
else layoutQuickFolders(dialog,*view,static_cast<int>(row));
return TRUE;
}
@@ -424,7 +404,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
}
void showFolderShortcuts(Panel &panel,int digit,bool all)
void showFolderShortcuts(Panel &panel,int digit)
{
if(digit>=0)
{
@@ -447,7 +427,6 @@ void showFolderShortcuts(Panel &panel,int digit,bool all)
}
FolderShortcutView view{digit};
view.panel=&panel;
view.all=all;
const auto result=FilesModalDialog::run(GetModuleHandleW(nullptr),MAKEINTRESOURCEW(109),GetParent(panel.list),
quickFolderDialog,reinterpret_cast<LPARAM>(&view));
SetFocus(panel.list);
+69
View File
@@ -0,0 +1,69 @@
#pragma once
#include <windows.h>
#include <algorithm>
#include <string_view>
#include <windowsx.h>
namespace ks::files
{
inline COLORREF hoverSurface(COLORREF surface)
{
return RGB(3*GetRValue(surface)/4,3*GetGValue(surface)/4,3*GetBValue(surface)/4);
}
class InlineListAction
{
std::wstring_view label;
LRESULT pressedRow=LB_ERR;
public:
explicit InlineListAction(std::wstring_view text):label(text){}
RECT bounds(RECT row,int cellWidth) const
{
row.right-=2*cellWidth;
row.left=std::max(row.left,row.right-static_cast<LONG>(label.size()*cellWidth));
return row;
}
bool hit(HWND list,LRESULT row,LPARAM point,int cellWidth) const
{
RECT item{};
if(SendMessageW(list,LB_GETITEMRECT,row,reinterpret_cast<LPARAM>(&item))==LB_ERR) return false;
const auto action=bounds(item,cellWidth);
return PtInRect(&action,{GET_X_LPARAM(point),GET_Y_LPARAM(point)});
}
void press(HWND list,LRESULT row)
{
pressedRow=row;
SetCapture(list);
}
bool pressed() const { return pressedRow!=LB_ERR; }
void cancel() { pressedRow=LB_ERR; }
bool release(HWND list,LRESULT row,bool overAction)
{
const bool activate=pressedRow==row && overAction;
cancel();
if(GetCapture()==list) ReleaseCapture();
return activate;
}
void paint(HDC dc,const RECT &action,int textInset,COLORREF ink,COLORREF surface,bool highlighted) const
{
SetTextColor(dc,ink);
SetBkColor(dc,highlighted?hoverSurface(surface):surface);
ExtTextOutW(dc,action.left,action.top+textInset,ETO_OPAQUE|ETO_CLIPPED,&action,
label.data(),static_cast<UINT>(label.size()),nullptr);
TEXTMETRICW metrics{};
GetTextMetricsW(dc,&metrics);
const LONG underline=std::min(action.bottom-1,action.top+textInset+metrics.tmAscent+1);
const RECT line{action.left,underline,action.right,underline+1};
SetDCBrushColor(dc,ink);
FillRect(dc,&line,static_cast<HBRUSH>(GetStockObject(DC_BRUSH)));
}
};
}
+127 -34
View File
@@ -27,10 +27,12 @@
#include "files_text_preferences.h"
#include "files_menu_paint.h"
#include "files_dropdown_paint.h"
#include "files_inline_action.h"
#include "files_history_date.h"
#include "files_terminal_view.h"
#include "files_lan_ipc.h"
#include "lan_files.h"
#include "lan_wake.h"
#include "platform.h"
namespace
@@ -429,7 +431,9 @@ struct DriveQuery
Json drives=Json::array();
std::wstring error;
};
struct DriveChoice { FilesPeer peer; fs::path path; };
struct DriveChoice { FilesPeer peer; std::optional<fs::path> path; };
constexpr wchar_t driveWakeLabel[]=L"Wake";
ks::files::InlineListAction driveWakeAction(driveWakeLabel);
std::vector<DriveQuery> driveQueries;
std::map<LRESULT,DriveChoice> remoteDriveRows;
constexpr UINT_PTR driveQueryTimer=3;
@@ -488,7 +492,7 @@ INT_PTR showFilesNotice(HWND owner,const wchar_t *text,const wchar_t *title,File
void openMenu(HWND window, int index);
void showFileDetails(const Panel &panel);
void editOptions(HWND owner);
void showFolderShortcuts(Panel &panel,int digit,bool all=false);
void showFolderShortcuts(Panel &panel,int digit);
void layout(HWND window,bool activeOnly=false);
void clearTerminalSelection();
@@ -1860,8 +1864,9 @@ bool applyDirectoryScan(Panel &panel,Panel::ScanRequest request,Panel::ScanResul
for (const auto &file : files) add(file, file.filename().wstring(), false);
const auto label=(panel.peer?panel.peer->name+L" · ":std::wstring{})+directory.native();
SetWindowTextW(panel.path,label.c_str());
InvalidateRect(panel.path,nullptr,FALSE);
if(&panel==&panels[active] && !sameDirectory)
layout(GetParent(panel.list));
layout(GetParent(panel.list),true);
auto selected=std::find(panel.rows.begin(),panel.rows.end(),previousSelection);
if(selected==panel.rows.end() && !panel.rows.empty())
selected=panel.rows.begin()+std::clamp<LRESULT>(previousRow,0,panel.rows.size()-1);
@@ -2042,6 +2047,45 @@ void prepareTextDialog(HWND dialog);
void showTextMessage(HWND owner,const wchar_t *text);
void editTextOptions(HWND owner,bool edit);
void startPeerAction(std::packaged_task<std::wstring()> task,const std::wstring &status)
{
pendingPeerAction=task.get_future();
try {std::thread(std::move(task)).detach();}
catch(const std::system_error &error)
{
pendingPeerAction={};
setStatus(fileError(error));
return;
}
setStatus(status);
}
void wakeRemotePeer(const FilesPeer &peer)
{
if(pendingPeerAction.valid())
{
setStatus(L"A remote PC request is already in progress.");
return;
}
std::packaged_task<std::wstring()> task([peer]
{
try
{
ks::lan::wakeFilesPeer(peer.id);
return peer.name+L": Wake-on-LAN packet sent.";
}
catch(const std::system_error &error)
{
return peer.name+L": Could not send Wake-on-LAN packet. "+fileError(error);
}
catch(const std::exception &error)
{
return peer.name+L": "+ks::wide(error.what());
}
});
startPeerAction(std::move(task),L"Sending Wake-on-LAN packet to "+peer.name+L"...");
}
void runActivePeerAction(HWND owner,bool update)
{
if(!panels[active].peer) return;
@@ -2091,15 +2135,8 @@ void runActivePeerAction(HWND owner,bool update)
return unconfirmed;
}
});
pendingPeerAction=task.get_future();
try {std::thread(std::move(task)).detach();}
catch(const std::system_error &error)
{
pendingPeerAction={};
setStatus(fileError(error));
return;
}
setStatus((update?L"Requesting a KSwitcher update on ":L"Requesting hibernation for ")+peer.name+L"...");
startPeerAction(std::move(task),
(update?L"Requesting a KSwitcher update on ":L"Requesting hibernation for ")+peer.name+L"...");
}
void selectDrive()
@@ -2140,7 +2177,11 @@ void selectDrive()
if(row>=0 && static_cast<size_t>(row)<drivePaths.size())
openOn(panels[pickerPanel],drivePaths[row],false,{});
else if(remote!=remoteDriveRows.end())
openOn(panels[pickerPanel],remote->second.path,false,remote->second.peer);
{
const auto &choice=remote->second;
if(choice.path) openOn(panels[pickerPanel],*choice.path,false,choice.peer);
else wakeRemotePeer(choice.peer);
}
}
LRESULT CALLBACK pickerKeys(HWND window, UINT msg, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR)
@@ -2173,6 +2214,29 @@ LRESULT CALLBACK pickerKeys(HWND window, UINT msg, WPARAM wp, LPARAM lp, UINT_PT
if(!HIWORD(hit) && separator(LOWORD(hit))) return 0;
}
}
if(msg==WM_CAPTURECHANGED) driveWakeAction.cancel();
if(!commandPicker && (msg==WM_LBUTTONDOWN || msg==WM_LBUTTONUP || msg==WM_LBUTTONDBLCLK))
{
const auto hit=SendMessageW(window,LB_ITEMFROMPOINT,0,lp);
const int row=HIWORD(hit)?-1:LOWORD(hit);
const auto choice=remoteDriveRows.find(row);
const bool wake=choice!=remoteDriveRows.end() && !choice->second.path;
if(msg==WM_LBUTTONUP && driveWakeAction.pressed())
{
if(driveWakeAction.release(window,row,wake && driveWakeAction.hit(window,row,lp,cellWidth)))
{
SendMessageW(window,LB_SETCURSEL,row,0);
selectDrive();
}
return 0;
}
if(wake && msg!=WM_LBUTTONUP)
{
if(msg==WM_LBUTTONDOWN && driveWakeAction.hit(window,row,lp,cellWidth))
driveWakeAction.press(window,row);
return 0;
}
}
if(!commandPicker && msg==WM_CHAR)
{
const auto key=towupper(static_cast<wchar_t>(wp));
@@ -2198,7 +2262,14 @@ LRESULT CALLBACK pickerKeys(HWND window, UINT msg, WPARAM wp, LPARAM lp, UINT_PT
TRACKMOUSEEVENT tracking{sizeof(tracking),TME_LEAVE,window,0};
TrackMouseEvent(&tracking);
const auto hit=SendMessageW(window,LB_ITEMFROMPOINT,0,lp);
if(!HIWORD(hit) && LOWORD(hit)<drivePaths.size()) row=LOWORD(hit);
if(!HIWORD(hit))
{
const auto choice=remoteDriveRows.find(LOWORD(hit));
if(LOWORD(hit)<drivePaths.size() ||
(choice!=remoteDriveRows.end() && !choice->second.path &&
driveWakeAction.hit(window,LOWORD(hit),lp,cellWidth)))
row=LOWORD(hit);
}
}
if(driveHover!=row)
{
@@ -2334,19 +2405,27 @@ void showRemoteDrives(bool focus=false,int initialRow=0)
for(const auto &query:driveQueries)
{
add(query.peer.name);
if(query.pending.valid()) add(L" Loading drives...");
const auto addChoice=[&](const std::wstring &label,std::optional<fs::path> path)
{
const auto row=add(label);
if(row<0) return;
if(previous && previous->peer.id==query.peer.id && previous->path==path) selection=row;
remoteDriveRows.emplace(row,DriveChoice{query.peer,std::move(path)});
};
if(query.peer.address.empty())
{
const std::wstring status=nextDriveRefresh?L" Looking for PC...":L" Offline";
addChoice(status+L" \t"+driveWakeLabel,std::nullopt);
}
else if(query.pending.valid()) add(L" Loading drives...");
else if(!query.error.empty()) add(L" "+query.error);
else if(query.peer.address.empty()) add(nextDriveRefresh?L" Looking for PC...":L" Offline");
else if(query.drives.empty()) add(L" No drives");
for(const auto &entry:query.drives)
{
const auto root=filePath(entry.at("path"));
if(root.native().size()!=3 || root.native().front()<L'A' || root.native().front()>L'Z') continue;
const auto labels=driveLabels(root.native().front(),entry.at("type"),entry.at("total"),entry.at("free"));
const auto row=add(L" "+labels[0]+L" "+labels[1]+L" "+labels[2]);
if(row<0) continue;
remoteDriveRows.emplace(row,DriveChoice{query.peer,root});
if(previous && previous->peer.id==query.peer.id && previous->path==root) selection=row;
addChoice(L" "+labels[0]+L" "+labels[1]+L" "+labels[2],root);
}
}
layoutDrivePicker(static_cast<int>(selection),focus);
@@ -5178,8 +5257,8 @@ void openMenu(HWND window, int index)
if(index==0 || index==4)
{
const bool wide=panels[index==4].wide;
rows={wide?L" Brief":L"✓ Brief",
wide?L"✓ Wide":L" Wide",
rows={wide?L" Brief\tCtrl+F1":L"✓ Brief\tCtrl+F1",
wide?L"✓ Wide\tCtrl+F2":L" Wide\tCtrl+F2",
index==0?L" Change drive\tAlt+F1":L" Change drive\tAlt+F2"};
}
else if(index==1) rows={L"Copy\tF5",L"Move\tF6",L"Make folder\tF7",L"Exit\tF10"};
@@ -5433,7 +5512,8 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
const auto rows=Json::parse(begin,begin+reply->cbData);
if(!rows.is_array()) return FALSE;
for(const auto &row:rows)
drivePeers.push_back({row.at("id"),row.at("address"),ks::wide(row.at("name")),ks::lan::FilesPort,row.value("filesBrowse",false)});
drivePeers.push_back({row.at("id"),row.at("address"),ks::wide(row.at("name")),ks::lan::FilesPort,
row.value("filesBrowse",false)});
}
catch(const std::exception &){drivePeers.clear();return FALSE;}
drivePeerReplyReceived=true;
@@ -5876,8 +5956,7 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
SelectObject(item.hDC,mono);
SetTextColor(item.hDC,foreground);
const auto normal=colors[Dialog];
const auto hover=RGB(3*GetRValue(normal)/4,3*GetGValue(normal)/4,
3*GetBValue(normal)/4);
const auto hover=ks::files::hoverSurface(normal);
SetBkColor(item.hDC,background==Dialog && static_cast<int>(item.itemID)==driveHover?
hover:colors[background]);
ExtTextOutW(item.hDC,0,0,ETO_OPAQUE,&item.rcItem,L"",0,nullptr);
@@ -5915,12 +5994,27 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
else if(item.hwndItem==picker && !commandPicker && item.itemID>drivePaths.size())
{
auto bounds=item.rcItem;
RECT button{};
const auto choice=remoteDriveRows.find(item.itemID);
const bool wake=choice!=remoteDriveRows.end() && !choice->second.path;
SelectObject(item.hDC,mono);
SetTextColor(item.hDC,foreground);
SetBkColor(item.hDC,colors[background]);
SetBkColor(item.hDC,colors[wake?Dialog:background]);
if(wake)
{
button=driveWakeAction.bounds(bounds,cellWidth);
if(shortcut!=std::wstring::npos) text.resize(shortcut);
ExtTextOutW(item.hDC,0,0,ETO_OPAQUE,&bounds,L"",0,nullptr);
bounds.right=button.left;
}
ExtTextOutW(item.hDC,bounds.left+driveColumnStarts[0],bounds.top+3,
ETO_OPAQUE|ETO_CLIPPED,&bounds,text.c_str(),lstrlenW(text.c_str()),nullptr);
ETO_OPAQUE|ETO_CLIPPED,&bounds,text.c_str(),static_cast<UINT>(text.size()),nullptr);
if(wake)
{
const bool focused=(item.itemState&ODS_SELECTED) && GetFocus()==picker;
driveWakeAction.paint(item.hDC,button,3,foreground,colors[Dialog],
focused || static_cast<int>(item.itemID)==driveHover);
}
}
else if(item.CtlID>=130 && item.CtlID<=134)
paintMenuLabel(item.hDC,item.rcItem,text,0,foreground,colors[background]);
@@ -6184,8 +6278,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int show)
if(message.message==WM_KEYDOWN && mainInput && !terminalVisible &&
(GetKeyState(VK_CONTROL)&0x8000) && !(GetKeyState(VK_MENU)&0x8000) &&
!(GetKeyState(VK_LWIN)&0x8000) && !(GetKeyState(VK_RWIN)&0x8000) &&
message.wParam>='0' && message.wParam<='9' && !copyInProgress &&
(message.wParam!='8' || (GetKeyState(VK_SHIFT)&0x8000)))
message.wParam>='0' && message.wParam<='9' && !copyInProgress)
{
if(!(message.lParam & (1LL<<30)))
{
@@ -6199,17 +6292,17 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int show)
continue;
}
const bool filesMessage=message.hwnd==window || IsChild(window,message.hwnd);
if(filesMessage && !terminalVisible && !copyInProgress && !commandHistoryWindow &&
message.message==WM_KEYDOWN && message.wParam=='8' &&
if(mainInput && !terminalVisible && !copyInProgress &&
message.message==WM_KEYDOWN && message.wParam>=VK_F1 && message.wParam<=VK_F12 &&
(GetKeyState(VK_CONTROL)&0x8000) && !(GetKeyState(VK_MENU)&0x8000) &&
!(GetKeyState(VK_SHIFT)&0x8000) && !(GetKeyState(VK_LWIN)&0x8000) &&
!(GetKeyState(VK_RWIN)&0x8000))
{
if(!(message.lParam & (1LL<<30)))
if(!(message.lParam & (1LL<<30)) && (message.wParam==VK_F1 || message.wParam==VK_F2))
{
hidePicker();
showMenu(false);
showFolderShortcuts(panels[active],-1,true);
setMode(active,message.wParam==VK_F2);
}
continue;
}
+87 -4
View File
@@ -7,6 +7,8 @@
#include "lan_mesh.h"
#include "lan_clipboard.h"
#include "lan_layout.h"
#include "lan_network.h"
#include "lan_wake.h"
#include <atomic>
#include <mutex>
#include <thread>
@@ -28,14 +30,41 @@ std::string hostName()
wchar_t name[256]{}; DWORD size=256;
return GetComputerNameW(name,&size) ? utf8(std::wstring(name,size)) : "KSwitcher";
}
std::vector<ULONG> broadcasts()
Bytes ipv4Adapters()
{
ULONG size=16384; Bytes data(size);
auto flags=GAA_FLAG_SKIP_ANYCAST|GAA_FLAG_SKIP_MULTICAST|GAA_FLAG_SKIP_DNS_SERVER;
auto result=GetAdaptersAddresses(AF_INET,flags,nullptr,(IP_ADAPTER_ADDRESSES*)data.data(),&size);
if(result==ERROR_BUFFER_OVERFLOW) { data.resize(size); result=GetAdaptersAddresses(AF_INET,flags,nullptr,(IP_ADAPTER_ADDRESSES*)data.data(),&size); }
if(result!=NO_ERROR) return {};
return data;
}
std::string wakeMacFor(ULONG remote)
{
DWORD interfaceIndex{};
if(GetBestInterface(remote,&interfaceIndex)!=NO_ERROR) return {};
auto data=ipv4Adapters();
if(data.empty()) return {};
for(auto a=reinterpret_cast<const IP_ADAPTER_ADDRESSES*>(data.data());a;a=a->Next)
{
if(a->IfIndex!=interfaceIndex || a->OperStatus!=IfOperStatusUp || a->PhysicalAddressLength!=6 ||
(a->IfType!=IF_TYPE_ETHERNET_CSMACD && a->IfType!=IF_TYPE_IEEE80211)) continue;
std::string result;
for(size_t i=0;i<a->PhysicalAddressLength;++i)
{
const auto byte=a->PhysicalAddress[i];
result+="0123456789abcdef"[byte>>4];
result+="0123456789abcdef"[byte&15];
}
return lan::wakePacket(result)?result:std::string{};
}
return {};
}
std::vector<ULONG> broadcasts()
{
auto data=ipv4Adapters();
std::vector<ULONG> out;
if(result!=NO_ERROR) return out;
if(data.empty()) return out;
for(auto a=(IP_ADAPTER_ADDRESSES*)data.data();a;a=a->Next)
if(a->OperStatus==IfOperStatusUp)
for(auto u=a->FirstUnicastAddress;u;u=u->Next)
@@ -47,6 +76,38 @@ std::vector<ULONG> broadcasts()
return out;
}
}
void lan::wakeFilesPeer(const std::string &id)
{
const auto settings=Json::parse(unprotect(readFile(dataDirectory()/L"lan-pairing.bin",256*1024)));
const auto &trusted=settings.at("trusted");
if(!settings.value("enabled",false) || !trusted.contains(id))
throw std::runtime_error("Enable KSwitcher LAN and select a paired PC.");
const auto packet=wakePacket(trusted.at(id).value("wakeMac",""));
if(!packet) throw std::runtime_error("No saved MAC address. Run updated KSwitcher on this PC while it is online once.");
const auto destinations=broadcasts();
if(destinations.empty()) throw std::runtime_error("No local IPv4 network is available.");
Network network;
WinSocket socket{::socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP)};
if(socket.value==INVALID_SOCKET) socketError();
const BOOL broadcast=TRUE;
if(setsockopt(socket.value,SOL_SOCKET,SO_BROADCAST,reinterpret_cast<const char*>(&broadcast),sizeof(broadcast)))
socketError();
bool sent=false;
int error=WSAEHOSTUNREACH;
for(const auto ip:destinations)
{
sockaddr_in destination{};
destination.sin_family=AF_INET;
destination.sin_port=htons(9);
destination.sin_addr.s_addr=ip;
if(sendto(socket.value,reinterpret_cast<const char*>(packet->data()),static_cast<int>(packet->size()),0,
reinterpret_cast<const sockaddr*>(&destination),sizeof(destination))==SOCKET_ERROR)
error=WSAGetLastError();
else sent=true;
}
if(!sent) throw std::system_error(error,std::system_category());
}
struct LanService::Impl
{
struct Peer { std::string name,epoch; sockaddr_in address{}; uint64_t seen{},verified{}; bool files{}; };
@@ -231,7 +292,15 @@ struct LanService::Impl
if(trusted.contains(other))
{
auto response=lan::envelope("presence",id); response["to"]=other; response["epoch"]=epoch;
response["proof"]=lan::mac(trusted[other].at("key"),heartbeat(id,other,epoch,session));
const auto &key=trusted[other].at("key");
const auto challenge=heartbeat(id,other,epoch,session);
response["proof"]=lan::mac(key,challenge);
const auto wakeMac=wakeMacFor(address.sin_addr.s_addr);
if(!wakeMac.empty())
{
response["wakeMac"]=wakeMac;
response["wakeProof"]=lan::mac(key,challenge+"|wake|"+wakeMac);
}
send(socket,address,response);
}
return;
@@ -260,7 +329,21 @@ struct LanService::Impl
}
if(type=="presence" && trusted.contains(other) && j.value("epoch","")==peer.epoch &&
lan::equal(j.value("proof",""),lan::mac(trusted[other].at("key"),heartbeat(other,id,peer.epoch,epoch))))
{ peer.verified=now; return; }
{
peer.verified=now;
auto &entry=trusted.at(other);
const auto wakeMac=j.value("wakeMac","");
if(lan::wakePacket(wakeMac) && wakeMac!=entry.value("wakeMac","") &&
lan::equal(j.value("wakeProof",""),
lan::mac(entry.at("key"),heartbeat(other,id,peer.epoch,epoch)+"|wake|"+wakeMac)))
{
auto previous=entry;
entry["wakeMac"]=wakeMac;
try {save();}
catch(const std::exception &){entry=std::move(previous);}
}
return;
}
if(pending && pending->peer==other)
{
for(const auto &response:pending->receive(j,now)) send(socket,address,response);
+1 -22
View File
@@ -14,6 +14,7 @@
#include <thread>
#include "lan_files.h"
#include "lan_channel.h"
#include "lan_network.h"
namespace ks::lan
{
@@ -111,28 +112,6 @@ DWORD createJunction(const fs::path &name,const fs::path &target)
constexpr size_t FrameLimit=256*1024;
constexpr DWORD SocketTimeout=5000;
struct WinSocket
{
SOCKET value=INVALID_SOCKET;
~WinSocket(){if(value!=INVALID_SOCKET) closesocket(value);}
};
void socketError()
{
throw std::system_error(WSAGetLastError(),std::system_category());
}
struct Network
{
Network()
{
WSADATA data{};
if(const auto error=WSAStartup(MAKEWORD(2,2),&data))
throw std::system_error(error,std::system_category());
}
~Network(){WSACleanup();}
};
class Wire
{
SOCKET socket;
+28
View File
@@ -0,0 +1,28 @@
#pragma once
#include <winsock2.h>
#include <system_error>
namespace ks::lan
{
inline void socketError()
{
throw std::system_error(WSAGetLastError(),std::system_category());
}
struct WinSocket
{
SOCKET value=INVALID_SOCKET;
~WinSocket(){if(value!=INVALID_SOCKET) closesocket(value);}
};
struct Network
{
Network()
{
WSADATA data{};
if(const auto error=WSAStartup(MAKEWORD(2,2),&data))
throw std::system_error(error,std::system_category());
}
~Network(){WSACleanup();}
};
}
+31
View File
@@ -0,0 +1,31 @@
#pragma once
#include <algorithm>
#include <array>
#include <optional>
#include <string>
#include <string_view>
namespace ks::lan
{
inline std::optional<std::array<unsigned char,102>> wakePacket(std::string_view mac)
{
constexpr std::string_view digits="0123456789abcdef";
std::array<unsigned char,6> address{};
if(mac.size()!=2*address.size()) return {};
for(size_t i=0;i<address.size();++i)
{
const auto high=digits.find(mac[2*i]),low=digits.find(mac[2*i+1]);
if(high==digits.npos || low==digits.npos) return {};
address[i]=static_cast<unsigned char>(16*high+low);
}
if((address.front()&1) || std::all_of(address.begin(),address.end(),[](auto byte){return byte==0;}))
return {};
std::array<unsigned char,102> packet{};
std::fill_n(packet.begin(),6,0xff);
for(auto next=packet.begin()+6;next!=packet.end();next+=address.size())
std::copy(address.begin(),address.end(),next);
return packet;
}
void wakeFilesPeer(const std::string &id);
}
+3 -2
View File
@@ -269,8 +269,9 @@ void validateSettings(const Settings &s)
if (alphabet.empty() || words.size() > 10000)
throw std::runtime_error("Invalid personal dictionary language or too many words");
for (const auto &word : words)
if (word.empty() || word.size() > 32 || lower(word).find_first_not_of(alphabet) != word.npos)
throw std::runtime_error("Personal words must contain 1-32 letters of their selected language");
if (!validPersonalWord(word, alphabet))
throw std::runtime_error("Personal words must be 1-32 characters, with letters of the selected language. "
"A hyphen (-) is allowed between letters.");
}
if (s.maxItems < 10 || s.maxItems > 10000 || s.maxMiB < 1 || s.maxMiB > 2048 || s.maxImageMiB < 1 ||
s.maxImageMiB > 64)
+1 -1
View File
@@ -1705,7 +1705,7 @@ void showAutoOptions(HWND parent, SettingsView *v)
label(w, L"Never correct these words (comma-separated)", 18, 184, 525);
edit(w, 405, 18, 212, 524, 52, ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL);
value(w, 405, commaList(v->draft.autoNever));
label(w, L"My dictionary: correct words, separated by commas or new lines", 18, 276, 525);
label(w, L"My dictionary: separate words by commas or new lines. Internal hyphens allowed.", 18, 276, 525);
for (auto [id, language] : {std::pair{411, L"en"}, {412, L"uk"}, {413, L"ru"}})
{
int x = 18 + (id - 411) * 178;
+1 -1
View File
@@ -2,7 +2,7 @@
#include "platform.h"
namespace ks
{
inline constexpr wchar_t AppVersion[] = L"0.6.107";
inline constexpr wchar_t AppVersion[] = L"0.6.110";
inline constexpr UINT UpdateMessage = WM_APP + 7;
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
+74 -1
View File
@@ -1,15 +1,26 @@
param([string]$Executable = "$PSScriptRoot/../build/files-dev/KSwitcher.Files.exe")
param(
[string]$Executable = "$PSScriptRoot/../build/files-dev/KSwitcher.Files.exe",
[switch]$OfflineWake,
[string]$Screenshot
)
$ErrorActionPreference = 'Stop'
Add-Type -AssemblyName System.Drawing
Add-Type @'
using System;
using System.Text;
using System.Runtime.InteropServices;
public static class FilesDriveShortcutTest {
[StructLayout(LayoutKind.Sequential)]
public struct Rect { public int Left, Top, Right, Bottom; }
[DllImport("user32.dll")] public static extern IntPtr GetDlgItem(IntPtr window, int id);
[DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr window);
[DllImport("user32.dll")] public static extern bool PostMessage(IntPtr window, uint msg, IntPtr w, IntPtr l);
[DllImport("user32.dll", CharSet=CharSet.Unicode)]
public static extern IntPtr SendMessage(IntPtr window, uint msg, IntPtr w, StringBuilder text);
[DllImport("user32.dll", EntryPoint="SendMessageW")]
public static extern IntPtr SendRect(IntPtr window, uint msg, IntPtr w, out Rect rect);
[DllImport("user32.dll")] public static extern bool GetClientRect(IntPtr window, out Rect rect);
[DllImport("user32.dll")] public static extern bool PrintWindow(IntPtr window, IntPtr dc, uint flags);
}
'@
function Wait-Until([scriptblock]$Condition) {
@@ -38,6 +49,68 @@ try {
[void][FilesDriveShortcutTest]::PostMessage($picker, 258, [IntPtr][int]$Key, [IntPtr]::Zero)
Wait-Until { ![FilesDriveShortcutTest]::IsWindowVisible($picker) }
}
if ($OfflineWake) {
function Read-Picker {
$count = [FilesDriveShortcutTest]::SendMessage($picker, 395, [IntPtr]::Zero, $null).ToInt32()
for ($i = 0; $i -lt $count; $i++) { Read-Text $picker 393 $i }
}
function Render-Picker {
$client = [FilesDriveShortcutTest+Rect]::new()
[void][FilesDriveShortcutTest]::GetClientRect($picker, [ref]$client)
$bitmap = [Drawing.Bitmap]::new($client.Right, $client.Bottom)
$graphics = [Drawing.Graphics]::FromImage($bitmap)
try {
$dc = $graphics.GetHdc()
try {
if (![FilesDriveShortcutTest]::PrintWindow($picker, $dc, 2)) { throw 'Could not render drive picker.' }
} finally { $graphics.ReleaseHdc($dc) }
return $bitmap
} finally { $graphics.Dispose() }
}
function Click-Picker([int]$X, [int]$Y) {
$point = [IntPtr](($Y -shl 16) -bor $X)
[void][FilesDriveShortcutTest]::PostMessage($picker, 513, [IntPtr]1, $point)
[void][FilesDriveShortcutTest]::PostMessage($picker, 514, [IntPtr]::Zero, $point)
}
Open-Picker
$rows = @(Read-Picker)
$wake = -1
for ($i = 0; $i -lt $rows.Count; $i++) {
if ($rows[$i] -match '^ (Offline|Looking for PC\.\.\.) \tWake$') { $wake = $i; break }
}
if ($wake -lt 0) { throw 'This check requires an offline paired PC with a Wake action.' }
$rect = [FilesDriveShortcutTest+Rect]::new()
[void][FilesDriveShortcutTest]::SendRect($picker, 408, [IntPtr]$wake, [ref]$rect)
$original = [FilesDriveShortcutTest]::SendMessage($picker, 392, [IntPtr]::Zero, $null)
Click-Picker ($rect.Left + 16) ([int](($rect.Top + $rect.Bottom) / 2))
Start-Sleep -Milliseconds 100
if (![FilesDriveShortcutTest]::IsWindowVisible($picker) -or
[FilesDriveShortcutTest]::SendMessage($picker, 392, [IntPtr]::Zero, $null) -ne $original) {
throw 'Clicking outside the Wake label selected or activated the status row.'
}
[void][FilesDriveShortcutTest]::PostMessage($picker, 675, [IntPtr]::Zero, [IntPtr]::Zero)
$normal = Render-Picker
[void][FilesDriveShortcutTest]::SendMessage($picker, 390, [IntPtr]$wake, $null)
$focused = Render-Picker
try {
$changed = @(for ($x = $rect.Left; $x -lt [Math]::Min($rect.Right, $normal.Width); $x++) {
if ($normal.GetPixel($x,$rect.Top) -ne $focused.GetPixel($x,$rect.Top)) { $x }
})
$width = $rect.Right - $rect.Left
if (!$changed.Count -or $changed[0] -lt ($rect.Left + $width / 2) -or $changed[-1] -ge $rect.Right - 2) {
throw 'Wake focus must highlight only the inline action and leave the status and trailing space unchanged.'
}
if ($Screenshot) { $focused.Save($Screenshot, [Drawing.Imaging.ImageFormat]::Png) }
Click-Picker ([int](($changed[0]+$changed[-1])/2)) ([int](($rect.Top+$rect.Bottom)/2))
Wait-Until { ![FilesDriveShortcutTest]::IsWindowVisible($picker) }
} finally { $normal.Dispose(); $focused.Dispose() }
Open-Picker
[void][FilesDriveShortcutTest]::SendMessage($picker, 390, [IntPtr]$wake, $null)
[void][FilesDriveShortcutTest]::PostMessage($picker, 256, [IntPtr]13, [IntPtr]::Zero)
Wait-Until { ![FilesDriveShortcutTest]::IsWindowVisible($picker) }
Write-Output 'Wake focus and mouse activation are limited to the inline action. Enter activates the focused action.'
return
}
Open-Picker
$count = [FilesDriveShortcutTest]::SendMessage($picker, 395, [IntPtr]::Zero, $null).ToInt32()
$rows = @(for ($i = 0; $i -lt $count; $i++) { Read-Text $picker 393 $i })
+123
View File
@@ -0,0 +1,123 @@
param(
[string]$Executable = "$PSScriptRoot/../build/files-cmake/KSwitcher.Files.exe",
[string]$Screenshot
)
$ErrorActionPreference = 'Stop'
Add-Type @'
using System;
using System.Text;
using System.Runtime.InteropServices;
public static class FilesShortcutWindow {
[StructLayout(LayoutKind.Sequential)]
public struct Rect { public int Left, Top, Right, Bottom; }
[DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
[DllImport("user32.dll")] static extern bool SetForegroundWindow(IntPtr window);
[DllImport("user32.dll")] static extern void keybd_event(byte key, byte scan, uint flags, UIntPtr extra);
[DllImport("user32.dll")] public static extern IntPtr GetWindow(IntPtr window, uint command);
[DllImport("user32.dll")] public static extern IntPtr GetDlgItem(IntPtr window, int id);
[DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr window);
[DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr window, out Rect rect);
[DllImport("user32.dll", CharSet=CharSet.Unicode)]
public static extern IntPtr SendMessage(IntPtr window, uint msg, IntPtr w, StringBuilder text);
public static bool Activate(IntPtr window) {
if (GetForegroundWindow() == window) return true;
keybd_event(0x12, 0, 0, UIntPtr.Zero);
keybd_event(0x12, 0, 2, UIntPtr.Zero);
SetForegroundWindow(window);
return GetForegroundWindow() == window;
}
}
'@
function Wait-Until([scriptblock]$Condition) {
for ($attempt = 0; $attempt -lt 100; $attempt++) {
if (& $Condition) { return }
Start-Sleep -Milliseconds 50
}
throw "Timed out waiting for: $Condition"
}
function Read-Text($Control, $Message = 13, $Parameter = 2048) {
$buffer = [Text.StringBuilder]::new(2048)
[void][FilesShortcutWindow]::SendMessage($Control, $Message, [IntPtr]$Parameter, $buffer)
$buffer.ToString()
}
function Read-ShortcutDialog {
$foreground = [FilesShortcutWindow]::GetForegroundWindow()
if ([FilesShortcutWindow]::GetWindow($foreground, 4) -eq $window -and
[FilesShortcutWindow]::GetDlgItem($foreground, 310) -ne [IntPtr]::Zero) { return $foreground }
return [IntPtr]::Zero
}
$exe = (Resolve-Path $Executable).Path
$key = [Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Software\KSwitcher\Files')
$saved = @{}
$names = 'FolderShortcuts', 'LeftWide', 'RightWide', 'LeftPath', 'RightPath', 'LeftCursor', 'RightCursor', 'WindowPlacement'
foreach ($name in $names) {
if ($name -in $key.GetValueNames()) { $saved[$name] = @($key.GetValue($name), $key.GetValueKind($name)) }
}
$folder = [IO.Directory]::CreateTempSubdirectory('ks-files-shortcuts-').FullName
try {
$groups = [object[]]::new(10)
for ($digit = 0; $digit -lt 10; $digit++) { $groups[$digit] = @() }
foreach ($entry in @(@(3, 'Three'), @(4, 'Four'), @(8, 'Eight A'), @(8, 'Eight B'))) {
$path = [IO.Directory]::CreateDirectory((Join-Path $folder $entry[1])).FullName
$groups[$entry[0]] += @{ path = $path; peer = ''; name = ''; title = $entry[1] }
}
$key.SetValue('FolderShortcuts', [Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject $groups -Depth 4)), 'Binary')
foreach ($name in 'LeftWide', 'RightWide') { $key.SetValue($name, 1, 'DWord') }
foreach ($name in 'LeftPath', 'RightPath') { $key.SetValue($name, $folder, 'String') }
$key.DeleteValue('WindowPlacement', $false)
$process = Start-Process -FilePath $exe -PassThru
$keyboard = New-Object -ComObject WScript.Shell
Wait-Until { $process.Refresh(); $process.MainWindowHandle -ne [IntPtr]::Zero }
$window = $process.MainWindowHandle
Wait-Until { [FilesShortcutWindow]::Activate($window) }
$heading = [FilesShortcutWindow]::GetDlgItem($window, 140)
$rightHeading = [FilesShortcutWindow]::GetDlgItem($window, 141)
$leftPath = [FilesShortcutWindow]::GetDlgItem($window, 142)
Wait-Until { (Read-Text $leftPath) -eq $folder }
$keyboard.SendKeys('^8')
Wait-Until { (Read-ShortcutDialog) -ne [IntPtr]::Zero }
$dialog = Read-ShortcutDialog
$list = [FilesShortcutWindow]::GetDlgItem($dialog, 310)
$count = [FilesShortcutWindow]::SendMessage($list, 395, [IntPtr]::Zero, $null).ToInt32()
$rows = for ($row = 0; $row -lt $count; $row++) { Read-Text $list 393 $row }
if (($rows -join '|') -cne 'Eight A|Eight B') {
throw "Ctrl+8 should display only its two assigned folders. Actual rows: $($rows -join ' | ')"
}
if ($Screenshot) {
Add-Type -AssemblyName System.Drawing
$bounds = [FilesShortcutWindow+Rect]::new()
if (![FilesShortcutWindow]::GetWindowRect($dialog, [ref]$bounds)) { throw 'Cannot locate the rendered popup.' }
$bitmap = [Drawing.Bitmap]::new(($bounds.Right - $bounds.Left), ($bounds.Bottom - $bounds.Top))
try {
$graphics = [Drawing.Graphics]::FromImage($bitmap)
try { $graphics.CopyFromScreen($bounds.Left, $bounds.Top, 0, 0, $bitmap.Size) }
finally { $graphics.Dispose() }
$bitmap.Save($Screenshot, [Drawing.Imaging.ImageFormat]::Png)
} finally { $bitmap.Dispose() }
}
$keyboard.SendKeys('{ESC}')
Wait-Until { [FilesShortcutWindow]::GetForegroundWindow() -eq $window }
$keyboard.SendKeys('^4')
Wait-Until { (Read-Text $leftPath) -eq (Join-Path $folder 'Four') }
if (![FilesShortcutWindow]::IsWindowVisible($heading)) { throw 'Ctrl+4 changed panel mode.' }
$keyboard.SendKeys('^{F1}')
Wait-Until { ![FilesShortcutWindow]::IsWindowVisible($heading) }
if (![FilesShortcutWindow]::IsWindowVisible($rightHeading)) { throw 'Ctrl+F1 changed the inactive panel.' }
$keyboard.SendKeys('^{F2}')
Wait-Until { [FilesShortcutWindow]::IsWindowVisible($heading) }
Write-Output 'Verified Ctrl+8 popup rows, Ctrl+4 navigation and Ctrl+F1/F2 panel modes.'
} finally {
if ($process -and !$process.HasExited) {
$keyboard.SendKeys('{ESC}')
if (!$process.CloseMainWindow() -or !$process.WaitForExit(2500)) { $process.Kill(); $process.WaitForExit() }
}
foreach ($name in $names) {
if ($saved.ContainsKey($name)) { $key.SetValue($name, $saved[$name][0], $saved[$name][1]) }
else { $key.DeleteValue($name, $false) }
}
$key.Dispose()
[IO.Directory]::Delete($folder, $true)
}
+39 -22
View File
@@ -262,6 +262,33 @@ try {
$main = Wait-Until { Find-Window 'KSwitcher.Files' $process.Id }
$leftPanel=[SearchArrowTest]::GetDlgItem($main,102)
$rightPanel=[SearchArrowTest]::GetDlgItem($main,103)
# Initial directory scans repaint both panels when their results arrive.
[void](Wait-Until {
[SearchArrowTest]::SendText($leftPanel,0x1A2,-1,'A.txt').ToInt64() -ge 0 -and
[SearchArrowTest]::SendText($rightPanel,0x1A2,-1,'A.txt').ToInt64() -ge 0
})
if (!$KeyboardCursorOnly) {
$leftPath = [SearchArrowTest]::GetDlgItem($main,142)
foreach ($step in @(@{ Row='[Right fixture]'; Path=$rightFixture }, @{ Row='..'; Path=$scratch })) {
Select-Row $leftPanel $step.Row
Start-Sleep -Milliseconds 150
$lineCount = @(Get-Content -LiteralPath $paintTrace).Count
Post $leftPanel 0x100 13
[void](Wait-Until {
$path = [Text.StringBuilder]::new(1024)
[void][SearchArrowTest]::GetText($leftPath,0xD,$path.Capacity,$path)
$path.ToString() -eq $step.Path
})
[void](Wait-Until {
$highlight = Read-PanelHighlights $paintTrace $lineCount
@($highlight.Keys -like '0/*').Count -gt 0
})
Start-Sleep -Milliseconds 150
$draws = (Read-PanelHighlights $paintTrace $lineCount).Keys
if ($draws -like '1/*') { throw "Opening $($step.Row) repainted rows in the other panel." }
}
Write-Output 'Verified folder navigation repaints only the panel that changes directories.'
}
$clicks=if(!$KeyboardCursorOnly){
@(@{Panel=$leftPanel; Index=0},@{Panel=$rightPanel; Index=1},@{Panel=$rightPanel; Index=1})
}
@@ -319,22 +346,7 @@ try {
Post $commandMenu 0x100 27
[void](Wait-Until { ![SearchArrowTest]::IsWindowVisible($commandMenu) })
Write-Output 'Verified Commands grouping, arrow navigation, and inert separators.'
$panel = Wait-Until { $handle = [SearchArrowTest]::GetDlgItem($main,102); if ($handle -ne [IntPtr]::Zero) { $handle } }
$pathControl = [SearchArrowTest]::GetDlgItem($main,142)
$pathText = [Text.StringBuilder]::new(1024)
[void][SearchArrowTest]::GetText($pathControl,0xD,$pathText.Capacity,$pathText)
$path=$pathText.ToString()
if ([IO.Path]::GetPathRoot($path) -ne [IO.Path]::GetPathRoot($scratch)) {
throw 'Select a local left-panel folder on the test executable drive before running this interactive test.'
}
foreach ($component in $path.Substring(3).Split('\',[System.StringSplitOptions]::RemoveEmptyEntries)) {
Select-Row $panel '..'
[void][SearchArrowTest]::Send($panel,0x100,13,0)
}
foreach ($component in $scratch.Substring(3).Split('\')) {
Select-Row $panel "[$component]"
[void][SearchArrowTest]::Send($panel,0x100,13,0)
}
$panel = $leftPanel
$fixtureRow=[SearchArrowTest]::SendText($panel,0x1A2,-1,([IO.Path]::GetFileName($fixture))).ToInt32()
Click-PanelRow $panel $fixtureRow
[void](Wait-Until { [SearchArrowTest]::Send($panel,0x188,0,0).ToInt32() -eq $fixtureRow })
@@ -421,10 +433,10 @@ try {
if (!(Test-Path -LiteralPath (Join-Path $scratch $newFolder) -PathType Container)) {
throw 'F7 did not create the folder in the active panel.'
}
$newRow=[SearchArrowTest]::SendText($panel,0x1A2,-1,"[$newFolder]")
if ($newRow.ToInt64() -lt 0 -or [SearchArrowTest]::Send($panel,0x188,0,0) -ne $newRow) {
throw 'F7 did not select the new folder.'
}
[void](Wait-Until {
$newRow=[SearchArrowTest]::SendText($panel,0x1A2,-1,"[$newFolder]")
$newRow.ToInt64() -ge 0 -and [SearchArrowTest]::Send($panel,0x188,0,0) -eq $newRow
})
Post $main 0x111 115
$makeDialog=Wait-Until { Find-Window '#32770' $process.Id 361 }
$nameField=[SearchArrowTest]::GetDlgItem($makeDialog,361)
@@ -526,6 +538,10 @@ try {
!(Test-Path -LiteralPath (Join-Path $linkPath 'link-target.txt') -PathType Leaf)) {
throw "F7 did not create a $expected pointing to Alpha."
}
[void](Wait-Until {
$linkRow = [SearchArrowTest]::SendText($panel,0x1A2,-1,"[$linkName]")
$linkRow.ToInt64() -ge 0 -and [SearchArrowTest]::Send($panel,0x188,0,0) -eq $linkRow
})
}
Write-Output 'Verified F7 history, quoted batch names, and directory link handling.'
Select-Row $panel ([IO.Path]::GetFileName($fixture))
@@ -649,6 +665,7 @@ try {
} finally { $bitmap.Dispose() }
}
Select-Row $panel ([IO.Path]::GetFileName($fixture))
Post $panel 0x100 0x73
$editor=Wait-Until { Find-Window 'KSwitcher.Files.Text' $process.Id }
$firstControl=[SearchArrowTest]::FindWindowEx($editor,0,'Scintilla',[System.Management.Automation.Language.NullString]::Value)
@@ -684,8 +701,8 @@ try {
if ([SearchArrowTest]::GetWindow($otherEditor,4) -ne [IntPtr]::Zero) { throw 'The second editor is owned.' }
$editorIdentity=[SearchArrowTest]::TaskbarIdentity($editor)
$otherIdentity=[SearchArrowTest]::TaskbarIdentity($otherEditor)
if (!$editorIdentity -or !$otherIdentity -or $editorIdentity -eq $otherIdentity) {
throw 'Editor windows do not have distinct Windows taskbar identities.'
if ($editorIdentity -cne 'HrynCo.KSwitcher.Files.Editor' -or $otherIdentity -cne $editorIdentity) {
throw 'Both editor windows must use the Editor group on the Windows taskbar.'
}
Post $otherEditor 0x10 0
[void](Wait-Until { ![SearchArrowTest]::IsWindow($otherEditor) })
+23
View File
@@ -1,5 +1,6 @@
#include "lan.h"
#include "lan_pairing.h"
#include "lan_wake.h"
#include <iostream>
#include <tlhelp32.h>
@@ -29,6 +30,15 @@ int main(int argc,char **argv)
check(identifier(randomHex(16)),"cryptographic instance ID");
check(mac("key","The quick brown fox jumps over the lazy dog")=="f7bc83f430538424b13298e6aa6fb143ef4d59a14946175997479dbc2d1a3cd8", "HMAC SHA256 known vector");
check(equal("abc","abc")&&!equal("abc","abd")&&!equal("abc","ab"),"proof comparison");
const auto magic=wakePacket("02468ace1357");
const std::array<unsigned char,6> hardwareAddress{0x02,0x46,0x8a,0xce,0x13,0x57};
check(magic && std::all_of(magic->begin(),magic->begin()+6,[](auto byte){return byte==0xff;}),
"Wake-on-LAN synchronization bytes");
for(size_t repeat=0;repeat<16;++repeat)
check(std::equal(hardwareAddress.begin(),hardwareAddress.end(),magic->begin()+6*(repeat+1)),
"Wake-on-LAN repeats the target MAC address");
check(!wakePacket("ffffffffffff") && !wakePacket("000000000000") &&
!wakePacket("023456789abx") && !wakePacket("023456789ab"),"invalid Wake-on-LAN addresses rejected");
Pairing left(a,b,code,100),right(b,a,code,100),wrong(b,a,std::string(32,'f'),100);
check(wrong.receive(left.offer(),101).empty(),"different code cannot acknowledge");
auto forged=left.offer();forged["id"]=c;
@@ -118,6 +128,19 @@ int main(int argc,char **argv)
check(request(restored,{{"action","status"}})["peers"].empty(),"forget removes offline pair");
check(!request(restored,{{"action","status"}}).at("shareInput").get<bool>(),"forgetting the input peer revokes persisted input permission");
}
{
const auto folder=root/L"wake";
std::filesystem::create_directory(folder);
const auto saved=Json{{"version",1},{"id",a},{"enabled",true},{"trusted",{
{b,{{"name","Wake peer"},{"key",left.derived},{"wakeMac","02468ace1357"}}},
{c,{{"name","Legacy peer"},{"key",left.derived}}}}}}.dump();
atomicWrite(folder/L"lan-pairing.bin",protect(Bytes(saved.begin(),saved.end())));
LanService restored(folder);
const auto peers=request(restored,{{"action","filesPeers"}}).at("peers");
check(peers.size()==2 && peers[0].at("id")==b && peers[0].at("address")=="" &&
peers[1].at("id")==c,"offline PCs remain selectable in Files with or without a saved MAC address");
check(peers.dump().find("02468ace1357")==std::string::npos,"Files snapshot omits the stored MAC address");
}
if(argc>1&&std::string(argv[1])=="--network")
{
auto saved=Json::parse(unprotect(readFile(root/L"lan-pairing.bin",256*1024)));
+26 -1
View File
@@ -399,6 +399,25 @@ int main(int argc, char **argv)
require(!supplemental.suggest(L"релызик ", 1, layouts, options),
"never-correct list takes precedence over personal word");
options.autoNever.clear();
options.autoWords[L"en"] = {L"test-mt", L"dev-mt"};
auto hyphenated = supplemental.suggest(L"Еуые-ье ", 1, layouts, options);
require(hyphenated && hyphenated->text == L"Test-mt " && hyphenated->target == 0,
"hyphenated personal word corrects from the wrong layout");
options.autoMinLength = 2;
require(!supplemental.suggest(L"ЙФ ", 2, layouts, options),
"uppercase layout correction requires a personal dictionary entry");
options.autoWords[L"en"].push_back(L"qa");
auto acronym = supplemental.suggest(L"(ЙФ)! ", 2, layouts, options);
require(acronym && acronym->text == L"(QA)! " && acronym->target == 0,
"uppercase personal acronym corrects without changing case or punctuation");
require(!supplemental.suggest(L"йФ ", 2, layouts, options),
"mixed-case personal words remain protected");
auto uppercaseHyphenated = supplemental.suggest(L"ЕУЫЕ-ЬЕ ", 1, layouts, options);
require(uppercaseHyphenated && uppercaseHyphenated->text == L"TEST-MT ",
"uppercase hyphenated personal words correct without changing case");
options.autoMinLength = 3;
require(!supplemental.suggest(L"ЙФ ", 2, layouts, options),
"uppercase personal words respect minimum length");
options.autoWords[L"uk"].push_back(L"робить");
auto commaWord = supplemental.suggest(L"hj,bnm ", 0, layouts, options);
require(commaWord && commaWord->text == L"робить " && commaWord->target == 2,
@@ -739,7 +758,7 @@ int main(int argc, char **argv)
settings.autoPrefixChars = L"(#";
settings.autoSuffixChars = L");%";
settings.autoNever = {L"myWord"};
settings.autoWords = {{L"uk", {L"релізик"}}, {L"en", {L"kswitcher"}}};
settings.autoWords = {{L"uk", {L"релізик"}}, {L"en", {L"kswitcher", L"test-mt", L"dev-mt"}}};
settings.autoExcluded = {L"Code.exe"};
settings.cycle = {L"en", L"uk"};
settings.snippets = {{L";address", L"Line 1\r\n{cursor}Line 2"}};
@@ -765,6 +784,12 @@ int main(int argc, char **argv)
auto invalidWords = settings;
invalidWords.autoWords[L"uk"] = {L"hello"};
rejects([&] { ks::validateSettings(invalidWords); }, "personal dictionary rejects wrong language letters");
for (const auto *word : {L"-test", L"test-", L"test--mt", L"test-і"})
{
invalidWords = settings;
invalidWords.autoWords[L"en"] = {word};
rejects([&] { ks::validateSettings(invalidWords); }, "personal dictionary rejects malformed hyphenated words");
}
require(ks::encodeSettings(ks::decodeSettings(ks::encodeSettings(settings), {})) == ks::encodeSettings(settings),
"configurator snapshot survives serialization without changing the concurrency token");
rejects([&] { ks::decodeSettings(ks::Bytes{'{', '}'}, {}); },