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

linux: Don't crash if fcitx support is requested but unavailable. 

Fixes Bugzilla #3642.
This commit is contained in:
Ryan C. Gordon 2017-05-29 02:48:51 -04:00
parent 29a047df39
commit b135557df9
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/linux/SDL_fcitx.c
View File

@ -188,7 +188,7 @@ Fcitx_SetCapabilities(void *data,
SDL_DBus_CallVoidMethod(client->servicename, client->icname, FCITX_IC_DBUS_INTERFACE, "SetCapacity", DBUS_TYPE_UINT32, &caps, DBUS_TYPE_INVALID); SDL_DBus_CallVoidMethod(client->servicename, client->icname, FCITX_IC_DBUS_INTERFACE, "SetCapacity", DBUS_TYPE_UINT32, &caps, DBUS_TYPE_INVALID);
} }
static void static SDL_bool
FcitxClientCreateIC(FcitxClient *client) FcitxClientCreateIC(FcitxClient *client)
{ {
char *appname = GetAppName(); char *appname = GetAppName();
@ -196,9 +196,11 @@ FcitxClientCreateIC(FcitxClient *client)
int id = -1; int id = -1;
Uint32 enable, arg1, arg2, arg3, arg4; Uint32 enable, arg1, arg2, arg3, arg4;
SDL_DBus_CallMethod(client->servicename, FCITX_IM_DBUS_PATH, FCITX_IM_DBUS_INTERFACE, "CreateICv3", if (!SDL_DBus_CallMethod(client->servicename, FCITX_IM_DBUS_PATH, FCITX_IM_DBUS_INTERFACE, "CreateICv3",
DBUS_TYPE_STRING, &appname, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID, DBUS_TYPE_STRING, &appname, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID,
DBUS_TYPE_INT32, &id, DBUS_TYPE_BOOLEAN, &enable, DBUS_TYPE_UINT32, &arg1, DBUS_TYPE_UINT32, &arg2, DBUS_TYPE_UINT32, &arg3, DBUS_TYPE_UINT32, &arg4, DBUS_TYPE_INVALID); DBUS_TYPE_INT32, &id, DBUS_TYPE_BOOLEAN, &enable, DBUS_TYPE_UINT32, &arg1, DBUS_TYPE_UINT32, &arg2, DBUS_TYPE_UINT32, &arg3, DBUS_TYPE_UINT32, &arg4, DBUS_TYPE_INVALID)) {
id = -1; /* just in case. */
}
SDL_free(appname); SDL_free(appname);
@ -218,7 +220,10 @@ FcitxClientCreateIC(FcitxClient *client)
dbus->connection_flush(dbus->session_conn); dbus->connection_flush(dbus->session_conn);
SDL_AddHintCallback(SDL_HINT_IME_INTERNAL_EDITING, &Fcitx_SetCapabilities, client); SDL_AddHintCallback(SDL_HINT_IME_INTERNAL_EDITING, &Fcitx_SetCapabilities, client);
return SDL_TRUE;
} }
return SDL_FALSE;
} }
static Uint32 static Uint32
@ -252,9 +257,7 @@ SDL_Fcitx_Init()
"%s-%d", "%s-%d",
FCITX_DBUS_SERVICE, GetDisplayNumber()); FCITX_DBUS_SERVICE, GetDisplayNumber());
FcitxClientCreateIC(&fcitx_client); return FcitxClientCreateIC(&fcitx_client);
return SDL_TRUE;
} }
void void

16
src/core/linux/SDL_ime.c
View File

@ -87,8 +87,20 @@ SDL_IME_Init(void)
{ {
InitIME(); InitIME();
if (SDL_IME_Init_Real) if (SDL_IME_Init_Real) {
return SDL_IME_Init_Real(); if (SDL_IME_Init_Real()) {
return SDL_TRUE;
}
/* uhoh, the IME implementation's init failed! Disable IME support. */
SDL_IME_Init_Real = NULL;
SDL_IME_Quit_Real = NULL;
SDL_IME_SetFocus_Real = NULL;
SDL_IME_Reset_Real = NULL;
SDL_IME_ProcessKeyEvent_Real = NULL;
SDL_IME_UpdateTextRect_Real = NULL;
SDL_IME_PumpEvents_Real = NULL;
}
return SDL_FALSE; return SDL_FALSE;
} }