Migrating KeyCombination config file to e-tizen-data Module

Change-Id: I604b4905328ed340ee0da1ebc2c19f692c486b96
Signed-off-by: Dhiraj Kr Mishra <dk.mishra@samsung.com>

diff --git a/config/key_combinations.ini b/config/key_combinations.ini
deleted file mode 100644 (file)
index dd17cf6..0000000
--- a/config/key_combinations.ini
+++ /dev/null
@@ -1,431 +0,0 @@
-; Rules for this config file.
-;ANY NEW ADDITION HERE SHOULD MATCH A CORRESPONDING ADDITION TO THE ENUM "__key_comb_enum" DEFINED IN keyEvent.h IN libslp-UtilX MODULE,SUCH THAT THE COMBINATION
-;NUMBER HERE IS EQUAL TO ENUM VALUE OF THE COMBINATION ADDED IN KeyEvent.h
-; Add a new combination like[CombinationN] where N is next count from the last combination added. THIS IS IMPORTANT!
-;keys are added like:
-;1=74
-;2=90
-;3=97 here in 1=74, '1' is the 'index' :first key index in combination and '74' is the keycode expected at the 1st index among incoming keys.
-; here index has to be in sequence. THIS IS IMPORTANT!
-; KEYSYM=Keycodes mapping:
-;mute=74;exit=182;power=124;info=196;menu=133;return=9;enter=36;source=72;VolUp=76;VolDown=75;ChannelUp=96;ChannelDown=95;
-;blue key=70;RED key=67;green key=68;yellow key=69;tools key=135;FF=216;RW=176;play=208;stop=174
-;1=10;2=11;3=12;4=13;5=14;6=15;7=16;8=17;9=18;0=19;
-
-;Mute + 1 + 8 + 2 + Power
-[Combination1];
-1=74
-2=10
-3=17
-4=11
-5=124
-;Info + Menu + Mute + Power
-[Combination2]
-1=196
-2=133
-3=74
-4=124
-;Mute + Enter + Mute + Enter
-[Combination3]
-1=74
-2=36
-3=74
-4=36
-;Mute + 9 + 4 + 8 + Exit
-[Combination4]
-1=74
-2=18
-3=13
-4=17
-5=182
-;Mute + 3 + 6 + 9 + Exit
-[Combination5]
-1=74
-2=12
-3=15
-4=18
-5=182
-;Mute + 2 + 5 + 8 + Exit
-[Combination6]
-1=74
-2=11
-3=14
-4=17
-5=182
-;Info + Factory
-[Combination7]
-1=196
-2=0
-;Source + Exit + Power
-[Combination8]
-1=72
-2=182
-3=124
-;Mute + 1 + 8 + 6 + Exit
-[Combination9]
-1=74
-2=10
-3=17
-4=15
-5=182
-;Mute + 7 + 8 + 2 + Exit
-[Combination10]
-1=74
-2=16
-3=17
-4=11
-5=182
-;Mute + 7 + 8 + 3 + Exit
-[Combination11]
-1=74
-2=16
-3=17
-4=12
-5=182
-;Mute + 7 + 3 + 7 + Enter
-[Combination12]
-1=74
-2=16
-3=12
-4=16
-5=36
-;Mute + 4 + 3 + 7 + Exit
-[Combination13]
-1=74
-2=13
-3=12
-4=16
-5=182
-;Mute + 1 + 1 + 9 + Enter
-[Combination14]
-1=74
-2=10
-3=10
-4=18
-5=36
-;Mute + 5 + 6 + 7 + Exit
-[Combination15]
-1=74
-2=14
-3=15
-4=16
-5=182
-;Mute + 1 + 4 + 7 + Mute
-[Combination16]
-1=74
-2=10
-3=13
-4=16
-5=74
-;Mute + 3 + 6 + 9 + Mute
-[Combination17]
-1=74
-2=12
-3=15
-4=18
-5=74
-;Info + Mute
-[Combination18]
-1=196
-2=74
-;Mute + 2 + 2 + 7 + Exit
-[Combination19]
-1=74
-2=11
-3=11
-4=16
-5=182
-;Info + Source
-[Combination20]
-1=196
-2=72
-;Mute + RSS
-[Combination21]
-1=74
-2=0
-;Mute + 2 + 4 + 7 + Exit
-[Combination22]
-1=74
-2=11
-3=13
-4=16
-5=182
-;Mute + 2 + 0 + 7 + Exit
-[Combination23]
-1=74
-2=11
-3=19
-4=16
-5=182
-;Mute + 2 + 0 + 9 + Exit
-[Combination24]
-1=74
-2=11
-3=19
-4=18
-5=182
-;Mute + 0 + Mute + 0
-[Combination25]
-1=74
-2=19
-3=74
-4=19
-;Mute + 5 + 6 + 4 + Exit
-[Combination26]
-1=74
-2=14
-3=15
-4=13
-5=182
-;Mute + 1 + 8 + 4 + Exit
-[Combination27]
-1=74
-2=10
-3=17
-4=13
-5=182
-;'>>'(FF) + 2 + 8 + 7 + '<<'(RW)
-[Combination28]
-1=216
-2=11
-3=17
-4=16
-5=176
-;Mute + 8 + 2 + 4 + Power
-[Combination29]
-1=74
-2=17
-3=11
-4=13
-5=124
-;Mute + Vol Up + Return + Vol Down + Return + Vol Up + Return (smartctrl)
-[Combination30]
-1=74
-2=76
-3=9
-4=75
-5=9
-6=76
-7=9
-;Mute + 5 + 7 + 9 + Exit
-[Combination31]
-1=74
-2=14
-3=16
-4=18
-5=182
-;FF+2+8+9+RW 
-[Combination32]
-1=216
-2=11
-3=17
-4=18
-5=176
-;FF+2+8+9+1
-[Combination33]
-1=216
-2=11
-3=17
-4=18
-5=10
-;Mute+5+6+9+Exit
-[Combination34]
-1=74
-2=14
-3=15
-4=18
-5=182
-;Info+Menu+Mute+Menu+Exit
-[Combination35]
-1=196
-2=133
-3=74
-4=133
-5=182
-;Mute + 7 + 4 + 7 + Exit
-[Combination36]
-1=74
-2=16
-3=13
-4=16
-5=182
-;Mute + 7 + 8 + 7 + Exit
-[Combination37]
-1=74
-2=16
-3=17
-4=16
-5=182
-;FF+2+8+9+2
-[Combination38]
-1=216
-2=11
-3=17
-4=18
-5=11
-;FF+1+8+2+REW
-[Combination39]
-1=216
-2=10
-3=17
-4=11
-5=176
-;Mute+9+8+7+Exit "start key recording"
-[Combination40]
-1=74
-2=18
-3=17
-4=16
-5=182
-;Mute+Mute+Exit+Exit+Exit "stop key recording"
-[Combination41]
-1=74
-2=74
-3=182
-4=182
-5=182
-;Mute+Play+Play+Play+Exit "start playing recorded keys"
-[Combination42]
-1=74
-2=208
-3=208
-4=208
-5=182
-;Mute+Stop+Stop+Stop+Exit "stop playing recorded keys"
-[Combination43]
-1=74
-2=174
-3=174
-4=174
-5=182
-;Mute+Return+VolUp+ChannelUp+Mute 
-[Combination44]
-1=74
-2=9
-3=76
-4=96
-5=74
-;Info+Stop 
-[Combination45]
-1=196
-2=174
-;mute + 9 + 9 + 0 + 0 + exit
-[Combination46]
-1=74
-2=18
-3=18
-4=19
-5=19
-6=182
-;mute + 3 + mute +3
-[Combination47]
-1=74
-2=12
-3=74
-4=12
-;mute + 7 + mute + 7 
-[Combination48]
-1=74
-2=16
-3=74
-4=16
-;info + exit + mute
-[Combination49]
-1=196
-2=182
-3=74
-;KEY_SOURCE + 2 + 5 + 8 + 9 + KEY_PRECH
-[Combination50]
-1=72
-2=11
-3=14
-4=17
-5=18
-6=190
-;FF + 2 + 0 + 0 + 6 + 2 + 0 + 1 + 4 + 0 + 9
-[Combination51]
-1=216
-2=11
-3=19
-4=19
-5=15
-6=11
-7=19
-8=10
-9=13
-10=19
-11=18
-;FF + 2 + 0 + 0 + 6 + 2 + 0 + 1 + 4 + 0 + 8
-[Combination52]
-1=216
-2=11
-3=19
-4=19
-5=15
-6=11
-7=19
-8=10
-9=13
-10=19
-11=17
-;FF + 2 + 0 + 0 + 6 + 2 + 0 + 1 + 5 + 0 + 9
-[Combination53]
-1=216
-2=11
-3=19
-4=19
-5=15
-6=11
-7=19
-8=10
-9=14
-10=19
-11=18
-;Mute+VolUp+ChannelUp+Mute
-[Combination54]
-1=74
-2=76
-3=96
-4=74
-;Mute+0+0+7+Exit
-[Combination55]
-1=74
-2=19
-3=19
-4=16
-5=182
-;Mute+4+8+7+Exit
-[Combination56]
-1=74
-2=13
-3=17
-4=16
-5=182
-;Mute+4+8+2+Exit
-[Combination57]
-1=74
-2=13
-3=17
-4=11
-5=182
-;Info+5+3+3+Exit
-[Combination58]
-1=196
-2=14
-3=12
-4=12
-5=182
-;Mute+7+7+7+Exit
-[Combination59]
-1=74
-2=16
-3=16
-4=16
-5=182
-;Mute+4+8+9+Exit
-[Combination60]
-1=74
-2=13
-3=17
-4=18
-5=182

diff --git a/configure.ac b/configure.ac
index 5b77c2f..b90fafd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ dnl ========================================================================
 #AC_HEADER_STDC
 AC_CHECK_HEADERS([math.h fcntl.h stdlib.h string.h unistd.h])
 
-COMBINATION_FILE_PATH="$TZ_SYS_RO_APP/keyrouter/key_combinations.ini"
+COMBINATION_FILE_PATH="$TZ_SYS_RO_APP/keyrouter/key_combination_list.ini"
 AC_DEFINE_UNQUOTED(COMBINATION_FILE_PATH, "$COMBINATION_FILE_PATH", [Path to Key Combination File])
 dnl ========================================================================
 # checks for typedefs, structures, and compiler characteristics

diff --git a/packaging/e-mod-tizen-keyrouter.spec b/packaging/e-mod-tizen-keyrouter.spec
index c80af2f..1831f6f 100644 (file)
--- a/packaging/e-mod-tizen-keyrouter.spec
+++ b/packaging/e-mod-tizen-keyrouter.spec
@@ -56,10 +56,6 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
 cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
 
-# for install combination key's configuration
-mkdir -p %{buildroot}%{TZ_SYS_RO_APP}/keyrouter
-cp -af config/key_combinations.ini %{buildroot}%{TZ_SYS_RO_APP}/keyrouter/
-
 # install
 make install DESTDIR=%{buildroot}
 
@@ -70,4 +66,3 @@ find  %{buildroot}%{_libdir}/enlightenment/modules/%{name} -name *.la | xargs rm
 %defattr(-,root,root,-)
 %{_libdir}/enlightenment/modules/e-mod-tizen-keyrouter
 %{TZ_SYS_RO_SHARE}/license/%{name}
-%attr(754, app, root) %{TZ_SYS_RO_APP}/keyrouter