From 7a0e087bf99f5230199425ca56e3d3be43c87840 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 29 Sep 2026 02:01:21 -0400 Subject: [PATCH] fix: give the QAM chord a Guide lead that stretches with slow frames so A is not taken as a press (#70) * fix: give the QAM chord a Guide lead that stretches with slow frames so A is not taken as a press * fix: start the QAM Guide lead at 80 ms and stretch it only when frames are slow * fix: set the QAM Guide lead minimum to 80 ms * fix: use Android's 300 ms double-tap window for Back so the single-press action comes sooner * fix: keep the 500 ms Back double-press window --- .../droiddeck/launcher/input/PadBridge.java | 33 +++++++++++++++---- .../launcher/wayland/WaylandCompositor.java | 21 ++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 5189049733..890fde729f 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -26,9 +26,24 @@ public final class PadBridge { /** Slot 0 is the one the session exports; extra slots would each show as another pad. */ private static final int SLOT = 0; private static final float DEAD_ZONE = 0.12f; - private static final long QAM_GUIDE_LEAD_MS = 80; - private static final long QAM_A_HOLD_MS = 120; - private static final long QAM_GUIDE_TAIL_MS = 40; + // The client takes A as part of the chord only once it has had Guide held for a while, and a + // client starved of CPU needs longer. Too short, and it acts on A as well, selecting whatever it + // had focused before opening QAM: with 80 ms of lead that was 3 times in 20 at rest, and 250 ms + // none in 20; with the session down to 1 fps a fixed 400 ms still let 3 in 15 through, where + // 1000 ms let none. The lead keeps 80 ms when frames are quick, for a QAM that feels immediate, + // and stretches to eight frames when they are slow. + private static final long QAM_GUIDE_LEAD_MIN_MS = 80; + private static final long QAM_GUIDE_LEAD_MAX_MS = 1500; + private static final int QAM_GUIDE_LEAD_FRAMES = 8; + private static final long QAM_A_HOLD_MS = 200; + private static final long QAM_GUIDE_TAIL_MS = 200; + // Off the main thread, so a busy UI cannot shorten or stretch the steps. + private static final Handler chordHandler; + static { + android.os.HandlerThread thread = new android.os.HandlerThread("qam-chord", android.os.Process.THREAD_PRIORITY_DISPLAY); + thread.start(); + chordHandler = new Handler(thread.getLooper()); + } private final FakeInputWriter writer; private final PadState state = new PadState(); @@ -212,21 +227,27 @@ public final class PadBridge { qamChordActive = true; int generation = ++qamChordGeneration; publish(); - mainHandler.postDelayed(() -> pressQamA(generation), QAM_GUIDE_LEAD_MS); + chordHandler.postDelayed(() -> pressQamA(generation), qamGuideLeadMs()); + } + + static long qamGuideLeadMs() { + long frame = com.droiddeck.launcher.wayland.WaylandCompositor.recentFrameIntervalMs(); + if (frame <= 0) return QAM_GUIDE_LEAD_MIN_MS; + return Math.max(QAM_GUIDE_LEAD_MIN_MS, Math.min(QAM_GUIDE_LEAD_MAX_MS, frame * QAM_GUIDE_LEAD_FRAMES)); } private synchronized void pressQamA(int generation) { if (generation != qamChordGeneration || !qamChordActive) return; qamSyntheticAPressed = true; publish(); - mainHandler.postDelayed(() -> releaseQamA(generation), QAM_A_HOLD_MS); + chordHandler.postDelayed(() -> releaseQamA(generation), QAM_A_HOLD_MS); } private synchronized void releaseQamA(int generation) { if (generation != qamChordGeneration || !qamChordActive) return; qamSyntheticAPressed = false; publish(); - mainHandler.postDelayed(() -> releaseQamGuide(generation), QAM_GUIDE_TAIL_MS); + chordHandler.postDelayed(() -> releaseQamGuide(generation), QAM_GUIDE_TAIL_MS); } private synchronized void releaseQamGuide(int generation) { diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index 7b77178697..dd29b6ad11 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -67,9 +67,30 @@ public final class WaylandCompositor { if (l != null) l.onGameSurface(window, gpuName); } + private static volatile long lastFrameNanos; + private static volatile long frameIntervalNanos; + + /** + * How long frames are taking to arrive right now, in ms, or -1 before the first: the smoothed + * interval, or the time since the last frame when that is longer (a session that has stalled). + */ + public static long recentFrameIntervalMs() { + long last = lastFrameNanos; + if (last == 0) return -1; + return Math.max(frameIntervalNanos, System.nanoTime() - last) / 1_000_000; + } + /** Invoked from native (banner_on_game_frame) for every frame of the HUD's window. */ @SuppressWarnings("unused") static void onGameFrame() { + long now = System.nanoTime(); + long previous = lastFrameNanos; + lastFrameNanos = now; + if (previous != 0) { + long interval = now - previous; + long smoothed = frameIntervalNanos; + frameIntervalNanos = smoothed == 0 ? interval : (smoothed * 3 + interval) / 4; + } com.droiddeck.launcher.session.PerfHints.onFrame(); GameListener l = gameListener; if (l != null) l.onGameFrame();