cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config: fix multi-argument gesture dispatcher parsing (#11721)

Browse source 
* config: Fix multi-argument gesture dispatchers parsing

The `dispatcher` gesture handler used to only handle
the first argument to the dispatcher, while some dispatchers
(e.g., `sendshortcut`) want multiple arguments.

This fixes `ConfigManager` to handle all the arguments
provided to the dispatcher gesture handler.

Fixes #11684.

* test/gestures: Add a test for a gesture with a multi-argument dispatcher

* test/gestures: Factor out `waitForWindowCount`

Reduce code duplication in the gestures test.
This commit is contained in:
Nikolai Nechaev 2025-09-21 00:57:49 +09:00 • committed by GitHub
parent 838439080a
commit 41dad38177
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
hyprtester/src/tests/main/gestures.cpp
View file

@ -18,6 +18,20 @@ using namespace Hyprutils::Memory;
#define UP CUniquePointer
#define SP CSharedPointer
static bool waitForWindowCount(int expectedWindowCnt, std::string_view expectation, int waitMillis = 100, int maxWaitCnt = 50) {
int counter = 0;
while (Tests::windowCount() != expectedWindowCnt) {
counter++;
std::this_thread::sleep_for(std::chrono::milliseconds(waitMillis));
if (counter > maxWaitCnt) {
NLog::log("{}Unmet expectation: {}", Colors::RED, expectation);
return false;
}
}
return true;
}
static bool test() {
NLog::log("{}Testing gestures", Colors::GREEN);
@ -27,19 +41,21 @@ static bool test() {
NLog::log("{}Switching to workspace 1", Colors::YELLOW);
getFromSocket("/dispatch workspace 1"); // no OK: we might be on 1 already
Tests::spawnKitty();
EXPECT(Tests::windowCount(), 1);
// Give the shell a moment to initialize
std::this_thread::sleep_for(std::chrono::milliseconds(100));
OK(getFromSocket("/dispatch plugin:test:gesture up,4"));
EXPECT(waitForWindowCount(0, "Gesture sent ctrl+d to kitty"), true);
EXPECT(Tests::windowCount(), 0);
OK(getFromSocket("/dispatch plugin:test:gesture left,3"));
// wait while kitty spawns
int counter = 0;
while (Tests::windowCount() != 1) {
counter++;
std::this_thread::sleep_for(std::chrono::milliseconds(100));
if (counter > 50) {
NLog::log("{}Gesture didnt spawn kitty", Colors::RED);
return false;
}
}
EXPECT(waitForWindowCount(1, "Gesture spawned kitty"), true);
EXPECT(Tests::windowCount(), 1);
@ -126,16 +142,7 @@ static bool test() {
OK(getFromSocket("/dispatch plugin:test:gesture up,3"));
counter = 0;
while (Tests::windowCount() != 0) {
counter++;
std::this_thread::sleep_for(std::chrono::milliseconds(100));
if (counter > 50) {
NLog::log("{}Gesture didnt close kitty", Colors::RED);
return false;
}
}
EXPECT(waitForWindowCount(0, "Gesture closed kitty"), true);
EXPECT(Tests::windowCount(), 0);