Files
MeowOS-SDK/sdk/test_meow_ui_theme.c
T
AskaEth 27a3750e36 SDK: 同步主仓 M15/M16/bug3/MD3 修复 — 时钟 ABI 补全/IME 冷却窗/列表行高派生/形状 token/翻页键
公开 SDK 落后主仓的一批 bugfix(主仓是固件构建源,这些修复已在设备上跑过)。
本次只做「主仓 → 公开仓」单向同步,图像栈方向由主仓侧另一单处理。

时钟 ABI(M16 第二弹,原文件自认「残余未修」):
- meow_ui_time.c 147→345 行:futex 相对超时接管(__timedwait/_cp)、
  timerfd_create/settime/gettime 的 itimerspec 64↔32 双向转换、
  __clock_settime64 越界返 ENOTSUP,另有 4 个纯换算函数
- meow_ui_internal.h:struct meow_time32 / meow_itimerspec32 契约移入内部头
- CLOCK_ABI.md:补接管机制、验证配方与 objdump 证据
- 新增 test_meow_time64.c

IME bug3(成对才有意义):
- meow_ui_ime.c:IME_TAP_COOLDOWN_MS 200 冷却窗 + 打开时二次 drain
- meow_ui_input.c:meow_input_touch_reset() 并在 drain 内调用(复位触摸状态机)
- test_ime_fix.c:新增用例④ stray-tap

列表行高(M15,修用户可见 bug):
- meow_ui_widget.c:listv_item_h() 由主题字体行高派生,不再写死 56
  (两行列表 62 > 56 会让首行标题被裁剪守卫整条跳过)
- include/meow_ui_widgets.h:新增 meow_listview_item_h()
- 新增 test_meow_ui_listview_rowh.c

其余:meow_select.c / meow_ui_dialog.c 统一 MD3 形状 token;
include/meow_ipc.h 补 MSG_KEY_PAGEUP/PAGEDOWN 枚举;
meow_ui_sys.c / meow_cachegov.c 取时统一走 meow_ui_time_ms()。

测试辅助函数标定:tuku/test/test_settings_lock_host.c 的注入前等待 150ms→350ms。
该等待按修复前 IME 标定,新冷却窗下首键 dt_open≈114ms 会被当迟到抬起吞掉,
只录到 "68" 两位。仅改等待时长,断言原样保留。

验证:tuku 四套脚本全绿(run_tests 644 PASS / zip 106 / cbz 296 / webtoon PASS);
12 个源文件与主仓逐字节一致;sdk/build_sdk.sh 34 成员;
tuku/build_tuku.sh 产出静态 MIPS32r2 ELF。
2026-11-06 21:31:54 +08:00

120 lines
6.2 KiB
C
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
/* test_meow_ui_theme.c — 宿主验证 §8.1 顶级主题:MD3 × MIUIx 各 light/dark 四套配色 & 控件形态。
*
* 用法:build 后跑 4 次(每次一个 style×mode 组合,dump 一张 PPM):
* for s in 0 1; do for m in 0 1; do
* MEOW_UI_DUMP=/tmp/meow_t_${s}_${m}.ppm ./test_meow_ui_theme $s $m
* done; done
* s: 0=MEOW_STYLE_MD3 1=MEOW_STYLE_MIUIX; m: 0=light 1=dark
*
* 编译(宿主 gcc,链真实 gfx/sys/theme/vol/log/widget/input/activity/dialog/ime + 打桩 font/global):
* gcc -o test_meow_ui_theme test_meow_ui_theme.c test_host_stub.c \
* meow_ui_gfx.c meow_ui_time.c meow_ui_sys.c meow_ui_theme.c meow_ui_vol.c meow_ui_log.c \
* meow_ui_widget.c meow_ui_input.c meow_ui_activity.c meow_ui_dialog.c meow_ui_ime.c meow_ui_str.c \
* meow_pinyin.c meow_ui_draw.c meow_ui_view.c meow_ui_box.c meow_ui_anim.c meow_ui_img.c meow_ui_media.c \
* meow_notify_ipc.c stb_image.c meow_ui_nav.c \
* -I. -Iinclude -DMEOW_UI_HOST_TEST -pthread -lm
*
* 验证要点:四套主题 primary/radius 各不相同(MD3 蓝 / MIUIx 橙 + 更大圆角),
* 同 style 下 light/dark 的 surface 成对切换;图形用 MEOW_UI_DUMP 导出 PPM 目检。
*/
#include "meow_ui.h"
#include "meow_ui_internal.h" /* meow_gfx_fill_round / meow_ui_back_buf(真实像素断言) */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
static meow_widget *g_w[16];
static int g_wn = 0;
static void render_sample(const meow_theme *th)
{
int W = meow_ui_width(), H = meow_ui_height();
meow_ui_clear(th->bg);
/* 卡片:surfaceContainerLow 底 + outlineVariant 圆角描边(radius_card) */
meow_gfx_fill_round(20, 56, W - 40, 132, th->radius_card, th->surfaceContainerLow);
meow_ui_draw_rect_round(20, 56, W - 40, 132, th->radius_card, th->outlineVariant);
meow_ui_text(36, 74, "THEME SAMPLE", th->font_title, th->onSurface);
meow_ui_text(36, 116, "surfaceContainerLow/outline", th->font_body, th->onSurfaceVariant);
char info[64];
snprintf(info, sizeof info, "primary=0x%06X radius=%d", th->primary, th->radius);
meow_ui_text(36, 148, info, th->font_body, th->onSurfaceVariant);
/* 文字行:onSurface / onSurfaceVariant 对比 */
meow_ui_text(20, 204, "onSurface text", th->font_body, th->onSurface);
meow_ui_text(20, 232, "onSurfaceVariant dim", th->font_body, th->onSurfaceVariant);
meow_ui_text(20, 260, "primary accent", th->font_body, th->primary);
/* 控件(真实控件走主题 radius/spacing/stroke 形态,meow_widget_draw 内取 meow_theme_get) */
for (int i = 0; i < g_wn; i++) meow_widget_draw(g_w[i]);
/* 滑杆:surfaceContainer 轨道 + primary 已选段(spacing/radius 来自主题) */
meow_gfx_fill_round(20, H - 90, W - 40, 8, 4, th->surfaceContainerHigh);
meow_gfx_fill_round(20, H - 90, (W - 40) * 2 / 3, 8, 4, th->primary);
/* 开关(开):primary 圆钮(radius=控件圆角) */
meow_gfx_fill_round(W - 90, H - 150, 52, 30, 15, th->primary);
meow_gfx_fill_circle(W - 48, H - 135, 11, th->onPrimary);
/* 错误色 sample */
meow_gfx_fill_round(20, H - 180, 120, 30, th->radius, th->errorContainer);
meow_ui_text(36, H - 176, "error", th->font_body, th->onErrorContainer);
(void)H;
}
int main(int argc, char **argv)
{
int style = argc > 1 ? atoi(argv[1]) : 0; /* 0=MD3 1=MIUIx */
int dark = argc > 2 ? atoi(argv[2]) : 1; /* 0=light 1=dark */
if (argc >= 2 && !strcmp(argv[1], "usage")) {
fprintf(stderr, "usage: %s <style 0|1> <dark 0|1>\n", argv[0]);
return 2;
}
if (!getenv("MEOW_UI_DUMP")) setenv("MEOW_UI_DUMP", "/tmp/meow_theme.ppm", 1);
meow_ui_opts o = { 480, 720 };
assert(meow_ui_init(&o) == 0);
assert(meow_ui_width() == 480 && meow_ui_height() == 720);
/* 控件样张(复刻 test_meow_ui_widgets 的五型按钮,验证控件形态随主题) */
g_w[g_wn++] = meow_btn_create_variant(20, 290, 200, 52, "FILLED", MEOW_BTN_FILLED);
g_w[g_wn++] = meow_btn_create_variant(20, 352, 200, 52, "TONAL", MEOW_BTN_TONAL);
g_w[g_wn++] = meow_btn_create_variant(20, 414, 200, 52, "OUTLINED",MEOW_BTN_OUTLINED);
g_w[g_wn++] = meow_btn_create_variant(20, 476, 200, 52, "TEXT", MEOW_BTN_TEXT);
g_w[g_wn++] = meow_btn_create_variant(20, 538, 200, 52, "ELEVATED",MEOW_BTN_ELEVATED);
/* 切到目标 style×mode,再取主题渲染。
* 先 set_mode(触发首次 load_settings,g_loaded 锁 1)再 set_style(设置后不再被 reload 覆盖)——
* 宿主无 settings.conf,若先 set_style 再 set_mode,后者会 load_settings 把 g_style 重读回 MD3。 */
meow_theme_set_mode(dark ? MEOW_THEME_DARK : MEOW_THEME_LIGHT);
meow_ui_set_style(style);
const meow_theme *th = meow_theme_get();
/* 断言:样式可感知差异(primary 不同、圆角更大、间距/描边不同)——直接约束主题包正确性 */
if (style == MEOW_STYLE_MD3) {
assert(th->primary == (dark ? 0x4A6A9A : 0x2A5A8A)); /* MD3 蓝 */
assert(th->radius_card == 16 && th->radius == 12 && th->spacing == 8 && th->stroke_w == 0);
} else {
assert(th->primary == (dark ? 0xFF8C4A : 0xF57200)); /* MIUIx 橙 */
assert(th->radius_card == 28 && th->radius == 20 && th->spacing == 12 && th->stroke_w == 1);
/* 与 MD3 同明暗对比:primary 必须不同(避免"切了没感觉") */
assert(th->primary != (dark ? 0x4A6A9A : 0x2A5A8A));
}
/* surface/bg 为「该 style 的派生背景」(宿主无 settings.conf → 默认面) */
if (dark) assert(th->surface == (style == MEOW_STYLE_MIUIX ? 0x181310 : 0x141824));
else assert(th->surface == (style == MEOW_STYLE_MIUIX ? 0xF7F3EE : 0xE8EAF0));
render_sample(th);
meow_ui_flush();
printf("PASS theme[%d][%d] style=%s dark=%d bg=0x%06X primary=0x%06X radius=%d card=%d spacing=%d stroke=%d\n",
style, dark, style ? "MIUIx" : "MD3", dark, th->bg, th->primary,
th->radius, th->radius_card, th->spacing, th->stroke_w);
printf("PASS dump: MEOW_UI_DUMP=%s\n", getenv("MEOW_UI_DUMP") ? getenv("MEOW_UI_DUMP") : "(none)");
meow_ui_shutdown();
return 0;
}