mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

keyboard: Don't use next_utf8_char() to go back where we came from 

We go one utf8 char back and then one forward.  Just remember the original
position instead, which also avoids a warning about potentially
dereferencing a NULL return value from next_utf8_char().
This commit is contained in:
Kristian Høgsberg 2013-08-15 11:37:09 -07:00
parent 0a8461b95e
commit 20ffdffc03
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clients/keyboard.c
View File

@ -456,16 +456,6 @@ prev_utf8_char(const char *s, const char *p)
return NULL;
}
static const char *
next_utf8_char(const char *p)
{
if (*p == '\0')
return NULL;
for (++p; (*p & 0xc0) == 0x80; ++p)
;
return p;
}
static void
delete_before_cursor(struct virtual_keyboard *keyboard)
{
@ -483,7 +473,7 @@ delete_before_cursor(struct virtual_keyboard *keyboard)
return;
}
end = next_utf8_char(start);
end = keyboard->surrounding_text + keyboard->surrounding_cursor;
wl_input_method_context_delete_surrounding_text(keyboard->context,
(start - keyboard->surrounding_text) - keyboard->surrounding_cursor,