Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec4079b346 | ||
|
|
41cef4d4f3 | ||
|
|
b53b5715ab | ||
|
|
01f44d22b5 | ||
|
|
c78090f7d4 | ||
|
|
0d797c4f35 | ||
|
|
b6eaa2c85d | ||
|
|
72024c3385 | ||
|
|
d60ef626f0 | ||
|
|
e144cd6607 | ||
|
|
05a3f7a8f4 | ||
|
|
12b8f5090c | ||
|
|
19d574edcf | ||
|
|
3840744819 | ||
|
|
94e8ba4304 | ||
|
|
edb1440be0 | ||
|
|
8ef13ca9bd | ||
|
|
c0eca89738 | ||
|
|
0b6709495b | ||
|
|
5f0c51b557 | ||
|
|
733b6deefa | ||
|
|
b3a1e762ec | ||
|
|
219bdd4883 | ||
|
|
d018b91397 |
No files matched your search
+5
-1
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.24)
|
||||
project(KSwitcher VERSION 0.6.106 LANGUAGES CXX RC)
|
||||
project(KSwitcher VERSION 0.6.113 LANGUAGES CXX RC)
|
||||
if(NOT WIN32)
|
||||
message(FATAL_ERROR "KSwitcher uses native Windows APIs")
|
||||
endif()
|
||||
@@ -7,6 +7,10 @@ set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
add_executable(KSwitcherFiles WIN32 src/files_main.cpp src/files_text_window.cpp
|
||||
src/files_text_document.cpp src/files_text_language.cpp resources/files.rc)
|
||||
set_property(SOURCE resources/files.rc APPEND PROPERTY OBJECT_DEPENDS
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/resources/kswitcher-files.ico"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/resources/kswitcher-files-viewer.ico"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/resources/kswitcher-files-editor.ico")
|
||||
include(cmake/FilesTextLibraries.cmake)
|
||||
set_target_properties(KSwitcherFiles PROPERTIES OUTPUT_NAME "KSwitcher.Files")
|
||||
target_compile_definitions(KSwitcherFiles PRIVATE UNICODE _UNICODE NOMINMAX _WIN32_WINNT=0x0A00)
|
||||
|
||||
+61
-11
@@ -1,6 +1,7 @@
|
||||
# Оформлення KSwitcher Files
|
||||
|
||||
Far Manager є зразком для оформлення файлового менеджера. Основне вікно використовує системний заголовок Windows. Панелі, меню й діалоги операцій використовують моноширинний шрифт менеджера та оформлення в стилі Far.
|
||||
Іконка головного вікна показує дві сині панелі з бірюзовою рамкою та виділеним рядком.
|
||||
|
||||
Власні модальні діалоги панелей, редактора й переглядача використовують
|
||||
`FilesModalDialog`. Escape і клік поза діалогом у клієнтській області Files
|
||||
@@ -18,6 +19,10 @@ Far Manager є зразком для оформлення файлового м
|
||||
не займають місця. Перед завершенням змін перевір коротке повідомлення й
|
||||
повідомлення з кількома рядками, включно з відступами до рамки та кнопок.
|
||||
Смуга прокрутки з’являється, лише коли текст не вміщується в доступну висоту.
|
||||
Панелі, списки попапів і довгі повідомлення використовують вузьку смугу
|
||||
прокрутки зі стрілками вгорі й унизу та крапковою доріжкою. Відтінки доріжки
|
||||
й повзунка залежать від фону, на якому вони малюються. Повзунок світліший
|
||||
за доріжку й показує положення та розмір видимої частини списку.
|
||||
Оформлення, кнопки й необов’язковий прапорець задаються параметрами шаблону.
|
||||
Підтвердження гібернації та віддаленого оновлення мають червоне оформлення
|
||||
Warning і початковий фокус на No.
|
||||
@@ -37,19 +42,55 @@ Warning і початковий фокус на No.
|
||||
Папка відкривається у Провіднику, файл виконує свою стандартну дію Windows.
|
||||
|
||||
- У головному вікні клавіатурний фокус залишається в командному рядку.
|
||||
Tab перемикає активну панель, клік вибирає рядок, а стрілки вгору й вниз,
|
||||
Page Up і Page Down пересувають курсор у панелі навіть під час набору команди.
|
||||
Tab без модифікаторів перемикає активну панель, а клік вибирає рядок.
|
||||
Ctrl+U міняє видимі панелі місцями разом із їхніми папками, режимами,
|
||||
курсорами й позначками. Активна панель залишається активною на новому боці.
|
||||
Page Up і Page Down пересувають курсор у панелі. Стрілки вгору й вниз
|
||||
керують панеллю, коли список підказок закритий.
|
||||
Стрілки вліво й вправо переходять до першого й останнього рядків, коли
|
||||
командний рядок порожній.
|
||||
Клік оновлює підсвічування рядків курсора без перемальовування всієї панелі.
|
||||
Меню й діалоги тимчасово приймають фокус. Ctrl+V і Shift+Insert вставляють
|
||||
текст із буфера обміну в позицію курсора або замінюють виділення.
|
||||
Enter і Shift+Enter спочатку виконують введену команду. Коли рядок
|
||||
Enter виконує введену команду, якщо підказку не вибрано. Shift+Enter
|
||||
виконує команду одразу. Коли рядок
|
||||
порожній, Enter відкриває поточний елемент. Якщо панелі приховано,
|
||||
Enter передає порожній рядок у термінал. Escape очищає рядок.
|
||||
Enter передає порожній рядок у термінал.
|
||||
Якщо фокус у виводі термінала, Enter і Shift+Enter повертають його до
|
||||
командного рядка й виконують відповідну дію за тими самими правилами.
|
||||
Під час запуску термінала область виводу має темне тло, поки WebView2
|
||||
готує сторінку.
|
||||
Промпт і текст команди вирівняні по спільній базовій лінії.
|
||||
- Під час набору локальної команди над полем з’являються підказки PowerShell.
|
||||
Автодоповнення працює з відкритими й прихованими панелями (Ctrl+O).
|
||||
Список уточнюється після кожної зміни тексту й доповнює команди, параметри
|
||||
та шляхи відносно робочої папки термінала або активної панелі до запуску
|
||||
термінала. Після `cd ` список пропонує папки,
|
||||
а після вибору можна продовжити шлях через `\`, зокрема всередині лапок.
|
||||
Стрілки вгору й вниз вибирають підказку. Tab вставляє вибрану або першу,
|
||||
Enter вставляє виділену, а клік вставляє підказку під вказівником.
|
||||
Щоб виконати команду після вставлення, натисни Enter ще раз.
|
||||
Escape закриває список зі збереженням тексту. Без списку Escape очищає
|
||||
рядок, а Tab перемикає панель, якщо панелі відкриті. Доступні підказки стандартної локальної
|
||||
сесії PowerShell, включно з програмами з PATH. Для команд без аргументів,
|
||||
як-от `cls`, список не пропонує шляхи.
|
||||
Для `dotnet` підкоманди й параметри підказує встановлений .NET SDK.
|
||||
Для `git` підкоманди, параметри й доречні назви гілок бере штатний
|
||||
скрипт Git for Windows. Підказки використовують локальні дані репозиторію.
|
||||
- Довідник Windows Commands надає офлайн підказки ключів і підкоманд для
|
||||
системних утиліт. Наприклад, `ipconfig /re` пропонує `/release` і `/renew`,
|
||||
`reg q` пропонує `query`, а `cmd /c dir /` пропонує ключі `dir` для CMD.
|
||||
Каталог також підказує вкладені підкоманди та значення, перелічені в
|
||||
синтаксисі. Наприклад, `netsh interface ipv4 show co` пропонує `config`,
|
||||
а `schtasks /query /fo ` пропонує `CSV`, `LIST` і `TABLE`. F1 у командному
|
||||
рядку відкриває статтю Microsoft Learn для поточної команди чи підкоманди.
|
||||
Якщо ввести `dir` безпосередньо у Files, PowerShell підказує власні параметри.
|
||||
Після `ipconfig /renew ` або `ipconfig /release ` список підказує назви
|
||||
локальних адаптерів із DHCP для IPv4. Назви з пробілами вставляються в лапках.
|
||||
- Коли курсор у кінці рядка, список спочатку показує до 5 різних
|
||||
останніх команд з історії, які починаються з набраного тексту.
|
||||
Вибір підставляє всю команду. Підказки з історії доступні й у LAN-панелі.
|
||||
|
||||
- **F8 Delete** у нижньому рядку клавіш викликає той самий діалог видалення,
|
||||
що й клавіша F8.
|
||||
- У нижньому рядку, як у FAR, позначення клавіш сірі на чорному тлі,
|
||||
@@ -69,6 +110,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 →
|
||||
@@ -85,7 +135,9 @@ Warning і початковий фокус на No.
|
||||
за тими ж правилами вставлення й лапок. Рядок `..` пропускається.
|
||||
- Локальні й LAN-каталоги скануються у фоновому потоці. Під час переходу
|
||||
активна панель показує «Loading folder…» і зберігає попередній список до
|
||||
завершення сканування. Якщо надійшов новіший запит, результат попереднього
|
||||
завершення сканування. Після переходу оновлюються шлях і список цієї панелі
|
||||
та командний рядок. Сусідня панель не перемальовується через цей перехід.
|
||||
Якщо надійшов новіший запит, результат попереднього
|
||||
сканування пропускається. Після підтвердження UAC очікування списку
|
||||
від підвищеного процесу теж відбувається у фоні.
|
||||
- Ctrl+R перечитує поточну папку активної панелі. Позиція курсора й позначки
|
||||
@@ -144,7 +196,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
|
||||
|
||||
@@ -164,7 +217,8 @@ Warning і початковий фокус на No.
|
||||
За наявності змін перехід у перегляд пропонує Save, Discard або Cancel.
|
||||
Помилка збереження залишає відкритим редактор зі змінами.
|
||||
- Ctrl+Tab циклічно перемикає фокус між Files, редакторами й переглядачами
|
||||
у порядку їх відкриття.
|
||||
у порядку їх відкриття. Ctrl+Shift+Tab обходить ті самі вікна у зворотному
|
||||
порядку. Коли відкрито лише Files, активна панель не змінюється.
|
||||
- F3 відкриває Markdown як форматований документ із таблицями, блоками коду,
|
||||
інтерактивними чекбоксами списків і діаграмами Mermaid. Відмітки в перегляді
|
||||
діють до повторного рендерингу або виходу з цього режиму. F4 відкриває текст
|
||||
@@ -272,10 +326,6 @@ Warning і початковий фокус на No.
|
||||
у відкритих локальних папках. Фокус залишається там, де був, а курсор
|
||||
лишається на поточному елементі, якщо той ще існує.
|
||||
|
||||
- Ctrl+8 відкриває список усіх ярликів папок. Кожен рядок показує групу
|
||||
й назву або шлях. Enter відкриває папку в активній панелі, F4 редагує
|
||||
ярлик, а Delete прибирає його зі списку.
|
||||
|
||||
- У Change drive повідомлення No paired computers з’являється після
|
||||
успішної відповіді з порожнім списком. Збої локального запиту до
|
||||
KSwitcher відображаються окремо.
|
||||
|
||||
@@ -148,12 +148,14 @@ updating the application. After verifying a new package, the updater closes File
|
||||
screenshot editors, Settings, and bundled StayHere for that installation. Save open work before approving an update.
|
||||
If settings change in the tray while the configurator is open, a conflicting Save is rejected; reopen
|
||||
the configurator to load the latest settings.
|
||||
Updates from v0.3.x–v0.4.1 first install the compatible **v0.4.2 bridge** through
|
||||
Update in the tray menu. Select Update again to install the full current release;
|
||||
manual extraction is not required. Future full releases use stable `release-vX.Y.Z`
|
||||
tags, which the bridge and newer clients recognize. Older clients ignore those tags
|
||||
and continue to find the bridge instead of skipping it. Versions v0.2.3 and earlier
|
||||
still require the previously documented initial configurator migration.
|
||||
Updates from v0.3.x–v0.4.1 go through the compatible **v0.4.2 bridge**. If tray
|
||||
**Update** does not find it, download [v0.4.2](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases/tag/v0.4.2),
|
||||
close KSwitcher and its editors, and extract the bridge ZIP into the installation
|
||||
directory while keeping personal data, dictionaries, and tools. Start v0.4.2
|
||||
and select **Update** to install the current full release. Full releases use
|
||||
stable `release-vX.Y.Z` tags recognized by the bridge and newer clients.
|
||||
Versions v0.2.3 and earlier still require the previously documented initial
|
||||
configurator migration.
|
||||
|
||||
Modern ZIPs contain `release-files.json` (schema, version, file paths, sizes and SHA-256
|
||||
hashes). The updater validates that every packaged file is declared, all hashes match,
|
||||
@@ -873,7 +875,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 +900,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).
|
||||
@@ -924,8 +929,9 @@ CC BY-SA 4.0; attribution, pinned source revision and license are in `dictionari
|
||||
|
||||
Download the portable Windows x64 ZIP from [Gitea Releases](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases).
|
||||
The [Release folder](Release/README.md) tracks the release notes, manifest and SHA-256 checksum.
|
||||
Run `./package.ps1 -PublishRelease` after building and testing, then upload the generated ZIP,
|
||||
manifest and checksum as release assets.
|
||||
Run `./package.ps1 -PublishRelease` after building and testing. Upload `dist/KSwitcher-win-x64.zip`,
|
||||
`dist/KSwitcher/release-files.json` and `Release/SHA256SUMS.txt` as Gitea release assets.
|
||||
Keep the ZIP in `dist/` and attach it to the release without committing it to Git.
|
||||
|
||||
## Verification
|
||||
|
||||
|
||||
@@ -1,5 +1,83 @@
|
||||
# Latest Windows release
|
||||
|
||||
## v0.6.113 — 2026-11-17
|
||||
|
||||
- KSwitcher Files keeps the terminal output area dark while WebView2 initializes. This fixes the white flash during startup.
|
||||
- The terminal copy regression test checks for a new clipboard write and verifies its contents without first taking clipboard ownership.
|
||||
|
||||
**Українською.**
|
||||
|
||||
- Під час запуску термінала область виводу KSwitcher Files залишається темною, поки WebView2 готує сторінку. Це усуває білий спалах під час відкриття термінала.
|
||||
- Тест копіювання з термінала перевіряє новий запис і його вміст без попереднього захоплення буфера обміну.
|
||||
|
||||
## v0.6.112 — 2026-11-17
|
||||
|
||||
In KSwitcher Files, **Ctrl+Shift+Tab** cycles backward through Files, Editor, and Viewer windows. **Ctrl+Tab** cycles forward. Both shortcuts wrap at the ends of the window list, including in the Markdown preview.
|
||||
|
||||
**Українською.**
|
||||
|
||||
У KSwitcher Files **Ctrl+Shift+Tab** обходить вікна Files, редактора й переглядача у зворотному порядку. **Ctrl+Tab** обходить їх у прямому порядку. Обидві комбінації працюють циклічно, зокрема в перегляді Markdown.
|
||||
|
||||
## v0.6.111 — 2026-11-17
|
||||
|
||||
- KSwitcher Files updates a panel as soon as its background folder scan finishes.
|
||||
- **Ctrl+U** swaps the panels, keeping their folders, view modes, cursors, marked items, and active panel together. Use **Tab** by itself to switch the active panel. **Ctrl+Tab** cycles between Files, Editor, and Viewer windows.
|
||||
- Panels and scrollable Files popups share a Far-style scrollbar with up and down arrows, a dotted track, and a thumb lighter than its background.
|
||||
|
||||
**Українською.**
|
||||
|
||||
- KSwitcher Files оновлює панель одразу після завершення фонового читання папки.
|
||||
- **Ctrl+U** міняє панелі місцями разом із папками, режимами перегляду, курсорами й позначками. Активна панель залишається активною на новому боці. Для перемикання активної панелі натисніть **Tab** без модифікаторів. **Ctrl+Tab** перемикає вікна Files, редактора й переглядача.
|
||||
- Панелі та попапи з прокруткою у Files мають спільний скролбар у стилі Far зі стрілками вгорі й унизу, крапковою доріжкою та повзунком, світлішим за фон.
|
||||
|
||||
## 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.
|
||||
|
||||
The offline Windows command catalog includes nested syntax and documented choices such as `schtasks /query /fo LIST`. After `ipconfig /renew ` or `ipconfig /release `, Files suggests local IPv4 adapters configured for DHCP. With Git for Windows, Git completion includes options and matching branch names. With the .NET SDK, `dotnet` completion delegates to the CLI. The main Files window has a new blue two-pane icon inspired by FAR.
|
||||
|
||||
**Українською.**
|
||||
|
||||
KSwitcher Files підказує недавні команди з історії, команди й параметри PowerShell та шляхи під час набору. Список працює з відкритими й прихованими панелями. Стрілки **↑** і **↓** вибирають підказку, **Tab** або **Enter** на вибраній підказці вставляє її, а **Escape** закриває список. **F1** у командному рядку відкриває статтю Microsoft Learn для документованої команди чи підкоманди Windows.
|
||||
|
||||
Офлайн-каталог команд Windows містить вкладений синтаксис і документовані значення, наприклад `schtasks /query /fo LIST`. Після `ipconfig /renew ` або `ipconfig /release ` Files підказує локальні адаптери з DHCP для IPv4. За наявності Git for Windows підказки Git включають параметри й відповідні назви гілок. За наявності .NET SDK підказки для `dotnet` надає сама утиліта. Головне вікно Files має нову синю іконку з двома панелями в стилі FAR.
|
||||
|
||||
## v0.6.106 — 2026-11-16
|
||||
|
||||
Files scans local and LAN folders and runs copy, move, rename and delete in the background. Copy and Rename/Move validate destinations in the background. A failed operation opens a red Far-style dialog. For local sharing violations, **Processes…** shows possible blockers and **End process** ends the selected process after confirmation. Retry **F6**, **F8**, or **Shift+Delete** after releasing the item.
|
||||
|
||||
@@ -1 +1 @@
|
||||
1094524ee07ae94bebddd7dcfa6047fb1ca3d5ce86df9072aa1e881e90b95412 KSwitcher-win-x64.zip
|
||||
99a86abd99b5d886e60eade0c2be6fc9a3a956456479e50799330f7d05393b57 KSwitcher-win-x64.zip
|
||||
+78
-78
@@ -1,166 +1,166 @@
|
||||
{
|
||||
"schema": 1,
|
||||
"version": "0.6.106",
|
||||
"files": [
|
||||
{
|
||||
"size": 2369024,
|
||||
"sha256": "0b53535ef8f50f9ec504ed82b930dd2afc862105acdc38a9cfc09059123f0ff2",
|
||||
"path": "KSwitcher.exe"
|
||||
"path": "KSwitcher.exe",
|
||||
"size": 2479104,
|
||||
"sha256": "0127e3c73c0e5aa5e58c6347b7702439775841723ef28e644eb99e43851073b3"
|
||||
},
|
||||
{
|
||||
"size": 2366464,
|
||||
"sha256": "d4f1338575cb808497bfc3cb334a32129a66f0efd164a26c8cc5d0a8d5eca8bc",
|
||||
"path": "KSwitcher.Config.exe"
|
||||
"path": "KSwitcher.Config.exe",
|
||||
"size": 2458112,
|
||||
"sha256": "d65a7e8ff047f8f83674613aa0e0cd29d38beac2c590736d2c53510fded2c9ce"
|
||||
},
|
||||
{
|
||||
"size": 3346432,
|
||||
"sha256": "1416152e756cdbd37ce29d6337806cce5ceea26f3a03680f050ba8282a380de0",
|
||||
"path": "KSwitcher.Screenshot.exe"
|
||||
"path": "KSwitcher.Screenshot.exe",
|
||||
"size": 3060224,
|
||||
"sha256": "5e4990d5a6aeca88d20b4cfe8af3f6c050f8a20eb27228f93ce822f73f0a862d"
|
||||
},
|
||||
{
|
||||
"size": 3866112,
|
||||
"sha256": "8be3992909882beb7c94280f3b6902b59f19854f67f0a68d4b753682750edb85",
|
||||
"path": "KSwitcher.Files.exe"
|
||||
"path": "KSwitcher.Files.exe",
|
||||
"size": 4216832,
|
||||
"sha256": "2d43503ae5ff296858f5d7dabe39d994859f0dd8f4e0d44af292c8ff053ea50f"
|
||||
},
|
||||
{
|
||||
"path": "WebView2Loader.dll",
|
||||
"size": 194912,
|
||||
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6",
|
||||
"path": "WebView2Loader.dll"
|
||||
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6"
|
||||
},
|
||||
{
|
||||
"path": "terminal/addon-fit-LICENSE.txt",
|
||||
"size": 1103,
|
||||
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f",
|
||||
"path": "terminal/addon-fit-LICENSE.txt"
|
||||
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f"
|
||||
},
|
||||
{
|
||||
"path": "terminal/addon-fit.js",
|
||||
"size": 1521,
|
||||
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527",
|
||||
"path": "terminal/addon-fit.js"
|
||||
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527"
|
||||
},
|
||||
{
|
||||
"path": "terminal/index.html",
|
||||
"size": 527,
|
||||
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef",
|
||||
"path": "terminal/index.html"
|
||||
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef"
|
||||
},
|
||||
{
|
||||
"path": "terminal/markdown-it-LICENSE.txt",
|
||||
"size": 1073,
|
||||
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473",
|
||||
"path": "terminal/markdown-it-LICENSE.txt"
|
||||
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473"
|
||||
},
|
||||
{
|
||||
"path": "terminal/markdown-it.js",
|
||||
"size": 100786,
|
||||
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e",
|
||||
"path": "terminal/markdown-it.js"
|
||||
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e"
|
||||
},
|
||||
{
|
||||
"path": "terminal/markdown.html",
|
||||
"size": 3530,
|
||||
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c",
|
||||
"path": "terminal/markdown.html"
|
||||
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c"
|
||||
},
|
||||
{
|
||||
"size": 14660,
|
||||
"sha256": "fe202fa3d3c362aff2ab9028b40bd2aee61240bf9bd4a44af55e45d1a4081cf0",
|
||||
"path": "terminal/markdown.js"
|
||||
"path": "terminal/markdown.js",
|
||||
"size": 15014,
|
||||
"sha256": "55c905afaf074e3253267a7c48a5ebca14edd7f15449fd85c0a884c34da22763"
|
||||
},
|
||||
{
|
||||
"path": "terminal/mermaid-LICENSE.txt",
|
||||
"size": 1089,
|
||||
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80",
|
||||
"path": "terminal/mermaid-LICENSE.txt"
|
||||
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80"
|
||||
},
|
||||
{
|
||||
"path": "terminal/mermaid.js",
|
||||
"size": 5537838,
|
||||
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3",
|
||||
"path": "terminal/mermaid.js"
|
||||
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3"
|
||||
},
|
||||
{
|
||||
"path": "terminal/terminal.js",
|
||||
"size": 5033,
|
||||
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a",
|
||||
"path": "terminal/terminal.js"
|
||||
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a"
|
||||
},
|
||||
{
|
||||
"path": "terminal/xterm-LICENSE.txt",
|
||||
"size": 1261,
|
||||
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd",
|
||||
"path": "terminal/xterm-LICENSE.txt"
|
||||
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd"
|
||||
},
|
||||
{
|
||||
"path": "terminal/xterm.css",
|
||||
"size": 7112,
|
||||
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6",
|
||||
"path": "terminal/xterm.css"
|
||||
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6"
|
||||
},
|
||||
{
|
||||
"path": "terminal/xterm.js",
|
||||
"size": 488663,
|
||||
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972",
|
||||
"path": "terminal/xterm.js"
|
||||
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972"
|
||||
},
|
||||
{
|
||||
"path": "LICENSE",
|
||||
"size": 4401,
|
||||
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
|
||||
"path": "LICENSE"
|
||||
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c"
|
||||
},
|
||||
{
|
||||
"size": 1075,
|
||||
"sha256": "c0d068392ea65358b798b8c165103560f06e9e3b38c4ab4e2d8810a7b931af86",
|
||||
"path": "json-LICENSE.txt"
|
||||
"path": "json-LICENSE.txt",
|
||||
"size": 1096,
|
||||
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831"
|
||||
},
|
||||
{
|
||||
"path": "files-text-license.txt",
|
||||
"size": 883,
|
||||
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625",
|
||||
"path": "files-text-license.txt"
|
||||
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625"
|
||||
},
|
||||
{
|
||||
"size": 94769,
|
||||
"sha256": "adda764fa7ca0cf80958ef44ed446b438ffa18b5f996c7ef19b553132d0f112a",
|
||||
"path": "README.md"
|
||||
"path": "README.md",
|
||||
"size": 95289,
|
||||
"sha256": "fcbd14b6190dc2a3575a4bc4be7229540c647022cb038d33ec4ac22176c67a9e"
|
||||
},
|
||||
{
|
||||
"path": "LAN-PREVIEW.md",
|
||||
"size": 11577,
|
||||
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930",
|
||||
"path": "LAN-PREVIEW.md"
|
||||
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930"
|
||||
},
|
||||
{
|
||||
"size": 682867,
|
||||
"sha256": "5f267c141c3d6837870e1c098f86b89a113ba300343119432644ead88f720c21",
|
||||
"path": "dictionaries/en.txt"
|
||||
"path": "dictionaries/en.txt",
|
||||
"size": 732485,
|
||||
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9"
|
||||
},
|
||||
{
|
||||
"size": 20138,
|
||||
"sha256": "28a9529c7d0bb4dc51f4bf5c116a3d16ef247a052f7591466768ddf563fd1cf5",
|
||||
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt"
|
||||
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
|
||||
"size": 20566,
|
||||
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5"
|
||||
},
|
||||
{
|
||||
"path": "dictionaries/README.md",
|
||||
"size": 2265,
|
||||
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311",
|
||||
"path": "dictionaries/README.md"
|
||||
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311"
|
||||
},
|
||||
{
|
||||
"size": 1060364,
|
||||
"sha256": "9ef922c7699569304a428f6aba0fd13a21341c0d0cb9561f37ef83c41577a28b",
|
||||
"path": "dictionaries/ru.txt"
|
||||
"path": "dictionaries/ru.txt",
|
||||
"size": 1109134,
|
||||
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849"
|
||||
},
|
||||
{
|
||||
"path": "dictionaries/sources.json",
|
||||
"size": 1280,
|
||||
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408",
|
||||
"path": "dictionaries/sources.json"
|
||||
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408"
|
||||
},
|
||||
{
|
||||
"path": "dictionaries/uk.txt",
|
||||
"size": 940799,
|
||||
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf",
|
||||
"path": "dictionaries/uk.txt"
|
||||
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf"
|
||||
},
|
||||
{
|
||||
"path": "tools/README.txt",
|
||||
"size": 993,
|
||||
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a",
|
||||
"path": "tools/README.txt"
|
||||
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a"
|
||||
},
|
||||
{
|
||||
"size": 134656,
|
||||
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376",
|
||||
"path": "tools/StayHere.exe"
|
||||
"path": "tools/StayHere.exe",
|
||||
"size": 133120,
|
||||
"sha256": "4c773c10766de698cbaa4ee1c121e1962d83ec929801f0de13541141b96441f2"
|
||||
},
|
||||
{
|
||||
"path": "tools/StayHere-README.md",
|
||||
"size": 2796,
|
||||
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413",
|
||||
"path": "tools/StayHere-README.md"
|
||||
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413"
|
||||
}
|
||||
]
|
||||
],
|
||||
"version": "0.6.113",
|
||||
"schema": 1
|
||||
}
|
||||
+3
-4
@@ -41,12 +41,11 @@ try {
|
||||
[IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip,(Join-Path $destination $name),$name,[IO.Compression.CompressionLevel]::Optimal) | Out-Null
|
||||
}
|
||||
} finally { $zip.Dispose(); $stream.Dispose() }
|
||||
Get-FileHash -LiteralPath $archive -Algorithm SHA256
|
||||
$archiveHash = Get-FileHash -LiteralPath $archive -Algorithm SHA256
|
||||
$archiveHash
|
||||
if ($PublishRelease) {
|
||||
$release = Join-Path $root 'Release'
|
||||
New-Item -ItemType Directory -Force $release | Out-Null
|
||||
$published = Join-Path $release 'KSwitcher-win-x64.zip'
|
||||
Copy-Item -LiteralPath $archive -Destination $published -Force
|
||||
$hash = (Get-FileHash -LiteralPath $published -Algorithm SHA256).Hash.ToLowerInvariant()
|
||||
$hash = $archiveHash.Hash.ToLowerInvariant()
|
||||
"$hash KSwitcher-win-x64.zip" | Set-Content -LiteralPath (Join-Path $release 'SHA256SUMS.txt') -Encoding ascii
|
||||
}
|
||||
+3
-3
@@ -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,106,0
|
||||
PRODUCTVERSION 0,6,106,0
|
||||
FILEVERSION 0,6,113,0
|
||||
PRODUCTVERSION 0,6,113,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.106"
|
||||
VALUE "FileVersion", "0.6.113"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
+2
-2
@@ -54,7 +54,7 @@ END
|
||||
STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN
|
||||
FONT 10, "Consolas"
|
||||
BEGIN
|
||||
CONTROL "", 100, "Edit", ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | WS_VSCROLL, 14, 16, 157, 13
|
||||
CONTROL "", 100, "Edit", ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL, 14, 16, 157, 13
|
||||
AUTOCHECKBOX "&Remember for this session", 101, 14, 30, 157, 13, NOT WS_VISIBLE
|
||||
CONTROL "", 102, "Static", NOT WS_VISIBLE, 14, 35, 1, 1
|
||||
CONTROL "&OK", IDOK, "Button", BS_OWNERDRAW | WS_TABSTOP, 67, 38, 51, 15
|
||||
@@ -68,7 +68,7 @@ STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN
|
||||
FONT 10, "Consolas"
|
||||
BEGIN
|
||||
LTEXT "", 430, 14, 17, 322, 20
|
||||
LISTBOX 431, 14, 41, 322, 61, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
|
||||
LISTBOX 431, 14, 41, 322, 61, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_TABSTOP
|
||||
CONTROL "", 432, "Static", NOT WS_VISIBLE, 14, 108, 1, 1
|
||||
CONTROL "&End process", 433, "Button", BS_OWNERDRAW | WS_TABSTOP, 56, 110, 80, 16
|
||||
CONTROL "&Refresh", 434, "Button", BS_OWNERDRAW | WS_TABSTOP, 140, 110, 74, 16
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 3.5 KiB |
@@ -282,7 +282,7 @@ document.addEventListener('keydown', event => {
|
||||
event.preventDefault();
|
||||
} else if (event.ctrlKey && !event.altKey && event.key === 'Tab') {
|
||||
event.preventDefault();
|
||||
send('cycle');
|
||||
send('cycle', {reverse: event.shiftKey});
|
||||
} else if ((event.altKey && ['ArrowLeft', 'ArrowRight'].includes(event.key)) ||
|
||||
['BrowserBack', 'BrowserForward'].includes(event.key)) {
|
||||
event.preventDefault();
|
||||
|
||||
+11
-4
@@ -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
@@ -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
@@ -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 &&
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -0,0 +1,321 @@
|
||||
#pragma once
|
||||
|
||||
#include "platform.h"
|
||||
#include "files_powershell.h"
|
||||
#include "files_windows_command_catalog.h"
|
||||
#include "../vendor/json.hpp"
|
||||
#include <optional>
|
||||
#include <vector>
|
||||
|
||||
namespace ks::files
|
||||
{
|
||||
class CommandCompletion
|
||||
{
|
||||
public:
|
||||
using Json = nlohmann::json;
|
||||
|
||||
CommandCompletion() = default;
|
||||
CommandCompletion(const CommandCompletion &) = delete;
|
||||
CommandCompletion &operator=(const CommandCompletion &) = delete;
|
||||
~CommandCompletion() { close(); }
|
||||
|
||||
bool request(const std::wstring &line, DWORD caret, const std::wstring &directory)
|
||||
{
|
||||
auto message=Json{{"line",utf8(line)},{"caret",caret},{"directory",utf8(directory)}}.dump(
|
||||
-1,' ',true,Json::error_handler_t::replace)+"\n";
|
||||
if(message.size()>32768 || (!process && !start())) return false;
|
||||
if(!write(message))
|
||||
{
|
||||
close();
|
||||
return false;
|
||||
}
|
||||
deadline=GetTickCount64()+5000;
|
||||
return true;
|
||||
}
|
||||
|
||||
// An empty optional means the request is still running.
|
||||
std::optional<Json> poll()
|
||||
{
|
||||
DWORD available{},count{};
|
||||
char chunk[8192];
|
||||
if(!PeekNamedPipe(output,nullptr,0,nullptr,&available,nullptr) ||
|
||||
GetTickCount64()>=deadline || pending.size()>1024*1024)
|
||||
{
|
||||
close();
|
||||
return Json{};
|
||||
}
|
||||
if(available && ReadFile(output,chunk,std::min<DWORD>(available,sizeof(chunk)),&count,nullptr))
|
||||
pending.append(chunk,count);
|
||||
const auto end=pending.find('\n');
|
||||
if(end==pending.npos) return {};
|
||||
auto result=Json::parse(pending.begin(),pending.begin()+end,nullptr,false);
|
||||
pending.erase(0,end+1);
|
||||
return result;
|
||||
}
|
||||
|
||||
private:
|
||||
HANDLE process{},input{},output{},job{};
|
||||
ULONGLONG deadline{};
|
||||
std::string pending;
|
||||
|
||||
bool write(std::string_view message)
|
||||
{
|
||||
DWORD written{};
|
||||
return WriteFile(input,message.data(),static_cast<DWORD>(message.size()),&written,nullptr) &&
|
||||
written==message.size();
|
||||
}
|
||||
|
||||
bool start()
|
||||
{
|
||||
SECURITY_ATTRIBUTES inheritable{sizeof(inheritable),nullptr,TRUE};
|
||||
HANDLE childInput{},childOutput{};
|
||||
std::string catalog;
|
||||
for(const auto row:windowsCommandCatalog) catalog.append(row).push_back('\n');
|
||||
const auto initial=Json{{"catalog",std::move(catalog)}}.dump()+"\n";
|
||||
const auto inputCapacity=static_cast<DWORD>(initial.size()+32768);
|
||||
const bool pipes=CreatePipe(&childInput,&input,&inheritable,inputCapacity) &&
|
||||
CreatePipe(&output,&childOutput,&inheritable,65536) &&
|
||||
SetHandleInformation(input,HANDLE_FLAG_INHERIT,0) &&
|
||||
SetHandleInformation(output,HANDLE_FLAG_INHERIT,0);
|
||||
const bool started=pipes && launch(childInput,childOutput) && write(initial);
|
||||
if(childInput) CloseHandle(childInput);
|
||||
if(childOutput) CloseHandle(childOutput);
|
||||
if(!started) close();
|
||||
return started;
|
||||
}
|
||||
|
||||
bool launch(HANDLE childInput,HANDLE childOutput)
|
||||
{
|
||||
const auto shell=windowsPowerShell();
|
||||
if(shell.empty()) return false;
|
||||
// The request is data on stdin. PowerShell parses it for completion in this separate session.
|
||||
wchar_t command[]=LR"PS(powershell.exe -NoLogo -NoProfile -NonInteractive -Command "
|
||||
$ProgressPreference = 'SilentlyContinue';
|
||||
[Console]::OutputEncoding = [Text.UTF8Encoding]::new($false);
|
||||
function Get-CompletedArguments($command, $position, $includeCurrent) {
|
||||
foreach ($element in ($command.CommandElements | Select-Object -Skip 1)) {
|
||||
if ($element.Extent.EndOffset -gt $position -or
|
||||
(!$includeCurrent -and $element.Extent.EndOffset -eq $position)) { break }
|
||||
if ($element -is [System.Management.Automation.Language.StringConstantExpressionAst]) {
|
||||
$element.Value;
|
||||
} else { $element.Extent.Text }
|
||||
}
|
||||
}
|
||||
|
||||
function New-ArgumentCompletion([string]$value) {
|
||||
$text = $value;
|
||||
if ($value.StartsWith('@') -or $value -notmatch '^[\p{L}\p{M}\p{N}._/@:+,=\-]+$') {
|
||||
$quote = [string][char]39;
|
||||
$text = $quote + [System.Management.Automation.Language.CodeGeneration]::EscapeSingleQuotedStringContent($value) + $quote;
|
||||
}
|
||||
[System.Management.Automation.CompletionResult]::new($text, $value, 'ParameterValue', $value)
|
||||
}
|
||||
|
||||
function Get-DhcpAdapterNames {
|
||||
foreach ($adapter in [Net.NetworkInformation.NetworkInterface]::GetAllNetworkInterfaces()) {
|
||||
if (!$adapter.Supports([Net.NetworkInformation.NetworkInterfaceComponent]::IPv4)) { continue }
|
||||
try {
|
||||
if ($adapter.GetIPProperties().GetIPv4Properties().IsDhcpEnabled) { $adapter.Name }
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
|
||||
$initial = ConvertFrom-Json -InputObject ([Console]::ReadLine());
|
||||
$windowsCommands = @{};
|
||||
$windowsHelp = @{};
|
||||
foreach ($row in ($initial.catalog -split '\r?\n')) {
|
||||
if (!$row) { continue }
|
||||
$name, $values, $article = $row.Split([char]9, 3);
|
||||
$windowsCommands[$name] = if ($values) { $values.Split(' ') } else { @() };
|
||||
if ($article) { $windowsHelp[$name] = $article }
|
||||
}
|
||||
$windowsRoots = @($windowsCommands.Keys | Where-Object { !($_.Contains(' ')) } | Sort-Object);
|
||||
$windowsPrograms = @(foreach ($name in $windowsRoots) { $name; $name + '.exe'; $name + '.com' });
|
||||
function Get-WindowsCommandContext($command, $position, $includeCurrent) {
|
||||
if (!$command) { return }
|
||||
$invoked = $command.GetCommandName();
|
||||
if (!$invoked -or !$windowsCommands.ContainsKey([IO.Path]::GetFileNameWithoutExtension($invoked))) { return }
|
||||
$resolved = Get-Command -Name ([WildcardPattern]::Escape($invoked)) -ErrorAction SilentlyContinue |
|
||||
Select-Object -First 1;
|
||||
if ($resolved -is [System.Management.Automation.AliasInfo]) { $resolved = $resolved.ResolvedCommand }
|
||||
if ($resolved -isnot [System.Management.Automation.ApplicationInfo]) { return }
|
||||
$name = [IO.Path]::GetFileNameWithoutExtension($resolved.Name);
|
||||
$arguments = @(Get-CompletedArguments $command $position $includeCurrent);
|
||||
$values = $null;
|
||||
if ($name -eq 'cmd') {
|
||||
for ($i = 0; $i -lt $arguments.Count; ++$i) {
|
||||
if ($arguments[$i] -notin '/c', '/k') { continue }
|
||||
if ($i + 1 -lt $arguments.Count) {
|
||||
$name = [IO.Path]::GetFileNameWithoutExtension($arguments[$i + 1]);
|
||||
$arguments = @($arguments | Select-Object -Skip ($i + 2));
|
||||
} else { $values = $windowsRoots }
|
||||
break
|
||||
}
|
||||
}
|
||||
$root = $name;
|
||||
$article = $windowsHelp[$name];
|
||||
if (!$values) {
|
||||
foreach ($argument in $arguments) {
|
||||
$child = $name + ' ' + $argument;
|
||||
if (!$windowsCommands.ContainsKey($child)) { break }
|
||||
$name = $child;
|
||||
if ($windowsHelp[$name]) { $article = $windowsHelp[$name] }
|
||||
}
|
||||
$values = $windowsCommands[$name];
|
||||
}
|
||||
@{ root = $root; values = $values; arguments = $arguments; article = $article }
|
||||
}
|
||||
|
||||
Register-ArgumentCompleter -Native -CommandName $windowsPrograms -ScriptBlock {
|
||||
param($word, $command, $position)
|
||||
$context = Get-WindowsCommandContext $command $position $false;
|
||||
if (!$context) { return }
|
||||
if ($context.root -eq 'ipconfig' -and $context.arguments.Count -and
|
||||
$context.arguments[0] -in '/renew','/release') {
|
||||
$script:adapterArguments = $true;
|
||||
if ($context.arguments.Count -ne 1) { return }
|
||||
$prefix = ([string]$word).Trim([char[]]@([char]39, [char]34));
|
||||
foreach ($adapterName in (Get-DhcpAdapterNames | Sort-Object -Unique)) {
|
||||
if ($adapterName.StartsWith($prefix, [StringComparison]::OrdinalIgnoreCase)) {
|
||||
New-ArgumentCompletion $adapterName
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
if ($word -eq '?') { $word = '/?' }
|
||||
foreach ($value in $context.values) {
|
||||
if ($value.StartsWith([string]$word, [StringComparison]::OrdinalIgnoreCase)) {
|
||||
[System.Management.Automation.CompletionResult]::new($value)
|
||||
}
|
||||
}
|
||||
};
|
||||
Register-ArgumentCompleter -Native -CommandName dotnet,dotnet.exe -ScriptBlock {
|
||||
param($word, $command, $position)
|
||||
$offset = $position - $command.Extent.StartOffset;
|
||||
dotnet.exe complete --position $offset $command.ToString() 2>$null | ForEach-Object {
|
||||
[System.Management.Automation.CompletionResult]::new($_)
|
||||
}
|
||||
};
|
||||
function Find-GitCompletionTools {
|
||||
$git = Get-Command git.exe -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1;
|
||||
if (!$git) { return }
|
||||
$location = [IO.DirectoryInfo]::new([IO.Path]::GetDirectoryName($git.Source));
|
||||
for ($level = 0; $location -and $level -lt 3; ++$level) {
|
||||
$root = $location.FullName;
|
||||
$location = $location.Parent;
|
||||
$bash = Join-Path $root 'usr/bin/bash.exe';
|
||||
if (![IO.File]::Exists($bash)) { continue }
|
||||
foreach ($architecture in 'mingw64', 'mingw32', 'clangarm64') {
|
||||
$script = Join-Path $root ($architecture + '/share/git/completion/git-completion.bash');
|
||||
if ([IO.File]::Exists($script)) { return @{ bash = $bash; script = $script } }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Send words as data to Git for Windows. Backslash-quote escapes are for Windows PowerShell's native argv.
|
||||
$gitCompletionRunner = @'
|
||||
export GIT_ALLOW_PROTOCOL= GIT_TERMINAL_PROMPT=0
|
||||
mapfile -t input
|
||||
for i in ~${!input[@]}~; do input[i]=~${input[i]%$'\r'}~; done
|
||||
source ~${input[0]}~ || exit
|
||||
words=(~${input[@]:1}~)
|
||||
cword=$(( ${#words[@]} - 1 ))
|
||||
cur=${words[cword]}
|
||||
prev=${words[cword-1]}
|
||||
__git_main
|
||||
if (( ${#COMPREPLY[@]} )); then printf '%s\n' ~${COMPREPLY[@]}~; fi
|
||||
'@.Replace('~', ('\' + [char]34));
|
||||
$OutputEncoding = [Console]::OutputEncoding;
|
||||
Register-ArgumentCompleter -Native -CommandName git,git.exe -ScriptBlock {
|
||||
param($word, $command, $position)
|
||||
if (!$script:gitCompletionTools) { $script:gitCompletionTools = Find-GitCompletionTools }
|
||||
if (!$script:gitCompletionTools) { return }
|
||||
$arguments = @('git') + @(Get-CompletedArguments $command $position) + @([string]$word);
|
||||
@($script:gitCompletionTools.script) + $arguments |
|
||||
& $script:gitCompletionTools.bash --noprofile --norc -p -c $gitCompletionRunner 2>$null |
|
||||
ForEach-Object {
|
||||
$value = $_.TrimEnd();
|
||||
if ($value) { New-ArgumentCompletion $value }
|
||||
}
|
||||
};
|
||||
function Get-CompletionCommand($request) {
|
||||
$prefix = $request.line.Substring(0, $request.caret).TrimEnd();
|
||||
$ast = [System.Management.Automation.Language.Parser]::ParseInput($prefix, [ref]$null, [ref]$null);
|
||||
$ast.FindAll({
|
||||
param($node)
|
||||
$node -is [System.Management.Automation.Language.CommandAst] -and
|
||||
$node.Extent.EndOffset -eq $prefix.Length
|
||||
}, $true) | Select-Object -Last 1;
|
||||
}
|
||||
function Test-NoCommandArguments($command) {
|
||||
if (!$command) { return $false }
|
||||
$name = $command.GetCommandName();
|
||||
if (!$name) { return $false }
|
||||
$info = Get-Command -Name ([WildcardPattern]::Escape($name)) -ErrorAction SilentlyContinue;
|
||||
if ($info -is [System.Management.Automation.AliasInfo]) { $info = $info.ResolvedCommand }
|
||||
return ($info -is [System.Management.Automation.FunctionInfo] -or
|
||||
$info -is [System.Management.Automation.CmdletInfo]) -and $info.Parameters.Count -eq 0;
|
||||
}
|
||||
while ($null -ne ($line = [Console]::ReadLine())) {
|
||||
try {
|
||||
$request = ConvertFrom-Json -InputObject $line -ErrorAction Stop;
|
||||
Set-Location -LiteralPath $request.directory -ErrorAction Stop;
|
||||
$script:adapterArguments = $false;
|
||||
$command = Get-CompletionCommand $request;
|
||||
$context = Get-WindowsCommandContext $command $request.caret $true;
|
||||
$result = TabExpansion2 -inputScript $request.line -cursorColumn $request.caret;
|
||||
$candidates = $result.CompletionMatches;
|
||||
if ($candidates.Count -and $candidates[0].ResultType -in 'ProviderItem','ProviderContainer' -and
|
||||
($script:adapterArguments -or (Test-NoCommandArguments $command))) {
|
||||
$candidates = $candidates | Where-Object { $_.ResultType -notin 'ProviderItem','ProviderContainer' };
|
||||
}
|
||||
$items = @($candidates | Select-Object -First 100 | ForEach-Object {
|
||||
@{ label = $_.ListItemText; text = $_.CompletionText; directory = ($_.ResultType -eq 'ProviderContainer') }
|
||||
});
|
||||
$reply = @{ index = $result.ReplacementIndex; length = $result.ReplacementLength;
|
||||
matches = $items; article = [string]$context.article };
|
||||
[Console]::WriteLine((ConvertTo-Json -InputObject $reply -Compress -Depth 4));
|
||||
} catch { [Console]::WriteLine('{}') }
|
||||
}")PS";
|
||||
|
||||
job=CreateJobObjectW(nullptr,nullptr);
|
||||
JOBOBJECT_EXTENDED_LIMIT_INFORMATION limits{};
|
||||
limits.BasicLimitInformation.LimitFlags=JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
|
||||
if(!job || !SetInformationJobObject(job,JobObjectExtendedLimitInformation,&limits,sizeof(limits))) return false;
|
||||
|
||||
SIZE_T bytes{};
|
||||
InitializeProcThreadAttributeList(nullptr,1,0,&bytes);
|
||||
std::vector<unsigned char> storage(bytes);
|
||||
auto attributes=reinterpret_cast<LPPROC_THREAD_ATTRIBUTE_LIST>(storage.data());
|
||||
if(!InitializeProcThreadAttributeList(attributes,1,0,&bytes)) return false;
|
||||
HANDLE inherited[]{childInput,childOutput};
|
||||
STARTUPINFOEXW startup{};
|
||||
startup.StartupInfo.cb=sizeof(startup);
|
||||
startup.StartupInfo.dwFlags=STARTF_USESTDHANDLES;
|
||||
startup.StartupInfo.hStdInput=childInput;
|
||||
startup.StartupInfo.hStdOutput=startup.StartupInfo.hStdError=childOutput;
|
||||
startup.lpAttributeList=attributes;
|
||||
PROCESS_INFORMATION child{};
|
||||
const bool started=UpdateProcThreadAttribute(attributes,0,PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
|
||||
inherited,sizeof(inherited),nullptr,nullptr) &&
|
||||
CreateProcessW(shell.c_str(),command,nullptr,nullptr,TRUE,
|
||||
CREATE_SUSPENDED|CREATE_NO_WINDOW|EXTENDED_STARTUPINFO_PRESENT,
|
||||
nullptr,nullptr,&startup.StartupInfo,&child);
|
||||
DeleteProcThreadAttributeList(attributes);
|
||||
if(!started) return false;
|
||||
process=child.hProcess;
|
||||
const bool running=AssignProcessToJobObject(job,process) && ResumeThread(child.hThread)!=DWORD(-1);
|
||||
if(!running) TerminateProcess(process,1);
|
||||
CloseHandle(child.hThread);
|
||||
return running;
|
||||
}
|
||||
|
||||
void close()
|
||||
{
|
||||
for(const auto handle:{job,input,output,process})
|
||||
if(handle) CloseHandle(handle);
|
||||
job=input=output=process=nullptr;
|
||||
pending.clear();
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -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;
|
||||
});
|
||||
|
||||
@@ -140,13 +140,7 @@ LRESULT CALLBACK historyListScroll(HWND list,UINT message,WPARAM wp,LPARAM lp,UI
|
||||
SendMessageW(GetParent(list),WM_COMMAND,IDOK,0);
|
||||
return 0;
|
||||
}
|
||||
if(message==LB_GETTOPINDEX || message==WM_NCDESTROY)
|
||||
return DefSubclassProc(list,message,wp,lp);
|
||||
const auto top=SendMessageW(list,LB_GETTOPINDEX,0,0);
|
||||
const auto result=scrollList(list,message,wp,lp);
|
||||
if(top!=SendMessageW(list,LB_GETTOPINDEX,0,0))
|
||||
InvalidateRect(GetParent(list),nullptr,FALSE);
|
||||
return result;
|
||||
return DefSubclassProc(list,message,wp,lp);
|
||||
}
|
||||
|
||||
void sizeCommandHistory(HWND dialog,HWND list)
|
||||
@@ -179,7 +173,7 @@ void sizeCommandHistory(HWND dialog,HWND list)
|
||||
const int gap=MulDiv(4,dpi,96);
|
||||
const int listTop=top+2*textHeight+2*gap;
|
||||
const LONG desired=std::max<LONG>(MulDiv(320,dpi,96),
|
||||
longest+2*cellWidth+2*historyRowInset(dpi)+GetSystemMetricsForDpi(SM_CXVSCROLL,dpi))+2*inset;
|
||||
longest+2*cellWidth+2*historyRowInset(dpi)+scrollBarWidth(list))+2*inset;
|
||||
const auto target=std::min(desired,area.right-area.left);
|
||||
const auto rows=std::max<LRESULT>(1,SendMessageW(list,LB_GETCOUNT,0,0));
|
||||
RECT listWindow{},listClient{};
|
||||
@@ -198,7 +192,7 @@ void sizeCommandHistory(HWND dialog,HWND list)
|
||||
};
|
||||
place(GetDlgItem(dialog,historySearchLabel),top,textHeight);
|
||||
place(GetDlgItem(dialog,historySearch),top+textHeight+gap,textHeight);
|
||||
SetWindowPos(list,nullptr,inset,listTop,std::max(1L,target-2*inset-5),
|
||||
SetWindowPos(list,nullptr,inset,listTop,std::max(1L,target-2*inset-scrollBarWidth(list)),
|
||||
std::max(1L,height-listTop-inset),SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
GetClientRect(list,&listClient);
|
||||
if(rows*textHeight<=listClient.bottom) SendMessageW(list,LB_SETTOPINDEX,0,0);
|
||||
@@ -221,6 +215,7 @@ INT_PTR CALLBACK commandHistoryDialog(HWND dialog,UINT message,WPARAM wp,LPARAM
|
||||
prepareCopyDialog(dialog);
|
||||
const auto list=GetDlgItem(dialog,historyList);
|
||||
SetWindowSubclass(list,historyListScroll,1,0);
|
||||
installScrollBar(list,dialog);
|
||||
SendMessageW(list,WM_SETFONT,reinterpret_cast<WPARAM>(mono),TRUE);
|
||||
SendMessageW(list,LB_SETITEMHEIGHT,0,std::max(1,textHeight));
|
||||
const auto search=GetDlgItem(dialog,historySearch);
|
||||
|
||||
@@ -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())
|
||||
@@ -255,7 +243,8 @@ void layoutQuickFolders(HWND dialog,FolderShortcutView &view,int selection)
|
||||
GetWindowRect(owner,&parent);
|
||||
const auto windowWidth=std::max(px(260),static_cast<int>(parent.right-parent.left));
|
||||
const auto windowHeight=std::max(px(140),static_cast<int>(parent.bottom-parent.top));
|
||||
width=std::min(width,std::max(1,std::min(windowWidth,static_cast<int>(work.right-work.left))-2*inset));
|
||||
width=std::min(width+scrollBarWidth(list),
|
||||
std::max(1,std::min(windowWidth,static_cast<int>(work.right-work.left))-2*inset));
|
||||
const auto maxRows=std::max(1,(std::min(windowHeight,static_cast<int>(work.bottom-work.top))-2*listTop)/view.rowHeight);
|
||||
const auto count=static_cast<int>(SendMessageW(list,LB_GETCOUNT,0,0));
|
||||
const int rows=std::min(count,maxRows);
|
||||
@@ -267,7 +256,8 @@ void layoutQuickFolders(HWND dialog,FolderShortcutView &view,int selection)
|
||||
const int y=std::clamp(static_cast<int>((parent.top+parent.bottom-h)/2),
|
||||
static_cast<int>(work.top),std::max(static_cast<int>(work.top),static_cast<int>(work.bottom)-h));
|
||||
SetWindowPos(dialog,nullptr,x,y,w,h,SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
SetWindowPos(list,nullptr,inset,listTop,width,listHeight,SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
SetWindowPos(list,nullptr,inset,listTop,std::max(1,width-scrollBarWidth(list)),listHeight,
|
||||
SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
SendMessageW(list,LB_SETCURSEL,std::clamp(selection,0,std::max(0,count-1)),0);
|
||||
InvalidateRect(dialog,nullptr,TRUE);
|
||||
FilesModalDialog::refreshLayout(dialog);
|
||||
@@ -290,7 +280,7 @@ LRESULT CALLBACK quickFolderKeys(HWND list,UINT message,WPARAM key,LPARAM flags,
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return scrollList(list,message,key,flags);
|
||||
return DefSubclassProc(list,message,key,flags);
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
|
||||
@@ -303,6 +293,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
|
||||
layoutQuickFolders(dialog,view,0);
|
||||
const auto list=GetDlgItem(dialog,shortcutList);
|
||||
SetWindowSubclass(list,quickFolderKeys,1,0);
|
||||
installScrollBar(list,dialog);
|
||||
SetFocus(list);
|
||||
return FALSE;
|
||||
}
|
||||
@@ -322,7 +313,8 @@ 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);
|
||||
paintScrollPosition(dialog,dc,GetDlgItem(dialog,shortcutList),colors[Dialog]);
|
||||
EndPaint(dialog,&ps);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -349,7 +341,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 +350,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 +398,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 +408,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 +431,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);
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -186,6 +186,12 @@ INT_PTR CALLBACK lockProcessesDialog(HWND window,UINT message,WPARAM wp,LPARAM l
|
||||
SetWindowLongPtrW(window,DWLP_USER,lp);
|
||||
prepareCopyDialog(window);
|
||||
for(const auto id:{430,431}) SendDlgItemMessageW(window,id,WM_SETFONT,reinterpret_cast<WPARAM>(mono),FALSE);
|
||||
const auto list=GetDlgItem(window,431);
|
||||
RECT bounds{};
|
||||
GetWindowRect(list,&bounds);
|
||||
SetWindowPos(list,nullptr,0,0,std::max(1L,bounds.right-bounds.left-scrollBarWidth(list)),
|
||||
bounds.bottom-bounds.top,SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
installScrollBar(list,window);
|
||||
layoutDialogButtons(window,432,{433,434,IDOK});
|
||||
SendMessageW(window,DM_SETDEFID,IDOK,0);
|
||||
SetFocus(GetDlgItem(window,IDOK));
|
||||
@@ -233,7 +239,7 @@ INT_PTR CALLBACK lockProcessesDialog(HWND window,UINT message,WPARAM wp,LPARAM l
|
||||
}
|
||||
}
|
||||
if(message==WM_CLOSE) {FilesModalDialog::finish(window,IDCANCEL);return TRUE;}
|
||||
return paintCopyDialog(window,message,wp,lp,L" Locking processes ",false,{432});
|
||||
return paintCopyDialog(window,message,wp,lp,L" Locking processes ",false,{432},false,GetDlgItem(window,431));
|
||||
}
|
||||
|
||||
void showLockProcesses(HWND owner,std::vector<fs::path> paths)
|
||||
|
||||
+645
-107
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,15 @@
|
||||
#pragma once
|
||||
|
||||
#include <windows.h>
|
||||
#include <string>
|
||||
|
||||
namespace ks::files
|
||||
{
|
||||
inline std::wstring windowsPowerShell()
|
||||
{
|
||||
wchar_t system[MAX_PATH]{};
|
||||
const auto length=GetSystemDirectoryW(system,MAX_PATH);
|
||||
return length && length<MAX_PATH
|
||||
? std::wstring(system)+L"\\WindowsPowerShell\\v1.0\\powershell.exe" : std::wstring{};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
#pragma once
|
||||
|
||||
#include <windows.h>
|
||||
#include <algorithm>
|
||||
|
||||
namespace ks::files
|
||||
{
|
||||
inline int scrollBarWidth(HWND window) {return std::max(7,MulDiv(12,GetDpiForWindow(window),96));}
|
||||
|
||||
inline int scrollArrowHeight(RECT bounds)
|
||||
{
|
||||
return std::min(bounds.right-bounds.left,(bounds.bottom-bounds.top)/3);
|
||||
}
|
||||
|
||||
struct ScrollPosition
|
||||
{
|
||||
int count, visible, top;
|
||||
|
||||
int last() const {return std::max(0,count-visible);}
|
||||
|
||||
RECT thumb(RECT track) const
|
||||
{
|
||||
const auto arrow=scrollArrowHeight(track);
|
||||
track.top+=arrow;
|
||||
track.bottom-=arrow;
|
||||
const int height=track.bottom-track.top;
|
||||
if(height<=0 || !last()) return {};
|
||||
const int size=std::clamp(MulDiv(height,visible,count),std::min(height,arrow),height);
|
||||
track.top+=MulDiv(std::clamp(top,0,last()),height-size,last());
|
||||
track.bottom=track.top+size;
|
||||
return track;
|
||||
}
|
||||
|
||||
int click(RECT track,int y) const
|
||||
{
|
||||
const auto arrow=scrollArrowHeight(track);
|
||||
const auto grip=thumb(track);
|
||||
const int delta=y<track.top+arrow?-1:y>=track.bottom-arrow?1:
|
||||
y<grip.top?-visible:y>=grip.bottom?visible:0;
|
||||
return std::clamp(top+delta,0,last());
|
||||
}
|
||||
|
||||
int drag(RECT track,int y,int offset) const
|
||||
{
|
||||
const auto grip=thumb(track);
|
||||
const auto arrow=scrollArrowHeight(track);
|
||||
const auto travel=track.bottom-track.top-2*arrow-(grip.bottom-grip.top);
|
||||
return travel>0?std::clamp(MulDiv(y-track.top-arrow-offset,last(),travel),0,last()):top;
|
||||
}
|
||||
};
|
||||
|
||||
inline void paintScrollBar(HDC dc,RECT track,ScrollPosition position,COLORREF background)
|
||||
{
|
||||
const auto brush=static_cast<HBRUSH>(GetStockObject(DC_BRUSH));
|
||||
SetDCBrushColor(dc,background);
|
||||
FillRect(dc,&track,brush);
|
||||
if(!position.last()) return;
|
||||
const auto lighter=[&](int divisor){return RGB(GetRValue(background)+(257-GetRValue(background))/divisor,
|
||||
GetGValue(background)+(257-GetGValue(background))/divisor,
|
||||
GetBValue(background)+(257-GetBValue(background))/divisor);};
|
||||
const auto ink=lighter(4),dots=lighter(7);
|
||||
const int height=scrollArrowHeight(track);
|
||||
struct
|
||||
{
|
||||
BITMAPINFOHEADER header{sizeof(BITMAPINFOHEADER),4,4,1,32,BI_RGB};
|
||||
DWORD pixels[16]{};
|
||||
} tile;
|
||||
for(int y=0;y<4;++y)
|
||||
for(int x=0;x<4;++x)
|
||||
{
|
||||
const auto color=y%2==0 && x%2==y/2?dots:background;
|
||||
// DIB pixels are stored bottom-up in BGR order.
|
||||
tile.pixels[(3-y)*4+x]=RGB(GetBValue(color),GetGValue(color),GetRValue(color));
|
||||
}
|
||||
if(const auto pattern=CreateDIBPatternBrushPt(&tile,DIB_RGB_COLORS))
|
||||
{
|
||||
const RECT channel{track.left,track.top+height,track.right,track.bottom-height};
|
||||
POINT origin{};
|
||||
SetBrushOrgEx(dc,channel.left,channel.top,&origin);
|
||||
FillRect(dc,&channel,pattern);
|
||||
SetBrushOrgEx(dc,origin.x,origin.y,nullptr);
|
||||
DeleteObject(pattern);
|
||||
}
|
||||
SetDCBrushColor(dc,ink);
|
||||
const auto thumb=position.thumb(track);
|
||||
FillRect(dc,&thumb,brush);
|
||||
const int middle=(track.left+track.right)/2;
|
||||
const int radius=std::max(0,(height-3)/2);
|
||||
for(int row=0;row<=radius;++row)
|
||||
{
|
||||
const int y=track.top+(height-radius-1)/2+row;
|
||||
const int mirrored=track.bottom-1-(y-track.top);
|
||||
const RECT up{middle-row,y,middle+row+1,y+1};
|
||||
const RECT down{middle-row,mirrored,middle+row+1,mirrored+1};
|
||||
FillRect(dc,&up,brush);
|
||||
FillRect(dc,&down,brush);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "files_powershell.h"
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
@@ -50,10 +51,8 @@ public:
|
||||
startup.lpAttributeList=attributes;
|
||||
PROCESS_INFORMATION info{};
|
||||
wchar_t command[]=L"powershell.exe -NoLogo -NoProfile -NoExit -Command \"Remove-Module PSReadLine -ErrorAction SilentlyContinue; function global:prompt { $location = Get-Location; $path = if ($location.Provider.Name -eq 'FileSystem') { [Uri]::EscapeDataString($location.ProviderPath) }; ([string][char]27) + ']633;ks-directory:' + $path + [char]7 + [char]27 + '[?25l' }; Clear-Host\"";
|
||||
wchar_t system[MAX_PATH]{};
|
||||
const auto length=GetSystemDirectoryW(system,MAX_PATH);
|
||||
const auto shell=std::wstring(system)+L"\\WindowsPowerShell\\v1.0\\powershell.exe";
|
||||
const bool started=length && length<MAX_PATH &&
|
||||
const auto shell=ks::files::windowsPowerShell();
|
||||
const bool started=!shell.empty() &&
|
||||
UpdateProcThreadAttribute(attributes,0,PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE,
|
||||
console,sizeof(console),nullptr,nullptr) &&
|
||||
CreateProcessW(shell.c_str(),command,nullptr,nullptr,FALSE,EXTENDED_STARTUPINFO_PRESENT,
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
#ifdef __MINGW32__
|
||||
__CRT_UUID_DECL(ICoreWebView2_3, 0xA0D6DF20, 0x3B92, 0x416D, 0xAA, 0x0C, 0x43, 0x7A, 0x9C, 0x72, 0x78, 0x57)
|
||||
__CRT_UUID_DECL(ICoreWebView2Controller2, 0xc979903e, 0xd4ca, 0x4228, 0x92, 0xeb, 0x47, 0xee, 0x3f, 0xa9, 0x6e, 0xab)
|
||||
__CRT_UUID_DECL(ICoreWebView2ControllerOptions3, 0xb32b191a, 0x8998, 0x57ca, 0xb7, 0xcb, 0xe0, 0x46, 0x17, 0xe4, 0xce, 0x4a)
|
||||
__CRT_UUID_DECL(ICoreWebView2Environment10, 0xee0eb9df, 0x6f12, 0x46ce, 0xb5, 0x3f, 0x3f, 0x47, 0xb9, 0xc9, 0x28, 0xe0)
|
||||
__CRT_UUID_DECL(ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler, 0x4e8a3389, 0xc9d8, 0x4bd2, 0xb6, 0xb5, 0x12, 0x4f, 0xee, 0x6c, 0xc1, 0x4d)
|
||||
__CRT_UUID_DECL(ICoreWebView2CreateCoreWebView2ControllerCompletedHandler, 0x6c4819f3, 0xc9b7, 0x4260, 0x81, 0x27, 0xc9, 0xf5, 0xbd, 0xe7, 0xf6, 0x8c)
|
||||
__CRT_UUID_DECL(ICoreWebView2WebMessageReceivedEventHandler, 0x57213f19, 0x00e6, 0x49fa, 0x8e, 0x07, 0x89, 0x8e, 0xa0, 0x1e, 0xcb, 0xd2)
|
||||
@@ -16,6 +19,8 @@ __CRT_UUID_DECL(ICoreWebView2AcceleratorKeyPressedEventHandler, 0xb29c7e28, 0xfa
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
inline constexpr COLORREF terminalSurface=RGB(24,24,24);
|
||||
|
||||
template<class Interface, class... Args>
|
||||
class TerminalCallback final : public Interface
|
||||
{
|
||||
@@ -56,6 +61,7 @@ class FilesTerminalView
|
||||
RECT bounds{};
|
||||
bool ready{};
|
||||
bool visible{};
|
||||
bool waitForReady{};
|
||||
public:
|
||||
~FilesTerminalView() { close(); }
|
||||
void focus()
|
||||
@@ -94,9 +100,10 @@ public:
|
||||
RECT current{};
|
||||
if(FAILED(controller->get_Bounds(¤t)) || !EqualRect(¤t,&bounds))
|
||||
controller->put_Bounds(bounds);
|
||||
const bool showController=show && (!waitForReady || ready);
|
||||
BOOL currentVisibility{};
|
||||
if(FAILED(controller->get_IsVisible(¤tVisibility)) || !!currentVisibility!=show)
|
||||
controller->put_IsVisible(show);
|
||||
if(FAILED(controller->get_IsVisible(¤tVisibility)) || !!currentVisibility!=showController)
|
||||
controller->put_IsVisible(showController);
|
||||
}
|
||||
void close()
|
||||
{
|
||||
@@ -140,6 +147,9 @@ public:
|
||||
const auto uri=std::wstring(L"https://")+origin+(markdown?L"/markdown.html":L"/index.html");
|
||||
const auto assets=folder/L"terminal";
|
||||
if(markdown && !std::filesystem::exists(assets/L"markdown.html")) return false;
|
||||
waitForReady=!markdown;
|
||||
constexpr COREWEBVIEW2_COLOR background{
|
||||
255,GetRValue(terminalSurface),GetGValue(terminalSurface),GetBValue(terminalSurface)};
|
||||
lifetime=std::make_shared<int>(0);
|
||||
const std::weak_ptr<int> alive=lifetime;
|
||||
auto environment=terminalCallback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler,
|
||||
@@ -153,6 +163,12 @@ public:
|
||||
if(alive.expired()) return S_OK;
|
||||
if(FAILED(result) || !view) { failed(); return S_OK; }
|
||||
controller=view;
|
||||
if(!markdown)
|
||||
{
|
||||
view->put_IsVisible(FALSE);
|
||||
Microsoft::WRL::ComPtr<ICoreWebView2Controller2> colors;
|
||||
if(SUCCEEDED(controller.As(&colors))) colors->put_DefaultBackgroundColor(background);
|
||||
}
|
||||
view->get_CoreWebView2(&web);
|
||||
Microsoft::WRL::ComPtr<ICoreWebView2_3> mapped;
|
||||
if(!web || FAILED(web.As(&mapped)) || FAILED(mapped->SetVirtualHostNameToFolderMapping(
|
||||
@@ -207,7 +223,11 @@ public:
|
||||
uri==source &&
|
||||
SUCCEEDED(args->TryGetWebMessageAsString(&value)))
|
||||
{
|
||||
if(wcscmp(value,L"ready")==0) ready=true;
|
||||
if(!ready && wcscmp(value,L"ready")==0)
|
||||
{
|
||||
ready=true;
|
||||
if(waitForReady) layout(bounds,visible);
|
||||
}
|
||||
if(ready) receive(value);
|
||||
}
|
||||
CoTaskMemFree(value);
|
||||
@@ -222,6 +242,18 @@ public:
|
||||
layout(bounds,visible);
|
||||
return S_OK;
|
||||
});
|
||||
if(!markdown)
|
||||
{
|
||||
Microsoft::WRL::ComPtr<ICoreWebView2Environment10> configurable;
|
||||
Microsoft::WRL::ComPtr<ICoreWebView2ControllerOptions> options;
|
||||
Microsoft::WRL::ComPtr<ICoreWebView2ControllerOptions3> colors;
|
||||
if(SUCCEEDED(env->QueryInterface(IID_PPV_ARGS(&configurable))) &&
|
||||
SUCCEEDED(configurable->CreateCoreWebView2ControllerOptions(&options)) &&
|
||||
SUCCEEDED(options.As(&colors)) &&
|
||||
SUCCEEDED(colors->put_DefaultBackgroundColor(background)) &&
|
||||
SUCCEEDED(configurable->CreateCoreWebView2ControllerWithOptions(host,options.Get(),completed.Get())))
|
||||
return S_OK;
|
||||
}
|
||||
if(FAILED(env->CreateCoreWebView2Controller(host,completed.Get()))) failed();
|
||||
return S_OK;
|
||||
});
|
||||
|
||||
+37
-31
@@ -2,6 +2,7 @@
|
||||
#include "files_text_preferences.h"
|
||||
#include "files_menu_paint.h"
|
||||
#include "files_menu_navigation.h"
|
||||
#include "files_scrollbar.h"
|
||||
#include "files_history_date.h"
|
||||
#include "files_text_document.h"
|
||||
#include "files_text_language.h"
|
||||
@@ -317,10 +318,17 @@ struct FarPopup
|
||||
FarDropDownPalette palette;
|
||||
HFONT font{};
|
||||
int rowHeight{},inset{},visible{},top{},current{},result=-1;
|
||||
int dragOffset=-1;
|
||||
bool done{};
|
||||
|
||||
int rowTop() const { return inset+1+rowHeight/2; }
|
||||
int bottomMargin() const { return inset+1+rowHeight/4; }
|
||||
ScrollPosition scrollPosition() const {return {static_cast<int>(rows.size()),visible,top};}
|
||||
RECT scrollTrack(HWND window,RECT bounds) const
|
||||
{
|
||||
const LONG right=bounds.right-inset-1;
|
||||
return {std::max(bounds.left,right-scrollBarWidth(window)),rowTop(),right,rowTop()+visible*rowHeight};
|
||||
}
|
||||
|
||||
void select(int row)
|
||||
{
|
||||
@@ -370,8 +378,9 @@ struct FarPopup
|
||||
SetTextColor(dc,palette.text);
|
||||
SelectObject(dc,font);
|
||||
const LONG rowLeft=frame.left+inset;
|
||||
const LONG scrollWidth=static_cast<int>(rows.size())>visible?rowHeight/2:0;
|
||||
const LONG rowRight=scrollWidth?bounds.right-scrollWidth:frame.right-1;
|
||||
const auto position=scrollPosition();
|
||||
const auto track=scrollTrack(window,bounds);
|
||||
const LONG rowRight=position.last()?track.left:frame.right-1;
|
||||
LONG y=rowTop();
|
||||
for(int offset=0;offset<visible;++offset,y+=rowHeight)
|
||||
{
|
||||
@@ -400,22 +409,7 @@ struct FarPopup
|
||||
DrawTextW(dc,entry.text.data(),static_cast<int>(entry.text.size()),&box,
|
||||
DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX|DT_END_ELLIPSIS|(entry.index<0?DT_CENTER:DT_LEFT));
|
||||
}
|
||||
if(scrollWidth)
|
||||
{
|
||||
RECT up{rowRight,rowTop(),bounds.right,rowTop()+rowHeight};
|
||||
RECT down{rowRight,y-rowHeight,bounds.right,y};
|
||||
DrawTextW(dc,L"▲",1,&up,DT_SINGLELINE|DT_CENTER|DT_VCENTER);
|
||||
DrawTextW(dc,L"▼",1,&down,DT_SINGLELINE|DT_CENTER|DT_VCENTER);
|
||||
RECT track{up.left,up.bottom,up.right,down.top};
|
||||
for(LONG line=track.top;line<track.bottom;line+=2)
|
||||
for(LONG x=track.left+(line%4==0?0:1);x<track.right;x+=2)
|
||||
SetPixelV(dc,x,line,palette.text);
|
||||
const auto travel=std::max(0L,track.bottom-track.top-rowHeight);
|
||||
const auto thumbY=track.top+MulDiv(top,travel,static_cast<int>(rows.size())-visible);
|
||||
RECT thumb{track.left,thumbY,track.right,std::min(track.bottom,thumbY+rowHeight)};
|
||||
SetDCBrushColor(dc,palette.text);
|
||||
FillRect(dc,&thumb,brush);
|
||||
}
|
||||
if(position.last()) paintScrollBar(dc,track,position,palette.surface);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -482,17 +476,28 @@ LRESULT CALLBACK farPopupWindow(HWND window,UINT message,WPARAM wp,LPARAM lp)
|
||||
RECT bounds{};
|
||||
GetClientRect(window,&bounds);
|
||||
const POINT point{GET_X_LPARAM(lp),GET_Y_LPARAM(lp)};
|
||||
const auto position=state->scrollPosition();
|
||||
const auto track=state->scrollTrack(window,bounds);
|
||||
if(state->dragOffset>=0)
|
||||
{
|
||||
if(message==WM_MOUSEMOVE) state->top=position.drag(track,point.y,state->dragOffset);
|
||||
if(message==WM_LBUTTONUP) state->dragOffset=-1;
|
||||
InvalidateRect(window,nullptr,FALSE);
|
||||
return 0;
|
||||
}
|
||||
if(!PtInRect(&bounds,point))
|
||||
{
|
||||
if(message==WM_LBUTTONDOWN) state->done=true;
|
||||
return 0;
|
||||
}
|
||||
const auto offset=(point.y-state->rowTop())/state->rowHeight;
|
||||
const bool scroll=static_cast<int>(state->rows.size())>state->visible &&
|
||||
point.x>=bounds.right-state->rowHeight/2;
|
||||
const bool scroll=position.last() && PtInRect(&track,point);
|
||||
if(scroll && message==WM_LBUTTONDOWN)
|
||||
state->top=std::clamp(state->top+(offset<state->visible/2?-1:1),0,
|
||||
static_cast<int>(state->rows.size())-state->visible);
|
||||
{
|
||||
const auto thumb=position.thumb(track);
|
||||
if(PtInRect(&thumb,point)) state->dragOffset=point.y-thumb.top;
|
||||
else state->top=position.click(track,point.y);
|
||||
}
|
||||
if(!scroll && point.y>=state->rowTop() && offset<state->visible)
|
||||
{
|
||||
const auto row=state->top+offset;
|
||||
@@ -1542,7 +1547,7 @@ void TextWindow::updatePreview()
|
||||
}
|
||||
if(ctrl && !alt && key==VK_TAB)
|
||||
{
|
||||
PostMessageW(window,cycleWindow,0,0);
|
||||
PostMessageW(window,cycleWindow,(GetKeyState(VK_SHIFT)&0x8000)!=0,0);
|
||||
return true;
|
||||
}
|
||||
if(key==VK_BROWSER_BACK || key==VK_BROWSER_FORWARD || (alt && (key==VK_LEFT || key==VK_RIGHT)))
|
||||
@@ -1674,7 +1679,7 @@ void TextWindow::previewMessage(const std::wstring &value)
|
||||
const auto action=message.at("action").get<std::string>();
|
||||
if(action=="cycle")
|
||||
{
|
||||
PostMessageW(window,cycleWindow,0,0);
|
||||
PostMessageW(window,cycleWindow,message.value("reverse",false),0);
|
||||
return;
|
||||
}
|
||||
if(action=="failed")
|
||||
@@ -2208,7 +2213,7 @@ LRESULT CALLBACK TextWindow::procedure(HWND window, UINT message, WPARAM wparam,
|
||||
return 0;
|
||||
}
|
||||
case WM_SETFOCUS: self->focusContent(); return 0;
|
||||
case cycleWindow: cycleTextWindows(window); return 0;
|
||||
case cycleWindow: cycleTextWindows(window,wparam!=0); return 0;
|
||||
case WM_KEYDOWN:
|
||||
if(self->previewWanted && !self->previewVisible)
|
||||
{
|
||||
@@ -2407,7 +2412,7 @@ void textWindowOwnerClosed()
|
||||
if(textWindows.empty()) PostQuitMessage(0);
|
||||
}
|
||||
|
||||
bool cycleTextWindows(HWND current)
|
||||
bool cycleTextWindows(HWND current,bool reverse)
|
||||
{
|
||||
if(!current || (current!=filesOwner && !textWindows.contains(current))) return false;
|
||||
std::vector<HWND> windows;
|
||||
@@ -2417,11 +2422,12 @@ bool cycleTextWindows(HWND current)
|
||||
if(windows.size()<2) return false;
|
||||
const auto from=std::find(windows.begin(),windows.end(),current);
|
||||
if(from==windows.end()) return false;
|
||||
auto to=std::next(from);
|
||||
if(to==windows.end()) to=windows.begin();
|
||||
if(IsIconic(*to)) ShowWindow(*to,SW_RESTORE);
|
||||
SetForegroundWindow(*to);
|
||||
if(*to!=filesOwner) SendMessageW(*to,WM_SETFOCUS,0,0);
|
||||
const auto index=static_cast<size_t>(from-windows.begin());
|
||||
const auto step=reverse?windows.size()-1:1;
|
||||
const auto target=windows[(index+step)%windows.size()];
|
||||
if(IsIconic(target)) ShowWindow(target,SW_RESTORE);
|
||||
SetForegroundWindow(target);
|
||||
if(target!=filesOwner) SendMessageW(target,WM_SETFOCUS,0,0);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -54,5 +54,5 @@ struct TextDialogs
|
||||
void openTextWindow(HWND owner,const std::filesystem::path &path,bool edit,TextDialogs dialogs,
|
||||
const lan::FilesPeer *peer=nullptr,std::string_view fragment={},bool newWindow=false);
|
||||
void textWindowOwnerClosed();
|
||||
bool cycleTextWindows(HWND current);
|
||||
bool cycleTextWindows(HWND current,bool reverse);
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
+87
-4
@@ -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);
|
||||
|
||||
+4
-25
@@ -1,3 +1,4 @@
|
||||
#include "files_powershell.h"
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include <shellapi.h>
|
||||
@@ -13,6 +14,7 @@
|
||||
#include <thread>
|
||||
#include "lan_files.h"
|
||||
#include "lan_channel.h"
|
||||
#include "lan_network.h"
|
||||
|
||||
namespace ks::lan
|
||||
{
|
||||
@@ -110,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;
|
||||
@@ -323,9 +303,8 @@ struct RemoteCommand
|
||||
auto arguments=L"powershell.exe -NoLogo -NoProfile -NonInteractive -OutputFormat Text -Command "
|
||||
L"\"& ([ScriptBlock]::Create([Text.Encoding]::Unicode.GetString([Convert]::FromBase64String('"+
|
||||
encoded+L"'))))\"";
|
||||
wchar_t system[MAX_PATH]{};
|
||||
if(!GetSystemDirectoryW(system,MAX_PATH)) return GetLastError();
|
||||
const auto shell=std::wstring(system)+L"\\WindowsPowerShell\\v1.0\\powershell.exe";
|
||||
const auto shell=ks::files::windowsPowerShell();
|
||||
if(shell.empty()) return ERROR_PATH_NOT_FOUND;
|
||||
|
||||
FileHandle token,restricted,read,write,input,processJob;
|
||||
if(!OpenProcessToken(GetCurrentProcess(),TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_ASSIGN_PRIMARY|
|
||||
|
||||
@@ -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();}
|
||||
};
|
||||
}
|
||||
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
|
||||
#include "platform.h"
|
||||
namespace ks
|
||||
{
|
||||
inline constexpr wchar_t AppVersion[] = L"0.6.106";
|
||||
inline constexpr wchar_t AppVersion[] = L"0.6.113";
|
||||
inline constexpr UINT UpdateMessage = WM_APP + 7;
|
||||
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
|
||||
inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
|
||||
|
||||
+86
-15
@@ -27,6 +27,22 @@ public static class FilesActivationUi {
|
||||
[DllImport("user32.dll")] static extern IntPtr GetDC(IntPtr window);
|
||||
[DllImport("user32.dll")] static extern int ReleaseDC(IntPtr window, IntPtr dc);
|
||||
[DllImport("gdi32.dll")] static extern uint GetPixel(IntPtr dc, int x, int y);
|
||||
[DllImport("user32.dll")] static extern bool GetWindowRect(IntPtr window, out Rect rect);
|
||||
[DllImport("user32.dll")] static extern IntPtr SetThreadDpiAwarenessContext(IntPtr context);
|
||||
|
||||
public static uint ReadScreenCenter(IntPtr window) {
|
||||
var previous = SetThreadDpiAwarenessContext(new IntPtr(-4));
|
||||
try {
|
||||
Rect bounds;
|
||||
if (!GetWindowRect(window, out bounds)) throw new InvalidOperationException("Missing terminal output.");
|
||||
var dc = GetDC(IntPtr.Zero);
|
||||
if (dc == IntPtr.Zero) throw new InvalidOperationException("Could not read the screen.");
|
||||
try { return GetPixel(dc, (bounds.Left + bounds.Right) / 2, (bounds.Top + bounds.Bottom) / 2); }
|
||||
finally { ReleaseDC(IntPtr.Zero, dc); }
|
||||
} finally {
|
||||
if (previous != IntPtr.Zero) SetThreadDpiAwarenessContext(previous);
|
||||
}
|
||||
}
|
||||
|
||||
public static bool HasWarningBackground(IntPtr window) {
|
||||
var dc = GetDC(window);
|
||||
@@ -35,6 +51,7 @@ public static class FilesActivationUi {
|
||||
finally { ReleaseDC(window, dc); }
|
||||
}
|
||||
[DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
|
||||
[DllImport("user32.dll")] public static extern uint GetClipboardSequenceNumber();
|
||||
[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 bool PostMessage(IntPtr window, uint msg, IntPtr w, IntPtr l);
|
||||
@@ -86,6 +103,19 @@ function Wait-Until([string]$Description, [scriptblock]$Condition) {
|
||||
throw "Timed out waiting for $Description"
|
||||
}
|
||||
|
||||
function Invoke-ClipboardOperation([scriptblock]$Operation) {
|
||||
for ($attempt = 1; $attempt -le 3; $attempt++) {
|
||||
try { return (& $Operation) }
|
||||
catch {
|
||||
# CLIPBRD_E_CANT_OPEN means another process is using the shared clipboard.
|
||||
if ($_.Exception.GetBaseException().HResult -ne 0x800401D0 -or
|
||||
$attempt -eq 3) { throw }
|
||||
[Windows.Forms.Application]::DoEvents()
|
||||
Start-Sleep -Milliseconds 25
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function Find-OperationDialog($Owner, [int]$Control) {
|
||||
$candidate = [IntPtr]::Zero
|
||||
while ($true) {
|
||||
@@ -214,6 +244,18 @@ try {
|
||||
$profile.SetValue('StatusFields', 3)
|
||||
|
||||
if($TerminalOnly){
|
||||
$terminalPage = Join-Path $app 'terminal/index.html'
|
||||
$page = Get-Content -Raw -LiteralPath $terminalPage
|
||||
$page = $page.Replace('<style>','<style media="not all">').Replace('src="terminal.js"','src="startup-fixture.js"')
|
||||
[IO.File]::WriteAllText($terminalPage,$page)
|
||||
[IO.File]::WriteAllText((Join-Path $app 'terminal/startup-fixture.js'), @'
|
||||
function startTerminalFixture() {
|
||||
document.querySelector('style').media = 'all';
|
||||
const script = document.createElement('script');
|
||||
script.src = 'terminal.js';
|
||||
document.body.append(script);
|
||||
}
|
||||
'@)
|
||||
$listener=[Net.Sockets.TcpListener]::new([Net.IPAddress]::Loopback,0)
|
||||
$listener.Start()
|
||||
$port=$listener.LocalEndpoint.Port
|
||||
@@ -276,6 +318,29 @@ try {
|
||||
}
|
||||
if($SystemOpenOnly -or $TerminalOnly){
|
||||
$keys = New-Object -ComObject WScript.Shell
|
||||
if ($TerminalOnly) {
|
||||
Wait-Until 'Files active for the terminal startup check' {
|
||||
[FilesActivationUi]::Activate($window) -and [FilesActivationUi]::Focus($window) -eq $inputBox
|
||||
}
|
||||
$keys.SendKeys('^o')
|
||||
& $Node (Join-Path $PSScriptRoot 'files_markdown_browser.mjs') $port 'terminal-startup-pause'
|
||||
if ($LASTEXITCODE) { throw 'Could not pause terminal page initialization.' }
|
||||
foreach ($frame in 1..10) {
|
||||
if ([FilesActivationUi]::GetForegroundWindow() -ne $window -or
|
||||
![FilesActivationUi]::IsWindowVisible($output)) { throw 'The terminal must be visible for the startup check.' }
|
||||
$pixel = [FilesActivationUi]::ReadScreenCenter($output)
|
||||
if ($pixel -ne 0x181818) { throw ('Unexpected terminal startup background 0x{0:X6}.' -f $pixel) }
|
||||
Start-Sleep -Milliseconds 30
|
||||
}
|
||||
& $Node (Join-Path $PSScriptRoot 'files_markdown_browser.mjs') $port 'terminal-startup-resume'
|
||||
if ($LASTEXITCODE) { throw 'Could not resume terminal page initialization.' }
|
||||
Wait-Until 'the terminal rendering after startup' {
|
||||
Select-String -LiteralPath $trace -SimpleMatch ' web-anchor ' -Quiet -ErrorAction SilentlyContinue
|
||||
}
|
||||
$keys.SendKeys('^o')
|
||||
Wait-Until 'file panes restored after the startup check' { [FilesActivationUi]::IsWindowVisible($left) }
|
||||
Write-Output 'Verified the dark terminal background before WebView initialization completes.'
|
||||
}
|
||||
foreach($case in @(
|
||||
@{Name='enter-panes'; Keys='{ENTER}'},
|
||||
@{Name='shift-enter-panes'; Keys='+{ENTER}'},
|
||||
@@ -334,21 +399,21 @@ try {
|
||||
Send-InteractiveTerminal "Write-Output '$outputSelection'"
|
||||
Wait-Until 'output selection fixture command submitted' { !(Read-Text $inputBox) }
|
||||
Add-Type -AssemblyName System.Windows.Forms
|
||||
$savedClipboard = [Windows.Forms.Clipboard]::GetDataObject()
|
||||
$savedClipboard = Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetDataObject() }
|
||||
try {
|
||||
$nativeDraft = "Get-Item -LiteralPath '$leftDir'"
|
||||
[void][FilesActivationUi]::Write($inputBox,0x0C,[IntPtr]::Zero,$nativeDraft)
|
||||
[void][FilesActivationUi]::Send($inputBox,0xB1,[IntPtr]0,[IntPtr]4)
|
||||
$keys.SendKeys('^{INSERT}')
|
||||
Wait-Until 'Ctrl+Insert copying the full command line with a partial selection' {
|
||||
[Windows.Forms.Clipboard]::GetText() -ceq $nativeDraft
|
||||
(Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetText() }) -ceq $nativeDraft
|
||||
}
|
||||
$webviewDraft = "Get-Item -LiteralPath '$rightDir'"
|
||||
[void][FilesActivationUi]::Write($inputBox,0x0C,[IntPtr]::Zero,$webviewDraft)
|
||||
& $Node (Join-Path $PSScriptRoot 'files_markdown_browser.mjs') $port 'terminal-copy'
|
||||
if($LASTEXITCODE){throw 'Could not send Ctrl+Insert through the terminal WebView.'}
|
||||
Wait-Until 'Ctrl+Insert copying the command line with focus in the terminal WebView' {
|
||||
[Windows.Forms.Clipboard]::GetText() -ceq $webviewDraft
|
||||
(Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetText() }) -ceq $webviewDraft
|
||||
}
|
||||
& $Node (Join-Path $PSScriptRoot 'files_markdown_browser.mjs') $port 'terminal-select-output'
|
||||
if($LASTEXITCODE){throw 'Could not select the terminal output fixture.'}
|
||||
@@ -356,22 +421,26 @@ try {
|
||||
[FilesActivationUi]::Focus($window) -eq $inputBox
|
||||
}
|
||||
foreach($key in '^c','^{INSERT}') {
|
||||
[Windows.Forms.Clipboard]::SetText($webviewDraft)
|
||||
# Require a new clipboard write without making the test process the clipboard owner.
|
||||
$beforeCopy = [FilesActivationUi]::GetClipboardSequenceNumber()
|
||||
$keys.SendKeys($key)
|
||||
Wait-Until "$key copying only the selected terminal output with a command present" {
|
||||
[Windows.Forms.Clipboard]::GetText() -ceq $outputSelection
|
||||
[FilesActivationUi]::GetClipboardSequenceNumber() -ne $beforeCopy -and
|
||||
(Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetText() }) -ceq $outputSelection
|
||||
}
|
||||
if ((Read-Text $inputBox) -cne $webviewDraft) { throw 'Copying output changed the command line.' }
|
||||
}
|
||||
[void][FilesActivationUi]::Write($inputBox,0x0C,[IntPtr]::Zero,'')
|
||||
$keys.SendKeys('^{INSERT}')
|
||||
Wait-Until 'Ctrl+Insert copying the selected folder name when the command line is empty' {
|
||||
[Windows.Forms.Clipboard]::GetText() -ceq 'Test folder'
|
||||
(Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetText() }) -ceq 'Test folder'
|
||||
}
|
||||
} finally {
|
||||
if ([Windows.Forms.Clipboard]::GetText() -cin @($nativeDraft,$webviewDraft,$outputSelection,'Test folder')) {
|
||||
if ($savedClipboard) { [Windows.Forms.Clipboard]::SetDataObject($savedClipboard,$true) }
|
||||
else { [Windows.Forms.Clipboard]::Clear() }
|
||||
Invoke-ClipboardOperation {
|
||||
if ([Windows.Forms.Clipboard]::GetText() -cin @($nativeDraft,$webviewDraft,$outputSelection,'Test folder')) {
|
||||
if ($savedClipboard) { [Windows.Forms.Clipboard]::SetDataObject($savedClipboard,$true) }
|
||||
else { [Windows.Forms.Clipboard]::Clear() }
|
||||
}
|
||||
}
|
||||
}
|
||||
Write-Output 'Verified Ctrl+C and Ctrl+Insert copy the selected output, then fall back to the command line or panel.'
|
||||
@@ -477,7 +546,7 @@ try {
|
||||
Write-Output 'Both panels refreshed external creation, modification and deletion while preserving focus.'
|
||||
|
||||
Add-Type -AssemblyName System.Windows.Forms
|
||||
$savedClipboard=[Windows.Forms.Clipboard]::GetDataObject()
|
||||
$savedClipboard=Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetDataObject() }
|
||||
$programName=[IO.Path]::GetFileName($program)
|
||||
$expectedNames="Test folder`r`n$programName"
|
||||
try {
|
||||
@@ -490,18 +559,20 @@ try {
|
||||
}
|
||||
$shell.SendKeys('^{INSERT}')
|
||||
Wait-Until 'Ctrl+Insert copying marked names in panel order' {
|
||||
[Windows.Forms.Clipboard]::GetText() -ceq $expectedNames
|
||||
(Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetText() }) -ceq $expectedNames
|
||||
}
|
||||
Select-Row $right $fileName
|
||||
$shell.SendKeys('^{INSERT}')
|
||||
Wait-Until 'Ctrl+Insert copying the current item in the other pane' {
|
||||
[Windows.Forms.Clipboard]::GetText() -ceq $fileName
|
||||
(Invoke-ClipboardOperation { [Windows.Forms.Clipboard]::GetText() }) -ceq $fileName
|
||||
}
|
||||
Write-Output 'Ctrl+Insert copied marked names in order and used the cursor in the other pane.'
|
||||
} finally {
|
||||
if ([Windows.Forms.Clipboard]::GetText() -cin @($expectedNames,$fileName)) {
|
||||
if ($savedClipboard) { [Windows.Forms.Clipboard]::SetDataObject($savedClipboard,$true) }
|
||||
else { [Windows.Forms.Clipboard]::Clear() }
|
||||
Invoke-ClipboardOperation {
|
||||
if ([Windows.Forms.Clipboard]::GetText() -cin @($expectedNames,$fileName)) {
|
||||
if ($savedClipboard) { [Windows.Forms.Clipboard]::SetDataObject($savedClipboard,$true) }
|
||||
else { [Windows.Forms.Clipboard]::Clear() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,446 @@
|
||||
param(
|
||||
[Parameter(Mandatory)][string]$Executable,
|
||||
[string]$Screenshot
|
||||
)
|
||||
$ErrorActionPreference = 'Stop'
|
||||
Add-Type -AssemblyName System.Drawing
|
||||
Add-Type @"
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Runtime.InteropServices;
|
||||
public static class CompletionTest {
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct Rect { public int Left, Top, Right, Bottom; }
|
||||
[DllImport("user32.dll", CharSet=CharSet.Unicode)] public static extern IntPtr FindWindowEx(IntPtr parent, IntPtr after, string name, string title);
|
||||
[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 IntPtr GetForegroundWindow();
|
||||
[DllImport("user32.dll")] static extern uint GetWindowThreadProcessId(IntPtr window, IntPtr process);
|
||||
[DllImport("user32.dll")] static extern bool SetForegroundWindow(IntPtr window);
|
||||
[DllImport("user32.dll")] static extern bool AttachThreadInput(uint first, uint second, bool attach);
|
||||
[DllImport("kernel32.dll")] static extern uint GetCurrentThreadId();
|
||||
public static void Activate(IntPtr window) {
|
||||
var own = GetCurrentThreadId();
|
||||
var foreground = GetWindowThreadProcessId(GetForegroundWindow(), IntPtr.Zero);
|
||||
bool attached = foreground != 0 && own != foreground && AttachThreadInput(own, foreground, true);
|
||||
try { SetForegroundWindow(window); }
|
||||
finally { if (attached) AttachThreadInput(own, foreground, false); }
|
||||
}
|
||||
[DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr window, out Rect bounds);
|
||||
[DllImport("user32.dll")] public static extern IntPtr GetWindow(IntPtr window, uint relation);
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct Point { public int X, Y; }
|
||||
[DllImport("user32.dll")] public static extern IntPtr WindowFromPoint(Point point);
|
||||
[DllImport("user32.dll")] public static extern bool RedrawWindow(IntPtr window, IntPtr rect, IntPtr region, uint flags);
|
||||
[DllImport("user32.dll")] public static extern IntPtr SetThreadDpiAwarenessContext(IntPtr context);
|
||||
[DllImport("user32.dll")] public static extern bool PostMessage(IntPtr window, int message, IntPtr w, IntPtr l);
|
||||
[DllImport("user32.dll", EntryPoint="SendMessageW")] public static extern IntPtr Send(IntPtr window, int message, IntPtr w, IntPtr l);
|
||||
[DllImport("user32.dll", EntryPoint="SendMessageW", CharSet=CharSet.Unicode)] public static extern IntPtr SetText(IntPtr window, int message, IntPtr w, string text);
|
||||
[DllImport("user32.dll", EntryPoint="SendMessageW", CharSet=CharSet.Unicode)] public static extern IntPtr GetText(IntPtr window, int message, IntPtr w, StringBuilder text);
|
||||
[DllImport("user32.dll", EntryPoint="SendMessageW")] public static extern IntPtr ItemRect(IntPtr window, int message, IntPtr w, out Rect bounds);
|
||||
}
|
||||
"@
|
||||
|
||||
function Wait-Until([string]$Description, [scriptblock]$Condition) {
|
||||
for ($attempt = 0; $attempt -lt 120; ++$attempt) {
|
||||
if (& $Condition) { return }
|
||||
Start-Sleep -Milliseconds 50
|
||||
}
|
||||
throw "Timed out waiting for $Description"
|
||||
}
|
||||
|
||||
function Set-Line([string]$Line) {
|
||||
[void][CompletionTest]::SetText($edit, 0x000C, 0, $Line)
|
||||
[void][CompletionTest]::Send($edit, 0x00B1, $Line.Length, $Line.Length)
|
||||
}
|
||||
|
||||
function Read-Line {
|
||||
$text = [Text.StringBuilder]::new(2049)
|
||||
[void][CompletionTest]::GetText($edit, 0x000D, $text.Capacity, $text)
|
||||
$text.ToString()
|
||||
}
|
||||
|
||||
function Suggestions([string]$Expected, [int]$Count = -1) {
|
||||
Wait-Until "suggestion '$Expected' (count $Count)" {
|
||||
if (![CompletionTest]::IsWindowVisible($list)) { return $false }
|
||||
$found = [CompletionTest]::SetText($list, 0x01A2, -1, $Expected).ToInt64()
|
||||
$size = [CompletionTest]::Send($list, 0x018B, 0, 0).ToInt64()
|
||||
$found -ge 0 -and ($Count -lt 0 -or $size -eq $Count)
|
||||
}
|
||||
}
|
||||
|
||||
function Press-Key([int]$Key) {
|
||||
if (![CompletionTest]::PostMessage($edit, 0x0100, $Key, 1)) { throw 'Could not post key' }
|
||||
}
|
||||
|
||||
function Toggle-Panels {
|
||||
Wait-Until 'foreground Files window before toggling panes' {
|
||||
if ([CompletionTest]::GetForegroundWindow() -eq $window) { return $true }
|
||||
[void]$keyboard.AppActivate($process.Id)
|
||||
[CompletionTest]::Activate($window)
|
||||
[CompletionTest]::GetForegroundWindow() -eq $window
|
||||
}
|
||||
$keyboard.SendKeys('^o')
|
||||
}
|
||||
|
||||
function Read-SuggestionFrameColor {
|
||||
$frame = [CompletionTest]::GetWindow($list, 2)
|
||||
$bounds = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::GetWindowRect($frame, [ref]$bounds)
|
||||
$pixel = [Drawing.Bitmap]::new(1, 1)
|
||||
$graphics = [Drawing.Graphics]::FromImage($pixel)
|
||||
try {
|
||||
$graphics.CopyFromScreen($bounds.Left + 2, $bounds.Top + 2, 0, 0, $pixel.Size)
|
||||
$pixel.GetPixel(0, 0).ToArgb()
|
||||
} finally {
|
||||
$graphics.Dispose()
|
||||
$pixel.Dispose()
|
||||
}
|
||||
}
|
||||
|
||||
function Test-DotnetCompletion {
|
||||
if (!$hasDotnetSdk) { return }
|
||||
Set-Line 'dotnet '
|
||||
Suggestions 'build'
|
||||
Set-Line 'dotnet bu'
|
||||
Suggestions 'build'
|
||||
Set-Line 'dotnet build --no-res'
|
||||
Suggestions '--no-restore'
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, '--no-restore')
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'dotnet option insertion' { (Read-Line) -ceq 'dotnet build --no-restore' }
|
||||
}
|
||||
|
||||
function Test-GitCompletion {
|
||||
if (!$gitFixture) { return }
|
||||
Set-Line 'git ch'
|
||||
Suggestions 'checkout'
|
||||
Set-Line 'git --ver'
|
||||
Suggestions '--version'
|
||||
$switch = 'git -C "' + $gitFixture + '" switch '
|
||||
Set-Line ($switch + '--de')
|
||||
Suggestions '--detach'
|
||||
$prefix = $switch + 'comp'
|
||||
Set-Line $prefix
|
||||
Suggestions 'completion-one'
|
||||
Suggestions 'completion-two'
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, 'completion-one')
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'Git branch insertion' { (Read-Line) -ceq ($prefix + 'letion-one') }
|
||||
}
|
||||
|
||||
function Test-WindowsCommandCompletion {
|
||||
Set-Line 'ipconfig '
|
||||
Suggestions '/all'
|
||||
Set-Line 'ipconfig /re'
|
||||
Suggestions '/renew'
|
||||
Suggestions '/release'
|
||||
Set-Line 'ipconfig ?'
|
||||
Suggestions '/?'
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, '/?')
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'ipconfig help switch insertion' { (Read-Line) -ceq 'ipconfig /?' }
|
||||
|
||||
Set-Line 'tasklist.exe /f'
|
||||
Suggestions '/fo'
|
||||
Set-Line 'robocopy /mi'
|
||||
Suggestions '/mir'
|
||||
Set-Line 'reg q'
|
||||
Suggestions 'query'
|
||||
Set-Line 'reg query /r'
|
||||
Suggestions '/reg:64'
|
||||
Set-Line 'cmd /c dir /'
|
||||
Suggestions '/w'
|
||||
Set-Line 'dir -Fi'
|
||||
Suggestions 'File'
|
||||
}
|
||||
|
||||
function Test-NestedWindowsCommandCompletion {
|
||||
Set-Line 'netsh interface ip'
|
||||
Suggestions 'ipv4'
|
||||
Set-Line 'netsh interface ipv4 sh'
|
||||
Suggestions 'show'
|
||||
Set-Line 'netsh interface ipv4 show co'
|
||||
Suggestions 'config'
|
||||
Set-Line 'netsh interface ipv4 show config na'
|
||||
Suggestions 'name='
|
||||
Set-Line 'fsutil file queryallocranges of'
|
||||
Suggestions 'offset='
|
||||
Set-Line 'wevtutil query-events /sb'
|
||||
Suggestions '/sbm:'
|
||||
Set-Line 'schtasks /query /fo L'
|
||||
Suggestions 'LIST'
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, 'LIST')
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'nested Windows option insertion' { (Read-Line) -ceq 'schtasks /query /fo LIST' }
|
||||
}
|
||||
|
||||
function Test-IpconfigAdapterCompletion {
|
||||
$adapters = foreach ($adapter in [Net.NetworkInformation.NetworkInterface]::GetAllNetworkInterfaces()) {
|
||||
if (!$adapter.Supports([Net.NetworkInformation.NetworkInterfaceComponent]::IPv4)) { continue }
|
||||
try {
|
||||
if ($adapter.GetIPProperties().GetIPv4Properties().IsDhcpEnabled) { $adapter.Name }
|
||||
} catch {}
|
||||
}
|
||||
if (!$adapters) { return }
|
||||
$name = $adapters | Where-Object { $_ -match '^[\p{L}\p{N}-]+ [\p{L}\p{N} ]+$' } | Select-Object -First 1
|
||||
if ($name) {
|
||||
$prefix = '"' + $name.Substring(0, $name.IndexOf(' ') + 1)
|
||||
$expected = "'" + $name + "'"
|
||||
} else {
|
||||
$name = $adapters | Where-Object { $_ -match '^[\p{L}\p{N}-]+$' } | Select-Object -First 1
|
||||
if (!$name) { return }
|
||||
$prefix = $name.Substring(0, 1).ToUpperInvariant()
|
||||
$expected = $name
|
||||
}
|
||||
Set-Line 'ipconfig /renew '
|
||||
Suggestions $name
|
||||
Set-Line ('ipconfig.exe /release ' + $prefix)
|
||||
Suggestions $name
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, $name)
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'ipconfig adapter insertion' { (Read-Line) -ceq ('ipconfig.exe /release ' + $expected) }
|
||||
}
|
||||
|
||||
function Test-PathCompletion {
|
||||
$prefix = 'cd "' + $root + '\Al'
|
||||
Set-Line $prefix
|
||||
Suggestions 'Alpine' 2
|
||||
[void][CompletionTest]::Send($edit, 0x0102, [int][char]'p', 1)
|
||||
Suggestions 'Alpha Space' 2
|
||||
[void][CompletionTest]::Send($edit, 0x0102, [int][char]'h', 1)
|
||||
Suggestions 'Alpha Space' 1
|
||||
|
||||
$row = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::ItemRect($list, 0x0198, 0, [ref]$row)
|
||||
$listBounds = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::GetWindowRect($list, [ref]$listBounds)
|
||||
$mouse = [CompletionTest+Point]::new()
|
||||
$mouse.X = $listBounds.Left + 5
|
||||
$mouse.Y = $listBounds.Top + (($row.Top + $row.Bottom) -shr 1)
|
||||
if ([CompletionTest]::WindowFromPoint($mouse) -ne $list) { throw 'The suggestions list is covered' }
|
||||
$point = ((($row.Top + $row.Bottom) -shr 1) -shl 16) -bor 5
|
||||
[void][CompletionTest]::PostMessage($list, 0x0201, 1, $point)
|
||||
Wait-Until 'click insertion with quotes' { (Read-Line) -ceq ('cd "' + $root + '\Alpha Space"') }
|
||||
[void][CompletionTest]::Send($edit, 0x0102, [int][char]'\', 1)
|
||||
Suggestions 'Nested' 1
|
||||
|
||||
Press-Key 0x1B
|
||||
Wait-Until 'Escape dismissal' { ![CompletionTest]::IsWindowVisible($list) }
|
||||
if ((Read-Line) -cne ('cd "' + $root + '\Alpha Space\"')) { throw 'Escape changed the command line' }
|
||||
}
|
||||
|
||||
$root = Join-Path ([IO.Path]::GetTempPath()) ("KSwitcherCompletion-" + [guid]::NewGuid().ToString('N'))
|
||||
$process = $null
|
||||
$dotnet = Get-Command dotnet.exe -CommandType Application -ErrorAction SilentlyContinue
|
||||
$hasDotnetSdk = $dotnet -and [bool](& $dotnet.Source --list-sdks)
|
||||
$historyKey = [Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Software\KSwitcher\Files')
|
||||
$historyPrefix = "Write-Output 'completion-$([guid]::NewGuid().ToString('N'))"
|
||||
$latest = "$historyPrefix-alpha-recent'"
|
||||
$earlier = "$historyPrefix-alpha-earlier'"
|
||||
$other = "$historyPrefix-beta'"
|
||||
$combined = "Get-ChildItem -Name # $([guid]::NewGuid().ToString('N'))"
|
||||
$clearPrefix = ' cls '
|
||||
$clearHistory = "$clearPrefix# $([guid]::NewGuid().ToString('N'))"
|
||||
$fixture = "2026-01-01`0$earlier`02026-01-01`0$other`02026-01-01`0$earlier`02026-01-01`0$latest`02026-01-01`0$combined`02026-01-01`0$clearHistory`0"
|
||||
|
||||
function Remove-HistoryFixture {
|
||||
$bytes = $historyKey.GetValue('CommandHistory')
|
||||
if ($bytes -isnot [byte[]]) { return }
|
||||
$current = [Text.Encoding]::Unicode.GetString($bytes)
|
||||
$clean = $current.Replace($fixture, '')
|
||||
if ($clean -ceq $current) { return }
|
||||
if ($clean.Length -eq 0 -and $null -eq $originalHistory) {
|
||||
$historyKey.DeleteValue('CommandHistory', $false)
|
||||
} else {
|
||||
$historyKey.SetValue('CommandHistory', [Text.Encoding]::Unicode.GetBytes($clean), 'Binary')
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$originalHistory = $historyKey.GetValue('CommandHistory')
|
||||
$history = if ($null -ne $originalHistory) { [Text.Encoding]::Unicode.GetString($originalHistory) } else { '' }
|
||||
$historyKey.SetValue('CommandHistory', [Text.Encoding]::Unicode.GetBytes($history + $fixture), 'Binary')
|
||||
[void](New-Item -ItemType Directory -Path "$root\Alpha Space\Nested", "$root\Alpine")
|
||||
$gitFixture = $null
|
||||
$git = Get-Command git.exe -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1
|
||||
if ($git) {
|
||||
$location = [IO.DirectoryInfo]::new([IO.Path]::GetDirectoryName($git.Source))
|
||||
for ($level = 0; $location -and $level -lt 3; ++$level) {
|
||||
$installation = $location.FullName
|
||||
$location = $location.Parent
|
||||
if (!(Test-Path -LiteralPath (Join-Path $installation 'usr/bin/bash.exe'))) { continue }
|
||||
$gitFixture = Join-Path $root 'Git Repo'
|
||||
[void](New-Item -ItemType Directory -Path $gitFixture)
|
||||
& $git.Source -C $gitFixture init --quiet --template= --initial-branch=main
|
||||
if ($LASTEXITCODE) { throw 'Could not initialize the Git fixture' }
|
||||
& $git.Source -C $gitFixture -c user.name=Test -c user.email=test@example.invalid -c commit.gpgSign=false -c core.hooksPath=NUL commit --quiet --allow-empty -m fixture
|
||||
if ($LASTEXITCODE) { throw 'Could not create the Git fixture commit' }
|
||||
& $git.Source -C $gitFixture branch completion-one
|
||||
if ($LASTEXITCODE) { throw 'Could not create Git fixture branch completion-one' }
|
||||
& $git.Source -C $gitFixture branch completion-two
|
||||
if ($LASTEXITCODE) { throw 'Could not create Git fixture branch completion-two' }
|
||||
break
|
||||
}
|
||||
}
|
||||
$process = Start-Process -FilePath (Resolve-Path $Executable) -PassThru -WindowStyle Normal
|
||||
Wait-Until 'Files window' {
|
||||
$process.Refresh()
|
||||
$process.MainWindowHandle -ne [IntPtr]::Zero
|
||||
}
|
||||
Remove-HistoryFixture
|
||||
$window = $process.MainWindowHandle
|
||||
$keyboard = New-Object -ComObject WScript.Shell
|
||||
Wait-Until 'foreground Files window' {
|
||||
[void]$keyboard.AppActivate($process.Id)
|
||||
[CompletionTest]::Activate($window)
|
||||
[CompletionTest]::GetForegroundWindow() -eq $window
|
||||
}
|
||||
$edit = [CompletionTest]::FindWindowEx($window, 0, 'Edit', [System.Management.Automation.Language.NullString]::Value)
|
||||
$list = [CompletionTest]::GetDlgItem($window, 149)
|
||||
if (!$edit -or !$list) { throw 'Missing command line or suggestions list' }
|
||||
|
||||
[void][CompletionTest]::SetThreadDpiAwarenessContext(-4)
|
||||
$status = [CompletionTest]::GetDlgItem($window, 144)
|
||||
$panel = [CompletionTest]::GetDlgItem($window, 102)
|
||||
$statusBounds = [CompletionTest+Rect]::new()
|
||||
$panelBounds = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::GetWindowRect($panel, [ref]$panelBounds)
|
||||
[void][CompletionTest]::GetWindowRect($status, [ref]$statusBounds)
|
||||
if ($statusBounds.Left -ge $panelBounds.Right) {
|
||||
Press-Key 0x09
|
||||
Wait-Until 'left panel active' {
|
||||
$bounds = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::GetWindowRect($status, [ref]$bounds)
|
||||
$bounds.Left -lt $panelBounds.Right
|
||||
}
|
||||
[void][CompletionTest]::GetWindowRect($status, [ref]$statusBounds)
|
||||
}
|
||||
|
||||
Set-Line $clearPrefix
|
||||
Suggestions $clearHistory 1
|
||||
|
||||
Set-Line 'Get-Chi'
|
||||
Suggestions 'Get-ChildItem'
|
||||
Suggestions $combined
|
||||
|
||||
$frame = [CompletionTest]::GetWindow($list, 2)
|
||||
$frameBounds = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::GetWindowRect($frame, [ref]$frameBounds)
|
||||
$x = [Math]::Max($statusBounds.Left, $frameBounds.Left)
|
||||
$y = [Math]::Max($statusBounds.Top, $frameBounds.Top)
|
||||
$w = [Math]::Min($statusBounds.Right, $frameBounds.Right) - $x
|
||||
$h = [Math]::Min($statusBounds.Bottom, $frameBounds.Bottom) - $y
|
||||
if ($w -le 0 -or $h -le 0) { throw 'Suggestions and status must overlap for the repaint check' }
|
||||
$before = [Drawing.Bitmap]::new($w, $h)
|
||||
$after = [Drawing.Bitmap]::new($w, $h)
|
||||
try {
|
||||
$graphics = [Drawing.Graphics]::FromImage($before)
|
||||
try { $graphics.CopyFromScreen($x, $y, 0, 0, $before.Size) } finally { $graphics.Dispose() }
|
||||
[void][CompletionTest]::SetText($status, 0x000C, 0, ('Status repaint test ' * 48))
|
||||
[void][CompletionTest]::RedrawWindow($status, 0, 0, 0x0105)
|
||||
$graphics = [Drawing.Graphics]::FromImage($after)
|
||||
try { $graphics.CopyFromScreen($x, $y, 0, 0, $after.Size) } finally { $graphics.Dispose() }
|
||||
for ($rowPixel = 0; $rowPixel -lt $h; ++$rowPixel) {
|
||||
for ($columnPixel = 0; $columnPixel -lt $w; ++$columnPixel) {
|
||||
if ($before.GetPixel($columnPixel, $rowPixel) -ne $after.GetPixel($columnPixel, $rowPixel)) {
|
||||
throw 'Status repaint drew over command suggestions'
|
||||
}
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
$before.Dispose()
|
||||
$after.Dispose()
|
||||
}
|
||||
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, 'Get-ChildItem')
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x09
|
||||
Wait-Until 'Tab insertion' { (Read-Line) -ceq 'Get-ChildItem' }
|
||||
|
||||
Set-Line ($historyPrefix.ToUpperInvariant())
|
||||
Suggestions $latest 3
|
||||
Set-Line "$historyPrefix-alpha"
|
||||
Suggestions $earlier 2
|
||||
Press-Key 0x09
|
||||
Wait-Until 'most recent history insertion' { (Read-Line) -ceq $latest }
|
||||
|
||||
Set-Line 'Get-ChildItem -Pa'
|
||||
Suggestions 'Path'
|
||||
$row = [CompletionTest]::SetText($list, 0x01A2, -1, 'Path')
|
||||
[void][CompletionTest]::Send($list, 0x0186, $row, 0)
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'Enter insertion' { (Read-Line) -ceq 'Get-ChildItem -Path' }
|
||||
|
||||
Test-PathCompletion
|
||||
Test-DotnetCompletion
|
||||
Test-GitCompletion
|
||||
Test-WindowsCommandCompletion
|
||||
Test-NestedWindowsCommandCompletion
|
||||
Test-IpconfigAdapterCompletion
|
||||
|
||||
# Toggle with a populated list and verify the same draft and suggestions remain accessible.
|
||||
Set-Line "$historyPrefix-alpha"
|
||||
Suggestions $latest 2
|
||||
$frameColor = Read-SuggestionFrameColor
|
||||
$output = [CompletionTest]::GetDlgItem($window, 145)
|
||||
Toggle-Panels
|
||||
Wait-Until 'terminal-only view' {
|
||||
[CompletionTest]::IsWindowVisible($output) -and ![CompletionTest]::IsWindowVisible($panel) -and
|
||||
[CompletionTest]::GetWindow($output, 5) -ne [IntPtr]::Zero
|
||||
}
|
||||
Suggestions $latest 2
|
||||
# Let WebView2 finish its first compositor update after showing the terminal.
|
||||
Start-Sleep -Milliseconds 350
|
||||
if ((Read-SuggestionFrameColor) -ne $frameColor) {
|
||||
throw 'Terminal output drew over command suggestions with panels hidden'
|
||||
}
|
||||
if ($Screenshot) {
|
||||
[void][CompletionTest]::SetThreadDpiAwarenessContext(-4)
|
||||
$bounds = [CompletionTest+Rect]::new()
|
||||
[void][CompletionTest]::GetWindowRect($window, [ref]$bounds)
|
||||
$bitmap = [Drawing.Bitmap]::new($bounds.Right - $bounds.Left, $bounds.Bottom - $bounds.Top)
|
||||
$graphics = [Drawing.Graphics]::FromImage($bitmap)
|
||||
try {
|
||||
$graphics.CopyFromScreen($bounds.Left, $bounds.Top, 0, 0, $bitmap.Size)
|
||||
$bitmap.Save($Screenshot, [Drawing.Imaging.ImageFormat]::Png)
|
||||
} finally {
|
||||
$graphics.Dispose()
|
||||
$bitmap.Dispose()
|
||||
}
|
||||
}
|
||||
|
||||
Press-Key 0x28
|
||||
Press-Key 0x0D
|
||||
Wait-Until 'history insertion with panels hidden' { (Read-Line) -ceq $latest }
|
||||
Test-PathCompletion
|
||||
Test-DotnetCompletion
|
||||
Test-GitCompletion
|
||||
Test-WindowsCommandCompletion
|
||||
Test-NestedWindowsCommandCompletion
|
||||
Test-IpconfigAdapterCompletion
|
||||
|
||||
Toggle-Panels
|
||||
Wait-Until 'panels restored' { [CompletionTest]::IsWindowVisible($panel) }
|
||||
Set-Line "$historyPrefix-alpha"
|
||||
Suggestions $latest 2
|
||||
'Command completion passed with panels visible and hidden'
|
||||
} finally {
|
||||
if ($process -and !$process.HasExited) { Stop-Process -Id $process.Id }
|
||||
Remove-HistoryFixture
|
||||
$historyKey.Dispose()
|
||||
if ($gitFixture -and (Test-Path -LiteralPath $gitFixture)) {
|
||||
$resolved = (Resolve-Path -LiteralPath $gitFixture).ProviderPath
|
||||
if ($resolved -eq [IO.Path]::GetFullPath((Join-Path $root 'Git Repo'))) {
|
||||
Remove-Item -LiteralPath $resolved -Recurse -Force
|
||||
}
|
||||
}
|
||||
foreach ($path in "$root\Alpha Space\Nested", "$root\Alpha Space", "$root\Alpine", $root) {
|
||||
if (Test-Path -LiteralPath $path) { [IO.Directory]::Delete($path) }
|
||||
}
|
||||
}
|
||||
@@ -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 })
|
||||
|
||||
@@ -0,0 +1,226 @@
|
||||
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; }
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct Point { public int X, Y; }
|
||||
[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")] public static extern uint GetDpiForWindow(IntPtr window);
|
||||
[DllImport("user32.dll")] public static extern IntPtr SetThreadDpiAwarenessContext(IntPtr context);
|
||||
[DllImport("user32.dll")] public static extern bool ScreenToClient(IntPtr window, ref Point point);
|
||||
[DllImport("user32.dll", EntryPoint="SendMessageW")]
|
||||
public static extern IntPtr Send(IntPtr window, uint message, IntPtr w, IntPtr l);
|
||||
[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
|
||||
$previousDpi = [FilesShortcutWindow]::SetThreadDpiAwarenessContext([IntPtr](-4))
|
||||
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] }
|
||||
}
|
||||
$groups[9] = @(1..200 | ForEach-Object {
|
||||
@{ path = (Join-Path $folder "Folder $_"); peer = ''; name = ''; title = "Folder $_" }
|
||||
})
|
||||
$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('^{TAB}')
|
||||
$keyboard.SendKeys('^{F1}')
|
||||
Wait-Until {
|
||||
![FilesShortcutWindow]::IsWindowVisible($heading) -or
|
||||
![FilesShortcutWindow]::IsWindowVisible($rightHeading)
|
||||
}
|
||||
if (![FilesShortcutWindow]::IsWindowVisible($rightHeading)) {
|
||||
throw 'Ctrl+Tab changed the active panel.'
|
||||
}
|
||||
$keyboard.SendKeys('{TAB}')
|
||||
$keyboard.SendKeys('^{F1}')
|
||||
Wait-Until { ![FilesShortcutWindow]::IsWindowVisible($rightHeading) }
|
||||
$keyboard.SendKeys('^{F2}')
|
||||
Wait-Until { [FilesShortcutWindow]::IsWindowVisible($rightHeading) }
|
||||
$keyboard.SendKeys('{TAB}')
|
||||
Wait-Until { ![FilesShortcutWindow]::IsWindowVisible($heading) }
|
||||
|
||||
$rightPath = [FilesShortcutWindow]::GetDlgItem($window, 143)
|
||||
$leftList = [FilesShortcutWindow]::GetDlgItem($window, 102)
|
||||
$rightList = [FilesShortcutWindow]::GetDlgItem($window, 103)
|
||||
$keyboard.SendKeys('^u')
|
||||
Wait-Until {
|
||||
(Read-Text ([FilesShortcutWindow]::GetDlgItem($window, 142))) -eq $folder -and
|
||||
(Read-Text ([FilesShortcutWindow]::GetDlgItem($window, 143))) -eq (Join-Path $folder 'Four') -and
|
||||
[FilesShortcutWindow]::IsWindowVisible($rightHeading)
|
||||
}
|
||||
$movedLeft = [FilesShortcutWindow+Rect]::new()
|
||||
$movedRight = [FilesShortcutWindow+Rect]::new()
|
||||
if (![FilesShortcutWindow]::GetWindowRect($rightList, [ref]$movedLeft) -or
|
||||
![FilesShortcutWindow]::GetWindowRect($leftList, [ref]$movedRight) -or
|
||||
$movedLeft.Right -gt $movedRight.Left -or
|
||||
[FilesShortcutWindow]::IsWindowVisible($heading)) {
|
||||
throw 'Ctrl+U did not move the visible panel lists with their modes.'
|
||||
}
|
||||
$keyboard.SendKeys('^3')
|
||||
Wait-Until { (Read-Text $leftPath) -eq (Join-Path $folder 'Three') }
|
||||
if ((Read-Text $rightPath) -ne $folder) { throw 'Ctrl+U did not preserve the active panel.' }
|
||||
$keyboard.SendKeys('^u')
|
||||
Wait-Until { [FilesShortcutWindow]::GetDlgItem($window, 142) -eq $leftPath }
|
||||
$keyboard.SendKeys('^{F2}')
|
||||
Wait-Until { [FilesShortcutWindow]::IsWindowVisible($heading) }
|
||||
|
||||
$keyboard.SendKeys('^9')
|
||||
Wait-Until { (Read-ShortcutDialog) -ne [IntPtr]::Zero }
|
||||
$dialog = Read-ShortcutDialog
|
||||
$list = [FilesShortcutWindow]::GetDlgItem($dialog, 310)
|
||||
Add-Type -AssemblyName System.Drawing
|
||||
$bounds = [FilesShortcutWindow+Rect]::new()
|
||||
if (![FilesShortcutWindow]::GetWindowRect($list, [ref]$bounds)) { throw 'Missing overflow list.' }
|
||||
Start-Sleep -Milliseconds 150
|
||||
$barWidth = [int][Math]::Round(12 * [FilesShortcutWindow]::GetDpiForWindow($list) / 96)
|
||||
$bitmap = [Drawing.Bitmap]::new($barWidth, ($bounds.Bottom - $bounds.Top))
|
||||
try {
|
||||
$graphics = [Drawing.Graphics]::FromImage($bitmap)
|
||||
try { $graphics.CopyFromScreen($bounds.Right, $bounds.Top, 0, 0, $bitmap.Size) }
|
||||
finally { $graphics.Dispose() }
|
||||
$background = $bitmap.GetPixel(0, 0)
|
||||
$thumb = $bitmap.GetPixel(0, $barWidth + 1)
|
||||
$trackColors = @(0..4 | ForEach-Object {
|
||||
$x = $_
|
||||
0..7 | ForEach-Object { $bitmap.GetPixel($x, [int]($bitmap.Height / 2) + $_).ToArgb() }
|
||||
} | Sort-Object -Unique)
|
||||
$hasArrow = {
|
||||
param($y)
|
||||
$center = [int][Math]::Floor($barWidth / 2)
|
||||
@(0..($barWidth - 1) | Where-Object {
|
||||
$bitmap.GetPixel($center, $y + $_).ToArgb() -eq $thumb.ToArgb()
|
||||
}).Count -gt 0
|
||||
}
|
||||
if ($thumb.GetBrightness() -le $background.GetBrightness() -or $trackColors.Count -ne 2 -or
|
||||
!(& $hasArrow 0) -or !(& $hasArrow ($bitmap.Height - $barWidth))) {
|
||||
throw "Unexpected scrollbar pixels. Background $background, thumb $thumb, track colors $($trackColors.Count), arrows $(& $hasArrow 0)/$(& $hasArrow ($bitmap.Height - $barWidth))."
|
||||
}
|
||||
} finally { $bitmap.Dispose() }
|
||||
$arrow = [FilesShortcutWindow+Point]::new()
|
||||
$arrow.X = $bounds.Right + [int]($barWidth / 2)
|
||||
$arrow.Y = $bounds.Bottom - [int]($barWidth / 2)
|
||||
if (![FilesShortcutWindow]::ScreenToClient($dialog, [ref]$arrow)) { throw 'Cannot locate the down arrow.' }
|
||||
$arrowPoint = [IntPtr](($arrow.Y -shl 16) -bor $arrow.X)
|
||||
[void][FilesShortcutWindow]::Send($dialog, 0x0201, [IntPtr]1, $arrowPoint)
|
||||
if ([FilesShortcutWindow]::Send($list, 0x018E, [IntPtr]::Zero, [IntPtr]::Zero).ToInt32() -ne 1) {
|
||||
throw 'The down arrow should scroll the list by one row.'
|
||||
}
|
||||
$grip = [FilesShortcutWindow+Point]::new()
|
||||
$grip.X = $bounds.Right + [int]($barWidth / 2)
|
||||
$grip.Y = $bounds.Top + $barWidth + 4
|
||||
if (![FilesShortcutWindow]::ScreenToClient($dialog, [ref]$grip)) { throw 'Cannot locate the thumb.' }
|
||||
$gripPoint = [IntPtr](($grip.Y -shl 16) -bor $grip.X)
|
||||
$dragPoint = [IntPtr]((($grip.Y + 3 * $barWidth) -shl 16) -bor $grip.X)
|
||||
[void][FilesShortcutWindow]::Send($dialog, 0x0201, [IntPtr]1, $gripPoint)
|
||||
[void][FilesShortcutWindow]::Send($dialog, 0x0200, [IntPtr]1, $dragPoint)
|
||||
[void][FilesShortcutWindow]::Send($dialog, 0x0202, [IntPtr]::Zero, $dragPoint)
|
||||
if ([FilesShortcutWindow]::Send($list, 0x018E, [IntPtr]::Zero, [IntPtr]::Zero).ToInt32() -le 1) {
|
||||
throw 'Dragging the scrollbar thumb should advance the list.'
|
||||
}
|
||||
$keyboard.SendKeys('{ESC}')
|
||||
Write-Output 'Verified folder shortcuts, panel swapping, and the rendered overflow scrollbar.'
|
||||
} finally {
|
||||
if ($previousDpi) { [void][FilesShortcutWindow]::SetThreadDpiAwarenessContext($previousDpi) }
|
||||
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)
|
||||
}
|
||||
@@ -54,10 +54,12 @@ public static class MarkdownUi {
|
||||
keybd_event(0x12,0,2,UIntPtr.Zero);
|
||||
SetForegroundWindow(window);
|
||||
}
|
||||
public static void CycleWindow() {
|
||||
public static void CycleWindow(bool reverse = false) {
|
||||
keybd_event(0x11,0,0,UIntPtr.Zero);
|
||||
if (reverse) keybd_event(0x10,0,0,UIntPtr.Zero);
|
||||
keybd_event(0x09,0,0,UIntPtr.Zero);
|
||||
keybd_event(0x09,0,2,UIntPtr.Zero);
|
||||
if (reverse) keybd_event(0x10,0,2,UIntPtr.Zero);
|
||||
keybd_event(0x11,0,2,UIntPtr.Zero);
|
||||
}
|
||||
[DllImport("user32.dll")] public static extern IntPtr GetDlgItem(IntPtr window, int id);
|
||||
@@ -328,8 +330,19 @@ const value = 42;
|
||||
Wait-Foreground $window
|
||||
Browser 'cycle' '' 'Preview.md'
|
||||
Wait-Foreground $child
|
||||
Browser 'cycle-reverse' '' 'Other.md'
|
||||
Wait-Foreground $window
|
||||
Browser 'edit' '' 'Preview.md'
|
||||
[void](Wait-For 'the first window to switch to Editor' { Find-Window 'KSwitcher.Files.Text' 'Editor' })
|
||||
[MarkdownUi]::CycleWindow($true)
|
||||
Wait-Foreground $main
|
||||
[MarkdownUi]::CycleWindow($true)
|
||||
Wait-Foreground $child
|
||||
Write-Output 'Verified backward Ctrl+Shift+Tab cycling through three windows and wrapping at Files.'
|
||||
Browser 'close' '' 'Other.md'
|
||||
[void](Wait-For 'Ctrl+W to close the Shift+click window' { ![MarkdownUi]::IsWindowVisible($child) })
|
||||
Post (Scintilla $window) 0x100 0x75
|
||||
Browser 'Перегляд Markdown' '' 'Preview.md'
|
||||
Browser 'follow'
|
||||
if ((Wait-For 'the in-place Markdown viewer' { Find-Window 'KSwitcher.Files.Text' 'Other.md' }) -ne $window) {
|
||||
throw 'A normal click did not stay in the same window.'
|
||||
|
||||
@@ -3,7 +3,7 @@ import { writeFile } from 'node:fs/promises';
|
||||
import { setTimeout as delay } from 'node:timers/promises';
|
||||
|
||||
const [port, scenario, artifact, title] = process.argv.slice(2);
|
||||
const terminalScenario = ['terminal-enter', 'terminal-copy', 'terminal-select-output'].includes(scenario);
|
||||
const terminalScenario = scenario.startsWith('terminal-');
|
||||
let socket;
|
||||
const pending = new Map();
|
||||
let sequence = 0;
|
||||
@@ -69,7 +69,10 @@ await new Promise((resolve, reject) => {
|
||||
});
|
||||
|
||||
try {
|
||||
if (scenario === 'terminal-select-output') {
|
||||
if (scenario === 'terminal-startup-pause' || scenario === 'terminal-startup-resume') {
|
||||
await waitFor(() => evaluate('typeof startTerminalFixture === "function"'), 'the delayed terminal page');
|
||||
if (scenario === 'terminal-startup-resume') await evaluate('startTerminalFixture()');
|
||||
} else if (scenario === 'terminal-select-output') {
|
||||
const selection = await waitFor(() => evaluate(`(() => {
|
||||
const marker = 'terminal-output-copy-fixture';
|
||||
const buffer = terminal.buffer.active;
|
||||
@@ -209,8 +212,9 @@ try {
|
||||
} else if (scenario === 'back' || scenario === 'forward') {
|
||||
await waitFor(() => evaluate(`!document.getElementById('${scenario}').disabled`), scenario);
|
||||
await evaluate(`document.getElementById('${scenario}').click()`);
|
||||
} else if (scenario === 'cycle') {
|
||||
await command('Input.dispatchKeyEvent', {type:'keyDown', key:'Tab', code:'Tab', modifiers:2, windowsVirtualKeyCode:9});
|
||||
} else if (scenario === 'cycle' || scenario === 'cycle-reverse') {
|
||||
const modifiers = scenario === 'cycle-reverse' ? 10 : 2;
|
||||
await command('Input.dispatchKeyEvent', {type:'keyDown', key:'Tab', code:'Tab', modifiers, windowsVirtualKeyCode:9});
|
||||
} else if (scenario === 'close') {
|
||||
await command('Input.dispatchKeyEvent', {type:'keyDown', key:'w', code:'KeyW', modifiers:2, windowsVirtualKeyCode:87});
|
||||
} else {
|
||||
|
||||
@@ -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) })
|
||||
|
||||
@@ -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
@@ -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{'{', '}'}, {}); },
|
||||
|
||||
+45
-4
@@ -1,8 +1,50 @@
|
||||
"""Regenerate the native multi-resolution icon (development only; requires Pillow)."""
|
||||
"""Regenerate the native multi-resolution icons (development only; requires Pillow)."""
|
||||
from argparse import ArgumentParser
|
||||
from pathlib import Path
|
||||
from PIL import Image, ImageDraw
|
||||
|
||||
root = Path(__file__).resolve().parents[1] / 'resources'
|
||||
icon_sizes = [(size, size) for size in (16, 20, 24, 32, 40, 48, 64, 128, 256)]
|
||||
|
||||
|
||||
def draw_files_icon(size):
|
||||
image = Image.new('RGBA', (size, size))
|
||||
draw = ImageDraw.Draw(image)
|
||||
|
||||
def block(left, top, right, bottom, color):
|
||||
scale = size / 32
|
||||
draw.rectangle((round(left * scale), round(top * scale),
|
||||
round(right * scale) - 1, round(bottom * scale) - 1), fill=color)
|
||||
|
||||
# Draw each size on its own pixel grid so the pane divider stays sharp.
|
||||
frame = '#3DDDEB'
|
||||
panel = '#101E89'
|
||||
block(2, 2, 30, 30, '#10163D')
|
||||
block(2, 2, 30, 26, frame)
|
||||
block(4, 4, 28, 24, panel)
|
||||
divider = max(1, round(size / 16))
|
||||
center = size // 2 - divider // 2
|
||||
draw.rectangle((center, round(size / 8), center + divider - 1, round(size * 3 / 4) - 1), fill=frame)
|
||||
block(6, 6, 12, 8, '#FFE368')
|
||||
block(19, 6, 25, 8, '#FFE368')
|
||||
for y in (10, 18, 22):
|
||||
block(6, y, 12, y + 2, frame)
|
||||
for y, end in ((10, 26), (14, 24), (18, 26)):
|
||||
block(19, y, end, y + 2, frame)
|
||||
block(4, 14, 15, 16, '#5EEAD4')
|
||||
for left in (4, 10, 16, 22):
|
||||
block(left, 28, left + 4, 30, '#1AA3AD')
|
||||
return image
|
||||
|
||||
|
||||
parser = ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--files-only', action='store_true', help='Regenerate only the main Files icon.')
|
||||
args = parser.parse_args()
|
||||
frames = [draw_files_icon(size) for size, _ in icon_sizes]
|
||||
frames[-1].save(root / 'kswitcher-files.ico', sizes=icon_sizes, append_images=frames[:-1])
|
||||
if args.files_only:
|
||||
raise SystemExit
|
||||
|
||||
# Geometric K: white stem/upper arm, mint lower arm on an indigo keycap.
|
||||
polygons = [('#FFFFFF', [(8, 7), (12, 7), (12, 25), (8, 25)]),
|
||||
('#FFFFFF', [(11, 15), (22, 6), (25, 9), (14, 18)]),
|
||||
@@ -20,7 +62,7 @@ for color, points in polygons:
|
||||
draw.polygon([(x*scale,y*scale) for x,y in points], fill=color)
|
||||
im = im.resize((256,256),Image.Resampling.LANCZOS)
|
||||
im.save(root / 'kswitcher.png')
|
||||
im.save(root / 'kswitcher.ico', sizes=[(s,s) for s in (16,20,24,32,40,48,64,128,256)])
|
||||
im.save(root / 'kswitcher.ico', sizes=icon_sizes)
|
||||
|
||||
for mode, color in [('editor', '#4F46E5'), ('viewer', '#087C73')]:
|
||||
image = Image.new('RGBA', (32*scale, 32*scale))
|
||||
@@ -35,5 +77,4 @@ for mode, color in [('editor', '#4F46E5'), ('viewer', '#087C73')]:
|
||||
[(5, 16), (8, 12), (12, 9), (16, 8), (20, 9), (24, 12),
|
||||
(27, 16), (24, 20), (20, 23), (16, 24), (12, 23), (8, 20)]], fill='white')
|
||||
draw.ellipse((12*scale, 12*scale, 20*scale, 20*scale), fill=color)
|
||||
image.resize((256, 256), Image.Resampling.LANCZOS).save(root / f'kswitcher-files-{mode}.ico',
|
||||
sizes=[(s, s) for s in (16, 20, 24, 32, 40, 48, 64, 128, 256)])
|
||||
image.resize((256, 256), Image.Resampling.LANCZOS).save(root / f'kswitcher-files-{mode}.ico', sizes=icon_sizes)
|
||||
@@ -0,0 +1,159 @@
|
||||
param(
|
||||
[Parameter(Mandatory)][string]$DocumentationCheckout,
|
||||
[string]$Output = "$PSScriptRoot/../src/files_windows_command_catalog.h"
|
||||
)
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$docs = Join-Path $DocumentationCheckout 'WindowsServerDocs/administration/windows-commands'
|
||||
$revision = git -C $DocumentationCheckout rev-parse HEAD
|
||||
if ($LASTEXITCODE) { throw 'Could not determine the documentation revision.' }
|
||||
$index = Get-Content -LiteralPath (Join-Path $docs 'windows-commands.md') -Raw
|
||||
$entries = @{}
|
||||
$articles = @{}
|
||||
|
||||
function Add-Entry([string]$Name) {
|
||||
if (!$entries.ContainsKey($Name)) {
|
||||
$entries[$Name] = [Collections.Generic.SortedSet[string]]::new([StringComparer]::OrdinalIgnoreCase)
|
||||
}
|
||||
}
|
||||
|
||||
function Add-CommandPath([string]$Name, [string]$Article) {
|
||||
Add-Entry $Name
|
||||
if (!$articles.ContainsKey($Name)) { $articles[$Name] = $Article }
|
||||
$words = $Name.Split(' ')
|
||||
for ($i = 1; $i -lt $words.Count; ++$i) {
|
||||
$parent = $words[0..($i - 1)] -join ' '
|
||||
Add-Entry $parent
|
||||
[void]$entries[$parent].Add($words[$i])
|
||||
}
|
||||
}
|
||||
|
||||
function Add-Options([string]$Name, [string]$Field) {
|
||||
$field = $Field -replace '<[^<>\r\n]*>', ''
|
||||
foreach ($option in [regex]::Matches($field, $switch)) {
|
||||
[void]$entries[$Name].Add($option.Groups['flag'].Value)
|
||||
}
|
||||
}
|
||||
|
||||
# Only extract literal command names and options. Ignore prose, examples and placeholders.
|
||||
$links = [regex]::Matches($index, '(?m)^\s*- \[`(?<name>[\w.-]+(?: [\w.-]+)*)`\]\((?:\./)?(?<file>[\w.-]+\.md)\)')
|
||||
$switch = '(?i)(?:^|[\s\[\{|,`*])(?<flag>[-/+][a-z0-9?][a-z0-9?-]*(?::[a-z0-9]+|[:=])?|[a-z][a-z0-9-]*=)(?=$|[\s\[\]{}|,<>=)`*])'
|
||||
$documents = @{}
|
||||
foreach ($link in $links) {
|
||||
$name = ($link.Groups['name'].Value.ToLowerInvariant() -replace '\.exe(?= |$)', '')
|
||||
$documents[$name] = $link.Groups['file'].Value
|
||||
}
|
||||
foreach ($name in @($documents.Keys)) {
|
||||
if ($name.Contains(' ')) { continue }
|
||||
$file = Join-Path $docs $documents[$name]
|
||||
if (!(Test-Path -LiteralPath $file)) { continue }
|
||||
$text = Get-Content -LiteralPath $file -Raw
|
||||
foreach ($link in [regex]::Matches($text, '\[(?<label>[\w./ -]+)\]\((?:\./)?(?<file>[\w.-]+\.md)\)')) {
|
||||
$childFile = $link.Groups['file'].Value
|
||||
$label = $link.Groups['label'].Value.ToLowerInvariant()
|
||||
if (!$childFile.StartsWith($name + '-') -or !$label.StartsWith($name + ' ')) { continue }
|
||||
$childPath = Join-Path $docs $childFile
|
||||
if (!(Test-Path -LiteralPath $childPath)) { continue }
|
||||
$firstArgument = [regex]::Match((Get-Content -LiteralPath $childPath -Raw),
|
||||
'(?m)^' + [regex]::Escape($name) + '(?:\.exe)?\s+\[?(?<operation>/[\w-]+)(?=[\]\s]|$)')
|
||||
if ($firstArgument.Success -and $label -eq ($name + ' ' + $firstArgument.Groups['operation'].Value.TrimStart('/'))) {
|
||||
$label = $name + ' ' + $firstArgument.Groups['operation'].Value
|
||||
}
|
||||
if (!$documents.ContainsKey($label)) { $documents[$label] = $childFile }
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($name in $documents.Keys) {
|
||||
$article = Join-Path $docs $documents[$name]
|
||||
if (!(Test-Path -LiteralPath $article)) { continue }
|
||||
$text = Get-Content -LiteralPath $article -Raw
|
||||
$slug = [IO.Path]::GetFileNameWithoutExtension($article)
|
||||
Add-CommandPath $name $slug
|
||||
$articles[$name] = $slug
|
||||
$syntax = [regex]::Matches($text, '(?ims)^(?:#{2,6}[^\r\n]*\b)?syntax[ \t]*\r?\n(?<body>.*?)(?=^#{1,6} |\z)')
|
||||
$hasChildren = $false
|
||||
$root = $name.Split(' ')[0]
|
||||
$rootPattern = '^\s*' + [regex]::Escape($root) + '(?:\.exe)?(?=\s|$)\s*'
|
||||
$blocks = @(
|
||||
foreach ($section in $syntax) {
|
||||
[regex]::Matches($section.Groups['body'].Value, '(?ms)^```[^\r\n]*\r?\n(?<code>.*?)^```') |
|
||||
ForEach-Object { $_.Groups['code'].Value }
|
||||
}
|
||||
)
|
||||
foreach ($block in $blocks) {
|
||||
if ($block -match ($rootPattern + '\[\{')) {
|
||||
$operations = [regex]::Matches($block,
|
||||
'(?is)\[\{\s*(?<names>[a-z0-9-]+(?:\s*\|\s*[a-z0-9-]+)+)\s*\}(?<options>.*?)(?=\[\{|\z)')
|
||||
foreach ($operation in $operations) {
|
||||
foreach ($operationName in ($operation.Groups['names'].Value -split '\s*\|\s*')) {
|
||||
$context = $name + ' ' + $operationName.ToLowerInvariant()
|
||||
Add-CommandPath $context $slug
|
||||
Add-Options $context $operation.Groups['options'].Value
|
||||
$hasChildren = $true
|
||||
}
|
||||
}
|
||||
if ($operations.Count) { continue }
|
||||
}
|
||||
$command = $name
|
||||
foreach ($line in ($block -split '\r?\n')) {
|
||||
if ($line -match $rootPattern) {
|
||||
$tail = $line -replace $rootPattern, ''
|
||||
$command = $root
|
||||
while ($tail -match '^\[?(?<word>[a-z0-9][a-z0-9-]*)\]?(?=\s|$)(?!\s*\|)\s*') {
|
||||
$command += ' ' + $Matches.word.ToLowerInvariant()
|
||||
$tail = $tail.Substring($Matches[0].Length)
|
||||
}
|
||||
if ($command.Length -lt $name.Length) {
|
||||
$command = $name
|
||||
$operation = $name.Substring($root.Length).Trim()
|
||||
if ($operation.StartsWith('/')) {
|
||||
$tail = $tail -replace ('^\[?' + [regex]::Escape($operation) + '\]?(?=\s|$)\s*'), ''
|
||||
}
|
||||
}
|
||||
Add-CommandPath $command $slug
|
||||
if ($command.StartsWith($name + ' ')) { $hasChildren = $true }
|
||||
if ($tail -match '^[\[{]+\s*(?<choices>[a-z0-9?-]+(?:\s*\|\s*[a-z0-9?-]+)+)\s*[\]}]') {
|
||||
foreach ($choice in ($Matches.choices -split '\s*\|\s*')) {
|
||||
[void]$entries[$command].Add($choice)
|
||||
}
|
||||
$hasChildren = $true
|
||||
}
|
||||
Add-Options $command $tail
|
||||
} else {
|
||||
Add-Options $command $line
|
||||
}
|
||||
foreach ($choice in [regex]::Matches($line, '(?<flag>[/\-][a-z][a-z0-9-]*)\s+\{(?<values>[a-z0-9_-]+(?:\s*\|\s*[a-z0-9_-]+)+)\}', 'IgnoreCase')) {
|
||||
$context = $command + ' ' + $choice.Groups['flag'].Value.ToLowerInvariant()
|
||||
Add-CommandPath $context $slug
|
||||
foreach ($value in ($choice.Groups['values'].Value -split '\s*\|\s*')) {
|
||||
[void]$entries[$context].Add($value)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!$hasChildren) {
|
||||
foreach ($parameter in [regex]::Matches($text, '(?m)^\|\s*(?<value>[^|\r\n]+)\|')) {
|
||||
$field = $parameter.Groups['value'].Value
|
||||
if ($name.Contains(' /') -and $field.Trim() -eq $name.Split(' ')[-1]) { continue }
|
||||
Add-Options $name $field
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[string[]]$names = $entries.Keys
|
||||
[Array]::Sort($names, [StringComparer]::Ordinal)
|
||||
$lines = @(
|
||||
'#pragma once'
|
||||
'#include <string_view>'
|
||||
''
|
||||
'namespace ks::files'
|
||||
'{'
|
||||
'// Generated by tools/generate-windows-command-completion.ps1 from Microsoft Learn Windows Commands.'
|
||||
"// https://github.com/MicrosoftDocs/windowsserverdocs/tree/$revision/WindowsServerDocs/administration/windows-commands"
|
||||
'inline constexpr std::string_view windowsCommandCatalog[] = {'
|
||||
foreach ($name in $names) {
|
||||
' R"catalog(' + $name + "`t" + ($entries[$name] -join ' ') + "`t" + $articles[$name] + ')catalog",'
|
||||
}
|
||||
'};'
|
||||
'}'
|
||||
)
|
||||
$lines | Set-Content -LiteralPath $Output -Encoding ascii
|
||||
Reference in new issue
Block a user