Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : proto

Dir     : e17/proto/edje_cc


Modified Files:
        Etcher.h edje.l edje.y 


Log Message:
- parts
- fill in the script macros

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/Etcher.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Etcher.h    8 Sep 2004 02:18:16 -0000       1.4
+++ Etcher.h    8 Sep 2004 05:20:27 -0000       1.5
@@ -8,6 +8,7 @@
 typedef enum _Etcher_Text_Effect Etcher_Text_Effect;
 typedef enum _Etcher_Action Etcher_Action;
 typedef enum _Etcher_Transition Etcher_Transition;
+typedef enum _Etcher_Aspect_Preference Etcher_Aspect_Preference;
 
 typedef struct _Etcher_File Etcher_File;
 typedef struct _Etcher_Data Etcher_Data;
@@ -41,6 +42,7 @@
   ETCHER_TEXT_EFFECT_NONE,
   ETCHER_TEXT_EFFECT_PLAIN,
   ETCHER_TEXT_EFFECT_OUTLINE,
+  ETCHER_TEXT_EFFECT_SOFT_OUTLINE,
   ETCHER_TEXT_EFFECT_SHADOW,
   ETCHER_TEXT_EFFECT_OUTLINE_SHADOW,
   ETCHER_TEXT_EFFECT_SOFT_SHADOW,
@@ -66,6 +68,14 @@
   ETCHER_TRANSITION_DECELERATE
 };
 
+enum _Etcher_Aspect_Preference
+{
+  ETCHER_ASPECT_PREFERENCE_NONE,
+  ETCHER_ASPECT_PREFERENCE_VERTICAL,
+  ETCHER_ASPECT_PREFERENCE_HORIZONTAL,
+  ETCHER_ASPECT_PREFERENCE_BOTH
+};
+
 struct _Etcher_File
 {
   Evas_List *images;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.l,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje.l      8 Sep 2004 03:52:27 -0000       1.15
+++ edje.l      8 Sep 2004 05:20:27 -0000       1.16
@@ -1,4 +1,5 @@
 %{
+#include <string.h>
 #include <stdio.h>
 #include "Etcher.h"
 #include "edje_cc.tab.h"
@@ -8,23 +9,39 @@
     int col = 0;
     static int comment = 0, cpp_comment = 0;
     static int script_level = 0;
-    char *script;
+    static char *script;
 
     #define COMMENT_START() BEGIN(SC_COMMENT); comment++; 
+
     #define COMMENT_END()   comment--; \
                             if (comment <= 0) { comment = 0; BEGIN(INITIAL); }
     #define CPP_COMMENT()   comment = 1; cpp_comment = 1;
 
-    #define SCRIPT_START()  BEGIN(SC_SCRIPT); /* FIXME initialize script */
-    #define SCRIPT_END()    BEGIN(INITIAL); /* FIXME return script */
-    #define SCRIPT_PIECE()  ; /* FIXME add piece to script */
+    #define SCRIPT_START()  BEGIN(SC_SCRIPT); 
+
+    #define SCRIPT_END()    BEGIN(INITIAL); \
+                                                       if (script) { \
+                                                               yylval.string = 
strdup(script); \
+                                                               free(script); \
+                                                       } \
+                                                       script = NULL; \
+                                                       VAL_RETURN(SCRIPT);
+
+    #define SCRIPT_PIECE()  if (script == NULL) { \
+                                                               script = 
strdup(yytext); \
+                                                       } else { \
+                                                               realloc(script, 
strlen(script) + yyleng + 1); \
+                                                               strncat(script, 
yytext, yyleng); \
+                                                       } 
+
     #define SCRIPT_NEW_LINE() lnum ++; SCRIPT_PIECE(); 
+
     #define SCRIPT_OPEN_BRACE() script_level++; \
                                 if (script_level > 1) SCRIPT_PIECE();
+
     #define SCRIPT_CLOSE_BRACE() script_level--;\
                                  if (script_level > 0) { SCRIPT_PIECE();}\
                                  else {script_level = 0; SCRIPT_END();}\
-                                   
 
     #define WHITE_SPACE()   col += yyleng;
 
@@ -44,7 +61,7 @@
     #define STRING_RETURN() yylval.string = (char *)malloc(yyleng - 1); \
                             { \
                                 char *c = yytext; \
-                                strncpy(yylval.string, ++c, yyleng - 2); \
+                                snprintf(yylval.string, yyleng - 1, "%s", ++c); \
                             } \
                             VAL_RETURN(STRING);
 
@@ -73,6 +90,7 @@
 align                          { KEYWORD_RETURN(ALIGN); }
 aspect                         { KEYWORD_RETURN(ASPECT); }
 aspect_preference      { KEYWORD_RETURN(ASPECT_PREFERENCE); }
+BOTH                           { KEYWORD_RETURN(BOTH); }
 border                         { KEYWORD_RETURN(BORDER); }
 clip_to                                { KEYWORD_RETURN(CLIP_TO); }
 collections                    { KEYWORD_RETURN(COLLECTIONS); }
@@ -95,38 +113,51 @@
 font                           { KEYWORD_RETURN(FONT); }
 fonts                          { KEYWORD_RETURN(FONTS); }
 group                          { KEYWORD_RETURN(GROUP); }
+HORIZONTAL                     { KEYWORD_RETURN(HORIZONTAL); }
 image                          { KEYWORD_RETURN(IMAGE); }
 images                         { KEYWORD_RETURN(IMAGES); }
 in                                     { KEYWORD_RETURN(IN); }
 item                           { KEYWORD_RETURN(ITEM); }
+IMAGE                          { KEYWORD_RETURN(IMAGE); }
 LINEAR                         { KEYWORD_RETURN(LINEAR); }
 LOSSY                          { KEYWORD_RETURN(LOSSY); }
 max                                    { KEYWORD_RETURN(MAX); }
 min                                    { KEYWORD_RETURN(MIN); }
 mouse_events           { KEYWORD_RETURN(MOUSE_EVENTS); }
 name                           { KEYWORD_RETURN(NAME); }
+NONE                           { KEYWORD_RETURN(NONE); }
 normal                         { KEYWORD_RETURN(NORMAL); }
 offset                         { KEYWORD_RETURN(OFFSET); }
 origin                         { KEYWORD_RETURN(ORIGIN); }
+OUTLINE                                { KEYWORD_RETURN(OUTLINE); }
+OUTLINE_SHADOW         { KEYWORD_RETURN(OUTLINE_SHADOW); }
+OUTLINE_SOFT_SHADOW { KEYWORD_RETURN(OUTLINE_SOFT_SHADOW); }
 part                           { KEYWORD_RETURN(PART); }
 parts                          { KEYWORD_RETURN(PARTS); }
+PLAIN                          { KEYWORD_RETURN(PLAIN); }
 program                                { KEYWORD_RETURN(PROGRAM); }
 programs                       { KEYWORD_RETURN(PROGRAMS); }
 RAW                                    { KEYWORD_RETURN(RAW); }
+RECT                           { KEYWORD_RETURN(RECT); }
 rel1                           { KEYWORD_RETURN(REL1); }
 rel2                           { KEYWORD_RETURN(REL2); }
 relative                       { KEYWORD_RETURN(RELATIVE); }
 repeat_events          { KEYWORD_RETURN(REPEAT_EVENTS); }
+SHADOW                         { KEYWORD_RETURN(SHADOW); }
 signal                         { KEYWORD_RETURN(SIGNAL); }
 SIGNAL_EMIT                    { KEYWORD_RETURN(SIGNAL_EMIT); }
 SINUSOIDAL                     { KEYWORD_RETURN(SINUSOIDAL); }
 size                           { KEYWORD_RETURN(SIZE); }
 smooth                         { KEYWORD_RETURN(SMOOTH); }
+SOFT_OUTLINE           { KEYWORD_RETURN(SOFT_OUTLINE); }
+SOFT_SHADOW                    { KEYWORD_RETURN(SOFT_SHADOW); }
 source                         { KEYWORD_RETURN(SOURCE); }
 state                          { KEYWORD_RETURN(STATE); }
 STATE_SET                      { KEYWORD_RETURN(STATE_SET); }
 step                           { KEYWORD_RETURN(STEP); }
+SWALLOW                                { KEYWORD_RETURN(SWALLOW); }
 target                         { KEYWORD_RETURN(TARGET); }
+TEXT                           { KEYWORD_RETURN(TEXT); }
 text                           { KEYWORD_RETURN(TEXT); }
 text_class                     { KEYWORD_RETURN(TEXT_CLASS); }
 to                                     { KEYWORD_RETURN(TO); }
@@ -135,6 +166,7 @@
 transition                     { KEYWORD_RETURN(TRANSITION); }
 tween                          { KEYWORD_RETURN(TWEEN); }
 type                           { KEYWORD_RETURN(TYPE); }
+VERTICAL                       { KEYWORD_RETURN(VERTICAL); }
 visible                                { KEYWORD_RETURN(VISIBLE); }
 x                                      { KEYWORD_RETURN(X); }
 y                                      { KEYWORD_RETURN(Y); }
@@ -142,9 +174,9 @@
 {floating_constant} { FLOAT_RETURN(); }
 \}                  { KEYWORD_RETURN(CLOSE_BRACE); }
 \{                  { KEYWORD_RETURN(OPEN_BRACE); }
-[:,]               { KEYWORD_RETURN(COLON); }
-;                  { KEYWORD_RETURN(SEMICOLON); }
-\"                 { KEYWORD_RETURN(QUOTE); }
+[:,]                   { KEYWORD_RETURN(COLON); }
+;                          { KEYWORD_RETURN(SEMICOLON); }
+\"                         { KEYWORD_RETURN(QUOTE); }
 [ \t]+              { WHITE_SPACE(); }
 \n                  { NEW_LINE(); }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje.y      8 Sep 2004 02:42:29 -0000       1.12
+++ edje.y      8 Sep 2004 05:20:27 -0000       1.13
@@ -18,6 +18,10 @@
        float val;
        Etcher_Action prog_actions;
        Etcher_Transition transition_type;
+       Etcher_Part_Type part_type;
+       Etcher_Image_Type image_type;
+       Etcher_Text_Effect text_effect;
+       Etcher_Aspect_Preference aspect_pref;
 }
 
 %token STRING FLOAT
@@ -32,12 +36,18 @@
 %token OPEN_BRACE CLOSE_BRACE RAW COMP LOSSY
 %token COLON QUOTE SEMICOLON STATE_SET ACTION_STOP SIGNAL_EMIT
 %token DRAG_VAL_SET DRAG_VAL_STEP DRAG_VAL_PAGE LINEAR
-%token SINUSOIDAL ACCELERATE DECELERATE
+%token SINUSOIDAL ACCELERATE DECELERATE IMAGE RECT SWALLOW
+%token NONE PLAIN OUTLINE SOFT_OUTLINE SHADOW SOFT_SHADOW
+%token OUTLINE_SHADOW OUTLINE_SOFT_SHADOW VERTICAL HORIZONTAL BOTH
 
-%type <string> STRING lossless_type lossy_type 
+%type <string> STRING 
 %type <val> FLOAT
 %type <prog_actions> action_type
 %type <transition_type> transition_type
+%type <part_type> part_type
+%type <image_type> image_type
+%type <text_effect> effect_type
+%type <aspect_pref> aspect_pref_type
 
 %%
 
@@ -74,18 +84,17 @@
        | image image_statement
        ;
 
-image: IMAGE COLON STRING lossless_type SEMICOLON {
+image: IMAGE COLON STRING image_type SEMICOLON {
                printf("got image '%s' of type %s\n", $3, $4);
        }
-       | IMAGE COLON STRING lossy_type FLOAT SEMICOLON {
+       | IMAGE COLON STRING image_type FLOAT SEMICOLON {
                printf("got image '%s' of type %s (%f)\n", $3, $4, $5);
        }
        ;
 
-lossy_type: LOSSY { $$ = strdup("lossy"); }
-
-lossless_type: RAW { $$ = strdup("raw"); }
-       | COMP { $$ = strdup("comp"); }
+image_type: RAW { $$ = ETCHER_IMAGE_TYPE_RAW; }
+       | COMP { $$ = ETCHER_IMAGE_TYPE_COMP; }
+       | LOSSY { $$ = ETCHER_IMAGE_TYPE_LOSSY; }
        ;
 
 data:  DATA OPEN_BRACE data_statement CLOSE_BRACE 
@@ -183,7 +192,12 @@
        | group collection_statement
        ;
 
-group: GROUP OPEN_BRACE group_preamble group_body CLOSE_BRACE
+group: GROUP OPEN_BRACE group_foo CLOSE_BRACE
+       ;
+
+group_foo: 
+       | group_preamble group_foo
+       | group_body group_foo
        ;
 
 group_body: data
@@ -192,7 +206,9 @@
        | programs
        ;
 
-script:
+script: SCRIPT {
+               printf("script\n--%s\n--\n", yylval.string);
+       }
        ;
 
 group_preamble: group_preamble_entry
@@ -214,6 +230,354 @@
        }
        ;
 
+parts: PARTS OPEN_BRACE parts_statement CLOSE_BRACE
+       ;
+
+parts_statement: part
+       | part parts_statement
+       ;
+
+part: PART OPEN_BRACE part_foo CLOSE_BRACE
+       ;
+
+part_foo: 
+       | part_preamble part_foo
+       | part_body part_foo
+       ;
+
+part_preamble: part_preamble_entry
+       | part_preamble_entry part_preamble
+
+part_preamble_entry: name
+       | type
+       | effect
+       | mouse_events
+       | repeat_events
+       | clip_to
+       | color_class
+       | text_class
+    ; 
+
+type: TYPE COLON part_type {
+               printf("type %d\n", $3);
+       }
+       ;
+
+part_type: IMAGE { $$ = ETCHER_PART_TYPE_IMAGE; }
+       | RECT { $$ = ETCHER_PART_TYPE_RECT; }
+       | TEXT { $$ = ETCHER_PART_TYPE_TEXT; }
+       | SWALLOW { $$ = ETCHER_PART_TYPE_SWALLOW; }
+       ;
+
+effect: EFFECT COLON effect_type SEMICOLON {
+               printf("effect %d\n", $3);
+       }
+       ;
+
+effect_type: NONE { $$ = ETCHER_TEXT_EFFECT_NONE; }
+       | PLAIN { $$ = ETCHER_TEXT_EFFECT_PLAIN; }
+       | OUTLINE { $$ = ETCHER_TEXT_EFFECT_OUTLINE; }
+       | SOFT_OUTLINE { $$ = ETCHER_TEXT_EFFECT_SOFT_OUTLINE; }
+       | SHADOW { $$ = ETCHER_TEXT_EFFECT_SHADOW; }
+       | SOFT_SHADOW { $$ = ETCHER_TEXT_EFFECT_SOFT_SHADOW; }
+       | OUTLINE_SOFT_SHADOW { $$ = ETCHER_TEXT_EFFECT_OUTLINE_SOFT_SHADOW; }
+       ;
+
+mouse_events: MOUSE_EVENTS COLON FLOAT SEMICOLON {
+               printf("mouse event %f\n", $3);
+       }
+       ;
+
+repeat_events: REPEAT_EVENTS COLON FLOAT SEMICOLON {
+               printf("repeat events %d\n", $3);
+       }
+       ;
+
+clip_to: CLIP_TO COLON STRING SEMICOLON {
+               printf("clip to (%s)\n", $3);
+       }
+       ;
+
+color_class: COLOR_CLASS COLON STRING SEMICOLON {
+               printf("color class %s\n", $3);
+       }
+       ;
+
+text_class: TEXT_CLASS COLON STRING SEMICOLON {
+               printf("text class %s\n", $3);
+       }
+       ;
+
+part_body: part_body_entry
+       | part_body_entry part_body
+       ;
+
+part_body_entry: dragable
+       | description
+       ;
+
+dragable: DRAGABLE OPEN_BRACE dragable_statement CLOSE_BRACE
+       ;
+
+dragable_statement: dragable_body
+       | dragable_body dragable_statement
+       ;
+
+dragable_body: x
+       | y
+       | confine
+       ;
+
+x: X COLON FLOAT FLOAT FLOAT SEMICOLON {
+               printf("x %f %f %f\n", $3, $4, $5);
+       }
+       ;
+
+y: Y COLON FLOAT FLOAT FLOAT SEMICOLON {
+               printf("y %f %f %f\n", $3, $4, $5);
+       }
+       ;
+
+confine: CONFINE COLON STRING SEMICOLON {
+               printf("confine %s\n", $3);
+       }
+       ;
+
+description: DESCRIPTION OPEN_BRACE desc_foo CLOSE_BRACE
+       ;
+
+desc_foo:
+       | desc_preamble desc_foo
+       | desc_body desc_foo
+       ;
+
+desc_preamble: desc_preamble_entry
+       | desc_preamble_entry desc_preamble
+       ;
+
+desc_preamble_entry: state
+       | visible
+       | align
+       | min
+       | max
+       | step
+       | aspect
+       | aspect_preference
+       ;
+
+state: STATE COLON STRING FLOAT SEMICOLON {
+               printf("state %s %f\n", $3, $4);
+       }
+       ;
+
+visible: VISIBLE COLON FLOAT SEMICOLON {
+               printf("visible %f\n", $3);
+       }
+       ;
+
+align: ALIGN COLON FLOAT FLOAT SEMICOLON {
+               printf("align %f %f\n", $3, $4);
+       }
+       ;
+
+step: STEP COLON FLOAT FLOAT SEMICOLON {
+               printf("step %f %f\n", $3, $4);
+       }
+       ;
+
+aspect: ASPECT COLON FLOAT FLOAT SEMICOLON {
+               printf("aspect %f %f\n", $3, $4);
+       }
+       ;
+
+aspect_preference: ASPECT_PREFERENCE COLON aspect_pref_type SEMICOLON {
+               printf("aspect_preference %d\n", $3);
+       }
+       ;
+
+aspect_pref_type: NONE { $$ = ETCHER_ASPECT_PREFERENCE_NONE; }
+       | VERTICAL { $$ = ETCHER_ASPECT_PREFERENCE_VERTICAL; }
+       | HORIZONTAL { $$ = ETCHER_ASPECT_PREFERENCE_HORIZONTAL; }
+       | BOTH { $$ = ETCHER_ASPECT_PREFERENCE_BOTH; }
+       ;
+
+desc_body: desc_body_entry
+       | desc_body_entry desc_body
+       ;
+
+desc_body_entry: rel1
+       | rel2
+       | image
+       | border
+       | fill
+       | color_class
+       | color
+       | color2
+       | color3
+       | text
+       ;
+
+rel1: REL1 OPEN_BRACE rel_statement CLOSE_BRACE
+       ;
+
+rel2: REL2 OPEN_BRACE rel_statement CLOSE_BRACE
+       ;
+
+rel_statement: rel_body
+       | rel_body rel_statement
+       ;
+
+rel_body: relative
+       | offset
+       | to
+       | to_x
+       | to_y
+       ;
+
+relative: RELATIVE COLON FLOAT FLOAT SEMICOLON {
+               printf("relative %f %f\n", $3, $4);
+       }
+       ;
+
+offset: OFFSET COLON FLOAT FLOAT SEMICOLON {
+               printf("offset %f %f\n", $3, $4);
+       }
+       ;
+
+to: TO COLON STRING SEMICOLON {
+               printf("to %s\n", $3);
+       }
+       ;
+
+to_x: TO_X COLON STRING SEMICOLON {
+               printf("to_x %s\n", $3);
+       }
+       ;
+
+to_y: TO_Y COLON STRING SEMICOLON {
+               printf("to_y %s\n", $3);
+       }
+       ;
+
+image: IMAGE OPEN_BRACE image_statement CLOSE_BRACE
+       ;
+
+image_statement: image_body
+       | image_body image_statement
+       ;
+
+image_body: normal
+       | tween
+       ;
+
+normal: NORMAL COLON STRING SEMICOLON {
+               printf("normal %s\n", $3);
+       }
+       ;
+
+tween: TWEEN COLON STRING SEMICOLON {
+               printf("tween %s\n", $3);
+       }
+       ;
+
+border: BORDER COLON FLOAT FLOAT FLOAT FLOAT SEMICOLON {
+               printf("border %f %f %f %f\n", $3, $4, $5, $6);
+       }
+       ;
+
+fill: FILL OPEN_BRACE fill_statement CLOSE_BRACE
+       ;
+
+fill_statement: fill_body
+       | fill_body fill_statement
+       ;
+
+fill_body: smooth
+       | origin
+       | size
+       ;
+
+smooth: SMOOTH COLON FLOAT SEMICOLON {
+               printf("smooth %f\n", $3);
+       }
+       ;
+
+origin: ORIGIN OPEN_BRACE origin_statement CLOSE_BRACE
+       ;
+
+origin_statement: origin_body
+       | origin_statement origin_body
+       ;
+
+origin_body: relative
+       | offset
+       ;
+
+size: SIZE OPEN_BRACE origin_statement CLOSE_BRACE
+       ;
+
+color_class: COLOR_CLASS COLON STRING SEMICOLON {
+               printf("colour class %s\n", $3);
+       }
+       ;
+
+color: COLOR COLON FLOAT FLOAT FLOAT FLOAT SEMICOLON {
+               printf("color %f %f %f %f\n", $3, $4, $5, $6);
+       }
+       ;
+
+color2: COLOR2 COLON FLOAT FLOAT FLOAT FLOAT SEMICOLON {
+               printf("color2 %f %f %f %f\n", $3, $4, $5, $6);
+       }
+       ;
+               
+color3: COLOR3 COLON FLOAT FLOAT FLOAT FLOAT SEMICOLON {
+               printf("color3 %f %f %f %f\n", $3, $4, $5, $6);
+       }
+       ;
+
+text: TEXT OPEN_BRACE text_statement CLOSE_BRACE
+       ;
+
+text_statement: text_body
+       | text_body text_statement
+       ;
+
+text_body: text_entry
+       | text_class
+       | font_entry
+       | size_entry
+       | fit
+       | min
+       | align
+       ;
+
+text_entry: TEXT COLON STRING SEMICOLON {
+               printf("text (%s)\n", $3);
+       }
+       ;
+
+text_class: TEXT_CLASS COLON STRING SEMICOLON {
+               printf("text_class %s\n", $3);
+       }
+       ;
+
+font_entry: FONT COLON STRING SEMICOLON {
+               printf("font %s\n", $3);
+       }
+       ;
+
+size_entry: SIZE COLON FLOAT SEMICOLON {
+               printf("size %s\n", $3);
+       }
+       ;
+
+fit: FIT COLON FLOAT FLOAT SEMICOLON {
+               printf("fit %f %f\n", $3, $4);
+       }
+       ;
+
+
 %%
 
 void yyerror(const char *str) {




-------------------------------------------------------
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

Reply via email to