Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
Engrave.h Makefile.am engrave.y engrave_out.c engrave_parse.c
Log Message:
- change ETCHER -> ENGRAVE
- cleanup some more generated files
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Engrave.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Engrave.h 24 Sep 2004 04:01:46 -0000 1.2
+++ Engrave.h 7 Oct 2004 15:36:38 -0000 1.3
@@ -1,5 +1,5 @@
-#ifndef ETCHER_H
-#define ETCHER_H
+#ifndef ENGRAVE_H
+#define ENGRAVE_H
#include <stdio.h>
#include <stdlib.h>
@@ -21,69 +21,69 @@
typedef struct _Engrave_Program Engrave_Program;
typedef struct _Engrave_Part_State Engrave_Part_State;
-typedef enum _Engrave_Parse_Sectoin Engrave_Parse_Section;
+typedef enum _Engrave_Parse_Section Engrave_Parse_Section;
enum _Engrave_Image_Type
{
- ETCHER_IMAGE_TYPE_RAW,
- ETCHER_IMAGE_TYPE_COMP,
- ETCHER_IMAGE_TYPE_LOSSY,
- ETCHER_IMAGE_TYPE_EXTERNAL,
- ETCHER_IMAGE_TYPE_NUM
+ ENGRAVE_IMAGE_TYPE_RAW,
+ ENGRAVE_IMAGE_TYPE_COMP,
+ ENGRAVE_IMAGE_TYPE_LOSSY,
+ ENGRAVE_IMAGE_TYPE_EXTERNAL,
+ ENGRAVE_IMAGE_TYPE_NUM
};
enum _Engrave_Part_Type
{
- ETCHER_PART_TYPE_IMAGE,
- ETCHER_PART_TYPE_TEXT,
- ETCHER_PART_TYPE_RECT,
- ETCHER_PART_TYPE_SWALLOW,
- ETCHER_PART_TYPE_NUM
+ ENGRAVE_PART_TYPE_IMAGE,
+ ENGRAVE_PART_TYPE_TEXT,
+ ENGRAVE_PART_TYPE_RECT,
+ ENGRAVE_PART_TYPE_SWALLOW,
+ ENGRAVE_PART_TYPE_NUM
};
enum _Engrave_Text_Effect
{
- 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,
- ETCHER_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
- ETCHER_TEXT_EFFECT_NUM
+ ENGRAVE_TEXT_EFFECT_NONE,
+ ENGRAVE_TEXT_EFFECT_PLAIN,
+ ENGRAVE_TEXT_EFFECT_OUTLINE,
+ ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE,
+ ENGRAVE_TEXT_EFFECT_SHADOW,
+ ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW,
+ ENGRAVE_TEXT_EFFECT_SOFT_SHADOW,
+ ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
+ ENGRAVE_TEXT_EFFECT_NUM
};
enum _Engrave_Action
{
- ETCHER_ACTION_STATE_SET,
- ETCHER_ACTION_STOP,
- ETCHER_ACTION_SIGNAL_EMIT,
- ETCHER_ACTION_DRAG_VAL_SET,
- ETCHER_ACTION_DRAG_VAL_STEP,
- ETCHER_ACTION_DRAG_VAL_PAGE,
- ETCHER_ACTION_SCRIPT,
- ETCHER_ACTION_NUM
+ ENGRAVE_ACTION_STATE_SET,
+ ENGRAVE_ACTION_STOP,
+ ENGRAVE_ACTION_SIGNAL_EMIT,
+ ENGRAVE_ACTION_DRAG_VAL_SET,
+ ENGRAVE_ACTION_DRAG_VAL_STEP,
+ ENGRAVE_ACTION_DRAG_VAL_PAGE,
+ ENGRAVE_ACTION_SCRIPT,
+ ENGRAVE_ACTION_NUM
};
enum _Engrave_Transition
{
- ETCHER_TRANSITION_LINEAR,
- ETCHER_TRANSITION_SINUSOIDAL,
- ETCHER_TRANSITION_ACCELERATE,
- ETCHER_TRANSITION_DECELERATE,
- ETCHER_TRANSITION_NUM
+ ENGRAVE_TRANSITION_LINEAR,
+ ENGRAVE_TRANSITION_SINUSOIDAL,
+ ENGRAVE_TRANSITION_ACCELERATE,
+ ENGRAVE_TRANSITION_DECELERATE,
+ ENGRAVE_TRANSITION_NUM
};
enum _Engrave_Aspect_Preference
{
- ETCHER_ASPECT_PREFERENCE_NONE,
- ETCHER_ASPECT_PREFERENCE_VERTICAL,
- ETCHER_ASPECT_PREFERENCE_HORIZONTAL,
- ETCHER_ASPECT_PREFERENCE_BOTH,
- ETCHER_ASPECT_PREFERENCE_NUM
+ ENGRAVE_ASPECT_PREFERENCE_NONE,
+ ENGRAVE_ASPECT_PREFERENCE_VERTICAL,
+ ENGRAVE_ASPECT_PREFERENCE_HORIZONTAL,
+ ENGRAVE_ASPECT_PREFERENCE_BOTH,
+ ENGRAVE_ASPECT_PREFERENCE_NUM
};
struct _Engrave_File
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- Makefile.am 23 Sep 2004 22:20:21 -0000 1.1.1.1
+++ Makefile.am 7 Oct 2004 15:36:38 -0000 1.2
@@ -13,6 +13,11 @@
@evas_cflags@ \
@ecore_cflags@
+CLEANFILES = \
+libengrave_la-engrave.h \
+libengrave_la-engrave.c \
+engrave.c
+
lib_LTLIBRARIES = libengrave.la
include_HEADERS = Engrave.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave.y,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engrave.y 24 Sep 2004 04:01:46 -0000 1.2
+++ engrave.y 7 Oct 2004 15:36:38 -0000 1.3
@@ -105,10 +105,10 @@
}
;
-image_type: RAW { $$ = ETCHER_IMAGE_TYPE_RAW; }
- | COMP { $$ = ETCHER_IMAGE_TYPE_COMP; }
- | LOSSY { $$ = ETCHER_IMAGE_TYPE_LOSSY; }
- | USER { $$ = ETCHER_IMAGE_TYPE_EXTERNAL; }
+image_type: RAW { $$ = ENGRAVE_IMAGE_TYPE_RAW; }
+ | COMP { $$ = ENGRAVE_IMAGE_TYPE_COMP; }
+ | LOSSY { $$ = ENGRAVE_IMAGE_TYPE_LOSSY; }
+ | USER { $$ = ENGRAVE_IMAGE_TYPE_EXTERNAL; }
;
/* don't set a section here yet (since BASE and GROUP have data sects) */
@@ -222,12 +222,12 @@
}
;
-action_type: SIGNAL_EMIT { $$ = ETCHER_ACTION_SIGNAL_EMIT; }
- | STATE_SET { $$ = ETCHER_ACTION_STATE_SET; }
- | ACTION_STOP { $$ = ETCHER_ACTION_STOP; }
- | DRAG_VAL_SET { $$ = ETCHER_ACTION_DRAG_VAL_SET; }
- | DRAG_VAL_STEP { $$ = ETCHER_ACTION_DRAG_VAL_STEP; }
- | DRAG_VAL_PAGE { $$ = ETCHER_ACTION_DRAG_VAL_PAGE; }
+action_type: SIGNAL_EMIT { $$ = ENGRAVE_ACTION_SIGNAL_EMIT; }
+ | STATE_SET { $$ = ENGRAVE_ACTION_STATE_SET; }
+ | ACTION_STOP { $$ = ENGRAVE_ACTION_STOP; }
+ | DRAG_VAL_SET { $$ = ENGRAVE_ACTION_DRAG_VAL_SET; }
+ | DRAG_VAL_STEP { $$ = ENGRAVE_ACTION_DRAG_VAL_STEP; }
+ | DRAG_VAL_PAGE { $$ = ENGRAVE_ACTION_DRAG_VAL_PAGE; }
;
program_transition: TRANSITION COLON transition_type exp SEMICOLON {
@@ -235,10 +235,10 @@
}
;
-transition_type: LINEAR { $$ = ETCHER_TRANSITION_LINEAR; }
- | SINUSOIDAL { $$ = ETCHER_TRANSITION_SINUSOIDAL; }
- | ACCELERATE { $$ = ETCHER_TRANSITION_ACCELERATE; }
- | DECELERATE { $$ = ETCHER_TRANSITION_DECELERATE; }
+transition_type: LINEAR { $$ = ENGRAVE_TRANSITION_LINEAR; }
+ | SINUSOIDAL { $$ = ENGRAVE_TRANSITION_SINUSOIDAL; }
+ | ACCELERATE { $$ = ENGRAVE_TRANSITION_ACCELERATE; }
+ | DECELERATE { $$ = ENGRAVE_TRANSITION_DECELERATE; }
;
program_target: TARGET COLON STRING SEMICOLON {
@@ -363,10 +363,10 @@
}
;
-part_type: IMAGE { $$ = ETCHER_PART_TYPE_IMAGE; }
- | RECT { $$ = ETCHER_PART_TYPE_RECT; }
- | TEXT { $$ = ETCHER_PART_TYPE_TEXT; }
- | SWALLOW { $$ = ETCHER_PART_TYPE_SWALLOW; }
+part_type: IMAGE { $$ = ENGRAVE_PART_TYPE_IMAGE; }
+ | RECT { $$ = ENGRAVE_PART_TYPE_RECT; }
+ | TEXT { $$ = ENGRAVE_PART_TYPE_TEXT; }
+ | SWALLOW { $$ = ENGRAVE_PART_TYPE_SWALLOW; }
;
effect: EFFECT COLON effect_type SEMICOLON {
@@ -374,13 +374,13 @@
}
;
-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; }
+effect_type: NONE { $$ = ENGRAVE_TEXT_EFFECT_NONE; }
+ | PLAIN { $$ = ENGRAVE_TEXT_EFFECT_PLAIN; }
+ | OUTLINE { $$ = ENGRAVE_TEXT_EFFECT_OUTLINE; }
+ | SOFT_OUTLINE { $$ = ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE; }
+ | SHADOW { $$ = ENGRAVE_TEXT_EFFECT_SHADOW; }
+ | SOFT_SHADOW { $$ = ENGRAVE_TEXT_EFFECT_SOFT_SHADOW; }
+ | OUTLINE_SOFT_SHADOW { $$ = ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW; }
;
mouse_events: MOUSE_EVENTS COLON exp SEMICOLON {
@@ -506,10 +506,10 @@
}
;
-aspect_pref_type: NONE { $$ = ETCHER_ASPECT_PREFERENCE_NONE; }
- | VERTICAL { $$ = ETCHER_ASPECT_PREFERENCE_VERTICAL; }
- | HORIZONTAL { $$ = ETCHER_ASPECT_PREFERENCE_HORIZONTAL; }
- | BOTH { $$ = ETCHER_ASPECT_PREFERENCE_BOTH; }
+aspect_pref_type: NONE { $$ = ENGRAVE_ASPECT_PREFERENCE_NONE; }
+ | VERTICAL { $$ = ENGRAVE_ASPECT_PREFERENCE_VERTICAL; }
+ | HORIZONTAL { $$ = ENGRAVE_ASPECT_PREFERENCE_HORIZONTAL; }
+ | BOTH { $$ = ENGRAVE_ASPECT_PREFERENCE_BOTH; }
;
desc_body: desc_body_entry
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engrave_out.c 24 Sep 2004 04:01:46 -0000 1.2
+++ engrave_out.c 7 Oct 2004 15:36:38 -0000 1.3
@@ -10,21 +10,21 @@
static int level = 0;
-char *_image_type_string[ETCHER_IMAGE_TYPE_NUM] = {
+char *_image_type_string[ENGRAVE_IMAGE_TYPE_NUM] = {
"RAW",
"COMP",
"LOSSY",
"USER"
};
-char *_part_type_string[ETCHER_PART_TYPE_NUM] = {
+char *_part_type_string[ENGRAVE_PART_TYPE_NUM] = {
"IMAGE",
"TEXT",
"RECT",
"SWALLOW"
};
-char *_text_effect_string[ETCHER_TEXT_EFFECT_NUM] = {
+char *_text_effect_string[ENGRAVE_TEXT_EFFECT_NUM] = {
"NONE",
"PLAIN",
"OUTLINE",
@@ -35,7 +35,7 @@
"OUTLINE_SOFT_SHADOW"
};
-char *_action_string[ETCHER_ACTION_NUM] = {
+char *_action_string[ENGRAVE_ACTION_NUM] = {
"STATE_SET",
"ACTION_STOP",
"SIGNAL_EMIT",
@@ -45,14 +45,14 @@
"SCRIPT"
};
-char *_transition_string[ETCHER_TRANSITION_NUM] = {
+char *_transition_string[ENGRAVE_TRANSITION_NUM] = {
"LINEAR",
"SINUSOIDAL",
"ACCELERATE",
"DECELERATE"
};
-char *_aspect_preference_string[ETCHER_ASPECT_PREFERENCE_NUM] = {
+char *_aspect_preference_string[ENGRAVE_ASPECT_PREFERENCE_NUM] = {
"NONE",
"VERTICAL",
"HORIZONTAL",
@@ -172,7 +172,7 @@
Engrave_Image *image = l->data;
if (image)
{
- if (image->type == ETCHER_IMAGE_TYPE_LOSSY)
+ if (image->type == ENGRAVE_IMAGE_TYPE_LOSSY)
engrave_out_data(out, "image", "\"%s\" %s %.2f", image->name,
_image_type_string[image->type],
image->value);
@@ -335,13 +335,13 @@
engrave_out_data(out, "signal", "\"%s\"", program->signal);
engrave_out_data(out, "source", "\"%s\"", program->source);
- if(program->action == ETCHER_ACTION_STOP)
+ if(program->action == ENGRAVE_ACTION_STOP)
{
engrave_out_data(out, "action", "%s", _action_string[program->action]);
}
- else if (program->action == ETCHER_ACTION_DRAG_VAL_SET ||
- program->action == ETCHER_ACTION_DRAG_VAL_STEP ||
- program->action == ETCHER_ACTION_DRAG_VAL_PAGE)
+ else if (program->action == ENGRAVE_ACTION_DRAG_VAL_SET ||
+ program->action == ENGRAVE_ACTION_DRAG_VAL_STEP ||
+ program->action == ENGRAVE_ACTION_DRAG_VAL_PAGE)
{
engrave_out_data(out, "action", "%s %.2f %.2f",
_action_string[program->action],
@@ -349,7 +349,7 @@
program->value2
);
}
- else if (program->action == ETCHER_ACTION_STATE_SET)
+ else if (program->action == ENGRAVE_ACTION_STATE_SET)
{
engrave_out_data(out, "action", "%s \"%s\" %.2f",
_action_string[program->action],
@@ -362,7 +362,7 @@
program->duration
);
}
- else if (program->action == ETCHER_ACTION_SIGNAL_EMIT)
+ else if (program->action == ENGRAVE_ACTION_SIGNAL_EMIT)
{
engrave_out_data(out, "action", "%s \"%s\" \"%s\"",
_action_string[program->action],
@@ -370,7 +370,7 @@
program->state2
);
}
- else if(program->action == ETCHER_ACTION_SCRIPT)
+ else if(program->action == ENGRAVE_ACTION_SCRIPT)
{
if (program->script)
{
@@ -497,7 +497,7 @@
engrave_out_data(out, "color3", "%d %d %d %d",
state->color3.r, state->color3.g, state->color3.b, state->color3.a);
- if (part->type == ETCHER_PART_TYPE_IMAGE && state->image.normal )
+ if (part->type == ENGRAVE_PART_TYPE_IMAGE && state->image.normal )
{
engrave_out_start(out, "image");
engrave_out_data(out, "normal", "\"%s\"", state->image.normal->name);
@@ -508,7 +508,7 @@
}
engrave_out_end(out);
}
- else if (part->type == ETCHER_PART_TYPE_TEXT)
+ else if (part->type == ENGRAVE_PART_TYPE_TEXT)
{
engrave_out_start(out, "text");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_parse.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- engrave_parse.c 23 Sep 2004 22:20:21 -0000 1.1.1.1
+++ engrave_parse.c 7 Oct 2004 15:36:38 -0000 1.2
@@ -142,7 +142,7 @@
part = (Engrave_Part *)calloc(1, sizeof(Engrave_Part));
group = evas_list_data(evas_list_last(engrave_file->groups));
- part->type = ETCHER_PART_TYPE_IMAGE;
+ part->type = ENGRAVE_PART_TYPE_IMAGE;
part->mouse_events = 1;
part->repeat_events = 0;
@@ -934,7 +934,7 @@
if(program->script) free(program->script);
program->script = (char *)strdup(script);
- program->action = ETCHER_ACTION_SCRIPT;
+ program->action = ENGRAVE_ACTION_SCRIPT;
}
void
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
