[EGIT] [apps/terminology] master 01/01: config: rename Config_Color type to Color + reorganise eet setup

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=b1bdf50671bb454ffff892f7453fe724ced0acfc

commit b1bdf50671bb454ffff892f7453fe724ced0acfc
Author: Boris Faure <bill...@gmail.com>
Date:   Wed Sep 9 21:31:17 2020 +0200

    config: rename Config_Color type to Color + reorganise eet setup
---
 src/bin/colors.c | 10 ----------
 src/bin/config.c | 18 ++++++++++--------
 src/bin/config.h |  6 +++---
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/bin/colors.c b/src/bin/colors.c
index 4f65d03..46208b1 100644
--- a/src/bin/colors.c
+++ b/src/bin/colors.c
@@ -4,16 +4,6 @@
 #include "config.h"
 #include "colors.h"
 
-typedef struct _Color Color;
-
-struct _Color
-{
-   unsigned char r;
-   unsigned char g;
-   unsigned char b;
-   unsigned char a;
-};
-
 static const Color default_colors[2][2][12] =
 {
    { // normal
diff --git a/src/bin/config.c b/src/bin/config.c
index 5b2b484..c11f179 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -36,22 +36,19 @@ config_init(void)
             _config_home_get());
    ecore_file_mkpath(path);
 
-   eet_eina_stream_data_descriptor_class_set
-     (&eddc, sizeof(eddc), "Config", sizeof(Config));
-   edd_base = eet_data_descriptor_stream_new(&eddc);
 
    eet_eina_stream_data_descriptor_class_set
-     (&eddc, sizeof(eddc), "Config_Color", sizeof(Config_Color));
+     (&eddc, sizeof(eddc), "Config_Color", sizeof(Color));
    edd_color = eet_data_descriptor_stream_new(&eddc);
 
    EET_DATA_DESCRIPTOR_ADD_BASIC
-     (edd_color, Config_Color, "r", r, EET_T_UCHAR);
+     (edd_color, Color, "r", r, EET_T_UCHAR);
    EET_DATA_DESCRIPTOR_ADD_BASIC
-     (edd_color, Config_Color, "g", g, EET_T_UCHAR);
+     (edd_color, Color, "g", g, EET_T_UCHAR);
    EET_DATA_DESCRIPTOR_ADD_BASIC
-     (edd_color, Config_Color, "b", b, EET_T_UCHAR);
+     (edd_color, Color, "b", b, EET_T_UCHAR);
    EET_DATA_DESCRIPTOR_ADD_BASIC
-     (edd_color, Config_Color, "a", a, EET_T_UCHAR);
+     (edd_color, Color, "a", a, EET_T_UCHAR);
 
 
    eet_eina_stream_data_descriptor_class_set
@@ -75,6 +72,11 @@ config_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC
      (edd_keys, Config_Keys, "cb", cb, EET_T_STRING);
 
+
+   eet_eina_stream_data_descriptor_class_set
+     (&eddc, sizeof(eddc), "Config", sizeof(Config));
+   edd_base = eet_data_descriptor_stream_new(&eddc);
+
    EET_DATA_DESCRIPTOR_ADD_BASIC
      (edd_base, Config, "version", version, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC
diff --git a/src/bin/config.h b/src/bin/config.h
index fa04b49..2fb1266 100644
--- a/src/bin/config.h
+++ b/src/bin/config.h
@@ -4,7 +4,7 @@
 #include <Evas.h>
 
 typedef struct _Config Config;
-typedef struct _Config_Color Config_Color;
+typedef struct _Color Color;
 typedef struct _Config_Keys Config_Keys;
 
 struct _Config_Keys
@@ -20,7 +20,7 @@ struct _Config_Keys
 };
 /* TODO: separate config per terminal (tab, window) and global. */
 
-struct _Config_Color
+struct _Color
 {
    unsigned char r, g, b, a;
 };
@@ -97,7 +97,7 @@ struct _Config
    Eina_Bool         changedir_to_current;
    Eina_Bool         emoji_dbl_width;
    Eina_Bool         group_all;
-   Config_Color      colors[(4 * 12)];
+   Color             colors[(4 * 12)];
    Eina_List        *keys;
 
    Eina_Bool         temporary; /* not in EET */

--