From 9cd2e9ec8fc0127393dfce9c0359d500c8c238be Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 09 Apr 2019 02:22:50 +0000
Subject: [PATCH] updae source to 2.0.9 source
---
source/src/video/x11/SDL_x11keyboard.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/source/src/video/x11/SDL_x11keyboard.c b/source/src/video/x11/SDL_x11keyboard.c
index d667c7b..a57adf9 100644
--- a/source/src/video/x11/SDL_x11keyboard.c
+++ b/source/src/video/x11/SDL_x11keyboard.c
@@ -266,7 +266,7 @@
int best_distance;
int best_index;
int distance;
- BOOL xkb_repeat = 0;
+ Bool xkb_repeat = 0;
X11_XAutoRepeatOn(data->display);
@@ -292,9 +292,7 @@
char *prev_locale = setlocale(LC_ALL, NULL);
char *prev_xmods = X11_XSetLocaleModifiers(NULL);
const char *new_xmods = "";
-#if defined(HAVE_IBUS_IBUS_H) || defined(HAVE_FCITX_FRONTEND_H)
const char *env_xmods = SDL_getenv("XMODIFIERS");
-#endif
SDL_bool has_dbus_ime_support = SDL_FALSE;
if (prev_locale) {
@@ -309,16 +307,12 @@
when it is used via XIM which causes issues. Prevent this by forcing
@im=none if XMODIFIERS contains @im=ibus. IBus can still be used via
the DBus implementation, which also has support for pre-editing. */
-#ifdef HAVE_IBUS_IBUS_H
if (env_xmods && SDL_strstr(env_xmods, "@im=ibus") != NULL) {
has_dbus_ime_support = SDL_TRUE;
}
-#endif
-#ifdef HAVE_FCITX_FRONTEND_H
if (env_xmods && SDL_strstr(env_xmods, "@im=fcitx") != NULL) {
has_dbus_ime_support = SDL_TRUE;
}
-#endif
if (has_dbus_ime_support || !xkb_repeat) {
new_xmods = "@im=none";
}
--
Gitblit v1.9.3