Compare commits

..
20 changed files with 721 additions and 123 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.24)
project(KSwitcher VERSION 0.6.101 LANGUAGES CXX RC)
project(KSwitcher VERSION 0.6.104 LANGUAGES CXX RC)
if(NOT WIN32)
message(FATAL_ERROR "KSwitcher uses native Windows APIs")
endif()
+19 -5
View File
@@ -86,11 +86,13 @@ Warning і початковий фокус на No.
- Ctrl+R перечитує поточну папку активної панелі. Позиція курсора й позначки
зберігаються для наявних елементів, а підраховані через F3 розміри папок
скидаються. F2 також виконує цю дію.
- Ctrl+C копіює весь введений у командний рядок текст, навіть коли виділено
лише його частину.
- Ctrl+Insert копіює імена позначених файлів і папок активної панелі в порядку
відображення, по одному на рядок. Якщо позначок немає, копіюється ім’я під
курсором. Шляхи й рядок `..` пропускаються.
- Ctrl+C і Ctrl+Insert копіюють виділений текст із виводу термінала.
- За відсутності виділення у виводі Ctrl+C копіює весь введений у командний
рядок текст, навіть коли виділено лише його частину.
- Ctrl+Insert копіює весь текст непорожнього командного рядка. Якщо рядок
порожній, копіюються імена позначених файлів і папок активної панелі в
порядку відображення, по одному на рядок. Якщо позначок немає, копіюється
ім’я під курсором. Шляхи й рядок `..` пропускаються.
- Ctrl+E підставляє останню команду. Повторне натискання
підставляє старішу, доки не досягне початку історії. Alt+F8 відкриває історію
@@ -160,11 +162,18 @@ Warning і початковий фокус на No.
інтерактивними чекбоксами списків і діаграмами Mermaid. Відмітки в перегляді
діють до повторного рендерингу або виходу з цього режиму. F4 відкриває текст
із підсвічуванням Markdown.
HTML усередині Markdown підтримує таблиці, текстове форматування, посилання,
відносні зображення й окремі стилі, зокрема `white-space: nowrap` у клітинках.
Скрипти, вбудовані сторінки та обробники подій відфільтровуються.
Відносні посилання й зображення відкриваються від каталогу вихідного файла.
Вихідний текст приховано, доки Markdown і Mermaid готують перегляд.
Звичайний клік відкриває внутрішнє посилання в тому самому вікні,
Shift+клік відкриває окреме вікно. Назад і вперед працюють через стрілки
перегляду, бічні кнопки миші й Alt+←/→. Ctrl+W закриває перегляд.
Ctrl+F або кнопка пошуку відкриває пошук у відрендерованому документі.
Пошук без урахування регістру показує кількість збігів і підсвічує поточний.
Enter і F3 переходять до наступного збігу, а Shift+Enter і Shift+F3 — до
попереднього, циклічно. Escape спочатку закриває поле пошуку.
Коли локальний Markdown оновлюється на диску, відкритий перегляд
перерендерюється зі збереженням позиції прокрутки.
Вебпосилання HTTP і HTTPS відкриваються в системному браузері.
@@ -210,6 +219,11 @@ Warning і початковий фокус на No.
кодування. Нередаговані байти копіюються без перетворення.
- Команда Options у панелях, редакторі й переглядачі відкриває один діалог
KSwitcher Files Options. Розділи Viewer та Editor зберігають окремі профілі.
**Viewer → Markdown** задає максимальну ширину документа (0 — усе вікно),
гарнітуру та розмір основного тексту. Порожня гарнітура використовує системний
шрифт. Apply одразу оновлює відкриті перегляди Markdown.
Після повторного відкриття Options відновлюється останній розділ, зокрема
після Cancel. Пошуковий запит і чернетка змін не зберігаються.
З редактора або переглядача діалог відкриває відповідний розділ. Apply
застосовує зміни до відкритих вікон, Cancel відкидає незастосовану чернетку.
Доступні перенесення рядків, номери рядків, показ пробілів і
Binary file not shown.
+18
View File
@@ -1,5 +1,23 @@
# Latest Windows release
## v0.6.104 — 2026-11-16
**Ctrl+F** or the search icon opens search in the rendered KSwitcher Files Markdown preview. Search ignores case and highlights the current match. **Enter** or **F3** moves to the next match, and **Shift+Enter** or **Shift+F3** moves back. **Escape** closes the search first. This release includes the HTML, Markdown appearance, Options and terminal copy updates from v0.6.103.
**Українською.** **Ctrl+F** або піктограма пошуку відкриває пошук у відрендерованому Markdown у KSwitcher Files. Пошук ігнорує регістр і підсвічує поточний збіг. **Enter** або **F3** переходить до наступного збігу, а **Shift+Enter** або **Shift+F3** повертає до попереднього. **Escape** спочатку закриває пошук. Реліз включає підтримку HTML, налаштування вигляду Markdown, запам’ятовування розділу Options і копіювання з термінала з v0.6.103.
## v0.6.103 — 2026-11-16
The KSwitcher Files Markdown preview renders embedded HTML tables and inline styles such as `white-space: nowrap`. **Options → Viewer → Markdown** sets the preview width, font family and font size. Files Options reopens the last section. **Ctrl+C** and **Ctrl+Insert** copy selected terminal output. This release replaces v0.6.102.
**Українською.** Перегляд Markdown у KSwitcher Files відображає вбудовані HTML-таблиці й стилі, зокрема `white-space: nowrap`. У **Options → Viewer → Markdown** можна задати ширину перегляду, гарнітуру й розмір шрифту. Options відкриває останній відвіданий розділ. **Ctrl+C** і **Ctrl+Insert** копіюють виділений текст із виводу термінала. Цей реліз замінює v0.6.102.
## v0.6.102 — 2026-11-16
In KSwitcher Files, Ctrl+Insert copies the full command line when it contains text. With an empty command line, it copies names from the active pane. The LAN host returns Windows PowerShell startup errors without waiting for a system error dialog. Files explains DLL initialization failure `0xC0000142` and accepts another command. This release replaces v0.6.101.
**Українською.** У KSwitcher Files Ctrl+Insert копіює весь текст непорожнього командного рядка. Якщо рядок порожній, копіюються імена з активної панелі. ПК, який приймає LAN-команду, повертає помилки запуску Windows PowerShell без очікування системного діалогу. Files пояснює помилку ініціалізації DLL `0xC0000142` і знову приймає команди. Цей реліз замінює v0.6.101.
## v0.6.101 — 2026-11-16
In KSwitcher Files, Enter opens the selected item when the command line is empty, including when focus is in the terminal output. The Computers window places pairing and the monitor grid side by side so the bottom actions fit at high display scaling. This release replaces v0.6.100.
+1 -1
View File
@@ -1 +1 @@
b226b6956314530c4dfc68896ec385e06cb5a8f6709d9a555a6774efc8afed26 KSwitcher-win-x64.zip
53b30b2610b66b0d40e28b7fcb0b5e7e10c8a2415f38226059c9c239b2f7b58e KSwitcher-win-x64.zip
+67 -67
View File
@@ -1,166 +1,166 @@
{
"schema": 1,
"version": "0.6.101",
"files": [
{
"sha256": "176319fec5bfb3714bd31a2fdb8c256297d1d683de50a7f8dda319c40672cd83",
"path": "KSwitcher.exe",
"size": 2361856,
"sha256": "5ef419728079c2b45bbce6747ddbf6c8cbcf46134542613cdd22e81035b2c1d2"
"size": 2361856
},
{
"sha256": "e80a1d11a129f9a00a1698cd6830ac13f335f74f16dd6f407aa2fe6a3ea2bea8",
"path": "KSwitcher.Config.exe",
"size": 2359296,
"sha256": "000cf951ebe18ff39b5521bbdbdf54176230b1dca5607fc97321aab4988fd26f"
"size": 2359296
},
{
"sha256": "e7925cbaaf39645cb8a582f29bd32628c5fbb73be6b60f5f0f870ec9e936d648",
"path": "KSwitcher.Screenshot.exe",
"size": 3337216,
"sha256": "2310e016dad617fd97303abd03a9a04c91737ff0b43386aa58241dc96f883043"
"size": 3337216
},
{
"sha256": "ca59044cbb358ff99a6e9badbf5c9bc6b6ca5e41d3673ab063a29e03c297590b",
"path": "KSwitcher.Files.exe",
"size": 3739136,
"sha256": "be0b8b9097f8406bdd468f652be1659ec61de8ce29b543046d710cbc63c4a888"
"size": 3747840
},
{
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6",
"path": "WebView2Loader.dll",
"size": 194912,
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6"
"size": 194912
},
{
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f",
"path": "terminal/addon-fit-LICENSE.txt",
"size": 1103,
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f"
"size": 1103
},
{
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527",
"path": "terminal/addon-fit.js",
"size": 1521,
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527"
"size": 1521
},
{
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef",
"path": "terminal/index.html",
"size": 527,
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef"
"size": 527
},
{
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473",
"path": "terminal/markdown-it-LICENSE.txt",
"size": 1073,
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473"
"size": 1073
},
{
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e",
"path": "terminal/markdown-it.js",
"size": 100786,
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e"
"size": 100786
},
{
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c",
"path": "terminal/markdown.html",
"size": 2171,
"sha256": "b011e0872c869c48302a37b3e2e462addc1ee11e723f840ad7df1e893fc15336"
"size": 3530
},
{
"sha256": "fe202fa3d3c362aff2ab9028b40bd2aee61240bf9bd4a44af55e45d1a4081cf0",
"path": "terminal/markdown.js",
"size": 6381,
"sha256": "21cc15ceb2b8bee9b3f6a816d629677dab61243daf784c10b4c96312729cb149"
"size": 14660
},
{
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80",
"path": "terminal/mermaid-LICENSE.txt",
"size": 1089,
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80"
"size": 1089
},
{
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3",
"path": "terminal/mermaid.js",
"size": 5537838,
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3"
"size": 5537838
},
{
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a",
"path": "terminal/terminal.js",
"size": 4835,
"sha256": "27a8b3b7fd6e0797363a5241f8871e674d01293d53a7b21bd71dfae47aea4eec"
"size": 5033
},
{
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd",
"path": "terminal/xterm-LICENSE.txt",
"size": 1261,
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd"
"size": 1261
},
{
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6",
"path": "terminal/xterm.css",
"size": 7112,
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6"
"size": 7112
},
{
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972",
"path": "terminal/xterm.js",
"size": 488663,
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972"
"size": 488663
},
{
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
"path": "LICENSE",
"size": 4401,
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c"
"size": 4401
},
{
"sha256": "c0d068392ea65358b798b8c165103560f06e9e3b38c4ab4e2d8810a7b931af86",
"path": "json-LICENSE.txt",
"size": 1075,
"sha256": "c0d068392ea65358b798b8c165103560f06e9e3b38c4ab4e2d8810a7b931af86"
"size": 1075
},
{
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625",
"path": "files-text-license.txt",
"size": 883,
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625"
"size": 883
},
{
"sha256": "fca41227e9b38bf061298d69806ea66fb00086ae03aec49665e4f68ed2c3f8e9",
"path": "README.md",
"size": 94357,
"sha256": "fca41227e9b38bf061298d69806ea66fb00086ae03aec49665e4f68ed2c3f8e9"
"size": 94357
},
{
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930",
"path": "LAN-PREVIEW.md",
"size": 11577,
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930"
"size": 11577
},
{
"sha256": "5f267c141c3d6837870e1c098f86b89a113ba300343119432644ead88f720c21",
"path": "dictionaries/en.txt",
"size": 682867,
"sha256": "5f267c141c3d6837870e1c098f86b89a113ba300343119432644ead88f720c21"
"size": 682867
},
{
"sha256": "28a9529c7d0bb4dc51f4bf5c116a3d16ef247a052f7591466768ddf563fd1cf5",
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
"size": 20138,
"sha256": "28a9529c7d0bb4dc51f4bf5c116a3d16ef247a052f7591466768ddf563fd1cf5"
"size": 20138
},
{
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311",
"path": "dictionaries/README.md",
"size": 2265,
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311"
"size": 2265
},
{
"sha256": "9ef922c7699569304a428f6aba0fd13a21341c0d0cb9561f37ef83c41577a28b",
"path": "dictionaries/ru.txt",
"size": 1060364,
"sha256": "9ef922c7699569304a428f6aba0fd13a21341c0d0cb9561f37ef83c41577a28b"
"size": 1060364
},
{
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408",
"path": "dictionaries/sources.json",
"size": 1280,
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408"
"size": 1280
},
{
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf",
"path": "dictionaries/uk.txt",
"size": 940799,
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf"
"size": 940799
},
{
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a",
"path": "tools/README.txt",
"size": 993,
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a"
"size": 993
},
{
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376",
"path": "tools/StayHere.exe",
"size": 134656,
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376"
"size": 134656
},
{
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413",
"path": "tools/StayHere-README.md",
"size": 2796,
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413"
"size": 2796
}
]
],
"schema": 1,
"version": "0.6.104"
}
+3 -3
View File
@@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur"
1 RT_MANIFEST "app.manifest"
201 RCDATA "update.ps1"
1 VERSIONINFO
FILEVERSION 0,6,101,0
PRODUCTVERSION 0,6,101,0
FILEVERSION 0,6,104,0
PRODUCTVERSION 0,6,104,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.101"
VALUE "FileVersion", "0.6.104"
END
END
BLOCK "VarFileInfo"
+7
View File
@@ -144,6 +144,13 @@ BEGIN
PUSHBUTTON "Change color…", 366, 257, 181, 82, 15
LTEXT "", 367, 345, 184, 45, 12
PUSHBUTTON "&Save scheme…", 368, 131, 163, 118, 15
LTEXT "Maximum &width (px, 0 = full window)", 373, 131, 31, 184, 12
EDITTEXT 374, 318, 28, 64, 14, ES_NUMBER | ES_AUTOHSCROLL
LTEXT "Font &family (blank = system default)", 375, 131, 54, 250, 12
EDITTEXT 376, 131, 68, 168, 14, ES_AUTOHSCROLL
PUSHBUTTON "Choose &font…", 377, 306, 68, 76, 14
LTEXT "Font &size (8–72 pt)", 378, 131, 99, 184, 12
EDITTEXT 379, 318, 96, 64, 14, ES_NUMBER | ES_AUTOHSCROLL
DEFPUSHBUTTON "OK", IDOK, 222, 289, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 280, 289, 50, 14
PUSHBUTTON "&Apply", 283, 338, 289, 50, 14
+18 -3
View File
@@ -7,13 +7,20 @@
<style>
:root { color-scheme: light dark; font: 16px/1.55 system-ui, sans-serif; }
:root:not(.rendered) body { visibility: hidden; }
body { max-width: 960px; margin: auto; padding: 20px 28px; overflow-wrap: anywhere; }
nav { position: sticky; top: 0; display: flex; gap: .4em; padding-block: .25em; background: Canvas; }
body { max-width: var(--markdown-width, 960px); margin: auto; padding: 20px 28px; overflow-wrap: anywhere; }
main { font: var(--markdown-font-size, 12pt)/1.55 var(--markdown-font, system-ui, sans-serif); }
nav { position: sticky; top: 0; display: flex; flex-wrap: wrap; gap: .4em; padding-block: .25em; background: Canvas; }
nav button { appearance: none; border: 0; background: transparent; color: LinkText;
font: 1.35em/1.25 system-ui, sans-serif; min-width: 1.55em; padding: 0; cursor: pointer; }
nav button:disabled { color: GrayText; opacity: .6; cursor: default; }
nav button:hover:not(:disabled) { text-decoration: underline; }
nav button:focus-visible { outline: 2px solid currentColor; outline-offset: 2px; }
#search { margin-inline-start: auto; display: flex; align-items: center; gap: .35em;
flex: 0 1 22em; min-width: 0; max-width: 100%; }
#search[hidden] { display: none; }
#search-query { box-sizing: border-box; flex: 1; min-width: 0; width: 0; font: inherit; }
#search-status { white-space: nowrap; font-size: .8em; }
::highlight(markdown-search-active) { background: #ffab45; color: #171717; }
:is(h1,h2,h3,h4,h5,h6) { scroll-margin-top: 2.5em; }
h1, h2 { border-bottom: 1px solid GrayText; padding-bottom: .25em; }
a { color: LinkText; }
@@ -30,9 +37,17 @@ figure { margin: 1em 0; }
.task { list-style: none; }
.task input { margin-inline: -1.15em .4em; cursor: pointer; }
</style>
<nav aria-label="Document history">
<nav aria-label="Markdown preview">
<button id="back" type="button" title="Back (Alt+Left)" aria-label="Back" disabled>←</button>
<button id="forward" type="button" title="Forward (Alt+Right)" aria-label="Forward" disabled>→</button>
<button id="search-open" type="button" title="Find (Ctrl+F)" aria-label="Find in document" aria-controls="search" aria-expanded="false">⌕</button>
<div id="search" role="search" hidden>
<input id="search-query" type="search" aria-label="Find in document" placeholder="Find in document" autocomplete="off">
<output id="search-status" for="search-query" aria-live="polite"></output>
<button id="search-previous" type="button" title="Previous match (Shift+Enter)" aria-label="Previous match" disabled>↑</button>
<button id="search-next" type="button" title="Next match (Enter)" aria-label="Next match" disabled>↓</button>
<button id="search-close" type="button" title="Close search (Esc)" aria-label="Close search">×</button>
</div>
</nav>
<main></main>
<script src="markdown-it.js"></script>
+179 -5
View File
@@ -4,9 +4,17 @@ const bridge = window.chrome.webview;
const content = document.querySelector('main');
const back = document.querySelector('#back');
const forward = document.querySelector('#forward');
const markdown = markdownit({ html: false, linkify: true });
const searchOpen = document.querySelector('#search-open');
const search = document.querySelector('#search');
const searchQuery = document.querySelector('#search-query');
const searchStatus = document.querySelector('#search-status');
const searchPrevious = document.querySelector('#search-previous');
const searchNext = document.querySelector('#search-next');
const markdown = markdownit({ html: true, linkify: true });
let generation = 0;
let images = [];
let matches = [];
let activeMatch = -1;
mermaid.initialize({
startOnLoad: false,
@@ -42,13 +50,60 @@ markdown.renderer.rules.image = (tokens, i) => {
return '<img alt="' + escape(alt) + '" data-path="' + escape(token.attrGet('src')) + '">';
};
const htmlTags = new Set(`a abbr address article aside b blockquote br caption code col colgroup dd del
details div dl dt em figcaption figure footer h1 h2 h3 h4 h5 h6 header hr i img input ins kbd li
mark ol p pre s samp section small span strong sub summary sup table tbody td tfoot th thead time
tr u ul var wbr`.split(/\s+/));
const htmlAttributes = new Set(['id', 'class', 'title', 'lang', 'dir', 'aria-label']);
const tagAttributes = {
a: ['href'], col: ['span'], colgroup: ['span'], details: ['open'], img: ['alt', 'width', 'height'],
input: ['type', 'checked', 'disabled'], ol: ['start', 'reversed', 'type'], li: ['value'],
td: ['colspan', 'rowspan'], th: ['colspan', 'rowspan', 'scope'], time: ['datetime']
};
const inlineStyles = ['white-space', 'text-align', 'vertical-align', 'color', 'background-color',
'font-weight', 'font-style', 'text-decoration-line', 'width', 'max-width'];
function relativeResource(path) {
return path && !/^(?:[a-z][a-z\d+.-]*:|[\\/])/i.test(path) && !/[\u0000-\u001f\u007f]/.test(path);
}
function renderContent(text) {
// Parse in an inert template and allow only document markup before attaching it to the preview.
const template = document.createElement('template');
template.innerHTML = markdown.render(text);
for (const element of template.content.querySelectorAll('*')) {
const tag = element.localName;
if (element.namespaceURI !== 'http://www.w3.org/1999/xhtml' || !htmlTags.has(tag) ||
(tag === 'input' && element.type !== 'checkbox')) {
element.remove();
continue;
}
const imagePath = tag === 'img' && (element.getAttribute('src') ?? element.getAttribute('data-path'))?.trim();
const styles = element.hasAttribute('style')
? inlineStyles.map(name => [name, element.style.getPropertyValue(name)]) : [];
for (const { name } of [...element.attributes]) {
if (!htmlAttributes.has(name) && !tagAttributes[tag]?.includes(name)) element.removeAttribute(name);
}
for (const [name, value] of styles) {
if (value) element.style.setProperty(name, value);
}
if (relativeResource(imagePath)) element.dataset.path = imagePath;
if (tag === 'a' && element.hasAttribute('href')) {
const path = element.getAttribute('href').trim();
if (relativeResource(path) || /^https?:\/\/[^\s\u0000-\u001f\u007f]+$/i.test(path)) element.setAttribute('href', path);
else element.removeAttribute('href');
}
}
content.replaceChildren(template.content);
}
function send(action, options = {}) {
bridge.postMessage(JSON.stringify({ action, ...options }));
}
function scrollToHeading(fragment) {
if (!fragment) { window.scrollTo(0, 0); return; }
try { document.getElementById(decodeURIComponent(fragment))?.scrollIntoView(); } catch {}
try { content.querySelector('#' + CSS.escape(decodeURIComponent(fragment)))?.scrollIntoView(); } catch {}
}
function restorePosition({ fragment, scroll }) {
@@ -64,15 +119,114 @@ function navigate(action) {
back.addEventListener('click', () => navigate('back'));
forward.addEventListener('click', () => navigate('forward'));
function updateSearch(reveal = true) {
matches = [];
activeMatch = -1;
const query = searchQuery.value.trim();
if (query) {
const pattern = query.replace(/[.*+?^$(){}|[\]\\]/g, '\\$&').replace(/\s+/g, '\\s+');
const expression = new RegExp(pattern, 'giu');
const blockTags = 'article,aside,blockquote,caption,dd,div,dt,figcaption,footer,h1,h2,h3,h4,h5,h6,header,li,p,pre,section,summary,td,th,text';
const walker = document.createTreeWalker(content, NodeFilter.SHOW_TEXT);
let block = null;
let parts = [];
let text = '';
const searchBlock = () => {
let first = 0;
let last = 0;
for (const match of text.matchAll(expression)) {
const end = match.index + match[0].length;
while (parts[first].end <= match.index) ++first;
last = Math.max(last, first);
while (parts[last].end < end) ++last;
matches.push([parts[first].node, match.index - parts[first].start,
parts[last].node, end - parts[last].start]);
}
parts = [];
text = '';
};
for (let node = walker.nextNode(); node; node = walker.nextNode()) {
const element = node.parentElement;
if (!node.length || element.closest('style,svg title,svg desc,svg defs') ||
!element.checkVisibility({ visibilityProperty: true })) continue;
const nextBlock = element.closest(blockTags);
if (block !== nextBlock) searchBlock();
block = nextBlock;
const start = text.length;
text += node.data;
parts.push({ node, start, end: text.length });
}
searchBlock();
}
showSearchMatch(matches.length ? 0 : -1, reveal);
}
function showSearchMatch(index, reveal) {
activeMatch = index;
searchPrevious.disabled = searchNext.disabled = matches.length < 2;
searchStatus.value = !searchQuery.value.trim() ? '' : index < 0 ? 'No matches' : (index + 1) + ' / ' + matches.length;
CSS.highlights.delete('markdown-search-active');
if (index < 0) return;
const [start, from, end, to] = matches[index];
const range = new Range();
range.setStart(start, from);
range.setEnd(end, to);
CSS.highlights.set('markdown-search-active', new Highlight(range));
if (!reveal) return;
const rect = range.getBoundingClientRect();
const toolbarBottom = search.parentElement.getBoundingClientRect().bottom;
if (rect.top < toolbarBottom || rect.bottom > innerHeight) {
scrollBy(0, rect.top - Math.max(toolbarBottom, innerHeight / 2));
}
const scroller = start.parentElement.closest('pre, table');
if (scroller) {
const bounds = scroller.getBoundingClientRect();
if (rect.left < bounds.left || rect.right > bounds.right) {
scroller.scrollLeft += rect.left - bounds.left;
}
}
}
function openSearch() {
search.hidden = false;
searchOpen.setAttribute('aria-expanded', 'true');
searchQuery.focus({ preventScroll: true });
searchQuery.select();
}
function closeSearch() {
if (search.hidden) return false;
const hadFocus = search.contains(document.activeElement);
search.hidden = true;
searchOpen.setAttribute('aria-expanded', 'false');
searchQuery.value = '';
updateSearch();
if (hadFocus) searchOpen.focus({ preventScroll: true });
return true;
}
function stepSearch(direction) {
if (search.hidden) openSearch();
else if (matches.length) showSearchMatch((activeMatch + direction + matches.length) % matches.length, true);
}
searchOpen.addEventListener('click', openSearch);
document.querySelector('#search-close').addEventListener('click', closeSearch);
searchQuery.addEventListener('input', () => updateSearch());
searchPrevious.addEventListener('click', () => stepSearch(-1));
searchNext.addEventListener('click', () => stepSearch(1));
content.addEventListener('toggle', () => { if (!search.hidden) updateSearch(false); }, true);
async function render({ text, fragment, scroll, title, keepPosition }) {
const current = ++generation;
if (keepPosition) scroll = window.scrollY;
else closeSearch();
document.documentElement.classList.remove('rendered');
document.title = title;
content.innerHTML = markdown.render(text);
renderContent(text);
const headings = new Set();
for (const heading of content.querySelectorAll('h1,h2,h3,h4,h5,h6')) {
const base = heading.textContent.trim().toLowerCase().replace(/[^\p{L}\p{N}\s_-]/gu, '').replace(/\s/g, '-');
const base = heading.id || heading.textContent.trim().toLowerCase().replace(/[^\p{L}\p{N}\s_-]/gu, '').replace(/\s/g, '-');
let id = base;
for (let n = 1; headings.has(id); ++n) id = base + '-' + n;
heading.id = id;
@@ -97,6 +251,7 @@ async function render({ text, fragment, scroll, title, keepPosition }) {
}
restorePosition({ fragment, scroll });
document.documentElement.classList.add('rendered');
if (!search.hidden) updateSearch(false);
send('rendered');
}
@@ -116,7 +271,16 @@ document.addEventListener('pointerup', event => {
});
document.addEventListener('keydown', event => {
if (event.ctrlKey && !event.altKey && event.key === 'Tab') {
if (event.isComposing) return;
if (event.ctrlKey && !event.altKey && event.key.toLowerCase() === 'f') {
event.preventDefault();
openSearch();
} else if (event.key === 'F3' || (event.key === 'Enter' && event.target === searchQuery)) {
event.preventDefault();
stepSearch(event.shiftKey ? -1 : 1);
} else if (event.key === 'Escape' && closeSearch()) {
event.preventDefault();
} else if (event.ctrlKey && !event.altKey && event.key === 'Tab') {
event.preventDefault();
send('cycle');
} else if ((event.altKey && ['ArrowLeft', 'ArrowRight'].includes(event.key)) ||
@@ -134,11 +298,21 @@ bridge.addEventListener('message', ({ data }) => {
const message = JSON.parse(data);
if (message.action === 'clear') {
++generation;
closeSearch();
document.documentElement.classList.remove('rendered');
content.replaceChildren();
}
if (message.action === 'render') void render(message).catch(() => send('failed'));
if (message.action === 'appearance') {
const style = document.documentElement.style;
style.setProperty('--markdown-width', message.width ? message.width + 'px' : 'none');
style.setProperty('--markdown-font-size', message.fontSize + 'pt');
style.setProperty('--markdown-font', message.font ? CSS.escape(message.font) + ', system-ui, sans-serif' : 'system-ui, sans-serif');
}
if (message.action === 'anchor') restorePosition(message);
if (message.action === 'find') openSearch();
if (message.action === 'find-next') stepSearch(message.previous ? -1 : 1);
if (message.action === 'escape' && !closeSearch()) send('close');
if (message.action === 'back' || message.action === 'forward') navigate(message.action);
if (message.action === 'history') {
back.disabled = !message.back;
+6 -1
View File
@@ -20,6 +20,7 @@ terminal.parser.registerOscHandler(633, data => {
terminal.loadAddon(fit);
const host = document.getElementById('terminal');
terminal.open(host);
terminal.onSelectionChange(() => bridge.postMessage('selection:' + terminal.getSelection()));
host.addEventListener('pointerup', () => bridge.postMessage('focus-input'), true);
const screen = host.querySelector('.xterm-screen');
let traceEnabled = false;
@@ -67,7 +68,7 @@ terminal.attachCustomKeyEventHandler(event => {
if (!event.repeat) bridge.postMessage('insert-name');
}
else if (event.key === 'Insert') {
if (!event.repeat) bridge.postMessage('copy-panel-names');
if (!event.repeat) bridge.postMessage('copy-command-line-or-panel-names');
}
else if (event.code === 'KeyR') {
if (!event.repeat) bridge.postMessage('refresh-panel');
@@ -83,6 +84,10 @@ terminal.onScroll(() => {
anchorOutput();
});
bridge.addEventListener('message', ({ data }) => {
if (data === 'clear-selection') {
terminal.clearSelection();
return;
}
if (data === 'scroll-bottom') {
terminal.scrollToBottom();
anchorOutput();
+32 -9
View File
@@ -341,6 +341,7 @@ void traceTerminal(const char *event,int a=0,int b=0,int c=0,int d=0,int e=0)
terminalTrace<<GetTickCount64()<<' '<<event<<' '<<a<<' '<<b<<' '<<c<<' '<<d<<' '<<e<<std::endl;
}
FilesTerminalView terminalView;
std::wstring terminalSelection;
COORD terminalSize{80,25};
bool terminalViewRequested{};
HWND terminalInput{},terminalOutput{},terminalPrompt{};
@@ -453,6 +454,7 @@ void showFileDetails(const Panel &panel);
void editOptions(HWND owner);
void showFolderShortcuts(Panel &panel,int digit,bool all=false);
void layout(HWND window,bool activeOnly=false);
void clearTerminalSelection();
DWORD preference(const wchar_t *name, DWORD fallback)
{
@@ -590,7 +592,7 @@ bool applyFont(HWND owner, LOGFONTW font, int points)
return true;
}
bool chooseDisplayFont(HWND owner,LOGFONTW &font,int &points)
bool chooseDisplayFont(HWND owner,LOGFONTW &font,int &points,int maximum=24)
{
CHOOSEFONTW dialog{};
dialog.lStructSize=sizeof(dialog);
@@ -599,7 +601,7 @@ bool chooseDisplayFont(HWND owner,LOGFONTW &font,int &points)
dialog.iPointSize=points;
dialog.Flags=CF_SCREENFONTS|CF_INITTOLOGFONTSTRUCT|CF_LIMITSIZE;
dialog.nSizeMin=8;
dialog.nSizeMax=24;
dialog.nSizeMax=maximum;
if(!ChooseFontW(&dialog)) return false;
points=dialog.iPointSize;
return true;
@@ -903,6 +905,7 @@ void layout(HWND window,bool activeOnly)
const auto region=CreateRectRgn(0,terminalTop-4,std::max(0,width-8),terminalBottom-4);
if(region && !SetWindowRgn(terminalOutput,region,FALSE)) DeleteObject(region);
}
if(!showOutput) clearTerminalSelection();
ShowWindow(terminalOutput,showOutput?SW_SHOWNA:SW_HIDE);
ShowWindow(status,terminalVisible?SW_HIDE:SW_SHOWNA);
terminalView.layout(terminalOutput,showOutput,terminalBottom-4);
@@ -973,12 +976,19 @@ std::wstring terminalInputText()
return value;
}
void copyTerminalInput(HWND owner)
void clearTerminalSelection()
{
const auto value=terminalInputText();
if(terminalSelection.empty()) return;
terminalSelection.clear();
terminalView.post(L"clear-selection");
}
void copyTerminalText(HWND owner)
{
const auto value=terminalSelection.empty()?terminalInputText():terminalSelection;
if(value.empty()) return;
try { ks::writeClipboard(owner,ks::textClip(value)); }
catch(const std::exception &) { setStatus(L"Could not copy the command line."); }
catch(const std::exception &) { setStatus(L"Could not copy terminal text."); }
}
LRESULT currentPanelRow(const Panel &panel)
@@ -1014,6 +1024,12 @@ void copyPanelNames(HWND owner)
catch(const std::exception &) { setStatus(L"Could not copy file names."); }
}
void copyCommandLineOrPanelNames(HWND owner)
{
if(!terminalSelection.empty() || GetWindowTextLengthW(terminalInput)) copyTerminalText(owner);
else copyPanelNames(owner);
}
void refreshPanel(Panel &panel)
{
panel.folderSizeStop.request_stop();
@@ -1100,12 +1116,13 @@ bool ensureTerminalView(HWND owner)
{
if(GetForegroundWindow()==owner) SetFocus(terminalInput);
}
else if(message.starts_with(L"selection:")) terminalSelection=message.substr(10);
else if(message==L"enter" || message==L"shift-enter")
submitTerminalReturn(owner,message==L"shift-enter");
else if(message==L"insert-path") insertCurrentPanelPath();
else if(message==L"insert-name") insertCurrentPanelPath(true);
else if(message==L"copy-command-line") SendMessageW(terminalInput,WM_COPY,0,0);
else if(message==L"copy-panel-names") copyPanelNames(owner);
else if(message==L"copy-command-line-or-panel-names") copyCommandLineOrPanelNames(owner);
else if(message==L"refresh-panel") refreshPanel(panels[active]);
else if(message==L"toggle") showTerminal(owner,!terminalVisible);
else if(!terminalVisible && (message==L"grow" || message==L"shrink"))
@@ -1210,7 +1227,10 @@ bool submitTerminalCommand(const Panel &panel,const std::wstring &value)
{
FilesConnection host(&peer);
const auto code=ks::lan::runRemoteCommand(host,directory,value,appendRemoteOutput,stop);
appendRemoteOutput("\r\n[Remote exit code "+std::to_string(code)+"]\r\n");
if(code==STATUS_DLL_INIT_FAILED)
appendRemoteOutput("\r\nRemote PowerShell could not start: DLL initialization failed (0xC0000142).\r\n");
else
appendRemoteOutput("\r\n[Remote exit code "+std::to_string(code)+"]\r\n");
}
catch(const std::system_error &error)
{
@@ -1266,9 +1286,10 @@ void runCommandLine()
LRESULT CALLBACK terminalInputKeys(HWND input,UINT message,WPARAM wp,LPARAM lp,UINT_PTR,DWORD_PTR)
{
if(message==WM_LBUTTONDOWN || message==WM_RBUTTONDOWN) clearTerminalSelection();
if(message==WM_COPY || (message==WM_CHAR && wp==3))
{
copyTerminalInput(GetParent(input));
copyTerminalText(GetParent(input));
return 0;
}
if(message==WM_CHAR && wp==VK_TAB && !terminalVisible) return 0;
@@ -4459,6 +4480,7 @@ LRESULT CALLBACK panelKeys(HWND window, UINT message, WPARAM wp, LPARAM lp, UINT
if(message==WM_LBUTTONDOWN || message==WM_LBUTTONDBLCLK ||
(message==WM_MOUSEMOVE && (wp&MK_LBUTTON) && GetCapture()==window))
{
if(message==WM_LBUTTONDOWN) clearTerminalSelection();
auto &panel=panels[index];
activatePanel(static_cast<int>(index));
const auto count=SendMessageW(window,LB_GETCOUNT,0,0);
@@ -5410,6 +5432,7 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
return TRUE;
}
case WM_COMMAND:
if(reinterpret_cast<HWND>(lp)==terminalInput && HIWORD(wp)==EN_CHANGE) clearTerminalSelection();
if(copyInProgress || commandHistoryWindow || FilesModalDialog::activeFor(window)) return 0;
if(LOWORD(wp)==121 && HIWORD(wp)==LBN_DBLCLK) selectDrive();
if(LOWORD(wp)>=130 && LOWORD(wp)<=134 && HIWORD(wp)==BN_CLICKED)
@@ -5643,7 +5666,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int show)
if(message.wParam=='F') insertCurrentPanelPath();
else if(message.wParam=='R') refreshPanel(panels[active]);
else if(message.wParam==VK_RETURN) insertCurrentPanelPath(true);
else if(message.wParam==VK_INSERT) copyPanelNames(window);
else if(message.wParam==VK_INSERT) copyCommandLineOrPanelNames(window);
else SendMessageW(terminalInput,WM_COPY,0,0);
}
continue;
+104 -11
View File
@@ -19,6 +19,9 @@ constexpr int textTabWidth=357,textLineEnding=359,
constexpr int textControls[]{350,351,352,353,356,textTabWidth,
362,textTheme,364,textColor,textChangeColor,textColorValue,textSaveScheme};
constexpr int editingControls[]{354,355,358,textLineEnding};
constexpr int markdownSection=1,markdownWidth=374,markdownFamily=376,markdownChoose=377,markdownSize=379;
constexpr int markdownControls[]{373,markdownWidth,375,markdownFamily,markdownChoose,378,markdownSize};
constexpr wchar_t optionsLocationKey[]=L"OptionsLocation";
constexpr struct
{
int id;
@@ -102,7 +105,9 @@ struct OptionsDraft
int styleIndex=0;
bool styleSuggestionsLoaded{};
int page=PanelModes, section=PanelLayout;
HTREEITEM wideColumnsNode{};
DWORD location{};
int markdownError{};
HTREEITEM wideColumnsNode{},markdownNode{};
RECT initialClient{};
UINT initialDpi=96;
OptionsControl controls[8]{
@@ -150,7 +155,7 @@ void updateOptionsApply(HWND dialog,const OptionsDraft &draft)
DWORD fields=0;
for(int i=0;i<4;++i) if(checked(205+i)) fields|=1u<<i;
const auto &base=draft.baseline;
const bool dirty=!valid || width!=base.width ||
const bool dirty=!valid || draft.markdownError || width!=base.width ||
checked(273)!=base.wide[0] || checked(274)!=base.wide[1] ||
checked(202)!=base.extensions || checked(204)!=base.folders || checked(203)!=base.details ||
fields!=base.fields || draft.palette!=base.palette || draft.styles!=base.styles ||
@@ -333,9 +338,31 @@ void showTextOptions(HWND dialog,const ks::files::TextSettings &settings,const k
refreshTextColor(dialog,profile);
}
void showMarkdownOptions(HWND dialog,const ks::files::MarkdownPreferences &settings)
{
// SetDlgItemText sends EN_CHANGE synchronously, so take a snapshot first.
const auto values=settings;
SetDlgItemInt(dialog,markdownWidth,values.width,FALSE);
SetDlgItemInt(dialog,markdownSize,values.fontSize,FALSE);
SetDlgItemTextW(dialog,markdownFamily,values.font.c_str());
}
int readMarkdownOptions(HWND dialog,ks::files::MarkdownPreferences &settings)
{
BOOL widthValid{}, sizeValid{};
const auto width=GetDlgItemInt(dialog,markdownWidth,&widthValid,FALSE);
const auto size=GetDlgItemInt(dialog,markdownSize,&sizeValid,FALSE);
if(!widthValid || width>999999) return markdownWidth;
if(!sizeValid || size<8 || size>72) return markdownSize;
wchar_t font[LF_FACESIZE]{};
GetDlgItemTextW(dialog,markdownFamily,font,std::size(font));
settings={width,size,font};
return 0;
}
bool changeTextOption(HWND dialog,OptionsDraft &draft,WPARAM command)
{
if(!textOptionsPage(draft.page)) return false;
if(!textOptionsPage(draft.page) || (draft.page==TextViewer && draft.section==markdownSection)) return false;
auto &profile=draft.text.profiles[draft.page==TextEditor];
const auto id=LOWORD(command);
const auto row=[&](int control){return SendDlgItemMessageW(dialog,control,CB_GETCURSEL,0,0);};
@@ -386,12 +413,14 @@ void showOptionsPage(HWND dialog,OptionsDraft &draft,int page,int section)
{
draft.page=page;
draft.section=section;
const bool markdown=page==TextViewer && section==markdownSection;
const wchar_t *title=L"No matching settings";
if(page==allOptions) title=L"All settings";
else if(page>=0)
{
title=optionsTitles[page];
if(section>=0 && !textOptionsPage(page))
if(markdown) title=L"Markdown";
else if(section>=0 && !textOptionsPage(page))
title=page==PanelModes?panelSectionNames[section]:page==PanelColors?
(section==fileStyleSection?L"File type styles":colorNames[section]):
page==CommandLine?L"Command history":section==DialogFrame?L"Dialog frame":L"Font";
@@ -430,9 +459,10 @@ void showOptionsPage(HWND dialog,OptionsDraft &draft,int page,int section)
}
constexpr int commandLineControls[]{320,321,322,323,optionsRemoteTerminal,optionsRemoteHibernate,optionsRemoteUpdate};
show(commandLineControls,page==CommandLine && section==0);
show(textControls,textOptionsPage(page));
show(markdownControls,markdown);
show(textControls,textOptionsPage(page) && !markdown);
show(editingControls,page==TextEditor);
if(textOptionsPage(page)) showTextOptions(dialog,draft.text,draft.text.profiles[page==TextEditor]);
if(textOptionsPage(page) && !markdown) showTextOptions(dialog,draft.text,draft.text.profiles[page==TextEditor]);
const bool fileTypes=page==PanelColors && section==fileStyleSection;
constexpr int fileStyleControls[]{287,288,289,290,291,292,293,294,295,296,297,298,300,fileStyleState};
show(fileStyleControls,fileTypes);
@@ -491,6 +521,7 @@ void filterOptions(HWND dialog,OptionsDraft &draft)
const int previousPage=draft.page,previousSection=draft.section;
TreeView_DeleteAllItems(tree);
draft.wideColumnsNode=nullptr;
draft.markdownNode=nullptr;
const auto root=add(L"All settings",allOptions,-1,TVI_ROOT);
HTREEITEM first{},selected{};
for(int page=PanelModes;page<allOptions;++page)
@@ -500,11 +531,16 @@ void filterOptions(HWND dialog,OptionsDraft &draft)
const auto addSection=[&](const wchar_t *label,int section,bool aliasMatches=false)
{
if(!wholeCategory && !aliasMatches && !matches(label)) return;
if(!category) category=add(optionsTitles[page],page,-1,root);
if(!category)
{
category=add(optionsTitles[page],page,-1,root);
if(page==previousPage && previousSection<0) selected=category;
}
const auto node=add(label,page,section,category);
if(!first) first=node;
if(page==previousPage && section==previousSection) selected=node;
if(page==PanelModes && section==WideColumns) draft.wideColumnsNode=node;
if(page==TextViewer && section==markdownSection) draft.markdownNode=node;
};
if(page==PanelModes)
{
@@ -535,6 +571,8 @@ void filterOptions(HWND dialog,OptionsDraft &draft)
{return (page==TextEditor || check.id<354) && matches(check.name);}) ||
std::any_of(std::begin(ks::files::textColorNames),std::end(ks::files::textColorNames),matches);
addSection(page==TextEditor?L"Editing and appearance":L"Viewing and appearance",0,propertyMatches);
if(page==TextViewer) addSection(L"Markdown",markdownSection,
matches(L"Maximum width") || matches(L"Full window") || matches(L"Font family") || matches(L"Font size"));
}
else
{
@@ -569,6 +607,10 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
}
SetDlgItemInt(dialog,201,sizeWidth,FALSE);
SendDlgItemMessageW(dialog,201,EM_SETLIMITTEXT,2,0);
SendDlgItemMessageW(dialog,markdownWidth,EM_SETLIMITTEXT,6,0);
SendDlgItemMessageW(dialog,markdownSize,EM_SETLIMITTEXT,2,0);
SendDlgItemMessageW(dialog,markdownFamily,EM_SETLIMITTEXT,LF_FACESIZE-1,0);
showMarkdownOptions(dialog,draft.text.markdown);
SendDlgItemMessageW(dialog,optionsSearch,EM_SETLIMITTEXT,255,0);
for(const auto &option:frameOptions)
for(DWORD value=0;value<=option.maximum;++value)
@@ -626,7 +668,12 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
{
const auto &change=*reinterpret_cast<const NMTREEVIEWW*>(lp);
if(change.hdr.code==TVN_SELCHANGEDW && change.itemNew.hItem)
showOptionsPage(dialog,*draft,static_cast<int>(change.itemNew.lParam>>8),static_cast<int>(change.itemNew.lParam&255)-1);
{
const auto page=static_cast<int>(change.itemNew.lParam>>8);
if(page!=allOptions || !GetWindowTextLengthW(GetDlgItem(dialog,optionsSearch)))
draft->location=static_cast<DWORD>(change.itemNew.lParam);
showOptionsPage(dialog,*draft,page,static_cast<int>(change.itemNew.lParam&255)-1);
}
return FALSE;
}
if(message==WM_CLOSE || (message==WM_COMMAND && LOWORD(wp)==IDCANCEL))
@@ -654,6 +701,27 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
showOptionsPage(dialog,*draft,Appearance,Font);
updateOptionsApply(dialog,*draft);
return TRUE;
case markdownWidth: case markdownSize: case markdownFamily:
if(HIWORD(wp)==EN_CHANGE)
{
draft->markdownError=readMarkdownOptions(dialog,draft->text.markdown);
updateOptionsApply(dialog,*draft);
}
return TRUE;
case markdownChoose:
{
LOGFONTW font{};
const auto &settings=draft->text.markdown;
wcsncpy_s(font.lfFaceName,settings.font.empty()?L"Segoe UI":settings.font.c_str(),_TRUNCATE);
auto size=static_cast<int>(settings.fontSize)*10;
font.lfHeight=-MulDiv(size,GetDpiForWindow(dialog),720);
if(chooseDisplayFont(dialog,font,size,72))
{
SetDlgItemTextW(dialog,markdownFamily,font.lfFaceName);
SetDlgItemInt(dialog,markdownSize,(size+5)/10,FALSE);
}
return TRUE;
}
case outerFramePadding: case innerFramePadding: case rowTextPadding:
if(HIWORD(wp)==CBN_SELCHANGE)
{
@@ -731,8 +799,10 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
draft->framePadding=defaultDialogFramePadding;
if(draft->page==allOptions || textOptionsPage(draft->page))
for(int page=TextViewer;page<=TextEditor;++page)
if(draft->page==allOptions || draft->page==page)
if(draft->page==allOptions || (draft->page==page && draft->section!=markdownSection))
draft->text.profiles[page==TextEditor]=ks::files::TextPreferences{};
if(draft->page==allOptions || (draft->page==TextViewer && (draft->section<0 || draft->section==markdownSection)))
showMarkdownOptions(dialog,ks::files::MarkdownPreferences{});
showOptionsPage(dialog,*draft,draft->page,draft->section);
updateOptionsApply(dialog,*draft);
return TRUE;
@@ -759,6 +829,14 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
case optionsApply:
case IDOK:
{
if(draft->markdownError)
{
if(!draft->markdownNode) SetDlgItemTextW(dialog,optionsSearch,L"");
TreeView_SelectItem(GetDlgItem(dialog,optionsTree),draft->markdownNode);
showFilesNotice(dialog,L"Enter a width in pixels (0 for full window) and a font size from 8 to 72 pt.",L"Markdown");
SetFocus(GetDlgItem(dialog,draft->markdownError));
return TRUE;
}
BOOL valid{};
const auto width=GetDlgItemInt(dialog,201,&valid,FALSE);
if(!valid || width<6 || width>16)
@@ -780,6 +858,16 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
const auto &base=draft->baseline;
const bool textChanged=draft->text!=base.text;
auto textSettings=ks::files::loadTextPreferences();
if(draft->text.markdown!=base.text.markdown)
{
if(textSettings.markdown!=base.text.markdown && textSettings.markdown!=draft->text.markdown)
{
showFilesNotice(dialog,L"Markdown settings changed in another window. Reopen Options before editing them again.",
L"KSwitcher Files Options");
return TRUE;
}
textSettings.markdown=draft->text.markdown;
}
for(size_t i=0;i<textSettings.profiles.size();++i)
{
if(draft->text.profiles[i]==base.text.profiles[i]) continue;
@@ -884,6 +972,7 @@ INT_PTR CALLBACK optionsDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
SendMessageW(dialogOwner,filesPreferencesChanged,reinterpret_cast<WPARAM>(owner),0);
draft->baseline=OptionsBaseline{};
draft->text=draft->baseline.text;
showMarkdownOptions(dialog,draft->text.markdown);
populateTextSchemes(dialog,draft->text);
draft->font=displayFont;
draft->points=fontPoints;
@@ -919,12 +1008,16 @@ void runOptions(HWND owner,int page)
{
OptionsDraft draft;
draft.filesWindow=GetAncestor(owner,GA_ROOTOWNER);
draft.page=page;
draft.section=textOptionsPage(page)?0:PanelLayout;
const DWORD initial=static_cast<DWORD>((page<<8)|1);
const auto saved=preference(optionsLocationKey,initial);
draft.location=(saved>>8)<=allOptions?saved:initial;
draft.page=static_cast<int>(draft.location>>8);
draft.section=static_cast<int>(draft.location&255)-1;
std::copy(std::begin(colors),std::end(colors),draft.palette.begin());
const auto result=FilesModalDialog::run(GetModuleHandleW(nullptr),MAKEINTRESOURCEW(101),owner,optionsDialog,
reinterpret_cast<LPARAM>(&draft));
if(result==-1) setStatus(L"Could not open Files Options.");
else savePreference(optionsLocationKey,draft.location);
}
void editOptions(HWND owner)
+8
View File
@@ -44,10 +44,18 @@ struct NamedTextPalette
};
inline constexpr size_t maxTextPalettes = 48;
inline constexpr size_t maxTextPaletteName = 48;
struct MarkdownPreferences
{
unsigned width{960}, fontSize{12};
std::wstring font;
bool operator==(const MarkdownPreferences &) const = default;
};
struct TextSettings
{
TextPreferencesSet profiles;
std::vector<NamedTextPalette> schemes;
MarkdownPreferences markdown;
bool operator==(const TextSettings &) const = default;
};
TextSettings loadTextPreferences();
+45 -5
View File
@@ -83,6 +83,15 @@ TextSettings loadTextPreferences()
const auto data = nlohmann::json::parse(readFile(combined, 64 * 1024));
for (size_t i = 0; i < profiles.size(); ++i)
if (data.contains(profileNames[i])) readTextProfile(profiles[i], data.at(profileNames[i]));
if (const auto markdown=data.find("markdown");markdown!=data.end() && markdown->is_object())
{
if (const auto width=markdown->find("width");width!=markdown->end() && width->is_number_unsigned() && *width<=999999)
settings.markdown.width=width->get<unsigned>();
if (const auto size=markdown->find("fontSize");size!=markdown->end() && size->is_number_unsigned() && *size>=8 && *size<=72)
settings.markdown.fontSize=size->get<unsigned>();
if (const auto family=markdown->find("font");family!=markdown->end() && family->is_string())
settings.markdown.font=wide(family->get<std::string>()).substr(0,LF_FACESIZE-1);
}
if (data.contains("schemes") && data.at("schemes").is_array())
for (const auto &entry : data.at("schemes"))
{
@@ -126,6 +135,8 @@ void saveTextPreferences(const TextSettings &settings)
auto &schemes = data["schemes"] = nlohmann::json::array();
for (const auto &scheme : settings.schemes)
schemes.push_back({{"name", utf8(scheme.name)}, {"colors", scheme.colors}});
data["markdown"]={{"width",settings.markdown.width},{"fontSize",settings.markdown.fontSize},
{"font",utf8(settings.markdown.font)}};
const auto json = data.dump(2);
atomicWrite(dataDirectory() / L"files-text.json", Bytes(json.begin(), json.end()));
}
@@ -187,7 +198,7 @@ enum Command : UINT
{
save = 1, close, findText, findNext, previousPage, nextPage, firstPage, lastPage, goToPage,
undo, redo, cut, copy, paste, selectAll, lexerAuto, lexerPlain, options, switchMode,
historyBack, historyForward,
historyBack, historyForward, findPrevious, previewEscape,
lexerStart = 1000,
};
@@ -863,6 +874,7 @@ private:
void updatePreview();
void stopPreview(bool refresh=true,bool keepBrowser=false);
void renderPreview(bool keepPosition=false);
void applyMarkdownPreferences(const MarkdownPreferences &preferences);
std::optional<FileStamp> previewFileStamp() const;
void refreshPreview();
void cancelPreviewImages();
@@ -1134,7 +1146,9 @@ void TextWindow::reloadPreferences()
return;
}
pendingPreferences = false;
auto profile = loadTextPreferences().profiles[edit];
auto settings = loadTextPreferences();
applyMarkdownPreferences(settings.markdown);
auto &profile = settings.profiles[edit];
const auto font = search.style.readFont();
const bool fontChanged = font.tenthsOfPoint != filesFont.tenthsOfPoint ||
std::memcmp(&font.font, &filesFont.font, sizeof(LOGFONTW)) != 0;
@@ -1474,6 +1488,12 @@ void TextWindow::updatePreview()
{
const bool ctrl=(GetKeyState(VK_CONTROL)&0x8000)!=0;
const bool alt=(GetKeyState(VK_MENU)&0x8000)!=0;
if(!alt && ((ctrl && key=='F') || key==VK_F3))
{
const bool shift=(GetKeyState(VK_SHIFT)&0x8000)!=0;
PostMessageW(window,WM_COMMAND,key=='F'?findText:shift?findPrevious:findNext,0);
return true;
}
if(ctrl && !alt && key==VK_TAB)
{
PostMessageW(window,cycleWindow,0,0);
@@ -1485,7 +1505,7 @@ void TextWindow::updatePreview()
return true;
}
if(key!=VK_F6 && key!=VK_ESCAPE && key!=VK_F10 && !(ctrl && key=='W')) return false;
PostMessageW(window,WM_COMMAND,key==VK_F6?switchMode:close,0);
PostMessageW(window,WM_COMMAND,key==VK_F6?switchMode:key==VK_ESCAPE?previewEscape:close,0);
return true;
}))
stopPreview();
@@ -1547,6 +1567,7 @@ std::optional<TextWindow::FileStamp> TextWindow::previewFileStamp() const
void TextWindow::renderPreview(bool keepPosition)
{
applyMarkdownPreferences(loadTextPreferences().markdown);
previewDeadline=GetTickCount64()+30000;
std::string text;
for(uint64_t index=0;index<document->pages();++index)
@@ -1560,6 +1581,13 @@ void TextWindow::renderPreview(bool keepPosition)
preview.post(wide(message.dump(-1,' ',false,nlohmann::json::error_handler_t::replace)));
}
void TextWindow::applyMarkdownPreferences(const MarkdownPreferences &preferences)
{
if(!preview.initialized()) return;
preview.post(wide(nlohmann::json{{"action","appearance"},{"width",preferences.width},
{"fontSize",preferences.fontSize},{"font",utf8(preferences.font)}}.dump()));
}
void TextWindow::refreshPreview()
{
if(remote || !previewVisible || navigation.valid() || GetTickCount64()<nextFileCheck) return;
@@ -1918,8 +1946,20 @@ void TextWindow::command(UINT id)
reinterpret_cast<LPARAM>(&prompt)) == IDOK) go(prompt.page);
return;
}
case findText: openFind(); return;
case findNext: find((search.flags & FR_DOWN) != 0, search.flags); return;
case findText:
if(previewVisible) preview.post(L"{\"action\":\"find\"}");
else openFind();
return;
case findNext:
case findPrevious:
if(previewVisible)
preview.post(id==findNext?L"{\"action\":\"find-next\"}":L"{\"action\":\"find-next\",\"previous\":true}");
else if(id==findNext) find((search.flags & FR_DOWN) != 0, search.flags);
return;
case previewEscape:
if(previewVisible) preview.post(L"{\"action\":\"escape\"}");
else requestClose();
return;
case undo: if (edit) send(SCI_UNDO); return;
case redo: if (edit) send(SCI_REDO); return;
case cut: if (edit) send(SCI_CUT); return;
+2
View File
@@ -38,6 +38,8 @@ bool shouldElevateOnLaunch()
int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
{
// Inherited by unattended children such as the LAN PowerShell process.
SetErrorMode(GetErrorMode() | SEM_FAILCRITICALERRORS);
CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
int argc{};
auto argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+1 -1
View File
@@ -2,7 +2,7 @@
#include "platform.h"
namespace ks
{
inline constexpr wchar_t AppVersion[] = L"0.6.101";
inline constexpr wchar_t AppVersion[] = L"0.6.104";
inline constexpr UINT UpdateMessage = WM_APP + 7;
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
+45
View File
@@ -296,6 +296,51 @@ try {
}
Write-Output 'Verified Enter from the terminal WebView runs the command exactly once.'
Select-Row $left '[Test folder]'
$outputSelection = 'terminal-output-copy-fixture'
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()
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
}
$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
}
& $Node (Join-Path $PSScriptRoot 'files_markdown_browser.mjs') $port 'terminal-select-output'
if($LASTEXITCODE){throw 'Could not select the terminal output fixture.'}
Wait-Until 'focus returned to the command line after selecting terminal output' {
[FilesActivationUi]::Focus($window) -eq $inputBox
}
foreach($key in '^c','^{INSERT}') {
[Windows.Forms.Clipboard]::SetText($webviewDraft)
$keys.SendKeys($key)
Wait-Until "$key copying only the selected terminal output with a command present" {
[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'
}
} 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() }
}
}
Write-Output 'Verified Ctrl+C and Ctrl+Insert copy the selected output, then fall back to the command line or panel.'
& $Node (Join-Path $PSScriptRoot 'files_markdown_browser.mjs') $port 'terminal-enter'
if($LASTEXITCODE){throw 'Could not send Enter through the terminal WebView.'}
Wait-Until 'Enter from the terminal opening the selected folder in the pane' {
+54 -3
View File
@@ -1,6 +1,7 @@
param(
[Parameter(Mandatory)][string]$Executable,
[string]$Screenshot,
[string]$SearchScreenshot,
[string]$Node = 'node',
[string]$LanFixture
)
@@ -104,7 +105,7 @@ $docs = Join-Path $root 'docs'
$profileCaptured = $false
$profile = [Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Software\KSwitcher\Files')
$saved = @{}
$profileValues = 'LeftPath','RightPath','LeftCursor','RightCursor','WindowPlacement'
$profileValues = 'LeftPath','RightPath','LeftCursor','RightCursor','WindowPlacement','OptionsLocation'
$process = $null
$flags = $env:WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS
$data = $env:WEBVIEW2_USER_DATA_FOLDER
@@ -117,13 +118,25 @@ try {
| Header |
| ------ |
| Cell |
| <span id="nowrap-cell" style="white-space: nowrap; color: red; position: fixed" onclick="void 0">In Development</span> |
<table id="html-table">
<caption>Raw HTML table</caption>
<tr><th colspan="2">Priority</th></tr>
<tr><td><strong>Highest</strong></td><td>—</td></tr>
</table>
- [ ] Pending
- [x] Complete
## Збіг пошуку
Рядок для **збіг пошуку**.
![Relative image](images/tiny%20image.png)
![Missing image](images/missing.png)
[Child](child/Other.md#target-heading)
<img alt="HTML relative image" src="images/tiny%20image.png">
<a href="child/Other.md#target-heading">Child</a>
~~~mermaid
flowchart TD
@@ -160,7 +173,7 @@ const value = 42;
$profileCaptured = $true
$profile.SetValue('LeftPath',$docs)
$profile.SetValue('RightPath',$docs)
foreach ($name in 'LeftCursor','RightCursor','WindowPlacement') { $profile.DeleteValue($name,$false) }
foreach ($name in 'LeftCursor','RightCursor','WindowPlacement','OptionsLocation') { $profile.DeleteValue($name,$false) }
$listener = [Net.Sockets.TcpListener]::new([Net.IPAddress]::Loopback,0)
$listener.Start()
@@ -179,6 +192,40 @@ const value = 42;
throw 'F3 showed the source text while starting the Markdown preview.'
}
Browser 'render' $Screenshot
Post $window 0x111 3
Browser 'search-menu'
Browser 'search' $SearchScreenshot
Post $main 0x111 133
$options = Wait-For 'the shared Files Options dialog' { Find-Window '#32770' 'KSwitcher Files Options' }
[void][MarkdownUi]::SendText([MarkdownUi]::GetDlgItem($options,270),0x0C,0,'Markdown')
[void](Wait-For 'the Markdown settings section' { [MarkdownUi]::IsWindowVisible([MarkdownUi]::GetDlgItem($options,374)) })
foreach($field in @(@(374,'1200'),@(376,'Georgia'),@(379,'18'))){
[void][MarkdownUi]::SendText([MarkdownUi]::GetDlgItem($options,$field[0]),0x0C,0,$field[1])
}
Post $options 0x111 1
[void](Wait-For 'Options to close after saving Markdown settings' { ![MarkdownUi]::IsWindowVisible($options) })
Browser 'appearance-width'
Post $main 0x111 133
$options = Wait-For 'reopened Files Options' { Find-Window '#32770' 'KSwitcher Files Options' }
if (![MarkdownUi]::IsWindowVisible([MarkdownUi]::GetDlgItem($options,374))) {
throw 'Files Options did not restore its last section.'
}
[void][MarkdownUi]::SendText([MarkdownUi]::GetDlgItem($options,374),0x0C,0,'0')
Post $options 0x111 2
[void](Wait-For 'Options to close on Cancel' { ![MarkdownUi]::IsWindowVisible($options) })
Browser 'appearance-width'
Post $main 0x111 133
$options = Wait-For 'Files Options after Cancel' { Find-Window '#32770' 'KSwitcher Files Options' }
if (![MarkdownUi]::IsWindowVisible([MarkdownUi]::GetDlgItem($options,374))) {
throw 'Cancel did not preserve the last Options section.'
}
[void][MarkdownUi]::SendText([MarkdownUi]::GetDlgItem($options,374),0x0C,0,'0')
Post $options 0x111 1
[void](Wait-For 'Options to close after saving full width' { ![MarkdownUi]::IsWindowVisible($options) })
Browser 'appearance-full'
Write-Output 'Verified live Markdown width and font settings, Cancel and reopening the last Options section.'
if ([IO.File]::ReadAllText($original) -cne $fixture) { throw 'Checking a task modified the read-only file.' }
[IO.File]::WriteAllText($original,($fixture.Replace('Перегляд Markdown','Зміна на диску')))
Browser 'Зміна на диску' '' 'Preview.md'
@@ -196,6 +243,7 @@ const value = 42;
Wait-Foreground $main
[MarkdownUi]::CycleWindow()
Wait-Foreground $window
Write-Output 'Verified Ctrl+Tab between Files and the Markdown editor.'
$control = Scintilla $window
if ([MarkdownUi]::Send($control,2140,0,0).ToInt64()) { throw 'The editor is read-only.' }
Append-Character $control 'X'
@@ -216,6 +264,7 @@ const value = 42;
$child = Wait-For 'the Shift+click Markdown window' { Find-Window 'KSwitcher.Files.Text' 'Other.md' $window }
Browser 'Linked Markdown' '' 'Other.md'
[MarkdownUi]::Activate($child)
Wait-Foreground $child
Browser 'cycle' '' 'Other.md'
Wait-Foreground $main
[MarkdownUi]::CycleWindow()
@@ -247,6 +296,7 @@ const value = 42;
Post $control 0x100 0x75
Answer-Save 6
Browser 'Перегляд Markdown'
Browser 'appearance-full'
if (![IO.File]::ReadAllText($original).EndsWith('Y')) { throw 'F6 rendered before saving.' }
Post $window 0x10 0
[void](Wait-For 'the saved Markdown viewer to close' { !(Find-Window 'KSwitcher.Files.Text') })
@@ -314,6 +364,7 @@ const value = 42;
$process = Start-Process -FilePath $lanExe -ArgumentList ('"{0}"' -f $original) -PassThru -WindowStyle Normal
$window = Wait-For 'the LAN Markdown viewer' { Find-Window 'KSwitcher.Files.Text' 'Loopback peer' }
Browser 'render'
Browser 'search'
Browser 'edit'
if ((Wait-For 'LAN F6 editor' { Find-Window 'KSwitcher.Files.Text' 'Editor' }) -ne $window) {
throw 'LAN F6 changed windows.'
+111 -8
View File
@@ -3,6 +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);
let socket;
const pending = new Map();
let sequence = 0;
@@ -38,10 +39,16 @@ async function evaluate(expression) {
return reply.result.value;
}
async function pressKey(key, code, windowsVirtualKeyCode, modifiers = 0) {
const params = { key, code, windowsVirtualKeyCode, modifiers };
await command('Input.dispatchKeyEvent', { type: 'keyDown', ...params });
await command('Input.dispatchKeyEvent', { type: 'keyUp', ...params });
}
const target = await waitFor(async () => {
const response = await fetch('http://127.0.0.1:' + port + '/json/list').catch(() => null);
if (!response?.ok) return;
const url = scenario === 'terminal-enter'
const url = terminalScenario
? 'https://kswitcher-terminal.invalid/index.html'
: 'https://kswitcher-markdown.invalid/markdown.html';
return (await response.json()).find(item => item.url === url &&
@@ -62,10 +69,25 @@ await new Promise((resolve, reject) => {
});
try {
if (scenario === 'terminal-enter') {
if (scenario === 'terminal-select-output') {
const selection = await waitFor(() => evaluate(`(() => {
const marker = 'terminal-output-copy-fixture';
const buffer = terminal.buffer.active;
for (let row = buffer.viewportY; row < buffer.viewportY + terminal.rows; row++) {
if (buffer.getLine(row)?.translateToString(true) !== marker) continue;
terminal.select(0, row, marker.length);
document.querySelector('#terminal').dispatchEvent(new PointerEvent('pointerup', { bubbles:true }));
return terminal.getSelection();
}
})()`), 'the terminal output fixture');
assert.equal(selection, 'terminal-output-copy-fixture');
} else if (terminalScenario) {
await evaluate('document.querySelector(".xterm-helper-textarea").focus()');
await command('Input.dispatchKeyEvent', { type:'keyDown', key:'Enter', code:'Enter', windowsVirtualKeyCode:13 });
await command('Input.dispatchKeyEvent', { type:'keyUp', key:'Enter', code:'Enter', windowsVirtualKeyCode:13 });
const key = scenario === 'terminal-copy'
? { key:'Insert', code:'Insert', modifiers:2, windowsVirtualKeyCode:45 }
: { key:'Enter', code:'Enter', windowsVirtualKeyCode:13 };
await command('Input.dispatchKeyEvent', { type:'keyDown', ...key });
await command('Input.dispatchKeyEvent', { type:'keyUp', ...key });
} else if (scenario === 'render') {
await waitFor(() => evaluate(`document.documentElement?.classList.contains('rendered') &&
!!document.querySelector('figure svg') &&
@@ -76,6 +98,18 @@ try {
return style.borderTopWidth === '0px' && style.backgroundColor === 'rgba(0, 0, 0, 0)';
})`), true);
assert.equal(await evaluate(`document.querySelector('td').textContent`), 'Cell');
assert.deepEqual(await evaluate(`(() => {
const span = document.querySelector('td #nowrap-cell');
return span && [span.textContent, getComputedStyle(span).whiteSpace,
getComputedStyle(span).color, span.style.position, span.hasAttribute('onclick')];
})()`), ['In Development', 'nowrap', 'rgb(255, 0, 0)', '', false]);
assert.deepEqual(await evaluate(`(() => {
const table = document.querySelector('#html-table');
return table && [table.caption.textContent, table.querySelector('th').colSpan,
table.querySelector('td strong').textContent];
})()`), ['Raw HTML table', 2, 'Highest']);
await waitFor(() => evaluate(`document.querySelector('img[alt="HTML relative image"]')?.naturalWidth === 1`),
'the relative image in HTML');
assert.equal(await evaluate(`document.querySelector('figure svg').getBoundingClientRect().height > 0`), true);
assert.equal(await evaluate(`document.querySelector('figure svg').textContent.includes('Render target')`), true);
assert.equal(await evaluate(`!!document.querySelector('pre code.language-mermaid') &&
@@ -85,13 +119,82 @@ try {
.every(entry => entry.name.startsWith(location.origin + '/') || entry.name.startsWith('data:'))`), true);
await waitFor(() => evaluate(`document.querySelector('img[alt="Missing image"]')?.title === 'Image unavailable'`),
'missing image feedback');
assert.deepEqual(await evaluate(`[...document.querySelectorAll('input')].map(box => box.checked)`), [false, true]);
assert.deepEqual(await evaluate(`[...document.querySelectorAll('input')].map(box => { box.click(); return box.checked; })`), [true, false]);
assert.deepEqual(await evaluate(`[...document.querySelectorAll('input')].map(box => { box.click(); return box.checked; })`), [false, true]);
assert.deepEqual(await evaluate(`[...document.querySelectorAll('main input')].map(box => box.checked)`), [false, true]);
assert.deepEqual(await evaluate(`[...document.querySelectorAll('main input')].map(box => { box.click(); return box.checked; })`), [true, false]);
assert.deepEqual(await evaluate(`[...document.querySelectorAll('main input')].map(box => { box.click(); return box.checked; })`), [false, true]);
if (artifact) {
const { data } = await command('Page.captureScreenshot');
const { cssContentSize } = await command('Page.getLayoutMetrics');
const { data } = await command('Page.captureScreenshot', { captureBeyondViewport: true,
clip: { x:0, y:0, width:cssContentSize.width, height:Math.min(cssContentSize.height, 620), scale:1 } });
await writeFile(artifact, Buffer.from(data, 'base64'));
}
} else if (scenario === 'search-menu' || scenario === 'search') {
const searchFocused = 'document.activeElement === document.getElementById("search-query")';
const searchClosed = 'document.getElementById("search").hidden';
if (scenario === 'search-menu') {
await waitFor(() => evaluate(searchFocused), 'the viewer menu opening rendered Markdown search');
await pressKey('Escape', 'Escape', 27);
await waitFor(() => evaluate(searchClosed), 'Escape closing only the search');
} else {
await pressKey('f', 'KeyF', 70, 2);
await waitFor(() => evaluate(searchFocused), 'Ctrl+F opening search and focusing the search field');
const status = 'document.getElementById("search-status").value';
const active = '[...(CSS.highlights.get("markdown-search-active") || [])][0]?.toString()';
const query = async text => {
await evaluate('document.getElementById("search-query").select()');
await command('Input.insertText', { text });
};
await query('ЗБІГ ПОШУКУ');
assert.equal(await evaluate(status), '1 / 2');
const toolbar = await evaluate(`({
queryWidth: document.getElementById('search-query').getBoundingClientRect().width,
closeRight: document.getElementById('search-close').getBoundingClientRect().right,
viewportWidth: document.documentElement.clientWidth
})`);
assert.ok(toolbar.queryWidth >= 100 && toolbar.closeRight <= toolbar.viewportWidth,
'The search controls must fit the viewer: ' + JSON.stringify(toolbar));
assert.equal(await evaluate(active), 'Збіг пошуку');
await pressKey('Enter', 'Enter', 13);
assert.equal(await evaluate(status), '2 / 2');
assert.equal(await evaluate(active), 'збіг пошуку');
await pressKey('F3', 'F3', 114);
assert.equal(await evaluate(status), '1 / 2');
await pressKey('Enter', 'Enter', 13, 8);
assert.equal(await evaluate(status), '2 / 2');
await pressKey('F3', 'F3', 114, 8);
assert.equal(await evaluate(status), '1 / 2');
await evaluate('document.getElementById("search-previous").click()');
assert.equal(await evaluate(status), '2 / 2');
await evaluate('document.getElementById("search-next").click()');
assert.equal(await evaluate(status), '1 / 2');
if (artifact) {
const { data } = await command('Page.captureScreenshot');
await writeFile(artifact, Buffer.from(data, 'base64'));
}
await query('для збіг пошуку');
assert.equal(await evaluate(status), '1 / 1');
assert.equal(await evaluate(active), 'для збіг пошуку');
await query('RENDER TARGET');
assert.equal(await evaluate(status), '1 / 1');
assert.equal(await evaluate(active), 'Render target');
await query('[no matches]');
assert.equal(await evaluate(status), 'No matches');
assert.equal(await evaluate(active), undefined);
await pressKey('Escape', 'Escape', 27);
assert.equal(await evaluate(searchClosed), true);
assert.equal(await evaluate('document.documentElement.classList.contains("rendered")'), true);
await evaluate('document.getElementById("search-open").click()');
assert.equal(await evaluate(searchFocused), true);
await evaluate('document.getElementById("search-close").click()');
assert.equal(await evaluate(searchClosed), true);
}
} else if (scenario === 'appearance-width' || scenario === 'appearance-full') {
const width = scenario === 'appearance-full' ? 'none' : '1200px';
await waitFor(() => evaluate(`(() => {
const text = getComputedStyle(document.querySelector('main'));
return getComputedStyle(document.body).maxWidth === ${JSON.stringify(width)} &&
text.fontSize === '24px' && text.fontFamily.startsWith('Georgia,');
})()`), 'the saved Markdown width, font family and font size');
} else if (scenario === 'edit') {
await command('Input.dispatchKeyEvent', { type: 'keyDown', key: 'F6', code: 'F6', windowsVirtualKeyCode: 117 });
} else if (['follow', 'shift-follow', 'ctrl-follow'].includes(scenario)) {