enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix typos 

default color class values to 255 (so, if you just set color, but not color2/3, color2/3 will be unaffected).
delete cc's for real.


SVN revision: 19878
This commit is contained in:
rephorm 2006-01-17 18:31:16 +00:00 committed by rephorm
parent 62eba31084
commit f4f3eab425
3 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/e_color_class.c
View File

@ -42,20 +42,23 @@ e_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, i
cc = E_NEW(E_Color_Class, 1);
e_config->color_classes = evas_list_append(e_config->color_classes, cc);
cc->name = evas_stringshare_add(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;
}
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 (r != -1) cc->r2 = E_CLAMP(r2, 0, 255);
if (g != -1) cc->g2 = E_CLAMP(g2, 0, 255);
if (b != -1) cc->b2 = E_CLAMP(b2, 0, 255);
if (a != -1) cc->a2 = E_CLAMP(a2, 0, 255);
if (r != -1) cc->r3 = E_CLAMP(r3, 0, 255);
if (g != -1) cc->g3 = E_CLAMP(g3, 0, 255);
if (b != -1) cc->b3 = E_CLAMP(b3, 0, 255);
if (a != -1) cc->a3 = E_CLAMP(a3, 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,
@ -72,8 +75,7 @@ e_color_class_del(const char *name)
if (cc)
{
e_config->color_classes = evas_list_remove(e_config->color_classes, cc);
/* FIXME: add edje_color_class_del() and use that) */
edje_color_class_set(cc->name, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255);
edje_color_class_del(cc->name);
evas_stringshare_del(cc->name);
E_FREE(cc);
}

39
src/bin/e_ipc_handlers.h
View File

@ -7205,7 +7205,7 @@ break;
/****************************************************************************/
#define HDL E_IPC_OP_COLOR_CLASS_COLOR2_SET
#if (TYPE == E_REMOTE_OPTIONS)
OP("-color-class-color-set2", 5, "Set color_class (OPT1) color2 r, g, b, a (OPT2-5)", 0, HDL)
OP("-color-class-color2-set", 5, "Set color_class (OPT1) color2 r, g, b, a (OPT2-5)", 0, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_STRING_4INT(params[0], atoi(params[1]), atoi(params[2]), atoi(params[3]), atoi(params[4]), HDL)
#elif (TYPE == E_WM_IN)
@ -7219,7 +7219,7 @@ break;
/****************************************************************************/
#define HDL E_IPC_OP_COLOR_CLASS_COLOR3_SET
#if (TYPE == E_REMOTE_OPTIONS)
OP("-color-class-color-set3", 5, "Set color_class (OPT1) color3 r, g, b, a (OPT2-5)", 0, HDL)
OP("-color-class-color3-set", 5, "Set color_class (OPT1) color3 r, g, b, a (OPT2-5)", 0, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_STRING_4INT(params[0], atoi(params[1]), atoi(params[2]), atoi(params[3]), atoi(params[4]), HDL)
#elif (TYPE == E_WM_IN)
@ -7304,10 +7304,43 @@ break;
STRING_INT4_LIST(v, HDL);
if (v->str) printf("REPLY: \"%s\" (RGBA) %i %i %i %i\n", v->str, v->val1, v->val2, v->val3, v->val4);
else printf("REPLY: \"\" (RGBA) %i %i %i %i\n", v->val1, v->val2, v->val3, v->val4);
END_STRING_INT_LIST(v);
END_STRING_INT4_LIST(v);
#elif (TYPE == E_LIB_IN)
/* FIXME implement */
#endif
#undef HDL
/****************************************************************************/
#define HDL E_IPC_OP_COLOR_CLASS_LIST
#if (TYPE == E_REMOTE_OPTIONS)
OP("-color-class-list", 0, "List all color classes used by currently loaded edje objects.", 1, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_NULL(HDL);
#elif (TYPE == E_WM_IN)
GENERIC(HDL);
LIST_DATA();
ENCODE(edje_color_class_list(), e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_COLOR_CLASS_LIST_REPLY);
END_GENERIC();
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
/****************************************************************************/
#define HDL E_IPC_OP_COLOR_CLASS_LIST_REPLY
#if (TYPE == E_REMOTE_OPTIONS)
#elif (TYPE == E_REMOTE_OUT)
#elif (TYPE == E_WM_IN)
#elif (TYPE == E_REMOTE_IN)
GENERIC(HDL);
LIST();
DECODE(e_ipc_codec_str_list_dec) {
FOR(dat) {
printf("REPLY: \"%s\"\n", (char *)(l->data));
}
FREE_LIST(dat);
}
END_GENERIC();
#endif
#undef HDL
/****************************************************************************/

2
src/bin/e_ipc_handlers_list.h
View File

@ -363,3 +363,5 @@
#define E_IPC_OP_COLOR_CLASS_COLOR3_LIST 339
#define E_IPC_OP_COLOR_CLASS_COLOR_LIST_REPLY 340
#define E_IPC_OP_COLOR_CLASS_DEL 341
#define E_IPC_OP_COLOR_CLASS_LIST 342
#define E_IPC_OP_COLOR_CLASS_LIST_REPLY 343