AskaEth/MeowOS-For-R3P2
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdk(ui): 字符串资源外置（i18n 雏形 §13）—— meow_str_* + 内嵌双语表 + TF 覆盖表 + 控件接入

Browse Source 
公开 SDK 前把 SDK/App 硬编码文案外置：新增 meow_str/meow_strf/meow_str_set_locale/
meow_str_locale，按当前 locale 取串（永不 NULL），第三方开发者可做多语言。

- 新增 include/meow_ui_str.h + meow_ui_str.c：取串优先级 = TF 覆盖表 > 内嵌当前语言
  (en_us→en 其余→zh) > 内嵌内置默认(zh_cn) > 原样返回 id。内嵌双语表（common.* 21 条 +
  ime.* 9 条）；热路径零 malloc（编译期静态表 + ≤256 静态覆盖数组）；纯 libc 宿主可单测。
- locale 存系统设置 settings.conf 的 ui.locale（默认 zh_cn，首次调用惰性读取）；
  meow_str_set_locale 即时切换 + 重载覆盖表 + best-effort 持久化（流式改写保留其它行）。
- TF 覆盖表 MeowData/<pkg>/strings/<locale>.txt（id=text 行，UTF-8，'=' 两侧去空白）；
  无卡/无文件/无该 id → 回落内嵌。meow_strf 用调用方缓冲（snprintf 语义，重入安全）。
- SDK 控件接入：dialog 默认按钮 OK/CANCEL + INPUT 占位、IME 键面/徽标（空格/确定/拼英/
  ?123/清/拼音/（无候选）/中）改走 meow_str；空态/加载态给 App 提供 common.no_data/loading。
- 测试：新增 test_meow_ui_str.c（内嵌回退/TF 覆盖优先级/未知 id 回退/切 locale 即时生效/
  查找正确性/meow_strf，tmp+env 两模式）；全量宿主回归（widgets/dispatch/box/anim/scroll/
  listvirt/theme/ime_fix/pinyin/overlay/notif/sdk_input_keys/p1p2p3/config/vol/sb_collapse/
  notify_*) 0 回归；交叉 zig-mipsel -Wall -Wextra 0 warning。
- 文档：MEOW_APP_SDK.md 新增 §13（字符串资源/i18n，遗留顺延为 §14）；docs/APP_DEV_GUIDE.md
  新增 §7.11。各宿主 test_*.c 头注释补 meow_ui_str.c 编译依赖。

边界（§13.7）：仅 zh_cn/en_us 整串取用；不做复数规则 / BiDi / RTL / 动态字体回退（雏形）。
This commit is contained in:
AskaEth committed 2026-09-02 02:37:38 +08:00
1 parent d7bf62f448
commit 54857bc0fd
23 files changed
+615 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patch_v2/sdk/meow_ui_ime.c
+11 -11
View File
@@ -362,10 +362,10 @@ static const char *py_key_label(const struct kbkey *k, char *tmp)
switch (k->kind) {
case K_CH: { char c = (char)tolower((unsigned char)k->ch); tmp[0] = c; tmp[1] = 0; return tmp; }
case K_BACK: return "⌫";
case K_SPACE: return "空格";
case K_ENTER: return "确定";
case K_SWITCH: return "拼/英";
case K_SYMBOL: return "?123";
case K_SPACE: return meow_str("ime.space");
case K_ENTER: return meow_str("ime.enter");
case K_SWITCH: return meow_str("ime.switch");
case K_SYMBOL: return meow_str("ime.symbol");
default: return "";
}
}
@@ -398,9 +398,9 @@ static void meow_ime_draw_py(const meow_theme *th)
snprintf(pybuf, sizeof pybuf, "%s_", g_py_buf);
meow_ui_text(14, PY_COMBO_Y + 8, pybuf, th->font_body, th->onSurface);
meow_gfx_fill_round(PY_CLEAR_X, PY_COMBO_Y + 4, PY_CLEAR_W, PY_BADGE_H, 8, th->secondaryContainer);
meow_ui_text_center(PY_CLEAR_X + PY_CLEAR_W / 2, PY_COMBO_Y + 4 + (PY_BADGE_H - th20) / 2, "清", 20, th->onSecondaryContainer);
meow_ui_text_center(PY_CLEAR_X + PY_CLEAR_W / 2, PY_COMBO_Y + 4 + (PY_BADGE_H - th20) / 2, meow_str("ime.clear"), 20, th->onSecondaryContainer);
meow_gfx_fill_round(PY_BADGE_X, PY_BADGE_Y, PY_BADGE_W, PY_BADGE_H, 8, th->primaryContainer);
meow_ui_text_center(PY_BADGE_X + PY_BADGE_W / 2, PY_BADGE_Y + (PY_BADGE_H - th20) / 2, "拼音", 20, th->onPrimaryContainer);
meow_ui_text_center(PY_BADGE_X + PY_BADGE_W / 2, PY_BADGE_Y + (PY_BADGE_H - th20) / 2, meow_str("ime.pinyin_mode"), 20, th->onPrimaryContainer);
/* 候选栏：◀ ▶ 翻页 + 横排候选（高亮第 0 项） */
meow_ui_fill_rect(0, PY_CAND_Y, 480, PY_CAND_H, th->surfaceContainerHighest);
@@ -409,7 +409,7 @@ static void meow_ime_draw_py(const meow_theme *th)
meow_gfx_fill_round(PY_NEXT_X, PY_CAND_Y, PY_NEXT_W, PY_CAND_H, 8, th->surfaceContainerLow);
meow_ui_text_center(PY_NEXT_X + PY_NEXT_W / 2, PY_CAND_Y + (PY_CAND_H - th20) / 2, "▶", 20, th->onSurface);
if (g_py_nc == 0) {
meow_ui_text(PY_CAND_X0, PY_CAND_Y + (PY_CAND_H - th20) / 2, "（无候选）", th->font_body, th->onSurfaceVariant);
meow_ui_text(PY_CAND_X0, PY_CAND_Y + (PY_CAND_H - th20) / 2, meow_str("ime.no_candidate"), th->font_body, th->onSurfaceVariant);
} else {
int x = PY_CAND_X0;
for (int i = 0; i < PY_PAGE; i++) {
@@ -458,7 +458,7 @@ void meow_ime_draw(void)
{
int th20 = meow_ui_text_height(20);
meow_gfx_fill_round(ASCII_MID_X, KB_TOP + 7, ASCII_MID_W, 28, 8, th->primaryContainer);
meow_ui_text_center(ASCII_MID_X + ASCII_MID_W / 2, KB_TOP + 7 + (28 - th20) / 2, "中", 20, th->onPrimaryContainer);
meow_ui_text_center(ASCII_MID_X + ASCII_MID_W / 2, KB_TOP + 7 + (28 - th20) / 2, meow_str("ime.to_pinyin"), 20, th->onPrimaryContainer);
}
/* 键 */
for (int i = 0; i < g_nkeys; i++) {
@@ -471,9 +471,9 @@ void meow_ime_draw(void)
char label[2] = { k->ch, 0 };
if (is_letter(k->ch)) label[0] = g_shift ? (char)toupper((unsigned char)k->ch)
: (char)tolower((unsigned char)k->ch);
if (k->kind == K_SPACE) { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, "SPACE", th->font_body, fg); }
else if (k->kind == K_ENTER) { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, "OK", 20, fg); }
else if (k->kind == K_ESC) { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, "X", 20, fg); }
if (k->kind == K_SPACE) { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, meow_str("ime.space"), th->font_body, fg); }
else if (k->kind == K_ENTER) { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, meow_str("ime.enter"), 20, fg); }
else if (k->kind == K_ESC) { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, meow_str("ime.esc"), 20, fg); }
else { meow_ui_text_center(k->x + k->w / 2, k->y + (k->h - meow_ui_text_height(20)) / 2, label, 20, fg); }
}
}