|
 |
545bfa |
diff -pruN imsettings-1.6.1.orig/data/xinput.sh.in.in imsettings-1.6.1/data/xinput.sh.in.in
|
|
|
545bfa |
--- imsettings-1.6.1.orig/data/xinput.sh.in.in 2013-04-03 19:23:22.000000000 +0900
|
|
|
545bfa |
+++ imsettings-1.6.1/data/xinput.sh.in.in 2013-04-03 19:23:50.000000000 +0900
|
|
|
545bfa |
@@ -53,9 +53,10 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
|
|
|
545bfa |
fi
|
|
|
545bfa |
elif [ -r "$SYS_XINPUTRC" ]; then
|
|
|
545bfa |
# FIXME: This hardcoded list has to be gone in the future.
|
|
|
545bfa |
- _language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
|
|
|
545bfa |
+ # Locales that normally use input-method for native input
|
|
|
545bfa |
+ _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
|
|
|
545bfa |
_sourced_xinputrc=0
|
|
|
545bfa |
- for i in $_language_list; do
|
|
|
545bfa |
+ for i in $_im_language_list; do
|
|
|
545bfa |
if echo $tmplang | grep -q -E "^$i"; then
|
|
|
545bfa |
source "$SYS_XINPUTRC"
|
|
|
545bfa |
READ_XINPUTRC=$SYS_XINPUTRC
|
|
|
545bfa |
@@ -63,6 +64,19 @@ elif [ -r "$SYS_XINPUTRC" ]; then
|
|
|
545bfa |
break
|
|
|
545bfa |
fi
|
|
|
545bfa |
done
|
|
|
545bfa |
+ # Locales that usually use X locale compose
|
|
|
545bfa |
+ # FIXME: which other locales should be included here?
|
|
|
545bfa |
+ if [ $_sourced_xinputrc -eq 0 ]; then
|
|
|
545bfa |
+ _xcompose_language_list="am_ET el_GR fi_FI pt_BR ru_RU"
|
|
|
545bfa |
+ for i in $_xcompose_language_list; do
|
|
|
545bfa |
+ if echo $tmplang | grep -q -E "^$i"; then
|
|
|
545bfa |
+ source @XINPUT_PATH@/xcompose.conf
|
|
|
545bfa |
+ READ_XINPUTRC=@XINPUT_PATH@/xcompose.conf
|
|
|
545bfa |
+ _sourced_xinputrc=1
|
|
|
545bfa |
+ break
|
|
|
545bfa |
+ fi
|
|
|
545bfa |
+ done
|
|
|
545bfa |
+ fi
|
|
|
545bfa |
if [ $_sourced_xinputrc -eq 0 ]; then
|
|
|
545bfa |
# Read none.conf to set up properly for locales not listed the above.
|
|
|
545bfa |
source @XINPUT_PATH@/none.conf
|