encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: removed IBus_utf8_strlen(), use SDL_utf8strlen() instead.

This commit is contained in:
Ryan C. Gordon 2017-05-29 00:51:02 -04:00
parent a1faea980c
commit 1c5f483a8a
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/linux/SDL_ibus.c
View File

@ -107,21 +107,6 @@ IBus_GetVariantText(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext
return text; return text;
} }
static size_t
IBus_utf8_strlen(const char *str)
{
size_t utf8_len = 0;
const char *p;
for (p = str; *p; ++p) {
if (!((*p & 0x80) && !(*p & 0x40))) {
++utf8_len;
}
}
return utf8_len;
}
static DBusHandlerResult static DBusHandlerResult
IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data) IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
{ {
@ -162,8 +147,8 @@ IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
size_t cursor = 0; size_t cursor = 0;
do { do {
size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf)); const size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf));
size_t chars = IBus_utf8_strlen(buf); const size_t chars = SDL_utf8strlen(buf);
SDL_SendEditingText(buf, cursor, chars); SDL_SendEditingText(buf, cursor, chars);