Add Files shortcuts and unified Options

Refs #12
This commit is contained in:
agrynco committed 2026-11-14 10:44:54 +02:00
1 parent 4b144dad2f
commit ff2ebb0117
11 files changed
+752 -179

No files matched your search

+57 -16
View File
@@ -141,6 +141,8 @@ ULONG_PTR snippetReplayMarker()
static const char marker{};
return reinterpret_cast<ULONG_PTR>(&marker);
}
constexpr int OpenFiles = 25, FilesHotkeyFirst = 0x4B10, FilesHotkeySecond = 0x4B11;
std::vector<std::pair<int, std::wstring>> shortcuts(const Settings &s)
{
std::vector<std::pair<int, std::wstring>> out{{Toggle, s.toggle},
@@ -681,6 +683,7 @@ App::App(HINSTANCE h, bool test, const std::filesystem::path &dataRoot, HWND ser
}
App::~App()
{
if (filesHotkeyId) UnregisterHotKey(window, filesHotkeyId);
if (snippetPopup) DestroyWindow(snippetPopup);
lanService.reset();
stopBrowserChatMonitor();
@@ -854,6 +857,19 @@ bool App::registerHotkeys(const Settings &s, bool rollback)
registrationWarning = L"Keyboard interception could not start.";
return false;
}
const auto files = Hotkey::parse(s.filesHotkey.value_or(L"")).value_or(Hotkey{});
if (files != registeredFilesHotkey)
{
const int next = filesHotkeyId == FilesHotkeyFirst ? FilesHotkeySecond : FilesHotkeyFirst;
if (files.key && !RegisterHotKey(window, next, files.modifiers | MOD_NOREPEAT, files.key))
{
if (!rollback) registrationWarning = L"The KSwitcher Files shortcut is unavailable. Choose another shortcut.";
return false;
}
if (filesHotkeyId) UnregisterHotKey(window, filesHotkeyId);
filesHotkeyId = files.key ? next : 0;
registeredFilesHotkey = files;
}
hookBindings = std::move(bindings);
return true;
}
@@ -1022,6 +1038,7 @@ void App::setHotkeyCapture(HWND field)
}
bool App::isHotkey(DWORD key, UINT mods)
{
if (registeredFilesHotkey.key && registeredFilesHotkey.key == key && registeredFilesHotkey.modifiers == mods) return true;
for (auto &[id, text] : shortcuts(settings))
{
auto h = Hotkey::parse(text);
@@ -1964,6 +1981,20 @@ void App::dispatch(int command)
try
{
if (command == 23) { checkUpdate(true); return; }
if (command == OpenFiles)
{
auto path = std::filesystem::path(executable()).parent_path() / L"KSwitcher.Files.exe";
auto args = L"\"" + path.wstring() + L"\"";
STARTUPINFOW startup{sizeof(startup)};
PROCESS_INFORMATION process{};
if (!CreateProcessW(path.c_str(), args.data(), nullptr, nullptr, FALSE, 0, nullptr,
path.parent_path().c_str(), &startup, &process))
throw std::runtime_error(utf8(lastError(L"Cannot start KSwitcher Files")));
AllowSetForegroundWindow(process.dwProcessId);
CloseHandle(process.hThread);
CloseHandle(process.hProcess);
return;
}
if (command == Screenshot)
{
if (!busy) { resetInput(); launchScreenshot(*this); }
@@ -2769,7 +2800,7 @@ void App::trayMenu()
AppendMenuW(menu, MF_STRING, 10, L"Clipboard &history");
AppendMenuW(menu, MF_STRING, 24, L"&Capture screen region…");
AppendMenuW(menu, MF_STRING, 11, L"&Settings…");
AppendMenuW(menu, MF_STRING, 25, L"&Files…");
AppendMenuW(menu, MF_STRING, OpenFiles, L"&Files…");
SetMenuDefaultItem(menu, 11, FALSE);
AppendMenuW(menu, MF_STRING, 12, L"S&nippets…");
AppendMenuW(menu, MF_STRING, 13, L"&Keyboard shortcuts…");
@@ -2822,20 +2853,9 @@ void App::trayMenu()
}
switch (cmd)
{
case 25:
{
auto path = std::filesystem::path(executable()).parent_path() / L"KSwitcher.Files.exe";
auto command = L"\"" + path.wstring() + L"\"";
STARTUPINFOW startup{sizeof(startup)};
PROCESS_INFORMATION process{};
if (!CreateProcessW(path.c_str(), command.data(), nullptr, nullptr, FALSE, 0, nullptr,
path.parent_path().c_str(), &startup, &process))
throw std::runtime_error(utf8(lastError(L"Cannot start KSwitcher Files")));
AllowSetForegroundWindow(process.dwProcessId);
CloseHandle(process.hThread);
CloseHandle(process.hProcess);
case OpenFiles:
dispatch(OpenFiles);
break;
}
case 24:
dispatch(Screenshot);
break;
@@ -3015,7 +3035,11 @@ LRESULT CALLBACK App::windowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
return 0;
}
case WM_HOTKEY:
app->dispatch((int)wp);
if (app->filesHotkeyId && wp == static_cast<WPARAM>(app->filesHotkeyId))
{
app->dispatch(OpenFiles);
}
else if (wp != FilesHotkeyFirst && wp != FilesHotkeySecond) app->dispatch((int)wp);
return 0;
case MouseActionMessage:
app->dispatchMouseActions();
@@ -3341,7 +3365,24 @@ int App::execute()
}
keyboardHook = SetWindowsHookExW(WH_KEYBOARD_LL, keyProc, instance, 0);
mouseHook = SetWindowsHookExW(WH_MOUSE_LL, mouseProc, instance, 0);
registerHotkeys(settings);
const bool useDefaultFilesHotkey = !settings.filesHotkey;
if (useDefaultFilesHotkey)
{
const auto fallback = *Hotkey::parse(L"Ctrl+Alt+F");
const auto bindings = shortcuts(settings);
const bool conflict = std::any_of(bindings.begin(), bindings.end(), [&](const auto &binding)
{
return Hotkey::parse(binding.second) == fallback;
});
settings.filesHotkey = conflict ? L"" : L"Ctrl+Alt+F";
}
if (!registerHotkeys(settings) && settings.filesHotkey && !settings.filesHotkey->empty())
{
if (useDefaultFilesHotkey) settings.filesHotkey = L"";
auto fallback = settings;
fallback.filesHotkey = L"";
registerHotkeys(fallback, true);
}
if (!keyboardHook || !mouseHook)
report(L"Input tracking could not start. Automatic recent-text conversion is unavailable.");
AddClipboardFormatListener(window);