diff options
| -rw-r--r-- | cache/cache.c | 14 | ||||
| -rwxr-xr-x | make_keycodes.sh | 1 | ||||
| -rwxr-xr-x | make_symbols.sh | 1 | ||||
| -rw-r--r-- | packaging/xkeyboard-config.spec | 3 |
4 files changed, 13 insertions, 6 deletions
diff --git a/cache/cache.c b/cache/cache.c index f5a4b125..71b7888e 100644 --- a/cache/cache.c +++ b/cache/cache.c @@ -8,8 +8,6 @@ #define DFLT_MODEL "pc105" #define DFLT_LAYOUT "us" -#define KEYMAP_LAYOUT "/usr/share/X11/xkb/tizen_key_layout.txt" - #define STRLEN(s) (s ? strlen(s) : 0) #define STR(s) (s ? s : "") @@ -17,8 +15,16 @@ void parseKeymapFile(struct xkb_keymap *map) { FILE *file; int res, keycode; - char *tmp, *ret, buf[1024] = {0, }; - file = fopen(KEYMAP_LAYOUT, "r"); + char *tmp, *ret, buf[1024] = {0, }, *keymap_path; + + keymap_path = getenv("KEYMAP_FILE_PATH"); + if (!keymap_path) + { + printf("There is no enviroment of keymap file path\n"); + return; + } + + file = fopen(keymap_path, "r"); if (!file) return; while (!feof(file)) diff --git a/make_keycodes.sh b/make_keycodes.sh index fb15c2cb..e1ccafc2 100755 --- a/make_keycodes.sh +++ b/make_keycodes.sh @@ -4,7 +4,6 @@ if [ "$TZ_SYS_RO_SHARE" = "" ]; then TZ_SYS_RO_SHARE="/usr/share" fi -KEYMAP_FILE_PATH="${TZ_SYS_RO_SHARE}/X11/xkb/tizen_key_layout.txt" KEYCODES_PATH="./keycodes/" DEFAULT_KEYCODES_NAME="evdev" NEW_KEYCODES_NAME="tizen_"${TIZEN_PROFILE} diff --git a/make_symbols.sh b/make_symbols.sh index 9a1844e3..85b734e5 100755 --- a/make_symbols.sh +++ b/make_symbols.sh @@ -4,7 +4,6 @@ if [ "$TZ_SYS_RO_SHARE" = "" ]; then TZ_SYS_RO_SHARE="/usr/share" fi -KEYMAP_FILE_PATH="${TZ_SYS_RO_SHARE}/X11/xkb/tizen_key_layout.txt" SYMBOLS_PATH="./symbols/inet" DEFAULT_SYMBOLS_NAME="evdev" DEFAULT_SYMBOLS_DEFINE="Evdev" diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec index f7e53889..44f38367 100644 --- a/packaging/xkeyboard-config.spec +++ b/packaging/xkeyboard-config.spec @@ -29,6 +29,7 @@ BuildRequires: pkgconfig(xkbcommon) %global TZ_SYS_RO_SHARE %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share} %global TZ_SYS_VAR %{?TZ_SYS_VAR:%TZ_SYS_VAR}%{!?TZ_SYS_VAR:/opt/var} +%global KEYMAP_FILE_PATH "${TZ_SYS_RO_SHARE}/X11/xkb/tizen_key_layout.txt" %description The X Keyboard Extension essentially replaces the core protocol @@ -50,6 +51,7 @@ export TIZEN_WINDOW_SYSTEM="wayland" %endif export TZ_SYS_RO_SHARE="%{TZ_SYS_RO_SHARE}" +export KEYMAP_FILE_PATH="%{KEYMAP_FILE_PATH}" ./make_keycodes.sh ./make_symbols.sh @@ -80,6 +82,7 @@ ln -sf tizen_"%{?profile}" %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev export LOCAL_KEYMAP_PATH=%{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb ./remove_unused_files.sh export RULE_FILE_PATH=%{TZ_SYS_RO_SHARE}/X11/xkb/xkb.rule +export KEYMAP_FILE_PATH="%{KEYMAP_FILE_PATH}" %ifarch aarch64 x86_64 %else if [ -e %{buildroot}%{_bindir}/cache ]; then |