]>
Commit | Line | Data |
---|---|---|
857bdfe0 JB |
1 | --- imsettings-1.2.8/data/xinput.sh.in.in.orig 2012-02-10 03:25:18.000000000 +0100 |
2 | +++ imsettings-1.2.8/data/xinput.sh.in.in 2012-02-17 21:14:57.666422719 +0100 | |
3 | @@ -266,8 +266,34 @@ | |
90527fe8 JR |
4 | SHORT_DESC="User Specific" |
5 | fi | |
6 | elif [ -r "$SYS_XINPUTRC" ]; then | |
7 | - source "$SYS_XINPUTRC" | |
857bdfe0 | 8 | - READ_XINPUTRC=$SYS_XINPUTRC |
90527fe8 JR |
9 | + # FIXME: This hardcoded list has to be gone in the future. |
10 | + # Locales that normally use input-method for native input | |
11 | + _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh" | |
12 | + _sourced_xinputrc=0 | |
13 | + for i in $_im_language_list; do | |
14 | + if echo $tmplang | grep -q -E "^$i"; then | |
15 | + source "$SYS_XINPUTRC" | |
857bdfe0 | 16 | + READ_XINPUTRC=$SYS_XINPUTRC |
90527fe8 JR |
17 | + _sourced_xinputrc=1 |
18 | + break | |
19 | + fi | |
20 | + done | |
21 | + # Locales that usually use X locale compose | |
22 | + # FIXME: which other locales should be included here? | |
23 | + if [ $_sourced_xinputrc -eq 0 ]; then | |
24 | + _xcompose_language_list="am_ET el_GR fi_FI pt_BR ru_RU" | |
25 | + for i in $_xcompose_language_list; do | |
26 | + if echo $tmplang | grep -q -E "^$i"; then | |
27 | + source @XINPUT_PATH@/xcompose.conf | |
28 | + _sourced_xinputrc=1 | |
29 | + break | |
30 | + fi | |
31 | + done | |
32 | + fi | |
33 | + if [ $_sourced_xinputrc -eq 0 ]; then | |
34 | + # Read none.conf to set up properly for locales not listed the above. | |
35 | + source @XINPUT_PATH@/none.conf | |
36 | + fi | |
37 | fi | |
38 | ||
39 | [ -z "$IMSETTINGS_INTEGRATE_DESKTOP" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes |