Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/edje_cc
Modified Files:
edje.y etcher_out.c
Log Message:
fixies.
e_logo.edc, test.edc (from edje) read in and compile from the output ok.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- edje.y 9 Sep 2004 17:03:09 -0000 1.23
+++ edje.y 9 Sep 2004 21:11:00 -0000 1.24
@@ -387,13 +387,13 @@
;
mouse_events: MOUSE_EVENTS COLON exp SEMICOLON {
- etcher_parse_part_mouse_events($3);
+ etcher_parse_part_mouse_events((int)$3);
printf("mouse event %f\n", $3);
}
;
repeat_events: REPEAT_EVENTS COLON exp SEMICOLON {
- etcher_parse_part_repeat_events($3);
+ etcher_parse_part_repeat_events((int)$3);
printf("repeat events %d\n", $3);
}
;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/etcher_out.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etcher_out.c 9 Sep 2004 17:03:09 -0000 1.3
+++ etcher_out.c 9 Sep 2004 21:11:00 -0000 1.4
@@ -387,18 +387,18 @@
fprintf(out, "\t\t\t\t\tborder: %d %d %d %d;\n",
state->border.l, state->border.r, state->border.t, state->border.b);
- if (state->color.r != 255 && state->color.g != 255 &&
- state->color.b != 255 && state->color.a != 255)
+ if (state->color.r != 255 || state->color.g != 255 ||
+ state->color.b != 255 || state->color.a != 255)
fprintf(out, "\t\t\t\t\tcolor: %d %d %d %d;\n",
state->color.r, state->color.g, state->color.b, state->color.a);
- if (state->color2.r != 0 && state->color2.g != 0 &&
- state->color2.b != 0 && state->color2.a != 255)
+ if (state->color2.r != 0 || state->color2.g != 0 ||
+ state->color2.b != 0 || state->color2.a != 255)
fprintf(out, "\t\t\t\t\tcolor2: %d %d %d %d;\n",
state->color2.r, state->color2.g, state->color2.b, state->color2.a);
- if (state->color3.r != 0 && state->color3.g != 0 &&
- state->color3.b != 0 && state->color3.a != 128)
+ if (state->color3.r != 0 || state->color3.g != 0 ||
+ state->color3.b != 0 || state->color3.a != 128)
fprintf(out, "\t\t\t\t\tcolor3: %d %d %d %d;\n",
state->color3.r, state->color3.g, state->color3.b, state->color3.a);
@@ -425,6 +425,9 @@
if (state->text.font)
fprintf(out, "\t\t\t\t\t\tfont: \"%s\";\n", state->text.font);
+ if (state->text.size)
+ fprintf(out, "\t\t\t\t\t\tsize: %d;\n", state->text.size);
+
if (state->text.fit.x || state->text.fit.y)
fprintf(out, "\t\t\t\t\t\tfit: %d %d;\n",
state->text.fit.x, state->text.fit.y);
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
