mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-09-02 20:18:53 +02:00
## Summary of the Pull Request Adds configurable Windows-key hold activation to Shortcut Guide while keeping the regular activation shortcut independent. Users can choose to disable Windows-key activation, show taskbar indicators, or open the full Shortcut Guide. Full-guide mode also supports a configurable hold duration and optional close-on-release behavior. <img width="1099" height="611" alt="image" src="https://github.com/user-attachments/assets/e0fe4c0f-3bef-43f8-a526-d22caf9e484e" /> ## PR Checklist - [ ] Closes: N/A - [x] **Communication:** The UX and behavior were discussed before implementation - [x] **Tests:** Added/updated and all pass - [x] **Localization:** All end-user-facing strings can be localized - [x] **Dev docs:** Added/updated - [ ] **New binaries:** Not applicable - [ ] **Documentation updated:** Not applicable ## Detailed Description of the Pull Request / Additional comments - Adds Off, taskbar-indicator, and full-guide Windows-key actions to Settings. - Adds a 100–5,000 ms hold-duration setting and a full-guide close-on-release option. - Handles left and right Windows keys and suppresses Start after an activated hold. - Routes Windows-key holds through a dedicated event so custom activation shortcuts remain independent. - Clears previous pressed-key registrations before refreshing them to prevent duplicate long-press callbacks. - Preserves compatibility with the existing `press_time` setting and documents the new options. ## Validation Steps Performed - Built the affected ARM64 Debug Settings, Runner, Shortcut Guide module-interface, and Shortcut Guide UI projects. - `ShortcutGuide.UnitTests`: 7/7 passed. - Targeted Settings tests: 12/12 passed. - Manually verified Off, taskbar-indicator, full-guide close-on-release, and full-guide persistent modes. - Verified configured hold thresholds, both Windows keys, Start suppression, and regular-shortcut independence. - Validated the final Settings XAML layout in the running Settings app. --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Muyuan Li (from Dev Box) <muyuanli@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2b3acca3-e49b-4936-8fb9-6f669bd449db
354 lines
10 KiB
C++
354 lines
10 KiB
C++
// dllmain.cpp : Defines the entry point for the DLL application.
|
|
#include "pch.h"
|
|
|
|
#include <mutex>
|
|
#include <common/SettingsAPI/settings_helpers.h>
|
|
#include <common/utils/winapi_error.h>
|
|
#include <common/utils/logger_helper.h>
|
|
#include <common/interop/shared_constants.h>
|
|
|
|
#include "../interface/powertoy_module_interface.h"
|
|
#include "Generated Files/resource.h"
|
|
#include <common/SettingsAPI/settings_objects.h>
|
|
|
|
BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD /*ul_reason_for_call*/, LPVOID /*lpReserved*/)
|
|
{
|
|
return TRUE;
|
|
}
|
|
|
|
class ShortcutGuideModule : public PowertoyModuleIface
|
|
{
|
|
public:
|
|
ShortcutGuideModule()
|
|
{
|
|
app_name = GET_RESOURCE_STRING(IDS_SHORTCUT_GUIDE);
|
|
app_key = L"Shortcut Guide";
|
|
LoggerHelpers::init_logger(app_key, L"ModuleInterface", LogSettings::shortcutGuideLoggerName);
|
|
|
|
std::filesystem::path oldLogPath(PTSettingsHelper::get_module_save_folder_location(app_key));
|
|
oldLogPath.append("ShortcutGuideLogs");
|
|
LoggerHelpers::delete_old_log_folder(oldLogPath);
|
|
|
|
exitEvent = CreateEvent(nullptr, false, false, CommonSharedConstants::SHORTCUT_GUIDE_EXIT_EVENT);
|
|
if (!exitEvent)
|
|
{
|
|
Logger::warn(L"Failed to create {} event. {}", CommonSharedConstants::SHORTCUT_GUIDE_EXIT_EVENT, get_last_error_or_default(GetLastError()));
|
|
}
|
|
|
|
triggerEvent = CreateEvent(nullptr, false, false, CommonSharedConstants::SHORTCUT_GUIDE_TRIGGER_EVENT);
|
|
if (!triggerEvent)
|
|
{
|
|
Logger::warn(L"Failed to create {} event. {}", CommonSharedConstants::SHORTCUT_GUIDE_TRIGGER_EVENT, get_last_error_or_default(GetLastError()));
|
|
}
|
|
|
|
InitSettings();
|
|
}
|
|
|
|
virtual const wchar_t* get_name() override
|
|
{
|
|
return app_name.c_str();
|
|
}
|
|
|
|
virtual const wchar_t* get_key() override
|
|
{
|
|
return app_key.c_str();
|
|
}
|
|
|
|
// Return the configured status for the gpo policy for the module
|
|
virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
|
|
{
|
|
return powertoys_gpo::getConfiguredShortcutGuideEnabledValue();
|
|
}
|
|
|
|
virtual bool get_config(wchar_t* buffer, int* buffer_size) override
|
|
{
|
|
HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
|
|
PowerToysSettings::Settings settings(hinstance, get_name());
|
|
return settings.serialize_to_buffer(buffer, buffer_size);
|
|
}
|
|
|
|
virtual void set_config(const wchar_t* config) override
|
|
{
|
|
Logger::trace("set_config()");
|
|
try
|
|
{
|
|
// Parse the input JSON string.
|
|
PowerToysSettings::PowerToyValues values =
|
|
PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
|
|
|
|
ParseSettings(values);
|
|
}
|
|
catch (std::exception& ex)
|
|
{
|
|
Logger::error("Failed to parse settings. {}", ex.what());
|
|
}
|
|
}
|
|
|
|
virtual void enable() override
|
|
{
|
|
Logger::info("Shortcut Guide is enabling");
|
|
|
|
if (!_enabled)
|
|
{
|
|
_enabled = true;
|
|
StartProcess();
|
|
}
|
|
else
|
|
{
|
|
Logger::warn("Shortcut guide is already enabled");
|
|
}
|
|
}
|
|
|
|
virtual void disable() override
|
|
{
|
|
Logger::info("ShortcutGuideModule::disable()");
|
|
if (_enabled)
|
|
{
|
|
_enabled = false;
|
|
if (IsProcessActive())
|
|
{
|
|
TerminateProcess(m_hProcess, 0);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Logger::warn("Shortcut Guide is already disabled");
|
|
}
|
|
}
|
|
|
|
virtual bool is_enabled() override
|
|
{
|
|
return _enabled;
|
|
}
|
|
|
|
virtual void destroy() override
|
|
{
|
|
this->disable();
|
|
if (exitEvent)
|
|
{
|
|
CloseHandle(exitEvent);
|
|
}
|
|
if (triggerEvent)
|
|
{
|
|
CloseHandle(triggerEvent);
|
|
}
|
|
|
|
delete this;
|
|
}
|
|
|
|
virtual std::optional<HotkeyEx> GetHotkeyEx() override
|
|
{
|
|
Logger::trace("GetHotkeyEx()");
|
|
return m_hotkey;
|
|
}
|
|
|
|
virtual void OnHotkeyEx() override
|
|
{
|
|
Logger::trace("OnHotkeyEx()");
|
|
if (!_enabled)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (!IsProcessActive())
|
|
{
|
|
StartProcess();
|
|
}
|
|
|
|
SetEvent(triggerEvent);
|
|
}
|
|
|
|
virtual void send_settings_telemetry() override
|
|
{
|
|
Logger::trace("Send settings telemetry");
|
|
if (!StartProcess(L"telemetry"))
|
|
{
|
|
Logger::error("Failed to create a process to send settings telemetry");
|
|
}
|
|
}
|
|
virtual bool keep_track_of_pressed_win_key() override { return true; }
|
|
virtual UINT milliseconds_win_key_must_be_pressed() override { return m_millisecondsWinKeyPressTimeForGlobalWindowsShortcuts; }
|
|
|
|
private:
|
|
std::wstring app_name;
|
|
//contains the non localized key of the powertoy
|
|
std::wstring app_key;
|
|
bool _enabled = false;
|
|
HANDLE m_hProcess = nullptr;
|
|
|
|
// Hotkey to invoke the module
|
|
HotkeyEx m_hotkey;
|
|
|
|
// If the module should be activated through the legacy pressing windows key behavior.
|
|
const UINT DEFAULT_MILLISECONDS_WIN_KEY_PRESS_TIME_FOR_GLOBAL_WINDOWS_SHORTCUTS = 900;
|
|
const UINT DEFAULT_MILLISECONDS_WIN_KEY_PRESS_TIME_FOR_TASKBAR_ICON_SHORTCUTS = 900;
|
|
UINT m_millisecondsWinKeyPressTimeForGlobalWindowsShortcuts = DEFAULT_MILLISECONDS_WIN_KEY_PRESS_TIME_FOR_GLOBAL_WINDOWS_SHORTCUTS;
|
|
UINT m_millisecondsWinKeyPressTimeForTaskbarIconShortcuts = DEFAULT_MILLISECONDS_WIN_KEY_PRESS_TIME_FOR_TASKBAR_ICON_SHORTCUTS;
|
|
|
|
HANDLE triggerEvent;
|
|
HANDLE exitEvent;
|
|
|
|
bool StartProcess(std::wstring args = L"")
|
|
{
|
|
if (exitEvent)
|
|
{
|
|
ResetEvent(exitEvent);
|
|
}
|
|
|
|
if (triggerEvent)
|
|
{
|
|
ResetEvent(triggerEvent);
|
|
}
|
|
|
|
unsigned long powertoys_pid = GetCurrentProcessId();
|
|
std::wstring executable_args = L"";
|
|
executable_args.append(std::to_wstring(powertoys_pid));
|
|
if (!args.empty())
|
|
{
|
|
executable_args.append(L" ");
|
|
executable_args.append(args);
|
|
}
|
|
|
|
SHELLEXECUTEINFOW sei{ sizeof(sei) };
|
|
sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
|
|
sei.lpFile = L"WinUI3Apps\\PowerToys.ShortcutGuide.exe";
|
|
sei.nShow = SW_SHOWNORMAL;
|
|
sei.lpParameters = executable_args.data();
|
|
if (ShellExecuteExW(&sei) == false)
|
|
{
|
|
Logger::error(L"Failed to start SG process. {}", get_last_error_or_default(GetLastError()));
|
|
auto message = get_last_error_message(GetLastError());
|
|
if (message.has_value())
|
|
{
|
|
Logger::error(message.value());
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
Logger::trace(L"Started SG process with pid={}", GetProcessId(sei.hProcess));
|
|
m_hProcess = sei.hProcess;
|
|
return true;
|
|
}
|
|
|
|
bool IsProcessActive()
|
|
{
|
|
if (!m_hProcess)
|
|
{
|
|
return false;
|
|
}
|
|
auto result = WaitForSingleObject(m_hProcess, 0);
|
|
if (result == WAIT_FAILED)
|
|
{
|
|
Logger::error("Failed to wait for SG process.");
|
|
}
|
|
return result == WAIT_TIMEOUT;
|
|
}
|
|
|
|
void InitSettings()
|
|
{
|
|
try
|
|
{
|
|
PowerToysSettings::PowerToyValues settings =
|
|
PowerToysSettings::PowerToyValues::load_from_settings_file(app_key);
|
|
|
|
ParseSettings(settings);
|
|
}
|
|
catch (std::exception& ex)
|
|
{
|
|
Logger::error("Failed to init settings. {}", ex.what());
|
|
}
|
|
catch (...)
|
|
{
|
|
Logger::error("Failed to init settings");
|
|
}
|
|
}
|
|
|
|
void ParseSettings(PowerToysSettings::PowerToyValues& settings)
|
|
{
|
|
auto settingsObject = settings.get_raw_json();
|
|
if (settingsObject.GetView().Size())
|
|
{
|
|
try
|
|
{
|
|
// Parse HotKey
|
|
auto jsonHotkeyObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"open_shortcutguide");
|
|
auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonHotkeyObject);
|
|
m_hotkey = HotkeyEx();
|
|
if (hotkey.win_pressed())
|
|
{
|
|
m_hotkey.modifiersMask |= MOD_WIN;
|
|
}
|
|
|
|
if (hotkey.ctrl_pressed())
|
|
{
|
|
m_hotkey.modifiersMask |= MOD_CONTROL;
|
|
}
|
|
|
|
if (hotkey.shift_pressed())
|
|
{
|
|
m_hotkey.modifiersMask |= MOD_SHIFT;
|
|
}
|
|
|
|
if (hotkey.alt_pressed())
|
|
{
|
|
m_hotkey.modifiersMask |= MOD_ALT;
|
|
}
|
|
|
|
m_hotkey.vkCode = static_cast<WORD>(hotkey.get_code());
|
|
}
|
|
catch (...)
|
|
{
|
|
Logger::warn("Failed to initialize Shortcut Guide start shortcut");
|
|
}
|
|
|
|
try
|
|
{
|
|
auto propertiesObject = settingsObject.GetNamedObject(L"properties");
|
|
if (propertiesObject.HasKey(L"press_time"))
|
|
{
|
|
auto jsonDurationObject = propertiesObject.GetNamedObject(L"press_time");
|
|
if (jsonDurationObject.HasKey(L"value"))
|
|
{
|
|
auto pressTime = static_cast<UINT>(jsonDurationObject.GetNamedNumber(L"value"));
|
|
if (pressTime < 100)
|
|
{
|
|
pressTime = 100;
|
|
}
|
|
else if (pressTime > 5000)
|
|
{
|
|
pressTime = 5000;
|
|
}
|
|
|
|
m_millisecondsWinKeyPressTimeForGlobalWindowsShortcuts = pressTime;
|
|
}
|
|
}
|
|
}
|
|
catch (...) { /* Keep defaults */ }
|
|
}
|
|
else
|
|
{
|
|
Logger::info("Shortcut Guide settings are empty");
|
|
}
|
|
|
|
if (!m_hotkey.modifiersMask)
|
|
{
|
|
Logger::info("Shortcut Guide is going to use default shortcut");
|
|
m_hotkey.modifiersMask = MOD_SHIFT | MOD_WIN;
|
|
m_hotkey.vkCode = VK_OEM_2;
|
|
}
|
|
}
|
|
|
|
void WindowsKeyPressBehavior()
|
|
{
|
|
if (IsProcessActive())
|
|
{
|
|
TerminateProcess(m_hProcess, 0);
|
|
}
|
|
}
|
|
};
|
|
|
|
extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
|
|
{
|
|
return new ShortcutGuideModule();
|
|
} |