reader R1: os.meow.reader 书架+TXT 垂直链路骨架
- core: 编码检测(BOM→UTF-8严格→GB18030/Big5统计, Big5与GB重叠按GB18030兜底, §3.5风险注明) + GB18030双字节码表(uint16[126][190]=47880B, tools/gen_gb18030_table.py 生成, 生成物入仓) + 流式排版器(贪心断行+Kinsoku避头尾+分页+重排锚定, rd_meas_fn 测量回调替 FreeType, 宿主可测) + TXT 流式加载器(按段读, 不整文件入内存, \n 恒独立换行可安全分段) - engine: FreeType 封装(FT_New_Face 按需读文件, NO_HINTING/LIGHT 灰阶, LRU 512 key=码点+字号, blend565, rdft_advance 只测宽不栅格化) - app: 书架(扫 Books/ 识别 5 后缀, 最近读置顶, 空态提示) + 阅读页(W_CUSTOM 画布 3 栏翻页 +中央菜单占位(字号±/行距±/返回) +顶栏进度%/章节名) + 书桥(段表+flat 页索引, 渲染, 重排回锚) + 进度持久化(MeowData/os.meow.reader/progress/, path hash→seg/ch/fs/ls/ts) - 取舍: 正文字体 FreeType 直读 TF MeowOS/fonts/ TTF/OTF; 无字体回退 SDK 位图字库(meow_ui_text, 未打包字体(许可/体积), 全 glyph 兜底 R2); 页位图缓存当前+前后各1页(3×691KB), 翻页动画默认无 - 内存实测(宿主 --wrap malloc, 73页书): 书结构 130KB + 当前段刮擦~1.6MB(行/页容量按 n 偏高,R2 收紧) + 字形缓存~650KB + 3页位图 2.07MB ≈ 4.45MB 动态, 在 ≤8MB 阅读态预算内 - 测试: 宿主 core 58/58(enc/gb18030金标准/kinsoku/page/reflow/txt); qemu-mipsel ft_smoke PASS + book_smoke(12页/渲染有墨/翻页/重排回锚) PASS; reader 交叉 -Wall -Wextra 0 warning - 产物: reader(mipsel 静态1.2MB)+build_reader.sh(vendor FreeType 可复现); vendor/二进制 gitignore
This commit is contained in:
MeowOS committed
1 parent
33d3059038
commit
553a7d5d9e
26 files changed
+6155
No files matched your search
@@ -0,0 +1,346 @@
|
||||
/* app/book.c — 书桥实现（见 app/book.h）。 */
|
||||
#include "book.h"
|
||||
#include "rdtxt.h"
|
||||
#include "rdlayout.h"
|
||||
#include "../engine/rdft.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
typedef struct seg {
|
||||
size_t file_off, file_len;
|
||||
int page_start; /* 全局页表起点 */
|
||||
int page_count; /* 本段页数 */
|
||||
} seg_t;
|
||||
|
||||
struct rd_book {
|
||||
char path[400];
|
||||
char font[400];
|
||||
char base[256]; /* 文件名 */
|
||||
const char *encname;
|
||||
rdft *ft;
|
||||
rd_enc_t enc;
|
||||
|
||||
int fs, ls, pw, ph, mx, my, top;
|
||||
int content_w, content_h;
|
||||
|
||||
seg_t *segs; int nsegs;
|
||||
rd_book_page *pages; int npages; /* flat 页表 */
|
||||
int cur; /* 当前页 */
|
||||
|
||||
/* 当前渲染段的复用缓冲 */
|
||||
uint8_t *seg_utf8; size_t seg_utf8_cap;
|
||||
uint32_t *seg_cps; size_t seg_cps_n, seg_cps_cap;
|
||||
/* 当前段布局 */
|
||||
rd_line *seg_lines; rd_page *seg_pages; int seg_nlines, seg_npages;
|
||||
int seg_cache_idx; /* 当前缓冲对应段；-1=无 */
|
||||
};
|
||||
|
||||
static const char *encname_of(rd_enc_t e)
|
||||
{
|
||||
switch (e) {
|
||||
case RD_ENC_UTF8: return "UTF-8";
|
||||
case RD_ENC_UTF16LE: return "UTF-16LE";
|
||||
case RD_ENC_UTF16BE: return "UTF-16BE";
|
||||
case RD_ENC_GB18030: return "GB18030";
|
||||
case RD_ENC_BIG5: return "Big5(按GB18030)";
|
||||
case RD_ENC_ASCII: return "ASCII";
|
||||
}
|
||||
return "?";
|
||||
}
|
||||
|
||||
/* 测量回调：排版器逐字测 advance → rdft_advance（不栅格化）。 */
|
||||
static int book_meas(uint32_t cp, int fs, int *adv, void *ctx)
|
||||
{
|
||||
(void)fs;
|
||||
rd_book *b = (rd_book *)ctx;
|
||||
/* advance 受字号影响：rdft 已 set_px(fs)，故用当前 rdft 度量即可 */
|
||||
return rdft_advance(b->ft, cp, adv);
|
||||
}
|
||||
|
||||
static int build_index(rd_book *b)
|
||||
{
|
||||
int rc = 0;
|
||||
rdtxt_reader *r = NULL;
|
||||
if (rdtxt_reader_open(b->path, &(rdtxt_info){ .enc = b->enc, .file_size = 0, .path = "" },
|
||||
&r) != 0) return -1;
|
||||
/* rdtxt_reader_open 以 info 的 enc 为准（path 域不读） */
|
||||
size_t cap_segs = 64, cap_pages = 1024;
|
||||
b->segs = (seg_t *)malloc(cap_segs * sizeof(seg_t));
|
||||
b->pages = (rd_book_page *)malloc(cap_pages * sizeof(rd_book_page));
|
||||
if (!b->segs || !b->pages) { rd_book_close(b); return -6; }
|
||||
b->nsegs = b->npages = 0;
|
||||
|
||||
uint8_t *utf8 = (uint8_t *)malloc(RDTXT_SEG_UTF8_MAX + 8);
|
||||
if (!utf8) { rd_book_close(b); return -6; }
|
||||
|
||||
size_t off = 0, flen = 0, ulen = 0;
|
||||
int seg_idx = 0;
|
||||
while (rdtxt_reader_next(r, utf8, RDTXT_SEG_UTF8_MAX + 8, &ulen, &off, &flen) == 0) {
|
||||
if (seg_idx >= (int)cap_segs) { cap_segs *= 2; b->segs = (seg_t *)realloc(b->segs, cap_segs * sizeof(seg_t)); }
|
||||
uint32_t *cps = NULL; size_t n = 0;
|
||||
rd_utf8_to_cp(utf8, ulen, &cps, &n); /* rd_utf8_to_cp 内部 malloc */
|
||||
rd_layout_in in;
|
||||
rd_layout_out out;
|
||||
rd_line *lines = (rd_line *)malloc((n ? n : 1) * sizeof(rd_line));
|
||||
rd_page *pages = (rd_page *)malloc((n ? n : 1) * sizeof(rd_page));
|
||||
if (!lines || !pages) { free(lines); free(pages); free(cps); free(utf8); rd_book_close(b); return -6; }
|
||||
in.chars = cps; in.n = (int32_t)n; in.fs = b->fs; in.line_scale = b->ls;
|
||||
in.page_w = b->content_w; in.page_h = b->content_h; in.indent = b->fs;
|
||||
in.meas = book_meas; in.mctx = b;
|
||||
out.lines = lines; out.pages = pages; out.max_lines = (int)(n ? n : 1); out.max_pages = (int)(n ? n : 1);
|
||||
/* 布局容量不足时翻倍重试（罕见）。 */
|
||||
int lrc = rd_layout(&in, &out);
|
||||
free(cps);
|
||||
if (lrc != RD_LAYOUT_OK) { free(lines); free(pages); break; } /* 段为空/异常：跳过 */
|
||||
/* 登记段 + 页 */
|
||||
b->segs[seg_idx].file_off = off;
|
||||
b->segs[seg_idx].file_len = flen;
|
||||
b->segs[seg_idx].page_start = b->npages;
|
||||
b->segs[seg_idx].page_count = out.npages;
|
||||
for (int p = 0; p < out.npages; p++) {
|
||||
if (b->npages >= (int)cap_pages) { cap_pages *= 2; b->pages = (rd_book_page *)realloc(b->pages, cap_pages * sizeof(rd_book_page)); }
|
||||
b->pages[b->npages].seg = seg_idx;
|
||||
b->pages[b->npages].seg_char = out.pages[p].first_char;
|
||||
b->npages++;
|
||||
}
|
||||
free(lines); free(pages);
|
||||
seg_idx++;
|
||||
}
|
||||
free(utf8);
|
||||
rdtxt_reader_free(r);
|
||||
b->nsegs = seg_idx;
|
||||
rc = 0;
|
||||
return rc;
|
||||
}
|
||||
|
||||
int rd_book_open(rd_book **b, const char *path, const char *font_path,
|
||||
int fs, int ls, int pw, int ph, int mx, int my, int top)
|
||||
{
|
||||
if (!b || !path) return -1;
|
||||
rd_book *x = (rd_book *)calloc(1, sizeof *x);
|
||||
if (!x) return -6;
|
||||
if (strlen(path) >= sizeof x->path) { free(x); return -2; }
|
||||
strcpy(x->path, path);
|
||||
if (font_path) { if (strlen(font_path) >= sizeof x->font) { free(x); return -2; } strcpy(x->font, font_path); }
|
||||
/* 文件名 */
|
||||
const char *sl = strrchr(path, '/');
|
||||
strncpy(x->base, sl ? sl + 1 : path, sizeof x->base - 1); x->base[sizeof x->base - 1] = 0;
|
||||
|
||||
if (fs <= 0) fs = 20;
|
||||
if (ls <= 0) ls = 130;
|
||||
x->fs = fs; x->ls = ls; x->pw = pw; x->ph = ph; x->mx = mx; x->my = my; x->top = top;
|
||||
x->content_w = pw - 2 * mx;
|
||||
x->content_h = ph - top - my;
|
||||
if (x->content_w < 10 || x->content_h < 10) { close: free(x); return -3; }
|
||||
|
||||
rdtxt_info info;
|
||||
if (rdtxt_probe(path, &info) != 0) goto close;
|
||||
x->enc = info.enc;
|
||||
x->encname = encname_of(info.enc);
|
||||
|
||||
if (rdft_init(&x->ft) != 0) goto close;
|
||||
if (font_path && rdft_load_font(x->ft, x->font) != 0) { rdft_free(x->ft); goto close; }
|
||||
if (x->ft) rdft_set_px(x->ft, fs);
|
||||
|
||||
x->seg_cache_idx = -1;
|
||||
if (build_index(x) != 0) { rd_book_close(x); return -5; }
|
||||
x->cur = 0;
|
||||
*b = x;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void rd_book_close(rd_book *b)
|
||||
{
|
||||
if (!b) return;
|
||||
free(b->segs);
|
||||
free(b->pages);
|
||||
free(b->seg_utf8);
|
||||
free(b->seg_cps);
|
||||
free(b->seg_lines);
|
||||
free(b->seg_pages);
|
||||
if (b->ft) rdft_free(b->ft);
|
||||
free(b);
|
||||
}
|
||||
|
||||
int rd_book_pages(rd_book *b) { return b ? b->npages : 0; }
|
||||
int rd_book_current(rd_book *b) { return b ? b->cur : 0; }
|
||||
int rd_book_font(rd_book *b) { return b ? b->fs : 0; }
|
||||
int rd_book_ls(rd_book *b) { return b ? b->ls : 0; }
|
||||
void rd_book_geom(rd_book *b, int *fs, int *ls, int *pw, int *ph, int *mx, int *my, int *top)
|
||||
{
|
||||
if (!b) return;
|
||||
if (fs) *fs = b->fs;
|
||||
if (ls) *ls = b->ls;
|
||||
if (pw) *pw = b->pw;
|
||||
if (ph) *ph = b->ph;
|
||||
if (mx) *mx = b->mx;
|
||||
if (my) *my = b->my;
|
||||
if (top) *top = b->top;
|
||||
}
|
||||
const char *rd_book_basename(const rd_book *b) { return b ? b->base : ""; }
|
||||
const char *rd_book_encname(const rd_book *b) { return b ? b->encname : ""; }
|
||||
const char *rd_book_path(const rd_book *b) { return b ? b->path : ""; }
|
||||
|
||||
void rd_book_anchor(rd_book *b, int *seg, int32_t *ch)
|
||||
{
|
||||
if (!b || b->npages <= 0) { if (seg) *seg = 0; if (ch) *ch = 0; return; }
|
||||
int p = b->cur < 0 ? 0 : (b->cur >= b->npages ? b->npages - 1 : b->cur);
|
||||
if (seg) *seg = b->pages[p].seg;
|
||||
if (ch) *ch = b->pages[p].seg_char;
|
||||
}
|
||||
|
||||
int rd_book_turn(rd_book *b, int delta)
|
||||
{
|
||||
if (!b || b->npages <= 0) return 0;
|
||||
int np = b->cur + delta;
|
||||
if (np < 0) np = 0;
|
||||
if (np >= b->npages) np = b->npages - 1;
|
||||
b->cur = np;
|
||||
return np;
|
||||
}
|
||||
|
||||
/* --- 读回一段并布局到复用缓冲（渲染用）--- */
|
||||
static int load_seg(rd_book *b, int seg_idx)
|
||||
{
|
||||
if (seg_idx == b->seg_cache_idx) return 0;
|
||||
seg_t *s = &b->segs[seg_idx];
|
||||
size_t cap = RDTXT_SEG_UTF8_MAX + 8;
|
||||
if (!b->seg_utf8) b->seg_utf8 = (uint8_t *)malloc(cap);
|
||||
if (!b->seg_utf8) return -6;
|
||||
size_t ulen = 0;
|
||||
if (rdtxt_convert_span(b->path, b->enc, s->file_off, s->file_len, b->seg_utf8, cap, &ulen) != RD_ENC_OK)
|
||||
return -4;
|
||||
size_t n = 0;
|
||||
free(b->seg_cps); /* rd_utf8_to_cp 内部 malloc 新数组 */
|
||||
b->seg_cps = NULL;
|
||||
if (rd_utf8_to_cp(b->seg_utf8, ulen, &b->seg_cps, &n) != RD_ENC_OK) return -5;
|
||||
b->seg_cps_n = n;
|
||||
/* 布局（容量：段码点数为上界） */
|
||||
if (b->seg_lines) free(b->seg_lines);
|
||||
if (b->seg_pages) free(b->seg_pages);
|
||||
b->seg_lines = (rd_line *)malloc((n ? n : 1) * sizeof(rd_line));
|
||||
b->seg_pages = (rd_page *)malloc((n ? n : 1) * sizeof(rd_page));
|
||||
if (!b->seg_lines || !b->seg_pages) return -6;
|
||||
rd_layout_in in;
|
||||
rd_layout_out out;
|
||||
in.chars = b->seg_cps; in.n = (int32_t)n; in.fs = b->fs; in.line_scale = b->ls;
|
||||
in.page_w = b->content_w; in.page_h = b->content_h; in.indent = b->fs;
|
||||
in.meas = book_meas; in.mctx = b;
|
||||
out.lines = b->seg_lines; out.pages = b->seg_pages; out.max_lines = (int)(n ? n : 1); out.max_pages = (int)(n ? n : 1);
|
||||
int lrc = rd_layout(&in, &out);
|
||||
if (lrc != RD_LAYOUT_OK) { b->seg_nlines = b->seg_npages = 0; b->seg_cache_idx = -1; return -4; }
|
||||
b->seg_nlines = out.nlines; b->seg_npages = out.npages;
|
||||
b->seg_cache_idx = seg_idx;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rd_book_render(rd_book *b, int page_no, uint16_t *out, int pitch, uint16_t bg565, uint16_t fg565)
|
||||
{
|
||||
if (!b || !out || b->npages <= 0 || page_no < 0 || page_no >= b->npages) return -1;
|
||||
int npix = b->pw * b->ph;
|
||||
for (int i = 0; i < npix; i++) out[i] = bg565;
|
||||
|
||||
rd_book_page *pg = &b->pages[page_no];
|
||||
int seg_idx = (int)pg->seg;
|
||||
if (seg_idx < 0 || seg_idx >= b->nsegs) return -1;
|
||||
if (load_seg(b, seg_idx) != 0) return -2;
|
||||
int local_page = page_no - b->segs[seg_idx].page_start;
|
||||
if (local_page < 0 || local_page >= b->seg_npages) return 1; /* 空页 */
|
||||
rd_page *pp = &b->seg_pages[local_page];
|
||||
|
||||
int asc = rdft_ascender(b->ft);
|
||||
int screen_x0 = b->mx;
|
||||
int screen_y0 = b->top;
|
||||
for (int li = 0; li < pp->nlines; li++) {
|
||||
rd_line *ln = &b->seg_lines[pp->first_line + li];
|
||||
int pen = screen_x0 + ln->x;
|
||||
int baseline = screen_y0 + ln->y + asc;
|
||||
for (int32_t ci = ln->s; ci < ln->e; ci++) {
|
||||
uint32_t cp = b->seg_cps[ci];
|
||||
int adv = 0, bw = 0, bh = 0, left = 0, top = 0;
|
||||
const uint8_t *bmp = NULL;
|
||||
rdft_glyph(b->ft, cp, &adv, &bmp, &bw, &bh, &left, &top);
|
||||
if (bmp && bw > 0)
|
||||
rdft_blend565(out, pitch, b->pw, b->ph, pen, baseline, bmp, bw, bh, left, top, fg565, bg565);
|
||||
pen += adv;
|
||||
if (cp == '\t') pen += adv; /* 制表符已由布局按空格 advance 计量，此处保持游标 */
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 重排 + 回锚：以 (seg,ch) 为锚重排全书；返回重排后的页（0=成功，负值=错误）。 */
|
||||
int rd_book_set_size(rd_book *b, int fs, int ls)
|
||||
{
|
||||
if (!b) return -1;
|
||||
if (fs <= 0) fs = b->fs;
|
||||
if (ls <= 0) ls = b->ls;
|
||||
int anchor_seg, anchor_ch;
|
||||
rd_book_anchor(b, &anchor_seg, &anchor_ch);
|
||||
return rd_book_jump_to_anchor(b, anchor_seg, anchor_ch, fs, ls);
|
||||
}
|
||||
|
||||
int rd_book_jump_to_anchor(rd_book *b, int seg, int32_t ch, int fs, int ls)
|
||||
{
|
||||
if (!b) return -1;
|
||||
if (fs != b->fs || ls != b->ls) {
|
||||
b->fs = fs; b->ls = ls;
|
||||
b->content_w = b->pw - 2 * b->mx;
|
||||
b->content_h = b->ph - b->top - b->my;
|
||||
if (b->ft) rdft_set_px(b->ft, fs);
|
||||
/* 重建索引 */
|
||||
seg_t *nos = b->segs; int n_old_segs = b->nsegs;
|
||||
rd_book_page *nop = b->pages; int n_old_pages = b->npages;
|
||||
b->segs = NULL; b->pages = NULL; b->nsegs = b->npages = 0;
|
||||
if (build_index(b) != 0) {
|
||||
b->segs = nos; b->pages = nop; b->nsegs = n_old_segs; b->npages = n_old_pages;
|
||||
return -5;
|
||||
}
|
||||
free(nos); free(nop);
|
||||
}
|
||||
/* 回锚：找第一个 (seg==anchorSeg && seg_char>=anchorCh) 的页，或段内第一个 seg_char>=ch；跨段按 seg 序 */
|
||||
int target = 0;
|
||||
for (int p = 0; p < b->npages; p++) {
|
||||
int ps = b->pages[p].seg;
|
||||
if (ps < seg) { target = p + 1; continue; }
|
||||
if (ps > seg) { break; }
|
||||
if (b->pages[p].seg_char >= ch) { target = p; break; }
|
||||
target = p;
|
||||
}
|
||||
if (target >= b->npages) target = b->npages - 1;
|
||||
if (target < 0) target = 0;
|
||||
b->cur = target;
|
||||
return target;
|
||||
}
|
||||
|
||||
/* SDK 字库兜底：逐行回调正文文本（无 TTF/OTF 时用 meow_ui_text 渲染）。 */
|
||||
int rd_book_render_text(rd_book *b, int page_no, rd_book_line_fn fn, void *ctx)
|
||||
{
|
||||
if (!b || !fn || b->npages <= 0 || page_no < 0 || page_no >= b->npages) return -1;
|
||||
rd_book_page *pg = &b->pages[page_no];
|
||||
int seg_idx = (int)pg->seg;
|
||||
if (seg_idx < 0 || seg_idx >= b->nsegs) return -1;
|
||||
if (load_seg(b, seg_idx) != 0) return -2;
|
||||
int local_page = page_no - b->segs[seg_idx].page_start;
|
||||
if (local_page < 0 || local_page >= b->seg_npages) return 1;
|
||||
rd_page *pp = &b->seg_pages[local_page];
|
||||
/* 单线程渲染：每行最多 content_w 个单宽字符 → ≤4B/字 UTF-8 */
|
||||
uint8_t *line_utf8 = (uint8_t *)malloc((size_t)(b->content_w * 4 + 32));
|
||||
if (!line_utf8) return -6;
|
||||
for (int li = 0; li < pp->nlines; li++) {
|
||||
rd_line *ln = &b->seg_lines[pp->first_line + li];
|
||||
int x = b->mx + ln->x, y = b->top + ln->y;
|
||||
/* 组 utf8 */
|
||||
size_t o = 0;
|
||||
for (int32_t ci = ln->s; ci < ln->e; ci++) {
|
||||
uint8_t tmp[4];
|
||||
int n = rd_cp_to_utf8(b->seg_cps[ci], tmp);
|
||||
memcpy(line_utf8 + o, tmp, (size_t)n); o += (size_t)n;
|
||||
}
|
||||
line_utf8[o] = 0;
|
||||
fn(x, y, (const char *)line_utf8, (int)o, ctx);
|
||||
}
|
||||
free(line_utf8);
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
/* app/book.h — 书桥：把 core(TXT/排版) + engine(FreeType) 串成「一本 TXT 书」。
|
||||
*
|
||||
* 打开一本书：探测编码 → 逐段 rdtxt 流式读 → 每段 utf8→码点 → rd_layout（测量=rdft_advance）
|
||||
* → 页索引（flat：每页=段+段内字符偏移）+ 段表（file_off/file_len/page_start/page_count）。
|
||||
* 渲染页：定位段 → 重读该段 → 重排 → 取该页行 → 逐字 rdft_glyph → blend565 到全屏缓冲。
|
||||
* 锚定/进度：(段,字符偏移)，与字号无关；改字号/行距触发后台重排并回锚（§6.3）。
|
||||
*
|
||||
* 内存纪律：单段（文本+cps+布局）≈ 320KB 冲击，随段释放；页索引 flat ~每页 12B；3 页位图由
|
||||
* 阅读 view 持有（本模块只填一个渲染目标缓冲，不缓存整页）。
|
||||
*/
|
||||
#ifndef RDBOOK_H
|
||||
#define RDBOOK_H
|
||||
|
||||
#include "rdenc.h"
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct rd_book rd_book;
|
||||
|
||||
typedef struct rd_book_page {
|
||||
int32_t seg; /* 段下标 */
|
||||
int32_t seg_char; /* 段内字符偏移（页首） */
|
||||
} rd_book_page;
|
||||
|
||||
/* 打开书：path=TXT；font_path=FreeType 字体；geom=版面（fs 字号 / ls 行距% / pw,ph 全屏 /
|
||||
* mx,my 左右/上下边距 / top 顶部 inset（状态栏+顶条））。0=成功。 */
|
||||
int rd_book_open(rd_book **b, const char *path, const char *font_path,
|
||||
int fs, int ls, int pw, int ph, int mx, int my, int top);
|
||||
void rd_book_close(rd_book *b);
|
||||
|
||||
int rd_book_pages(rd_book *b);
|
||||
int rd_book_current(rd_book *b); /* 当前页 */
|
||||
int rd_book_turn(rd_book *b, int delta); /* +1/-1；clamp 到 [0,npages-1] */
|
||||
void rd_book_anchor(rd_book *b, int *seg, int32_t *ch);/* 当前页锚（段,字符偏移） */
|
||||
int rd_book_jump_to_anchor(rd_book *b, int seg, int32_t ch, int fs, int ls); /* 重排 + 回锚 */
|
||||
int rd_book_set_size(rd_book *b, int fs, int ls); /* 重排 + 回锚（anchor=当前页） */
|
||||
|
||||
/* 渲染页到全屏缓冲：out 为 pw*ph RGB565（每行 pitch 字节）；先填 bg565 再画正文。
|
||||
* 0=成功；1=该页为空（无正文，如末页空白）。 */
|
||||
int rd_book_render(rd_book *b, int page_no, uint16_t *out, int pitch, uint16_t bg565, uint16_t fg565);
|
||||
|
||||
/* SDK 字库兜底：逐行回调（每行一个 utf8 文本串，屏幕坐标 x,y 已含 inset/边距）。
|
||||
* 用于「无 TTF/OTF → 用 meow_ui_text 位图字库渲染正文」的降级路径（见 reader 视图取舍）。 */
|
||||
typedef void (*rd_book_line_fn)(int x, int y, const char *utf8, int len, void *ctx);
|
||||
int rd_book_render_text(rd_book *b, int page_no, rd_book_line_fn fn, void *ctx);
|
||||
|
||||
/* 书名/信息（章节名：TXT 无章节=文件名；enc 可读名）。调用方 strcpy 到自己的缓冲。 */
|
||||
const char *rd_book_basename(const rd_book *b); /* 文件名（路径尾分量） */
|
||||
const char *rd_book_encname(const rd_book *b);
|
||||
const char *rd_book_path(const rd_book *b); /* 原始路径 */
|
||||
|
||||
/* 字体/几何 */
|
||||
int rd_book_font(rd_book *b); /* 当前字号 */
|
||||
int rd_book_ls(rd_book *b); /* 行距% */
|
||||
void rd_book_geom(rd_book *b, int *fs, int *ls, int *pw, int *ph, int *mx, int *my, int *top);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* RDBOOK_H */
|
||||
@@ -0,0 +1,102 @@
|
||||
/* app/progress.c — 进度持久化（实现见 app/progress.h）。 */
|
||||
#include "progress.h"
|
||||
#include "meow_ui.h" /* meow_config_dir() */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/* 从 MEOW_DATA_DIR（<TF>/MeowData/<pkg>/data）剥掉尾 "/data"，得到 <TF>/MeowData/<pkg>。 */
|
||||
static void strip_data_suffix(const char *d, char *out, int outsz)
|
||||
{
|
||||
if (!d || !d[0]) { strncpy(out, "/tmp", (size_t)outsz - 1); out[outsz - 1] = 0; return; }
|
||||
size_t n = strlen(d);
|
||||
const char *suffix = "/data";
|
||||
size_t sl = strlen(suffix);
|
||||
size_t keep;
|
||||
if (n >= sl && strcmp(d + n - sl, suffix) == 0) keep = n - sl;
|
||||
else keep = n;
|
||||
if (keep >= (size_t)outsz) keep = (size_t)outsz - 1;
|
||||
memcpy(out, d, keep);
|
||||
out[keep] = 0;
|
||||
}
|
||||
|
||||
int rdprog_dir(char *out, int outsz)
|
||||
{
|
||||
if (!out || outsz <= 0) return -1;
|
||||
const char *data = meow_config_dir();
|
||||
char base[360];
|
||||
strip_data_suffix(data ? data : "", base, sizeof base);
|
||||
if (snprintf(out, (size_t)outsz, "%s/progress", base) >= outsz) return -2;
|
||||
/* mkdir -p */
|
||||
char tmp[400];
|
||||
strncpy(tmp, out, sizeof tmp - 1); tmp[sizeof tmp - 1] = 0;
|
||||
for (char *p = tmp + 1; *p; p++) {
|
||||
if (*p == '/') { *p = 0; mkdir(tmp, 0755); *p = '/'; }
|
||||
}
|
||||
mkdir(tmp, 0755);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void rdprog_hash(const char *book_path, char *out, int outsz)
|
||||
{
|
||||
uint32_t h = 2166136261u;
|
||||
for (const unsigned char *p = (const unsigned char *)book_path; *p; p++) {
|
||||
h ^= *p; h *= 16777619u;
|
||||
}
|
||||
snprintf(out, (size_t)outsz, "%08x.prog", h);
|
||||
}
|
||||
|
||||
static int rdprog_path(const char *book_path, char *out, int outsz,
|
||||
int *created_dir)
|
||||
{
|
||||
char dir[400];
|
||||
if (rdprog_dir(dir, sizeof dir) != 0) return -1;
|
||||
char name[24];
|
||||
rdprog_hash(book_path, name, sizeof name);
|
||||
if (snprintf(out, (size_t)outsz, "%s/%s", dir, name) >= outsz) return -2;
|
||||
if (created_dir) *created_dir = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rdprog_load(const char *book_path, rdprog *p)
|
||||
{
|
||||
if (!book_path || !p) return -1;
|
||||
char path[440];
|
||||
if (rdprog_path(book_path, path, sizeof path, NULL) != 0) return -1;
|
||||
FILE *f = fopen(path, "rb");
|
||||
if (!f) return 0;
|
||||
char line[256];
|
||||
int seg = 0, fs = 0, ls = 0; int32_t ch = 0; uint64_t ts = 0; int v = 0, found = 0;
|
||||
while (fgets(line, sizeof line, f)) {
|
||||
if (sscanf(line, "v=%d", &v) == 1) { if (v == 1) found = 1; }
|
||||
else if (sscanf(line, "seg=%d", &seg) == 1) { /* no-op */ }
|
||||
else if (sscanf(line, "ch=%d", &ch) == 1) { /* no-op */ }
|
||||
else if (sscanf(line, "fs=%d", &fs) == 1) { /* no-op */ }
|
||||
else if (sscanf(line, "ls=%d", &ls) == 1) { /* no-op */ }
|
||||
else if (sscanf(line, "ts=%llu", (unsigned long long *)&ts) == 1) { /* no-op */ }
|
||||
}
|
||||
fclose(f);
|
||||
if (!found) return 0;
|
||||
p->valid = 1; p->seg = seg; p->ch = ch; p->fs = fs; p->ls = ls; p->ts = ts;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int rdprog_save(const char *book_path, const rdprog *p)
|
||||
{
|
||||
if (!book_path || !p) return -1;
|
||||
char path[440];
|
||||
if (rdprog_path(book_path, path, sizeof path, NULL) != 0) return -1;
|
||||
FILE *f = fopen(path, "wb");
|
||||
if (!f) return -1;
|
||||
/* 先写临时再改原子（exFAT 无 rename+replace 语义保证，直接写亦可接受） */
|
||||
fprintf(f, "v=1\n");
|
||||
fprintf(f, "seg=%d\n", p->seg);
|
||||
fprintf(f, "ch=%d\n", (int)p->ch);
|
||||
fprintf(f, "fs=%d\n", p->fs);
|
||||
fprintf(f, "ls=%d\n", p->ls);
|
||||
fprintf(f, "ts=%llu\n", (unsigned long long)p->ts);
|
||||
fclose(f);
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
/* app/progress.h — 进度持久化：`MeowData/os.meow.reader/progress/`（每书 = path hash 文件）。
|
||||
*
|
||||
* 内容（文本，可读可调）：v=1 / seg=<段> / ch=<字符偏移> / fs=<字号> / ls=<行距%> / ts=<unix>。
|
||||
* 锚定是（段,字符偏移），与字号无关 → 换字号书签不失效（READER_ENGINE_NOTES §6.3）。
|
||||
* 无 SDK 之外依赖；目录推导：MEOW_DATA_DIR（launcher 注入 <TF>/MeowData/<pkg>/data）去皮 /data →
|
||||
* <TF>/MeowData/<pkg>，接 "progress"；无 env（宿主/无卡）回退 /tmp/meowcfg_<pid>/progress。
|
||||
*/
|
||||
#ifndef RDPROG_H
|
||||
#define RDPROG_H
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct rdprog {
|
||||
int valid; /* 1=有档 */
|
||||
int seg;
|
||||
int32_t ch;
|
||||
int fs;
|
||||
int ls;
|
||||
uint64_t ts; /* 最近阅读 unix 秒 */
|
||||
} rdprog;
|
||||
|
||||
/* 组装 progress 目录路径并 mkdir -p。成功 0（out 填目录绝对路径）；负值错误。 */
|
||||
int rdprog_dir(char *out, int outsz);
|
||||
|
||||
/* 由书路径算 hash 文件名（FNV-1a 32bit hex）写 out（≥20 字节）。 */
|
||||
void rdprog_hash(const char *book_path, char *out, int outsz);
|
||||
|
||||
/* 读进度：1=有档（填 p）；0=无/不存在；负值=IO 错。 */
|
||||
int rdprog_load(const char *book_path, rdprog *p);
|
||||
|
||||
/* 写进度。0=成功；负值=IO/无法建目录（不崩）。 */
|
||||
int rdprog_save(const char *book_path, const rdprog *p);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* RDPROG_H */
|
||||
@@ -0,0 +1,334 @@
|
||||
/* app/reader.c — 阅读页：W_CUSTOM 画布 + 三栏交互 + 中央菜单占位 + 顶栏进度/章节名 + 进度持久化。
|
||||
*
|
||||
* 渲染：W_CUSTOM 画布覆盖全屏；render_cb 画帧 = 填底色 → 翻页 blit（FreeType 页位图缓存 /
|
||||
* 无字体则 SDK 位图字库兜底直绘）→ 顶栏 → 菜单覆盖层。翻页 = 局部脏区（flush_region）。
|
||||
* 交互：点击左/右 1/3 翻页；中央唤菜单（字号±/行距±/返回）；左滑=下一页、右滑=上一页。
|
||||
* 进度：打开自动续读；换字号重排回锚（段,字符偏移）；离开/翻页时保存。
|
||||
*/
|
||||
#include "../reader_internal.h"
|
||||
#include "meow_ui_internal.h" /* back_buf/pitch/bpp 访问器（决策见报告） */
|
||||
#include "book.h"
|
||||
#include "progress.h"
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
|
||||
#define RD_MENU_H 64
|
||||
#define RD_MENU_BTN 5
|
||||
|
||||
static rd_book *g_book;
|
||||
static int g_reader_active;
|
||||
static meow_widget *g_canvas;
|
||||
static int g_pw, g_ph, g_top, g_mx, g_my;
|
||||
static int g_fs, g_ls;
|
||||
#define RD_PAGE_CACHE 3
|
||||
#define RD_PAGE_SLOT_CUR 1
|
||||
static uint16_t *g_page_buf[RD_PAGE_CACHE]; /* [0]=prev [1]=cur [2]=next（FreeType 页位图） */
|
||||
static int g_has_font; /* 1=FreeType 路径；0=SDK 字库兜底 */
|
||||
static int g_menu_open;
|
||||
static char g_font_path[400];
|
||||
static int g_notice_ms;
|
||||
|
||||
static uint32_t g_page_bg, g_page_fg; /* 正文页底/字色（24bit） */
|
||||
static char g_chapter[128]; /* 顶栏章节名（TXT 无章节=文件名） */
|
||||
|
||||
#define RD_READER_DEFAULT_FS 20
|
||||
#define RD_READER_DEFAULT_LS 130
|
||||
|
||||
/* 前向声明（reader_reflow* 依赖 reader_refill/redraw，定义在后） */
|
||||
static void reader_redraw(void);
|
||||
static int reader_refill_page(void);
|
||||
static void reader_reflow_persist(void);
|
||||
|
||||
/* ---------- 工具 ---------- */
|
||||
static uint16_t rgb565(uint32_t c)
|
||||
{
|
||||
int r = (c >> 16) & 0xFF, g = (c >> 8) & 0xFF, b = c & 0xFF;
|
||||
return (uint16_t)(((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3));
|
||||
}
|
||||
|
||||
/* 递归（深度≤3）扫 MeowOS/fonts/ 找第一个 .otf/.ttf。0=找到。 */
|
||||
static int find_font_rec(const char *dir, int depth)
|
||||
{
|
||||
if (depth > 3) return 0;
|
||||
DIR *dp = opendir(dir);
|
||||
if (!dp) return 0;
|
||||
struct dirent *de;
|
||||
int found = 0;
|
||||
while ((de = readdir(dp)) && !found) {
|
||||
if (de->d_name[0] == '.') continue;
|
||||
char full[480];
|
||||
if (snprintf(full, sizeof full, "%s/%s", dir, de->d_name) >= (int)sizeof full) continue;
|
||||
struct stat st;
|
||||
if (stat(full, &st) != 0) continue;
|
||||
if (S_ISDIR(st.st_mode)) { found = find_font_rec(full, depth + 1); }
|
||||
else {
|
||||
const char *d = strrchr(de->d_name, '.');
|
||||
if (d && (strcasecmp(d, ".otf") == 0 || strcasecmp(d, ".ttf") == 0)) {
|
||||
if (strlen(full) < sizeof g_font_path) {
|
||||
strcpy(g_font_path, full);
|
||||
found = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
closedir(dp);
|
||||
return found;
|
||||
}
|
||||
static const char *resolve_font(void)
|
||||
{
|
||||
g_font_path[0] = 0;
|
||||
if (find_font_rec(READER_SD_ROOT "/MeowOS/fonts", 0)) return g_font_path;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void chapter_name(void)
|
||||
{
|
||||
/* TXT 无章节 → 文件名；R1 固定。 */
|
||||
snprintf(g_chapter, sizeof g_chapter, "%s", rd_book_basename(g_book));
|
||||
}
|
||||
|
||||
static void reader_reflow(void)
|
||||
{
|
||||
if (!g_book) return;
|
||||
int seg = 0; int32_t ch = 0;
|
||||
rd_book_anchor(g_book, &seg, &ch); /* 记录当前锚，重排后回锚 */
|
||||
rd_book_jump_to_anchor(g_book, seg, ch, g_fs, g_ls);
|
||||
reader_refill_page();
|
||||
reader_redraw();
|
||||
reader_reflow_persist();
|
||||
}
|
||||
|
||||
static void reader_reflow_persist(void)
|
||||
{
|
||||
if (!g_book) return;
|
||||
int seg = 0; int32_t ch = 0;
|
||||
rd_book_anchor(g_book, &seg, &ch);
|
||||
rdprog p;
|
||||
p.valid = 1; p.seg = seg; p.ch = ch; p.fs = g_fs; p.ls = g_ls; p.ts = (uint64_t)time(NULL);
|
||||
rdprog_save(rd_book_path(g_book), &p);
|
||||
}
|
||||
|
||||
/* ---------- 渲染（W_CUSTOM render_cb） ---------- */
|
||||
static void reader_draw_line_atlas(int x, int y, const char *utf8, int len, void *ctx)
|
||||
{
|
||||
(void)ctx; (void)len;
|
||||
meow_ui_text(x, y, utf8, (g_fs <= 20) ? 20 : 28, g_page_fg);
|
||||
}
|
||||
|
||||
static void reader_canvas_render(meow_widget *w, const meow_theme *th, void *ctx)
|
||||
{
|
||||
(void)w; (void)ctx;
|
||||
meow_ui_clear(g_page_bg);
|
||||
if (g_book) {
|
||||
int page = rd_book_current(g_book);
|
||||
if (g_has_font && g_page_buf[RD_PAGE_SLOT_CUR]) {
|
||||
/* 翻页 blit：行拷贝当前页位图 → back_buf（局部脏区由 flush_region 上屏） */
|
||||
unsigned char *bb = meow_ui_back_buf();
|
||||
int pitch = meow_ui_back_buf_pitch();
|
||||
int bpp = meow_ui_back_buf_bpp();
|
||||
uint16_t *src = g_page_buf[RD_PAGE_SLOT_CUR];
|
||||
if (bb && pitch > 0 && bpp == 16) {
|
||||
for (int y = 0; y < g_ph; y++)
|
||||
memcpy(bb + (size_t)y * pitch, src + (size_t)y * g_pw, (size_t)g_pw * 2);
|
||||
}
|
||||
} else {
|
||||
rd_book_render_text(g_book, page, reader_draw_line_atlas, NULL);
|
||||
}
|
||||
}
|
||||
/* 顶栏：进度% + 章节名（避开系统状态栏） */
|
||||
int sbh = meow_ui_statusbar_height();
|
||||
int pages = rd_book_pages(g_book);
|
||||
int page = rd_book_current(g_book);
|
||||
char pct[16];
|
||||
int p = pages > 0 ? (page * 100 / pages) : 0;
|
||||
snprintf(pct, sizeof pct, "%d%%", p);
|
||||
meow_ui_fill_rect(0, sbh, g_pw, (g_top - 4 - sbh), g_page_bg);
|
||||
meow_ui_text(16, sbh + 4, g_chapter[0] ? g_chapter : "阅读", 20, th->fg);
|
||||
meow_ui_text_right(g_pw - 16, sbh + 4, pct, 20, th->fg);
|
||||
meow_ui_draw_rect(0, g_top - 5, g_pw, 1, th->outline);
|
||||
|
||||
if (g_menu_open) {
|
||||
int y = g_ph - RD_MENU_H;
|
||||
meow_ui_fill_rect_alpha(0, y, g_pw, RD_MENU_H, 0x000000, 160);
|
||||
/* 5 按钮：返回 | 字号− | 字号+ | 行距− | 行距+ */
|
||||
int bw = g_pw / RD_MENU_BTN;
|
||||
const char *labels[RD_MENU_BTN] = { "返回", "字-", "字+", "距-", "距+" };
|
||||
for (int i = 0; i < RD_MENU_BTN; i++) {
|
||||
int bx = i * bw;
|
||||
meow_ui_fill_rect(bx + 4, y + 12, bw - 8, RD_MENU_H - 24, th->surfaceContainer);
|
||||
meow_ui_text_center(bx + bw / 2, y + (RD_MENU_H - 20) / 2 - 6, labels[i], 20, th->fg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void reader_redraw(void)
|
||||
{
|
||||
if (!g_canvas) return;
|
||||
meow_widget_draw(g_canvas); /* → render_cb 画帧 */
|
||||
meow_ui_flush_region(0, 0, g_pw, g_ph);
|
||||
}
|
||||
|
||||
static void reader_free_page_bufs(void)
|
||||
{
|
||||
for (int i = 0; i < RD_PAGE_CACHE; i++) { free(g_page_buf[i]); g_page_buf[i] = NULL; }
|
||||
}
|
||||
|
||||
/* 渲染当前页 + 前后各一页到 3 槽缓存（对齐设计「当前±前±后」；动画档为 无/滑动/淡入 R1 默认无）。 */
|
||||
static int reader_refill_page(void)
|
||||
{
|
||||
if (!g_book) return -1;
|
||||
if (g_has_font && g_page_buf[RD_PAGE_SLOT_CUR]) {
|
||||
uint16_t bg = rgb565(g_page_bg), fg = rgb565(g_page_fg);
|
||||
int cur = rd_book_current(g_book);
|
||||
int np = rd_book_pages(g_book);
|
||||
int slots[RD_PAGE_CACHE] = { cur - 1, cur, cur + 1 };
|
||||
for (int i = 0; i < RD_PAGE_CACHE; i++) {
|
||||
int p = slots[i];
|
||||
if (p >= 0 && p < np) rd_book_render(g_book, p, g_page_buf[i], g_pw * 2, bg, fg);
|
||||
else for (int y = 0; y < g_ph; y++) /* 空白槽填背景 */
|
||||
for (int x = 0; x < g_pw; x++) g_page_buf[i][(size_t)y * g_pw + x] = bg;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return 0; /* 兜底路径：render_text 直绘 */
|
||||
}
|
||||
|
||||
/* ---------- 打开 ---------- */
|
||||
void reader_open(const char *path)
|
||||
{
|
||||
if (!path || !path[0]) return;
|
||||
if (g_book) { rd_book_close(g_book); g_book = NULL; }
|
||||
reader_free_page_bufs();
|
||||
|
||||
const char *fp = resolve_font();
|
||||
g_has_font = (fp != NULL);
|
||||
g_fs = RD_READER_DEFAULT_FS; g_ls = RD_READER_DEFAULT_LS;
|
||||
|
||||
/* 进度（含字号/行距偏好） */
|
||||
rdprog prog;
|
||||
int hasprog = (rdprog_load(path, &prog) == 1) && prog.valid;
|
||||
if (hasprog) { if (prog.fs >= 14 && prog.fs <= 40) g_fs = prog.fs; if (prog.ls >= 100 && prog.ls <= 200) g_ls = prog.ls; }
|
||||
|
||||
int sbh = meow_ui_statusbar_height();
|
||||
g_pw = meow_ui_width(); g_ph = meow_ui_height();
|
||||
g_top = sbh + 34; g_mx = 16; g_my = 20;
|
||||
|
||||
const meow_theme *th = meow_theme_get();
|
||||
g_page_bg = th->surface; g_page_fg = th->onSurface;
|
||||
|
||||
/* 开书（FreeType 路径带齐几何；无字体则 g_has_font=0 → atlas 兜底） */
|
||||
int rc = rd_book_open(&g_book, path, fp, g_fs, g_ls, g_pw, g_ph, g_mx, g_my, g_top);
|
||||
if (rc != 0) {
|
||||
meow_log(MEOW_LOG_WARN, "book open failed rc=%d path=%s", rc, path);
|
||||
g_book = NULL; g_has_font = 0;
|
||||
g_notice_ms = 3000;
|
||||
return;
|
||||
}
|
||||
chapter_name();
|
||||
|
||||
if (g_has_font) {
|
||||
reader_free_page_bufs();
|
||||
for (int i = 0; i < RD_PAGE_CACHE; i++)
|
||||
g_page_buf[i] = (uint16_t *)malloc((size_t)g_pw * (size_t)g_ph * 2);
|
||||
if (!g_page_buf[RD_PAGE_SLOT_CUR]) { reader_free_page_bufs(); g_has_font = 0; }
|
||||
}
|
||||
|
||||
/* 续读：进度锚（段,字符偏移）→ 跳页 */
|
||||
if (hasprog && g_book) {
|
||||
rd_book_jump_to_anchor(g_book, prog.seg, prog.ch, g_fs, g_ls);
|
||||
}
|
||||
|
||||
reader_refill_page();
|
||||
|
||||
g_menu_open = 0;
|
||||
if (g_reader_active) reader_redraw();
|
||||
}
|
||||
|
||||
/* ---------- 视图生命周期 ---------- */
|
||||
static void reader_on_create(meow_view *v, void *ctx) { (void)v; (void)ctx; }
|
||||
static void reader_on_enter(meow_view *v, void *ctx)
|
||||
{
|
||||
(void)v; (void)ctx;
|
||||
g_reader_active = 1;
|
||||
if (g_book) { reader_refill_page(); chapter_name(); }
|
||||
reader_redraw();
|
||||
}
|
||||
static void reader_on_leave(meow_view *v, void *ctx)
|
||||
{
|
||||
(void)v; (void)ctx;
|
||||
reader_reflow_persist(); /* 离开保存进度 */
|
||||
g_reader_active = 0;
|
||||
}
|
||||
static void reader_on_destroy(meow_view *v, void *ctx)
|
||||
{
|
||||
(void)v; (void)ctx;
|
||||
if (g_book) rd_book_close(g_book);
|
||||
g_book = NULL;
|
||||
reader_free_page_bufs();
|
||||
g_menu_open = 0; g_reader_active = 0;
|
||||
}
|
||||
|
||||
meow_view *reader_view_create(void)
|
||||
{
|
||||
static meow_view_hooks hooks = { reader_on_create, reader_on_enter, reader_on_leave,
|
||||
reader_on_destroy, NULL, NULL, NULL };
|
||||
meow_view *v = meow_view_create(ACT_READER, MEOW_VIEW_ACTIVITY, &hooks, NULL);
|
||||
g_canvas = meow_widget_custom_create(0, 0, 480, 720, reader_canvas_render, NULL, NULL);
|
||||
meow_view_add_widget(v, g_canvas);
|
||||
return v;
|
||||
}
|
||||
|
||||
int reader_is_active(void) { return g_reader_active; }
|
||||
|
||||
void reader_on_tap(int x, int y)
|
||||
{
|
||||
if (!g_book) { return; }
|
||||
if (g_menu_open) {
|
||||
/* 菜单按钮命中 */
|
||||
int y0 = g_ph - RD_MENU_H;
|
||||
if (y >= y0) {
|
||||
int bw = g_pw / RD_MENU_BTN;
|
||||
int idx = x / bw;
|
||||
switch (idx) {
|
||||
case 0: /* 返回书架 */
|
||||
g_menu_open = 0;
|
||||
reader_reflow_persist();
|
||||
meow_view_page_pop();
|
||||
return;
|
||||
case 1: if (g_fs > 14) { g_fs -= 2; reader_reflow(); } break;
|
||||
case 2: if (g_fs < 40) { g_fs += 2; reader_reflow(); } break;
|
||||
case 3: if (g_ls > 100) { g_ls -= 5; reader_reflow(); } break;
|
||||
case 4: if (g_ls < 200) { g_ls += 5; reader_reflow(); } break;
|
||||
}
|
||||
if (y >= y0) return;
|
||||
}
|
||||
g_menu_open = 0; /* 点菜单外关闭 */
|
||||
reader_redraw();
|
||||
return;
|
||||
}
|
||||
/* 三栏：左 1/3 上一页、右 1/3 下一页、中央唤菜单 */
|
||||
if (x < g_pw / 3) { rd_book_turn(g_book, -1); reader_refill_page(); reader_redraw(); }
|
||||
else if (x > g_pw * 2 / 3) { rd_book_turn(g_book, 1); reader_refill_page(); reader_redraw(); }
|
||||
else { g_menu_open = 1; reader_redraw(); }
|
||||
}
|
||||
|
||||
void reader_on_swipe(int dir, int dx, int dy)
|
||||
{
|
||||
(void)dx; (void)dy;
|
||||
if (!g_book) return;
|
||||
if (g_menu_open) { g_menu_open = 0; reader_redraw(); return; }
|
||||
if (dir == MEOW_SWIPE_LEFT) { rd_book_turn(g_book, 1); }
|
||||
else if (dir == MEOW_SWIPE_RIGHT) { rd_book_turn(g_book, -1); }
|
||||
else return;
|
||||
reader_refill_page(); reader_redraw();
|
||||
}
|
||||
|
||||
void reader_on_tick(uint64_t now)
|
||||
{
|
||||
(void)now;
|
||||
if (g_notice_ms > 0) { g_notice_ms--; if (g_notice_ms == 0) reader_redraw(); }
|
||||
}
|
||||
@@ -0,0 +1,184 @@
|
||||
/* app/shelf.c — 书架：扫 TF 卡 `Books/`，识别 TXT/FB2/EPUB/MOBI/CBZ（R1 仅 TXT 可开，
|
||||
* 其它显示「R2 支持」占位）；卡片列表 + 最近阅读置顶（按 progress ts 降序）。
|
||||
* 用 W_LISTVIEW（结构化列表）+ App 自绘标题。空态=清屏提示。
|
||||
*/
|
||||
#include "../reader_internal.h"
|
||||
#include "progress.h"
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#define SHELF_LIST_X 0
|
||||
#define SHELF_LIST_Y 64
|
||||
#define SHELF_LIST_W 480
|
||||
#define SHELF_LIST_H (720 - 64)
|
||||
|
||||
typedef struct shelf_book {
|
||||
char path[400];
|
||||
char title[128];
|
||||
char sub[160];
|
||||
int fmt; /* 0 txt,1 fb2,2 epub,3 mobi,4 cbz */
|
||||
long size;
|
||||
uint64_t ts; /* 最近阅读 unix；无=0 */
|
||||
} shelf_book;
|
||||
|
||||
static shelf_book g_books[256];
|
||||
static int g_nbooks;
|
||||
static int g_active;
|
||||
static meow_widget *g_list;
|
||||
static uint32_t g_bg, g_fg, g_dim;
|
||||
static char g_notice[160]; /* 空态/提示 */
|
||||
static int g_notice_ms; /* 剩余显示 ms（0=无） */
|
||||
|
||||
static const char *fmt_name(int f)
|
||||
{
|
||||
switch (f) { case 0: return "TXT"; case 1: return "FB2"; case 2: return "EPUB";
|
||||
case 3: return "MOBI"; case 4: return "CBZ"; default: return "?"; }
|
||||
}
|
||||
static int fmt_from_ext(const char *name)
|
||||
{
|
||||
const char *d = strrchr(name, '.');
|
||||
if (!d) return -1;
|
||||
if (strcasecmp(d, ".txt") == 0) return 0;
|
||||
if (strcasecmp(d, ".fb2") == 0) return 1;
|
||||
if (strcasecmp(d, ".epub") == 0) return 2;
|
||||
if (strcasecmp(d, ".mobi") == 0) return 3;
|
||||
if (strcasecmp(d, ".cbz") == 0) return 4;
|
||||
return -1;
|
||||
}
|
||||
static void fmt_size(char *out, int outsz, long s)
|
||||
{
|
||||
if (s >= 1 << 20) snprintf(out, outsz, "%.1fMB", (double)s / (1 << 20));
|
||||
else if (s >= 1 << 10) snprintf(out, outsz, "%.0fKB", (double)s / (1 << 10));
|
||||
else snprintf(out, outsz, "%ldB", s);
|
||||
}
|
||||
|
||||
static int cmp_recent_then_name(const void *a, const void *b)
|
||||
{
|
||||
const shelf_book *x = (const shelf_book *)a, *y = (const shelf_book *)b;
|
||||
if (x->ts != y->ts) return (x->ts < y->ts) ? 1 : -1; /* 最近在前 */
|
||||
return strcasecmp(x->title, y->title);
|
||||
}
|
||||
|
||||
static void scan_books(void)
|
||||
{
|
||||
const char *dir = READER_SD_ROOT "/Books";
|
||||
g_nbooks = 0;
|
||||
DIR *dp = opendir(dir);
|
||||
if (!dp) {
|
||||
snprintf(g_notice, sizeof g_notice, "未找到 %s 目录，请放入书籍（TXT）", dir);
|
||||
g_notice_ms = 4000;
|
||||
return;
|
||||
}
|
||||
struct dirent *de;
|
||||
while ((de = readdir(dp)) && g_nbooks < 256) {
|
||||
if (de->d_name[0] == '.') continue;
|
||||
int f = fmt_from_ext(de->d_name);
|
||||
if (f < 0) continue;
|
||||
shelf_book *b = &g_books[g_nbooks];
|
||||
if (snprintf(b->path, sizeof b->path, "%s/%s", dir, de->d_name) >= (int)sizeof b->path) continue;
|
||||
strncpy(b->title, de->d_name, sizeof b->title - 1); b->title[sizeof b->title - 1] = 0;
|
||||
char *dot = strrchr(b->title, '.');
|
||||
if (dot) *dot = 0; /* 标题去扩展名 */
|
||||
b->fmt = f;
|
||||
struct stat st;
|
||||
b->size = (stat(b->path, &st) == 0) ? (long)st.st_size : 0;
|
||||
rdprog p;
|
||||
b->ts = (rdprog_load(b->path, &p) == 1) ? p.ts : 0;
|
||||
char sz[24]; fmt_size(sz, sizeof sz, b->size);
|
||||
snprintf(b->sub, sizeof b->sub, "%s · %s%s", fmt_name(f), sz,
|
||||
b->ts ? " · 读" : "");
|
||||
g_nbooks++;
|
||||
}
|
||||
closedir(dp);
|
||||
qsort(g_books, (size_t)g_nbooks, sizeof(shelf_book), cmp_recent_then_name);
|
||||
}
|
||||
|
||||
/* listview 行源 */
|
||||
static int shelf_list_src(int idx, meow_list_item *out, void *ctx)
|
||||
{
|
||||
(void)ctx;
|
||||
if (idx < 0 || idx >= g_nbooks) return 0;
|
||||
const shelf_book *b = &g_books[idx];
|
||||
out->icon_kind = MEOW_LIST_ICON_FILE;
|
||||
out->title = b->title;
|
||||
out->subtitle = b->sub;
|
||||
out->right = MEOW_LIST_RIGHT_ARROW;
|
||||
out->enabled = 1;
|
||||
out->on = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void shelf_list_tapcb(int idx, int op, void *ctx)
|
||||
{
|
||||
(void)op; (void)ctx;
|
||||
if (idx < 0 || idx >= g_nbooks) return;
|
||||
const shelf_book *b = &g_books[idx];
|
||||
if (b->fmt == 0) { reader_open(b->path); }
|
||||
else { snprintf(g_notice, sizeof g_notice, "%s 格式 R2 支持（R1 先看 TXT）", fmt_name(b->fmt)); g_notice_ms = 2500; }
|
||||
}
|
||||
|
||||
/* view 生命周期 */
|
||||
static void shelf_on_create(meow_view *v, void *ctx) { (void)v; (void)ctx; }
|
||||
static void shelf_on_enter(meow_view *v, void *ctx)
|
||||
{
|
||||
(void)v; (void)ctx;
|
||||
g_active = 1;
|
||||
scan_books(); /* 回到书架即重扫（新增/最近读置顶刷新） */
|
||||
const meow_theme *th = meow_theme_get();
|
||||
g_bg = th->bg; g_fg = th->fg; g_dim = th->dim;
|
||||
/* 无控件时重建列表（首次/回到书架） */
|
||||
if (g_list) { meow_widget_free(g_list); g_list = NULL; }
|
||||
g_list = meow_listview_create(SHELF_LIST_X, SHELF_LIST_Y, SHELF_LIST_W, SHELF_LIST_H,
|
||||
g_nbooks, shelf_list_src, NULL, MEOW_LIST_SEL_SINGLE);
|
||||
meow_listview_set_on_tap(g_list, shelf_list_tapcb, NULL);
|
||||
shelf_redraw();
|
||||
}
|
||||
static void shelf_on_leave(meow_view *v, void *ctx) { (void)v; (void)ctx; g_active = 0; }
|
||||
static void shelf_on_destroy(meow_view *v, void *ctx)
|
||||
{
|
||||
(void)v; (void)ctx;
|
||||
if (g_list) { meow_widget_free(g_list); g_list = NULL; }
|
||||
}
|
||||
|
||||
meow_view *shelf_view_create(void)
|
||||
{
|
||||
static meow_view_hooks hooks = { shelf_on_create, shelf_on_enter, shelf_on_leave,
|
||||
shelf_on_destroy, NULL, NULL, NULL };
|
||||
return meow_view_create(ACT_SHELF, MEOW_VIEW_ACTIVITY, &hooks, NULL);
|
||||
}
|
||||
|
||||
int shelf_is_active(void) { return g_active; }
|
||||
|
||||
void shelf_redraw(void)
|
||||
{
|
||||
const meow_theme *th = meow_theme_get();
|
||||
g_bg = th->bg; g_fg = th->fg; g_dim = th->dim;
|
||||
meow_ui_clear(g_bg);
|
||||
meow_ui_text(20, 22, "书架", 28, g_fg);
|
||||
/* 副标题：格式化说明 */
|
||||
char sub[96]; snprintf(sub, sizeof sub, "Books/ · %d 本", g_nbooks);
|
||||
meow_ui_text(20, 24 + 34, sub, 20, g_dim);
|
||||
|
||||
if (g_list) meow_widget_draw(g_list);
|
||||
if (g_nbooks == 0) {
|
||||
meow_ui_text(30, 320, "书架为空：请往 TF 卡 Books/ 放书籍", 20, g_dim);
|
||||
meow_ui_text(30, 348, "支持 TXT（可读） / FB2 / EPUB / MOBI / CBZ（R2）", 20, g_dim);
|
||||
}
|
||||
if (g_notice_ms > 0) {
|
||||
meow_ui_fill_rect(0, 620, 480, 44, g_bg);
|
||||
meow_ui_text(20, 630, g_notice, 20, th->primary);
|
||||
}
|
||||
meow_ui_flush();
|
||||
}
|
||||
|
||||
int shelf_on_tap(int x, int y)
|
||||
{
|
||||
if (g_list && g_nbooks > 0) {
|
||||
int idx = meow_listview_tap_at(g_list, x, y);
|
||||
if (idx >= 0) { shelf_redraw(); return 1; } /* 选中已由 SDK 标脏；重绘 */
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
Reference in new issue
Block a user