fix(sdk+launcher): M39 点击输入门 — 固定时长吞窗改为「启动排空 + 短系统手势防穿透」
根因（M36 已查实）：不是布局竞态，而是固定时长的输入封闭窗口且窗口起点在首帧之后。 - SDK meow_ui_run：M2.22(C) 500ms 内丢弃 TAP/SWIPE/HOME/NOTIF_PULL/TOUCH_DOWN/MOVE/LONG_PRESS， 窗口在 App 画完首帧后才 arm → 用户看到界面后第一下必被吞。 改为入口 meow_input_drain() 排空一次（清环形队列 + 复位触摸状态机）， TAP/TOUCH_DOWN/TOUCH_MOVE/LONG_PRESS 立即生效；仅系统手势（左缘 SWIPE、底部上滑 HOME、 顶部下拉 NOTIF_PULL、SWIPE_PROGRESS）保留 STARTUP_GESTURE_GUARD_MS=150 防穿透。 - launcher：menu_after_app_exit 1200ms→150ms；子页返回 800ms→150ms；菜单/子页打开 300ms→150ms（统一 MENU_TOUCH_GUARD_MS）。menu_drain_touch() 同时复位 t_down/原点/坐标： 只清队列会把「按下已被 drain、抬手稍后才到」误判成一次 tap（幽灵重放的另一半）。 历史理由已核对：旧窗口是为 Bug2/4（App 运行期事件堆积在 launcher 自身 touch_fd 里被重放） 加的，真正的机制就是排空本进程 fd —— evdev 每 fd 各收一份，App/子页运行期全量事件都在 这个 fd 里，drain 后无历史事件可重放；窗口只兜面板重配尾巴。 - 单测：test_meow_ui_home_gesture 新增 T4（11 断言：立即点击生效/立即上滑被守卫挡+守卫后生效/ 立即左缘 SWIPE 同理/TOUCH_DOWN+MOVE 立即下发/LONG_PRESS 立即下发/run 入口 drain 丢弃预置残留； 旧 SDK 下 8 条红、新 SDK 30 pass/0 fail）；test_meow_ui_dispatch 新增 M5（drain 清队列+复位在途 手势+新点击不受影响，ALL PASS）；swipe 35/0、view_event ALL PASS（回归）。 - 重编重链（铁律）：meow_ui.a 8525aa6b（meow_ui_input.o 8248a6c6，旧 e54903ca）→ meow_launcherd e342d24f(891164) / files 17edac0f(383072) / hello 65c1c575(499380) / ncm 1c2f5ff7(1225676) / reader a463645f(1716212，gitignore 不入库)。 picbrowser 仓库内 0 个 tracked 文件（源码不存在）→ 无法重链，见 finding。 - 真机：未验证（纪律禁止覆盖设备已装组件；uinput 注入是 M36 设备失联诱因）。
This commit is contained in:
AskaEth committed
1 parent
46278fd051
commit
837cd47e7c
11 files changed
+256
-52
No files matched your search
@@ -12,6 +12,14 @@
|
||||
* 3b 未注册 on_swipe：注入 MEOW_EV_SWIPE(UP)（中部上滑）→ nav_request_exit 不触发（App 滚动）；
|
||||
* 3c 注册 on_swipe：注入 MEOW_EV_HOME → nav_request_exit 触发（系统级手势优先于 App on_swipe），
|
||||
* on_swipe 不被调用——屏底热区上滑是系统保留手势，任意 App 内生效（用户 2026-09-04 批②）。
|
||||
* T4 启动输入门（M39，取代 M2.22(C) 的 500ms 全量吞窗：启动 drain + ≤150ms 系统手势防穿透）：
|
||||
* 4a 启动后立即 TAP → on_tap 立即生效（旧窗口会吞，就是「要点两次」的根因）；
|
||||
* 4b 启动后立即 HOME → 守卫期不触发（防穿透）；守卫过后再上滑 → 触发一次；
|
||||
* 4c 启动后立即 SWIPE(LEFT) → 守卫期不下发；守卫过后 → 下发一次；
|
||||
* 4d 启动后立即 TOUCH_DOWN / TOUCH_MOVE → 跟手回调立即收到；
|
||||
* 4e 启动后立即 LONG_PRESS → 长按回调立即收到；
|
||||
* 4f meow_ui_run 入口 drain → run 之前已入队的 TAP/HOME/SWIPE 全部丢弃（旧时间窗要解决的
|
||||
* 「残留输入」改由一次性排空解决，且不影响 4a 的新输入）。
|
||||
*
|
||||
* 编译（宿主 gcc，链真实 SDK 源全集 + 打桩 font/global；**不链 meow_ui_nav.c**——本测以测试内
|
||||
* meow_ui_nav_request_exit 桩计数验证触发）：
|
||||
@@ -140,7 +148,7 @@ static int g_inj_type, g_inj_a, g_inj_b;
|
||||
static void *driver(void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
usleep(700000); /* 等 startup cooldown(500ms) 过后再注入 */
|
||||
usleep(700000); /* 等启动守卫（M39: 150ms，原 500ms cooldown）过后再注入 */
|
||||
meow_input_inject(g_inj_type, g_inj_a, g_inj_b);
|
||||
usleep(80000);
|
||||
meow_ui_request_exit();
|
||||
@@ -181,6 +189,128 @@ static void test_dispatch(void)
|
||||
CHECK(g_swipe_calls == 0, "T3c system-priority home -> on_swipe NOT called");
|
||||
}
|
||||
|
||||
/* ============ T4 启动输入门（M39） ============
|
||||
* 语义：meow_ui_run 入口 meow_input_drain() 排空一次（清队列 + 复位触摸状态机），随后只对
|
||||
* 「系统手势」（SWIPE / HOME / NOTIF_PULL / SWIPE_PROGRESS）保留 ≤150ms 防穿透；
|
||||
* TAP / TOUCH_DOWN / TOUCH_MOVE / LONG_PRESS 立即生效。 */
|
||||
#define T4_GUARD_WAIT_MS 260 /* > STARTUP_GESTURE_GUARD_MS(150)，留调度余量 */
|
||||
|
||||
static volatile int g_ticks = 0; /* run 循环 tick 计数（注入时序锚点） */
|
||||
static void tick_marker(void) { g_ticks++; }
|
||||
|
||||
static int g_taps = 0, g_tap_x = -1, g_tap_y = -1;
|
||||
static void tap_marker(int x, int y) { g_taps++; g_tap_x = x; g_tap_y = y; }
|
||||
static int g_downs = 0, g_moves = 0;
|
||||
static void down_marker(int x, int y) { (void)x; (void)y; g_downs++; }
|
||||
static void move_marker(int x, int y) { (void)x; (void)y; g_moves++; }
|
||||
static int g_longs = 0;
|
||||
static void long_marker(int x, int y) { (void)x; (void)y; g_longs++; }
|
||||
|
||||
static int g_inj2_type, g_inj2_a, g_inj2_b, g_inj_later;
|
||||
|
||||
/* 首个 tick（run 循环已进入、run 入口 drain 已过）注入一次；g_inj_later=1 时越过守卫再注入一次。 */
|
||||
static void *drv_startup(void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
while (g_ticks < 1) usleep(1000);
|
||||
meow_input_inject(g_inj_type, g_inj_a, g_inj_b);
|
||||
if (g_inj_later) {
|
||||
usleep(T4_GUARD_WAIT_MS * 1000);
|
||||
meow_input_inject(g_inj2_type, g_inj2_a, g_inj2_b);
|
||||
}
|
||||
usleep(80000);
|
||||
meow_ui_request_exit();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void run_startup_scenario(int type, int a, int b, int later,
|
||||
void (*tap_cb)(int, int), void (*swipe_cb)(int, int, int),
|
||||
void (*td_cb)(int, int), void (*tm_cb)(int, int))
|
||||
{
|
||||
g_inj_type = type; g_inj_a = a; g_inj_b = b;
|
||||
g_inj2_type = type; g_inj2_a = a; g_inj2_b = b;
|
||||
g_inj_later = later;
|
||||
g_ticks = 0; g_taps = 0; g_tap_x = g_tap_y = -1;
|
||||
g_downs = 0; g_moves = 0; g_longs = 0;
|
||||
g_nav_exit_calls = 0;
|
||||
g_swipe_calls = 0; g_swipe_dir = -1; g_swipe_dx = 0;
|
||||
meow_input_drain();
|
||||
|
||||
meow_ui_events ev; memset(&ev, 0, sizeof ev);
|
||||
ev.on_tick = tick_marker;
|
||||
ev.on_tap = tap_cb;
|
||||
ev.on_swipe = swipe_cb;
|
||||
ev.on_touch_down = td_cb;
|
||||
ev.on_touch_move = tm_cb;
|
||||
|
||||
pthread_t thd; pthread_create(&thd, NULL, drv_startup, NULL);
|
||||
meow_ui_run(&ev);
|
||||
pthread_join(thd, NULL);
|
||||
}
|
||||
|
||||
/* run 之前已入队（模拟「进入 App 前就堆积的残留输入」），run 入口 drain 必须全部丢掉。 */
|
||||
static void *drv_predrain(void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
usleep(T4_GUARD_WAIT_MS * 1000); /* 越过守卫：证明不是被窗口吞，而是被 drain 清掉 */
|
||||
meow_ui_request_exit();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void run_predrain_scenario(void)
|
||||
{
|
||||
g_taps = 0; g_nav_exit_calls = 0; g_swipe_calls = 0;
|
||||
meow_input_drain();
|
||||
meow_input_inject(MEOW_EV_TAP, 120, 200);
|
||||
meow_input_inject(MEOW_EV_HOME, MEOW_SWIPE_UP, 120);
|
||||
meow_input_inject(MEOW_EV_SWIPE, MEOW_SWIPE_LEFT, 80);
|
||||
|
||||
meow_ui_events ev; memset(&ev, 0, sizeof ev);
|
||||
ev.on_tap = tap_marker;
|
||||
ev.on_swipe = app_on_swipe;
|
||||
|
||||
pthread_t thd; pthread_create(&thd, NULL, drv_predrain, NULL);
|
||||
meow_ui_run(&ev);
|
||||
pthread_join(thd, NULL);
|
||||
}
|
||||
|
||||
static void test_startup_gate(void)
|
||||
{
|
||||
printf("T4 startup input gate (drain + <=150ms system-gesture guard)\n");
|
||||
|
||||
/* 4a 启动后立即点击：必须生效（旧 500ms 窗口在首帧后 arm → 会吞掉这一下） */
|
||||
run_startup_scenario(MEOW_EV_TAP, 120, 200, 0, tap_marker, NULL, NULL, NULL);
|
||||
CHECK(g_taps == 1, "T4a immediate TAP after start -> on_tap fired (got %d)", g_taps);
|
||||
CHECK(g_taps == 1 && g_tap_x == 120 && g_tap_y == 200, "T4a tap coords preserved (%d,%d)", g_tap_x, g_tap_y);
|
||||
|
||||
/* 4b 启动后立即上滑回桌面：守卫期不触发；守卫过后同一手势触发一次 */
|
||||
run_startup_scenario(MEOW_EV_HOME, MEOW_SWIPE_UP, 120, 1, NULL, NULL, NULL, NULL);
|
||||
CHECK(g_nav_exit_calls == 1, "T4b immediate HOME blocked by guard, post-guard HOME fires exactly once (got %d)", g_nav_exit_calls);
|
||||
|
||||
/* 4c 启动后立即左缘返回 SWIPE：守卫期不下发；守卫过后下发一次（行为与修改前一致） */
|
||||
run_startup_scenario(MEOW_EV_SWIPE, MEOW_SWIPE_LEFT, 80, 1, NULL, app_on_swipe, NULL, NULL);
|
||||
CHECK(g_swipe_calls == 1, "T4c immediate SWIPE(LEFT) blocked by guard, post-guard delivers exactly once (got %d)", g_swipe_calls);
|
||||
CHECK(g_swipe_dir == MEOW_SWIPE_LEFT, "T4c swipe dir == LEFT (got %d)", g_swipe_dir);
|
||||
|
||||
/* 4d 启动后立即跟手拖动：DOWN/MOVE 立即下发（不再被启动窗口吞） */
|
||||
run_startup_scenario(MEOW_EV_TOUCH_DOWN, 240, 300, 0, NULL, NULL, down_marker, move_marker);
|
||||
CHECK(g_downs == 1, "T4d immediate TOUCH_DOWN delivered (got %d)", g_downs);
|
||||
run_startup_scenario(MEOW_EV_TOUCH_MOVE, 240, 350, 0, NULL, NULL, down_marker, move_marker);
|
||||
CHECK(g_moves == 1, "T4d immediate TOUCH_MOVE delivered (got %d)", g_moves);
|
||||
|
||||
/* 4e 启动后立即长按：长按回调立即收到（长按本身需按住达阈值，启动窗口门控已移除） */
|
||||
meow_ui_set_long_press_cb(long_marker);
|
||||
run_startup_scenario(MEOW_EV_LONG_PRESS, 200, 420, 0, NULL, NULL, NULL, NULL);
|
||||
CHECK(g_longs == 1, "T4e immediate LONG_PRESS delivered (got %d)", g_longs);
|
||||
meow_ui_set_long_press_cb(NULL);
|
||||
|
||||
/* 4f run 入口 drain：进入前堆积的 TAP/HOME/SWIPE 全部丢弃（替代旧时间窗的防残留语义） */
|
||||
run_predrain_scenario();
|
||||
CHECK(g_taps == 0, "T4f pre-queued TAP drained at run entry (got %d)", g_taps);
|
||||
CHECK(g_nav_exit_calls == 0, "T4f pre-queued HOME drained at run entry (got %d)", g_nav_exit_calls);
|
||||
CHECK(g_swipe_calls == 0, "T4f pre-queued SWIPE drained at run entry (got %d)", g_swipe_calls);
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
meow_ui_opts o = { FBW, FBH };
|
||||
@@ -189,6 +319,7 @@ int main(void)
|
||||
test_predicate();
|
||||
test_touch_classify();
|
||||
test_dispatch();
|
||||
test_startup_gate();
|
||||
|
||||
meow_ui_shutdown();
|
||||
printf("home_gesture: %d pass / %d fail\n", g_pass, g_fail);
|
||||
|
||||
Reference in new issue
Block a user