mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
fix(gamescope): overlapping touches no longer leave the emulated click held (#2528)
This commit is contained in:
1 parent
75c321123d
commit
1570d4457c
3 files changed
+153
No files matched your search
@@ -350,3 +350,11 @@ motion while the seat is locked) with how the X pointer moves. A hinted constrai
|
||||
after 30 moving frames on which the X pointer follows. Any constraint goes relative once the X pointer moves less than a quarter
|
||||
of that motion on three frames within half a second, as it does when the game recentres it or clips it to a small rectangle
|
||||
(PEAK). `tools/tests/test_gamescope_pointer_hold.py` compiles the rule from this patch.
|
||||
|
||||
## 0134 wlserver: a touch presses the emulated click button only once
|
||||
|
||||
In the Left, Right and Middle touch click modes every finger pressed the button, but a finger lifting releases it once
|
||||
and clears the held flag. wlroots counts repeated presses of one button and sends the release only when the count
|
||||
reaches zero, so a second finger touching before the first lifted left the button pressed in the seat for good: the
|
||||
game saw a held click, and later taps only raised and lowered the count. A finger now presses the button only when no
|
||||
earlier finger holds it. `tools/tests/test_gamescope_touch_click.py` compiles the rule from this patch.
|
||||
@@ -0,0 +1,33 @@
|
||||
diff --git a/src/wlserver.cpp b/src/wlserver.cpp
|
||||
index d932df4..df352b0 100644
|
||||
--- a/src/wlserver.cpp
|
||||
+++ b/src/wlserver.cpp
|
||||
@@ -3343,6 +3343,14 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool
|
||||
bump_input_counter();
|
||||
}
|
||||
|
||||
+static bool touch_click_press( bool *pHeld, int nMode, uint32_t uButton )
|
||||
+{
|
||||
+ if ( uButton == 0 || nMode < 0 || nMode >= WLSERVER_BUTTON_COUNT || pHeld[ nMode ] )
|
||||
+ return false;
|
||||
+ pHeld[ nMode ] = true;
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
void wlserver_touchdown( double x, double y, int touch_id, uint32_t time, gamescope::IBackendConnector* connector )
|
||||
{
|
||||
assert( wlserver_is_lock_held() );
|
||||
@@ -3389,12 +3397,10 @@ void wlserver_touchdown( double x, double y, int touch_id, uint32_t time, gamesc
|
||||
|
||||
uint32_t button = TouchClickModeToLinuxButton( eMode );
|
||||
|
||||
- if ( button != 0 && eMode < WLSERVER_BUTTON_COUNT )
|
||||
+ if ( touch_click_press( wlserver.button_held, eMode, button ) )
|
||||
{
|
||||
wlr_seat_pointer_notify_button( wlserver.wlr.seat, time, button, WL_POINTER_BUTTON_STATE_PRESSED );
|
||||
wlr_seat_pointer_notify_frame( wlserver.wlr.seat );
|
||||
-
|
||||
- wlserver.button_held[ eMode ] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
PATCH = ROOT / "tools/gamescope/patches/0134-touch-click-press-once.patch"
|
||||
|
||||
|
||||
def added_source():
|
||||
return "\n".join(line[1:] for line in PATCH.read_text().splitlines() if line.startswith("+") and not line.startswith("+++"))
|
||||
|
||||
|
||||
def block(text, start):
|
||||
begin = text.index(start)
|
||||
return text[begin:text.index("\n}", begin) + 3]
|
||||
|
||||
|
||||
PREAMBLE = r'''
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
#define WLSERVER_BUTTON_COUNT 7
|
||||
enum { HOVER = 0, LEFT = 1, RIGHT = 2, PASSTHROUGH = 4 };
|
||||
static const uint32_t BTN_L = 0x110, BTN_R = 0x111;
|
||||
'''
|
||||
|
||||
MAIN = r'''
|
||||
struct Seat {
|
||||
int pressed[2] = {0, 0};
|
||||
int sent[2] = {0, 0};
|
||||
int slot(uint32_t b) { return b == BTN_L ? 0 : 1; }
|
||||
void press(uint32_t b) { if (pressed[slot(b)]++ == 0) sent[slot(b)]++; }
|
||||
void release(uint32_t b) { if (pressed[slot(b)] > 0 && --pressed[slot(b)] == 0) sent[slot(b)]--; }
|
||||
};
|
||||
|
||||
static uint32_t button_of(int mode) { return mode == LEFT ? BTN_L : mode == RIGHT ? BTN_R : 0; }
|
||||
|
||||
struct Server {
|
||||
bool held[WLSERVER_BUTTON_COUNT] = {};
|
||||
Seat seat;
|
||||
void down(int mode) {
|
||||
uint32_t b = button_of(mode);
|
||||
if (touch_click_press(held, mode, b)) seat.press(b);
|
||||
}
|
||||
void up() {
|
||||
for (int i = 0; i < WLSERVER_BUTTON_COUNT; i++) {
|
||||
if (held[i] && button_of(i)) seat.release(button_of(i));
|
||||
held[i] = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
int main() {
|
||||
Server tap;
|
||||
tap.down(LEFT);
|
||||
assert(tap.seat.sent[0] == 1);
|
||||
tap.up();
|
||||
assert(tap.seat.sent[0] == 0 && tap.seat.pressed[0] == 0);
|
||||
|
||||
Server overlap;
|
||||
overlap.down(LEFT);
|
||||
overlap.down(LEFT);
|
||||
overlap.up();
|
||||
overlap.up();
|
||||
assert(overlap.seat.pressed[0] == 0 && overlap.seat.sent[0] == 0);
|
||||
overlap.down(LEFT);
|
||||
assert(overlap.seat.sent[0] == 1);
|
||||
overlap.up();
|
||||
assert(overlap.seat.sent[0] == 0);
|
||||
|
||||
Server three;
|
||||
for (int i = 0; i < 3; i++) three.down(LEFT);
|
||||
for (int i = 0; i < 3; i++) three.up();
|
||||
assert(three.seat.pressed[0] == 0);
|
||||
|
||||
Server modes;
|
||||
modes.down(LEFT);
|
||||
modes.down(RIGHT);
|
||||
modes.up();
|
||||
modes.up();
|
||||
assert(modes.seat.pressed[0] == 0 && modes.seat.pressed[1] == 0);
|
||||
|
||||
Server hover;
|
||||
hover.down(HOVER);
|
||||
hover.down(PASSTHROUGH);
|
||||
assert(hover.seat.pressed[0] == 0 && hover.seat.pressed[1] == 0);
|
||||
bool held[WLSERVER_BUTTON_COUNT] = {};
|
||||
assert(!touch_click_press(held, -1, BTN_L));
|
||||
assert(!touch_click_press(held, WLSERVER_BUTTON_COUNT, BTN_L));
|
||||
return 0;
|
||||
}
|
||||
'''
|
||||
|
||||
|
||||
class GamescopeTouchClickTest(unittest.TestCase):
|
||||
def test_overlapping_touches_release_the_emulated_button(self):
|
||||
compiler = shutil.which("c++") or shutil.which("g++") or shutil.which("clang++")
|
||||
if not compiler:
|
||||
self.skipTest("no C++ compiler")
|
||||
source = PREAMBLE + block(added_source(), "static bool touch_click_press") + MAIN
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
src = Path(tmp) / "touch_click.cpp"
|
||||
exe = Path(tmp) / "touch_click"
|
||||
src.write_text(source)
|
||||
subprocess.run([compiler, "-std=c++17", "-Wall", "-Werror", "-UNDEBUG", str(src), "-o", str(exe)], check=True)
|
||||
subprocess.run([str(exe)], check=True)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user