AskaEth
ee5796747d
主仓 SDK 的图片层原本是 220 行 stb 直通（整幅解码后重采样）。公开仓 MeowOS-SDK 的同一子系统已被真实 App（tuku 阅读器）驱动并做过峰值实测与像素比对，故以公开仓 为权威方向并入主仓 meow_ui.a，两个方向的新功能都保留（逐文件 diff 确认公开仓是 严格超集：无一处「双方互有增减」）。 - 新增 meow_jpeg.c / meow_jpeg.h：DCT 域缩解 1/8、1/4、1/2（N=1/2/4 点 IDCT）， 渐进式只解到首个精细化扫描；不支持项（CMYK/YCCK、算术编码、过订阅 DHT、16bit 量化表）返回 0 由调用方回退 stb - 新增 meow_png_stream.c：libz 逐行 inflate + 反滤波，按步长丢行丢列直写目标尺寸； BMP 按目标行 seek + 行内跳列（8/16/24/32bpp） - meow_ui_img.c + include/meow_ui_image.h：新增 meow_img_pick_scale / load_file_step / load_file_step_ex / resample 四个公开入口；_dim 与 _mem_dim 先进后端，失败/不支持才回退 stb（对外语义不变） - include/meow_ui_draw.h + meow_ui_gfx.c：M32 RGB565 页图 5 函数 （meow_gfx_rgb565 / rgba_to_rgb565 / blit_rgb565 / _scaled）。gfx 保留主仓的 `#include "../meow_launcherd/meow_font.h"` 与 <time.h>（公开仓自 vendored meow_font.h 且无 <time.h>，机械覆盖会丢这两行） - meow_jpeg.h 保持内部：不进 meow_ui.h 伞头，include/ 下无任何头暴露 meow_jpeg_* - build_sdk.sh：OBJS 插入 meow_jpeg / meow_png_stream（32→34）；成员数 76→78（+meow_font.o +43 freetype），--verify 全为 ELF32 MIPS32 rel2/o32 - 测试：新增 test_meow_img_stream.c（S1-S16），test_meow_img_budget.c 同步公开仓 版（B9 断言收紧为 p_new <= p_old）；22 个既有宿主测试的编译注释行补 meow_jpeg.c / meow_png_stream.c / -lz（meow_ui_img.c 现引用后端符号，不加即 undefined reference） 宿主实测：S1-S16 全绿（S7 与 stb 网格像素一致：JPEG mad 4.35-13.69、PNG/BMP mad 0.00；S9 回退矩阵 CMYK/1bpp BMP/Adam7 均拒绝且 stb 仍成功），B1-B9 全绿 （B9 PNG 峰值 25.65→0.61 MiB、BMP 14.65→0.59 MiB）。回归 test_meow_ui_widgets / scroll / ime_fix / test_umbrella 全过。zlib 在应用链接期解析：meow_ui.a 只留 inflate* 未定义符号，四个 App 构建脚本原本就带 $SYSROOT/lib/libz.a，静态 linkcheck（meow_ui.a + libz.a -lpthread）通过。 注：主仓 patch_v2/reader_app 仍自带 vendored stb、不用 meow_img_*，本单不改变 阅读器的内存占用；RGB565 页图接入 reader_app 是另一个任务。
122 lines
5.9 KiB
C
122 lines
5.9 KiB
C
/* test_meow_ui_iconbtn.c — M7.0a 缺口#2 宿主验证：IconButton 圆形命中 + 按压态 + 位图图标。
|
||
*
|
||
* 覆盖：
|
||
* I1 圆形命中：中心/边界命中，角部/外缘不命中（区别于矩形按钮）；
|
||
* I2 owner==active + enabled 双闸门：非 active 或禁用不命中；
|
||
* I3 按压态视觉：设 MEOW_WS_PRESSED 后重绘，圆心像素向 onSurface 变亮（与未按不同）；
|
||
* 禁用时圆心向灰变暗；
|
||
* I4 实时按压（meow_input_touch 注入）：按下命中圆心 → 圆心变亮；释放恢复。
|
||
*
|
||
* 编译（宿主 gcc，链真实 gfx/sys/theme/vol/log/widget/input/activity/dialog/ime + 打桩 font/global）：
|
||
* gcc -Wall -Wextra -o test_meow_ui_iconbtn test_meow_ui_iconbtn.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_scroll.c \
|
||
* meow_ui_img.c meow_ui_media.c meow_notify_ipc.c stb_image.c meow_jpeg.c meow_png_stream.c \
|
||
* -I. -I../meow_launcherd -DMEOW_UI_HOST_TEST -pthread -lm -lz
|
||
* 运行：./test_meow_ui_iconbtn
|
||
*/
|
||
#include "meow_ui.h"
|
||
#include "meow_ui_internal.h"
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <assert.h>
|
||
|
||
static int g_fail = 0;
|
||
#define CHECK(cond, name) do { \
|
||
if (cond) printf(" PASS %s\n", name); \
|
||
else { printf(" FAIL %s\n", name); g_fail++; } } while (0)
|
||
|
||
/* ---- back_buf 像素读取（断言真实渲染，不依赖目检） ---- */
|
||
static void rd_px(int x, int y, unsigned short *p)
|
||
{
|
||
unsigned char *bb = meow_ui_back_buf();
|
||
int line = meow_ui_back_buf_pitch(), bpp = meow_ui_back_buf_bpp();
|
||
if (!bb || x < 0 || y < 0) { *p = 0; return; }
|
||
if (bpp == 16) *p = *(unsigned short *)(bb + (size_t)y * line + (size_t)x * 2);
|
||
else *p = (unsigned short)(*(unsigned int *)(bb + (size_t)y * line + (size_t)x * 4) >> 16);
|
||
}
|
||
static unsigned short px565_at(int x, int y)
|
||
{
|
||
unsigned short p; rd_px(x, y, &p); return p;
|
||
}
|
||
|
||
int main(void)
|
||
{
|
||
setenv("MEOW_UI_DUMP", "/tmp/iconbtn.ppm", 1);
|
||
meow_ui_opts o = { 480, 720 };
|
||
assert(meow_ui_init(&o) == 0);
|
||
meow_ui_activity_push(7); /* owner 对齐：IconButton 绑定 active=7 */
|
||
meow_theme_set_mode(MEOW_THEME_DARK);
|
||
|
||
/* size=64 → 外接框 (100,100,64,64) → 圆心 (132,132) r=32 */
|
||
meow_widget *ic = meow_iconbtn_create(100, 100, 64, MEOW_ICON_PLAY_ARROW);
|
||
assert(ic != NULL);
|
||
|
||
/* ============ I1 圆形命中 ============ */
|
||
printf("I1 circular hit\n");
|
||
CHECK(meow_widget_hit(ic, 132, 132), "center hits");
|
||
CHECK(meow_widget_hit(ic, 100, 132), "left edge (boundary) hits");
|
||
CHECK(meow_widget_hit(ic, 132, 100), "top edge (boundary) hits");
|
||
CHECK(!meow_widget_hit(ic, 100, 100), "corner (dist>r) MISSES (rect would hit)");
|
||
CHECK(!meow_widget_hit(ic, 132, 165), "below center (dist 33>32) MISSES");
|
||
|
||
/* ============ I2 owner 闸门：切 active 后不命中 ============ */
|
||
printf("I2 owner gate\n");
|
||
meow_ui_activity_push(8); /* 换 active：original owner=7 ≠ active=8 */
|
||
CHECK(!meow_widget_hit(ic, 132, 132), "non-active owner -> MISS (gate)");
|
||
meow_ui_activity_pop(); /* 回 active=7 */
|
||
CHECK(meow_widget_hit(ic, 132, 132), "back to active -> hits");
|
||
/* enabled 闸门 */
|
||
meow_widget_set_enabled(ic, 0);
|
||
CHECK(!meow_widget_hit(ic, 132, 132), "disabled -> MISS");
|
||
meow_widget_set_enabled(ic, 1);
|
||
CHECK(meow_widget_hit(ic, 132, 132), "enabled -> hits");
|
||
|
||
/* ============ I3 按压态视觉（状态机位 + 禁用变暗） ============
|
||
* 采样点选 (162,132)：圆内 (r=30<32) 但超出图标 ink 右缘（约 x≤148）——取的是圆形底色，
|
||
* 而非图标墨色（圆心为图标覆盖，不适合测底色 tint）。 */
|
||
printf("I3 pressed visual (state machine / disabled)\n");
|
||
const meow_theme *th = meow_theme_get();
|
||
meow_ui_clear(th->bg);
|
||
unsigned short p_bg = px565_at(100, 100); /* 空屏角部 = 页面底色 */
|
||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 0); /* 未按 */
|
||
meow_widget_draw(ic);
|
||
unsigned short p_idle = px565_at(162, 132);
|
||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 1); /* 按下 */
|
||
meow_widget_draw(ic);
|
||
unsigned short p_press = px565_at(162, 132);
|
||
CHECK(p_press != p_idle, "pressed circle-bg pixel differs from idle (tint layer)");
|
||
/* 禁用：向灰变暗，圆 bg 应更接近 onSurface 混合（与 idle 不同且更亮/更灰） */
|
||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 0);
|
||
meow_widget_set_enabled(ic, 0);
|
||
meow_widget_draw(ic);
|
||
unsigned short p_dis = px565_at(162, 132);
|
||
CHECK(p_dis != p_idle, "disabled circle-bg pixel differs from idle (dim)");
|
||
meow_widget_set_enabled(ic, 1);
|
||
/* 角部（圆外）不应出现圆形底色：等于页面底色（圆形命中/填充不外溢） */
|
||
meow_widget_draw(ic);
|
||
CHECK(px565_at(100, 100) == p_bg, "corner (outside circle) = page bg (no stray fill)");
|
||
|
||
/* ============ I4 实时按压（meow_input_touch 注入） ============ */
|
||
printf("I4 live press via input touch\n");
|
||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 0);
|
||
meow_ui_clear(th->bg);
|
||
meow_widget_draw(ic);
|
||
unsigned short q_idle = px565_at(162, 132);
|
||
meow_input_touch_set(1, 132, 132, 0); /* 按在圆心 */
|
||
meow_widget_draw(ic);
|
||
unsigned short q_live = px565_at(162, 132);
|
||
CHECK(q_live != q_idle, "live touch press -> circle bg brightens");
|
||
meow_input_touch_set(0, 0, 0, 0); /* 释放 */
|
||
meow_widget_draw(ic);
|
||
CHECK(px565_at(162, 132) == q_idle, "release -> circle bg restores");
|
||
|
||
meow_widget_free(ic);
|
||
meow_ui_activity_pop();
|
||
meow_ui_shutdown();
|
||
printf(g_fail ? "\nRESULT: %d FAIL(S)\n" : "\nRESULT: ALL PASS\n", g_fail);
|
||
return g_fail;
|
||
}
|