Blob Blame History Raw
diff -pruN imsettings-1.8.0.orig/data/imsettings-functions.in imsettings-1.8.0/data/imsettings-functions.in
--- imsettings-1.8.0.orig/data/imsettings-functions.in	2019-02-20 05:02:29.948564551 +0000
+++ imsettings-1.8.0/data/imsettings-functions.in	2019-02-20 05:07:25.437552479 +0000
@@ -175,6 +175,11 @@ function is_xim_supported() {
     return 1
 }
 
+function is_desktop_supported() {
+    @libexecdir[@]/imsettings-target-checker.sh >/dev/null
+    [ $? -eq 0 ]
+}
+
 function setup_gtk_immodule() {
     if is_imsettings_enabled && is_gtk_supported; then
 	# Ensure GTK_IM_MODULE is empty. otherwise GTK+ doesn't pick up immodule through XSETTINGS
diff -pruN imsettings-1.8.0.orig/data/xinput.sh.in.in imsettings-1.8.0/data/xinput.sh.in.in
--- imsettings-1.8.0.orig/data/xinput.sh.in.in	2019-02-20 05:02:29.950564550 +0000
+++ imsettings-1.8.0/data/xinput.sh.in.in	2019-02-20 05:09:35.103540024 +0000
@@ -39,6 +39,11 @@ tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8
 unset AUXILIARY_PROGRAM AUXILIARY_ARGS GTK_IM_MODULE ICON IMSETTINGS_IGNORE_ME LONG_DESC NOT_RUN PREFERENCE_PROGRAM PREFERENCE_ARGS QT_IM_MODULE SHORT_DESC XIM XIM_PROGRAM XIM_ARGS XMODIFIERS
 
 [ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
+[ -z "${IMSETTINGS_DISABLE_SYS_XINPUTRC-}" ] && IMSETTINGS_DISABLE_SYS_XINPUTRC=no
+
+if ! is_desktop_supported; then
+    IMSETTINGS_DISABLE_SYS_XINPUTRC=yes
+fi
 
 # migrate old configuration file
 [ ! -d $CONFIGDIR ] && mkdir -p $CONFIGDIR || :
@@ -51,7 +56,7 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
     if [ ! -h "$USER_XINPUTRC" ]; then
 	SHORT_DESC="User Specific"
     fi
-elif [ -r "$SYS_XINPUTRC" ]; then
+elif [ -r "$SYS_XINPUTRC" -a "x$IMSETTINGS_DISABLE_SYS_XINPUTRC" = "xno" ]; then
     # FIXME: This hardcoded list has to be gone in the future.
     # Locales that normally use input-method for native input
     _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
@@ -87,7 +92,7 @@ fi
 [ -z "${IMSETTINGS_INTEGRATE_DESKTOP-}" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes
 export IMSETTINGS_INTEGRATE_DESKTOP
 
-[ -z "$XIM" ] && XIM=none
+[ -z "$XIM" -a "x$IMSETTINGS_DISABLE_SYS_XINPUTRC" = "xno" ] && XIM=none
 
 # start IM via imsettings
 IMSETTINGS_MODULE=${SHORT_DESC:-${XIM}}
diff -pruN imsettings-1.8.0.orig/data/xinputinfo.sh.in imsettings-1.8.0/data/xinputinfo.sh.in
--- imsettings-1.8.0.orig/data/xinputinfo.sh.in	2018-04-02 10:11:55.000000000 +0000
+++ imsettings-1.8.0/data/xinputinfo.sh.in	2019-02-20 05:10:11.357524612 +0000
@@ -57,11 +57,12 @@ if [ $# -gt 0 ]; then
     IMSETTINGS_FILENAME=$1
 else
     [ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
+    [ -z "${IMSETTINGS_DISABLE_SYS_XINPUTRC-}" ] && IMSETTINGS_DISABLE_SYS_XINPUTRC=no
 
     if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
 	source "$USER_XINPUTRC"
 	IMSETTINGS_FILENAME=$USER_XINPUTRC
-    elif [ -r "$SYS_XINPUTRC" ]; then
+    elif [ -r "$SYS_XINPUTRC" -a "x$IMSETTINGS_DISABLE_SYS_XINPUTRC" = "xno" ]; then
 	source "$SYS_XINPUTRC"
 	IMSETTINGS_FILENAME=$SYS_XINPUTRC
     fi