diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /apps/plugins/lib/simple_viewer.c | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) | |
download | rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.zip |
[2/4] get rid of HAVE_LCD_CHARCELLS
HAVE_LCD_BITMAP is now redundant.
lcd_bitmap is always-on in features.txt so manual and lang strings
don't have to change
Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
Diffstat (limited to 'apps/plugins/lib/simple_viewer.c')
-rw-r--r-- | apps/plugins/lib/simple_viewer.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/plugins/lib/simple_viewer.c b/apps/plugins/lib/simple_viewer.c index 6927d84a96..4c05ee68c5 100644 --- a/apps/plugins/lib/simple_viewer.c +++ b/apps/plugins/lib/simple_viewer.c | |||
@@ -64,17 +64,12 @@ static const char* get_next_line(const char *text, struct view_info *info) | |||
64 | total = 0; | 64 | total = 0; |
65 | while(*ptr) | 65 | while(*ptr) |
66 | { | 66 | { |
67 | #ifdef HAVE_LCD_CHARCELLS | ||
68 | n = rb->utf8seek(ptr, 1); | ||
69 | w = 1; | ||
70 | #else | ||
71 | unsigned short ch; | 67 | unsigned short ch; |
72 | n = ((intptr_t)rb->utf8decode(ptr, &ch) - (intptr_t)ptr); | 68 | n = ((intptr_t)rb->utf8decode(ptr, &ch) - (intptr_t)ptr); |
73 | if (rb->is_diacritic(ch, NULL)) | 69 | if (rb->is_diacritic(ch, NULL)) |
74 | w = 0; | 70 | w = 0; |
75 | else | 71 | else |
76 | w = rb->font_get_width(info->pf, ch); | 72 | w = rb->font_get_width(info->pf, ch); |
77 | #endif | ||
78 | if (isbrchr(ptr, n)) | 73 | if (isbrchr(ptr, n)) |
79 | space = ptr+(isspace(*ptr) || total + w <= info->vp.width? n: 0); | 74 | space = ptr+(isspace(*ptr) || total + w <= info->vp.width? n: 0); |
80 | if (*ptr == '\n') | 75 | if (*ptr == '\n') |