From b8a3f7aa7ac41c66c297190d276ba3769889cbab Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sat, 10 Oct 2015 13:21:58 +0900
Subject: [PATCH] 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.
---
 legacy/elementary/config/default/base.src.in  | 4 ++--
 legacy/elementary/config/mobile/base.src.in   | 4 ++--
 legacy/elementary/config/standard/base.src.in | 4 ++--
 legacy/elementary/src/lib/elm_config.c        | 4 ++++
 legacy/elementary/src/lib/elm_priv.h          | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/legacy/elementary/config/default/base.src.in b/legacy/elementary/config/default/base.src.in
index 5b01b5e..5caff3d 100644
--- a/legacy/elementary/config/default/base.src.in
+++ b/legacy/elementary/config/default/base.src.in
@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131077;
+  value "config_version" int: 131078;
   value "engine" string: "";
   value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 1;
@@ -40,7 +40,7 @@ group "Elm_Config" struct {
   value "theme" string: "default";
   value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api";
   value "tooltip_delay" double: 1.0;
-  value "cursor_engine_only" uchar: 1;
+  value "cursor_engine_only" uchar: 0;
   value "focus_highlight_enable" uchar: 0;
   value "focus_highlight_animate" uchar: 0;
   value "focus_highlight_clip_disable" uchar: 0;
diff --git a/legacy/elementary/config/mobile/base.src.in b/legacy/elementary/config/mobile/base.src.in
index 6219c11..6621fb8 100644
--- a/legacy/elementary/config/mobile/base.src.in
+++ b/legacy/elementary/config/mobile/base.src.in
@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131077;
+  value "config_version" int: 131078;
   value "engine" string: "";
   value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 1;
@@ -40,7 +40,7 @@ group "Elm_Config" struct {
   value "theme" string: "default";
   value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api";
   value "tooltip_delay" double: 1.0;
-  value "cursor_engine_only" uchar: 1;
+  value "cursor_engine_only" uchar: 0;
   value "focus_highlight_enable" uchar: 0;
   value "focus_highlight_animate" uchar: 0;
   value "focus_highlight_clip_disable" uchar: 0;
diff --git a/legacy/elementary/config/standard/base.src.in b/legacy/elementary/config/standard/base.src.in
index b5f1b7a..a89beba 100644
--- a/legacy/elementary/config/standard/base.src.in
+++ b/legacy/elementary/config/standard/base.src.in
@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131077;
+  value "config_version" int: 131078;
   value "engine" string: "";
   value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 0;
@@ -40,7 +40,7 @@ group "Elm_Config" struct {
   value "theme" string: "default";
   value "modules" string: "prefs>prefs_iface:access_output>access/api:datetime_input_ctxpopup>datetime/api";
   value "tooltip_delay" double: 1.0;
-  value "cursor_engine_only" uchar: 1;
+  value "cursor_engine_only" uchar: 0;
   value "focus_highlight_enable" uchar: 0;
   value "focus_highlight_animate" uchar: 0;
   value "focus_highlight_clip_disable" uchar: 1;
diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c
index f73cb7c..29ef12d 100644
--- a/legacy/elementary/src/lib/elm_config.c
+++ b/legacy/elementary/src/lib/elm_config.c
@@ -1786,6 +1786,10 @@ _config_update(void)
    _elm_config->naviframe_prev_btn_auto_pushed = tcfg->naviframe_prev_btn_auto_pushed;
    IFCFGEND
 
+   IFCFG(0x0006)
+   _elm_config->cursor_engine_only = 0;
+   IFCFGEND
+
    /**
     * Fix user config for current ELM_CONFIG_EPOCH here.
     **/
diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h
index 48f2267..be92f15 100644
--- a/legacy/elementary/src/lib/elm_priv.h
+++ b/legacy/elementary/src/lib/elm_priv.h
@@ -123,7 +123,7 @@ struct _Elm_Theme
  * the users config doesn't need to be wiped - simply new values need
  * to be put in
  */
-#define ELM_CONFIG_FILE_GENERATION 0x0005
+#define ELM_CONFIG_FILE_GENERATION 0x0006
 #define ELM_CONFIG_VERSION_EPOCH_OFFSET 16
 #define ELM_CONFIG_VERSION         ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
                                     ELM_CONFIG_FILE_GENERATION)
-- 
2.7.4