Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved scroll speeds for wordwrapped texts

Browse Source
This commit is contained in:
d0k3 2019-12-15 22:01:00 +01:00
parent 6fb60e007a
commit 42f7fcfb7b
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
arm9/source/utils/scripting.c
View File

@ -254,19 +254,28 @@ static inline u32 hexntostr(const u8* hex, char* str, u32 len) {
return len; return len;
} }
static inline u32 line_len(const char* text, u32 len, u32 ww, const char* line) { static inline u32 line_len(const char* text, u32 len, u32 ww, const char* line, char** eol) {
char* line0 = (char*) line; u32 last = ((text + len) - line);
char* line1 = (char*) line;
u32 llen = 0; u32 llen = 0;
char* lf = NULL;
char* spc = NULL;
// non wordwrapped length // search line feeds, spaces (only relevant for wordwrapped)
while ((line1 < (text + len)) && (*line1 != '\n') && *line1) line1++; for (llen = 0; !ww || (llen < ww); llen++) {
while ((line1 > line0) && (*(line1-1) <= ' ')) line1--; if (ww && (line[llen] == ' ')) spc = (char*) (line + llen);
llen = line1 - line0; if (!line[llen] || (line[llen] == '\n') || (llen == last)) {
if (ww && (llen > ww)) { // wordwrapped length lf = (char*) (line + llen);
for (llen = ww; (llen > 0) && (line[llen] != ' '); llen--); break;
if (!llen) llen = ww; // workaround for long strings }
} }
// line feed found, truncate trailing "empty" chars
// for wordwrapped, stop line after last space (if any)
if (lf) for (; (llen > 0) && (line[llen-1] <= ' '); llen--);
else if (ww && spc) llen = (spc - line) + 1;
// signal eol if required
if (eol) *eol = lf;
return llen; return llen;
} }
@ -294,33 +303,30 @@ static inline char* line_seek(const char* text, u32 len, u32 ww, const char* lin
char* l0 = (char*) line; char* l0 = (char*) line;
// handle forwards wordwrapped search // handle forwards wordwrapped search
while ((add > 0) && (l0 < text + len)) { for (; (add > 0) && (l0 < text + len); add--) {
u32 llen = line_len(text, len, 0, l0); char* eol = NULL;
for (; (add > 0) && (llen > ww); add--) { u32 llenww = line_len(text, len, ww, l0, &eol);
u32 llenww = line_len(text, len, ww, l0); if (eol || !llenww) l0 = line_seek(text, len, 0, l0, 1);
llen -= llenww; else l0 += llenww;
l0 += llenww;
}
if (add > 0) {
l0 = line_seek(text, len, 0, l0, 1);
add--;
}
} }
// handle backwards wordwrapped search // handle backwards wordwrapped search
while ((add < 0) && (l0 > text)) { while ((add < 0) && (l0 > text)) {
char* l1 = line_seek(text, len, 0, l0, -1); char* l1 = line_seek(text, len, 0, l0, -1);
int nlww = 0; // count wordwrapped lines in paragraph char* l0_minus1 = l1;
for (char* ld = l1; ld < l0; ld = line_seek(text, len, ww, ld, 1), nlww++); int nlww = 0; // no of wordwrapped lines in paragraph
if (add + nlww < 0) { for (char* ld = l1; ld < l0; ld = line_seek(text, len, ww, ld, 1), nlww++)
l0_minus1 = ld;
if (add + nlww < 0) { // haven't reached the desired line yet
add += nlww; add += nlww;
l0 = l1; l0 = l1;
} else { } else { // reached the desired line
l0 = line_seek(text, len, ww, l1, nlww + add); l0 = (add == -1) ? l0_minus1 : line_seek(text, len, ww, l1, nlww + add);
add = 0; add = 0;
} }
} }
return l0; return l0;
} }
} }
@ -1557,7 +1563,7 @@ void MemTextView(const char* text, u32 len, char* line0, int off_disp, int lno,
u32 nln = lno; u32 nln = lno;
for (u32 y = TV_VPAD; y < SCREEN_HEIGHT; y += FONT_HEIGHT_EXT + (2*TV_VPAD)) { for (u32 y = TV_VPAD; y < SCREEN_HEIGHT; y += FONT_HEIGHT_EXT + (2*TV_VPAD)) {
char* ptr_next = line_seek(text, len, ww, ptr, 1); char* ptr_next = line_seek(text, len, ww, ptr, 1);
u32 llen = line_len(text, len, ww, ptr); u32 llen = line_len(text, len, ww, ptr, NULL);
u32 ncpy = ((int) llen < off_disp) ? 0 : (llen - off_disp); u32 ncpy = ((int) llen < off_disp) ? 0 : (llen - off_disp);
if (ncpy > TV_LLEN_DISP) ncpy = TV_LLEN_DISP; if (ncpy > TV_LLEN_DISP) ncpy = TV_LLEN_DISP;
bool al = !ww && off_disp && (ptr != ptr_next); bool al = !ww && off_disp && (ptr != ptr_next);
@ -1630,7 +1636,7 @@ bool MemTextViewer(const char* text, u32 len, u32 start, bool as_script) {
// find maximum line len // find maximum line len
u32 llen_max = 0; u32 llen_max = 0;
for (char* ptr = (char*) text; ptr < (text + len); ptr = line_seek(text, len, 0, ptr, 1)) { for (char* ptr = (char*) text; ptr < (text + len); ptr = line_seek(text, len, 0, ptr, 1)) {
u32 llen = line_len(text, len, 0, ptr); u32 llen = line_len(text, len, 0, ptr, NULL);
if (llen > llen_max) llen_max = llen; if (llen > llen_max) llen_max = llen;
} }