dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r9011) -Codechange (r9003): Rework Utf8PrevChar so that it returns a pointer to the previous UTF8 character's first byte instead of a byte-length offset

Browse Source
This commit is contained in:
Darkvater
2007-03-05 00:34:48 +00:00
parent f8a5fa0921
commit ca4c856247
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/misc_gui.cpp
View File

@@ -804,17 +804,21 @@ static void DelChar(Textbuf *tb, bool backspace)
WChar c;
uint width;
size_t len;
char *s = tb->buf + tb->caretpos;
if (backspace) tb->caretpos -= Utf8PrevCharLen(tb->buf + tb->caretpos);
if (backspace) s = Utf8PrevChar(s);
len = Utf8Decode(&c, tb->buf + tb->caretpos);
len = Utf8Decode(&c, s);
width = GetCharacterWidth(FS_NORMAL, c);
tb->width -= width;
if (backspace) tb->caretxoffs -= width;
if (backspace) {
tb->caretpos -= len;
tb->caretxoffs -= width;
}
/* Move the remaining characters over the marker */
memmove(tb->buf + tb->caretpos, tb->buf + tb->caretpos + len, tb->length - tb->caretpos - len + 1);
memmove(s, s + len, tb->length - (s - tb->buf) - len + 1);
tb->length -= len;
}
@@ -887,9 +891,9 @@ bool MoveTextBufferPos(Textbuf *tb, int navmode)
case WKC_LEFT:
if (tb->caretpos != 0) {
WChar c;
tb->caretpos -= Utf8PrevCharLen(tb->buf + tb->caretpos);
Utf8Decode(&c, tb->buf + tb->caretpos);
const char *s = Utf8PrevChar(tb->buf + tb->caretpos);
Utf8Decode(&c, s);
tb->caretpos = s - tb->buf; // -= (tb->buf + tb->caretpos - s)
tb->caretxoffs -= GetCharacterWidth(FS_NORMAL, c);
return true;