diff --git a/po/POTFILES.in b/po/POTFILES.in index 84fc1c434..4c493c56d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,6 @@ src/bin/e_bg.c src/bin/e_bindings.c src/bin/e_client.c src/bin/e_color.c -src/bin/e_color_class.c src/bin/e_color_dialog.c src/bin/e_comp.c src/bin/e_comp_x.c diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 5a50c0fa5..279cbc5de 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -52,7 +52,6 @@ src/bin/e_bg.h \ src/bin/e_bindings.h \ src/bin/e_client.h \ src/bin/e_client.x \ -src/bin/e_color_class.h \ src/bin/e_color_dialog.h \ src/bin/e_color.h \ src/bin/e_comp.h \ @@ -219,7 +218,6 @@ src/bin/e_bg.c \ src/bin/e_bindings.c \ src/bin/e_client.c \ src/bin/e_color.c \ -src/bin/e_color_class.c \ src/bin/e_color_dialog.c \ src/bin/e_comp.c \ src/bin/e_comp_canvas.c \ diff --git a/src/bin/e_color_class.c b/src/bin/e_color_class.c deleted file mode 100644 index a5af91dbb..000000000 --- a/src/bin/e_color_class.c +++ /dev/null @@ -1,163 +0,0 @@ -#include "e.h" - -EINTERN int -e_color_class_init(void) -{ - const Eina_List *l; - const E_Color_Class *cc; - - EINA_LIST_FOREACH(e_config->color_classes, l, cc) - { - if (!cc) continue; - - printf("INIT CC: %s, %d %d %d %d\n", cc->name, cc->r, cc->g, cc->b, cc->a); - edje_color_class_set(cc->name, - cc->r, cc->g, cc->b, cc->a, - cc->r2, cc->g2, cc->b2, cc->a2, - cc->r3, cc->g3, cc->b3, cc->a3); - } - return 1; -} - -EINTERN int -e_color_class_shutdown(void) -{ - return 1; -} - -static Eina_List * -e_color_class_node_find_stringshared(const char *name) -{ - Eina_List *l; - E_Color_Class *cc; - - EINA_LIST_FOREACH(e_config->color_classes, l, cc) - if (cc && cc->name == name) - return l; - return NULL; -} - -EAPI E_Color_Class * -e_color_class_find_stringshared(const char *name) -{ - Eina_List *l = e_color_class_node_find_stringshared(name); - if (!l) return NULL; - return l->data; -} - -EAPI E_Color_Class * -e_color_class_find(const char *name) -{ - E_Color_Class *cc; - - name = eina_stringshare_add(name); - cc = e_color_class_find_stringshared(name); - eina_stringshare_del(name); - - return cc; -} - -EAPI void -e_color_class_instance_set(E_Color_Class *cc, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3) -{ - if (!cc) return; - - if (r != -1) cc->r = E_CLAMP(r, 0, 255); - if (g != -1) cc->g = E_CLAMP(g, 0, 255); - if (b != -1) cc->b = E_CLAMP(b, 0, 255); - if (a != -1) cc->a = E_CLAMP(a, 0, 255); - if (r2 != -1) cc->r2 = E_CLAMP(r2, 0, 255); - if (g2 != -1) cc->g2 = E_CLAMP(g2, 0, 255); - if (b2 != -1) cc->b2 = E_CLAMP(b2, 0, 255); - if (a2 != -1) cc->a2 = E_CLAMP(a2, 0, 255); - if (r3 != -1) cc->r3 = E_CLAMP(r3, 0, 255); - if (g3 != -1) cc->g3 = E_CLAMP(g3, 0, 255); - if (b3 != -1) cc->b3 = E_CLAMP(b3, 0, 255); - if (a3 != -1) cc->a3 = E_CLAMP(a3, 0, 255); - - edje_color_class_set(cc->name, - cc->r, cc->g, cc->b, cc->a, - cc->r2, cc->g2, cc->b2, cc->a2, - cc->r3, cc->g3, cc->b3, cc->a3); - e_config_save_queue(); -} - -EAPI E_Color_Class * -e_color_class_set_stringshared(const char *color_class, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3) -{ - E_Color_Class *cc = e_color_class_find_stringshared(color_class); - if (!cc) - { - cc = E_NEW(E_Color_Class, 1); - if (!cc) return NULL; - e_config->color_classes = eina_list_append(e_config->color_classes, cc); - cc->name = eina_stringshare_ref(color_class); - cc->r = cc->g = cc->b = cc->a = 255; - cc->r2 = cc->g2 = cc->b2 = cc->a2 = 255; - cc->r3 = cc->g3 = cc->b3 = cc->a3 = 255; - } - - e_color_class_instance_set(cc, - r, g, b, a, - r2, g2, b2, a2, - r3, g3, b3, a3); - return cc; -} - -EAPI E_Color_Class * -e_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3) -{ - E_Color_Class *cc; - - color_class = eina_stringshare_add(color_class); - cc = e_color_class_set_stringshared(color_class, - r, g, b, a, - r2, g2, b2, a2, - r3, g3, b3, a3); - eina_stringshare_del(color_class); - - return cc; -} - -static void -e_color_class_node_del(Eina_List *n) -{ - E_Color_Class *cc = n->data; - edje_color_class_del(cc->name); - eina_stringshare_del(cc->name); - E_FREE(cc); - - e_config->color_classes = eina_list_remove_list(e_config->color_classes, n); - e_config_save_queue(); -} - -EAPI void -e_color_class_instance_del(E_Color_Class *cc) -{ - Eina_List *n = eina_list_data_find_list(e_config->color_classes, cc); - if (!n) return; - e_color_class_node_del(n); -} - -EAPI void -e_color_class_del_stringshared(const char *name) -{ - Eina_List *n = e_color_class_node_find_stringshared(name); - if (!n) return; - e_color_class_node_del(n); -} - -EAPI void -e_color_class_del(const char *name) -{ - name = eina_stringshare_add(name); - e_color_class_del_stringshared(name); - eina_stringshare_del(name); -} - -EAPI Eina_List * -e_color_class_list(void) -{ - return e_config->color_classes; -} - diff --git a/src/bin/e_color_class.h b/src/bin/e_color_class.h deleted file mode 100644 index 767540986..000000000 --- a/src/bin/e_color_class.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifdef E_TYPEDEFS - -typedef struct _E_Color_Class E_Color_Class; - -#else -#ifndef E_COLOR_CLASSES_H -#define E_COLOR_CLASSES_H - -struct _E_Color_Class -{ - const char *name; /* stringshared name */ - int r, g, b, a; - int r2, g2, b2, a2; - int r3, g3, b3, a3; -}; - -EINTERN int e_color_class_init(void); -EINTERN int e_color_class_shutdown(void); - -EAPI void e_color_class_instance_set(E_Color_Class *cc, - int r, int g, int b, int a, - int r2, int b2, int g2, int a2, - int r3, int g3, int b3, int a3); -EAPI E_Color_Class *e_color_class_set_stringshared(const char *color_class, - int r, int g, int b, int a, - int r2, int b2, int g2, int a2, - int r3, int g3, int b3, int a3); -EAPI E_Color_Class *e_color_class_set(const char *color_class, - int r, int g, int b, int a, - int r2, int b2, int g2, int a2, - int r3, int g3, int b3, int a3); -EAPI E_Color_Class *e_color_class_find(const char *name); -EAPI E_Color_Class *e_color_class_find_stringshared(const char *name); - - -EAPI void e_color_class_instance_del(E_Color_Class *cc); -EAPI void e_color_class_del_stringshared(const char *name); -EAPI void e_color_class_del(const char *name); - -EAPI Eina_List *e_color_class_list(void); - -#endif -#endif diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index f6f104bb5..359aa739a 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -85,7 +85,6 @@ #include "e_dpms.h" #include "e_int_config_modules.h" #include "e_exehist.h" -#include "e_color_class.h" #include "e_widget_textblock.h" #include "e_gadcon.h" #include "e_shelf.h"