Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/edje_cc
Modified Files:
Etcher.h Makefile edje.y
Added Files:
etcher_parse.c
Log Message:
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/Etcher.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Etcher.h 8 Sep 2004 05:20:27 -0000 1.5
+++ Etcher.h 8 Sep 2004 06:56:23 -0000 1.6
@@ -16,6 +16,7 @@
typedef struct _Etcher_Font Etcher_Font;
typedef struct _Etcher_Group Etcher_Group;
typedef struct _Etcher_Part Etcher_Part;
+typedef struct _Etcher_Program Etcher_Program;
typedef struct _Etcher_Part_State Etcher_Part_State;
@@ -80,7 +81,8 @@
{
Evas_List *images;
Evas_List *fonts;
-
+ Evas_List *data;
+ Evas_List *groups;
};
struct _Etcher_Data
@@ -91,7 +93,7 @@
struct _Etcher_Image
{
- char *image;
+ char *name;
char *path;
Etcher_Image_Type type;
double value;
@@ -107,7 +109,10 @@
struct _Etcher_Group
{
char *name;
- int min, max;
+ struct
+ {
+ int w, h;
+ } min, max;
Evas_List *parts;
Evas_List *programs;
@@ -169,7 +174,7 @@
struct
{
double w, h;
- unsigned char prefer; /* NEITHER = 0, VERTICAL = 1, HORIZONTAL = 2 */
+ Etcher_Aspect_Preference prefer;
} aspect;
struct
@@ -177,7 +182,12 @@
struct
{
double x, y;
- } relative, offset;
+ } relative;
+
+ struct
+ {
+ int x, y;
+ } offset;
char *to_x;
char *to_y;
@@ -192,16 +202,16 @@
struct
{
int l, r, t, b;
- };
+ } border;
struct
{
- unsigned char r, g, b, a;
+ int r, g, b, a;
} color, color2, color3;
struct
{
- char smooth;
+ int smooth;
struct
{
@@ -222,7 +232,7 @@
int size;
struct {
- unsigned char x, y;
+ int x, y;
} fit, min;
struct {
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile 8 Sep 2004 05:55:06 -0000 1.2
+++ Makefile 8 Sep 2004 06:56:23 -0000 1.3
@@ -3,7 +3,7 @@
PARSE_FILE=edje.y
all: lexer parser
- $(CC) lex.yy.c edje_cc.tab.c main.c -lfl -o edje_cc
+ $(CC) lex.yy.c edje_cc.tab.c main.c etcher_parse.c -lfl -levas -o edje_cc
lexer: $(LEX_FILE)
flex $(LEX_FILE)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- edje.y 8 Sep 2004 06:26:08 -0000 1.18
+++ edje.y 8 Sep 2004 06:56:23 -0000 1.19
@@ -73,7 +73,7 @@
;
font: FONT COLON STRING STRING SEMICOLON {
- printf("got font '%s' named (%s)\n", $3, $4);
+ printf("got font '%s' named (%s)\n", $3, $4);
}
;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
