summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-10-10 13:21:58 +0900
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-12 10:15:03 +0100
commit02fc30deac9f5f422913bd25aa441f6665cf403c (patch)
treed411589776d6759080a86b7a47dd623b40c91ba5
parent4ff6cb815687f05a617da75f638f6f3fb515e53f (diff)
elm cusro config - move elm to by default look for cursors in theme
previous config ignored elm theme if ithas cursors. this was just wrong, so switch default back to using theme and update configs accordingly etc. this is houw it should have worked.
-rw-r--r--config/default/base.src.in4
-rw-r--r--config/mobile/base.src.in4
-rw-r--r--config/standard/base.src.in4
-rw-r--r--src/lib/elm_config.c4
-rw-r--r--src/lib/elm_priv.h2
5 files changed, 11 insertions, 7 deletions
diff --git a/config/default/base.src.in b/config/default/base.src.in
index 5b01b5e87..5caff3d6f 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131077; 2 value "config_version" int: 131078;
3 value "engine" string: ""; 3 value "engine" string: "";
4 value "vsync" uchar: 0; 4 value "vsync" uchar: 0;
5 value "thumbscroll_enable" uchar: 1; 5 value "thumbscroll_enable" uchar: 1;
@@ -40,7 +40,7 @@ group "Elm_Config" struct {
40 value "theme" string: "default"; 40 value "theme" string: "default";
41 value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api"; 41 value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api";
42 value "tooltip_delay" double: 1.0; 42 value "tooltip_delay" double: 1.0;
43 value "cursor_engine_only" uchar: 1; 43 value "cursor_engine_only" uchar: 0;
44 value "focus_highlight_enable" uchar: 0; 44 value "focus_highlight_enable" uchar: 0;
45 value "focus_highlight_animate" uchar: 0; 45 value "focus_highlight_animate" uchar: 0;
46 value "focus_highlight_clip_disable" uchar: 0; 46 value "focus_highlight_clip_disable" uchar: 0;
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index 6219c1120..6621fb888 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131077; 2 value "config_version" int: 131078;
3 value "engine" string: ""; 3 value "engine" string: "";
4 value "vsync" uchar: 0; 4 value "vsync" uchar: 0;
5 value "thumbscroll_enable" uchar: 1; 5 value "thumbscroll_enable" uchar: 1;
@@ -40,7 +40,7 @@ group "Elm_Config" struct {
40 value "theme" string: "default"; 40 value "theme" string: "default";
41 value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api"; 41 value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api";
42 value "tooltip_delay" double: 1.0; 42 value "tooltip_delay" double: 1.0;
43 value "cursor_engine_only" uchar: 1; 43 value "cursor_engine_only" uchar: 0;
44 value "focus_highlight_enable" uchar: 0; 44 value "focus_highlight_enable" uchar: 0;
45 value "focus_highlight_animate" uchar: 0; 45 value "focus_highlight_animate" uchar: 0;
46 value "focus_highlight_clip_disable" uchar: 0; 46 value "focus_highlight_clip_disable" uchar: 0;
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index b5f1b7a78..a89bebad0 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131077; 2 value "config_version" int: 131078;
3 value "engine" string: ""; 3 value "engine" string: "";
4 value "vsync" uchar: 0; 4 value "vsync" uchar: 0;
5 value "thumbscroll_enable" uchar: 0; 5 value "thumbscroll_enable" uchar: 0;
@@ -40,7 +40,7 @@ group "Elm_Config" struct {
40 value "theme" string: "default"; 40 value "theme" string: "default";
41 value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api"; 41 value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api";
42 value "tooltip_delay" double: 1.0; 42 value "tooltip_delay" double: 1.0;
43 value "cursor_engine_only" uchar: 1; 43 value "cursor_engine_only" uchar: 0;
44 value "focus_highlight_enable" uchar: 0; 44 value "focus_highlight_enable" uchar: 0;
45 value "focus_highlight_animate" uchar: 0; 45 value "focus_highlight_animate" uchar: 0;
46 value "focus_highlight_clip_disable" uchar: 1; 46 value "focus_highlight_clip_disable" uchar: 1;
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index f73cb7c3a..29ef12de6 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1786,6 +1786,10 @@ _config_update(void)
1786 _elm_config->naviframe_prev_btn_auto_pushed = tcfg->naviframe_prev_btn_auto_pushed; 1786 _elm_config->naviframe_prev_btn_auto_pushed = tcfg->naviframe_prev_btn_auto_pushed;
1787 IFCFGEND 1787 IFCFGEND
1788 1788
1789 IFCFG(0x0006)
1790 _elm_config->cursor_engine_only = 0;
1791 IFCFGEND
1792
1789 /** 1793 /**
1790 * Fix user config for current ELM_CONFIG_EPOCH here. 1794 * Fix user config for current ELM_CONFIG_EPOCH here.
1791 **/ 1795 **/
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 48f2267b7..be92f1513 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -123,7 +123,7 @@ struct _Elm_Theme
123 * the users config doesn't need to be wiped - simply new values need 123 * the users config doesn't need to be wiped - simply new values need
124 * to be put in 124 * to be put in
125 */ 125 */
126#define ELM_CONFIG_FILE_GENERATION 0x0005 126#define ELM_CONFIG_FILE_GENERATION 0x0006
127#define ELM_CONFIG_VERSION_EPOCH_OFFSET 16 127#define ELM_CONFIG_VERSION_EPOCH_OFFSET 16
128#define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \ 128#define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
129 ELM_CONFIG_FILE_GENERATION) 129 ELM_CONFIG_FILE_GENERATION)