Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
Makefile.am engrave_file.c engrave_file.h engrave_group.c
engrave_group.h engrave_load.c engrave_macros.h engrave_out.c
engrave_parse.c engrave_part.c engrave_part.h
engrave_part_state.c engrave_part_state.h engrave_program.h
Added Files:
engrave_program.c
Log Message:
- fill out the rest of the api needed by engrave_parse.c.
- engrave_parse.c does not access the structs directly anymore
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 21 Oct 2004 06:56:38 -0000 1.3
+++ Makefile.am 22 Oct 2004 01:43:14 -0000 1.4
@@ -42,6 +42,7 @@
engrave_parse.c \
engrave_part.c \
engrave_part_state.c \
+ engrave_program.c \
engrave_load.c \
$(ENGRAVEHEADERS)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_file.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_file.c 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_file.c 22 Oct 2004 01:43:14 -0000 1.2
@@ -42,3 +42,16 @@
return evas_list_data(evas_list_last(ef->groups));
}
+Engrave_Image *
+engrave_file_image_by_name_find(Engrave_File *ef, char *name)
+{
+ Evas_List *l;
+ for (l = ef->images; l; l = l->next)
+ {
+ Engrave_Image *im = l->data;
+ if (im && !strcmp(im->name, name))
+ return im;
+ }
+ return NULL;
+}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_file.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_file.h 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_file.h 22 Oct 2004 01:43:14 -0000 1.2
@@ -18,5 +18,8 @@
Engrave_Group *engrave_file_group_last_get(Engrave_File *ef);
+Engrave_Image * engrave_file_image_by_name_find(Engrave_File *ef,
+ char *name);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_group.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_group.c 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_group.c 22 Oct 2004 01:43:14 -0000 1.2
@@ -23,7 +23,7 @@
engrave_group_script_set(Engrave_Group *eg, char *script)
{
if (!eg) return;
- if (eg->script) free(eg->script);
+ IF_FREE(eg->script);
eg->script = (script ? strdup(script) : NULL);
}
@@ -31,7 +31,7 @@
engrave_group_name_set(Engrave_Group *eg, char *name)
{
if (!eg) return;
- if (eg->name) free(eg->name);
+ IF_FREE(eg->name);
eg->name = (name ? strdup(name) : NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_group.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_group.h 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_group.h 22 Oct 2004 01:43:14 -0000 1.2
@@ -17,7 +17,7 @@
char *script;
};
-Engrave_Group * engrave_group_new(void);
+Engrave_Group *engrave_group_new(void);
void engrave_group_data_add(Engrave_Group *eg, Engrave_Data *ed);
void engrave_group_part_add(Engrave_Group *eg, Engrave_Part *ep);
void engrave_group_script_set(Engrave_Group *eg, char *script);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_load.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- engrave_load.c 7 Oct 2004 16:05:33 -0000 1.4
+++ engrave_load.c 22 Oct 2004 01:43:14 -0000 1.5
@@ -34,7 +34,7 @@
engrave_filename = strdup(file);
enf = engrave_parse(file);
- free(engrave_filename);
+ FREE(engrave_filename);
unlink(tmpf);
return(enf);
@@ -71,7 +71,7 @@
cmd = (char *)calloc(len,sizeof(char));
snprintf(cmd, len, "cp %s %s/%s", old_fname, work_dir, ptr);
ret = system(cmd);
- free(cmd);
+ FREE(cmd);
if (ret < 0) {
fprintf(stderr, "Unable to copy %s to tmp dir %s: %s\n",
@@ -93,7 +93,7 @@
cmd = (char *)calloc(len, sizeof(char));
snprintf(cmd, len, "edje_decc %s/%s", work_dir, ptr);
ret = system(cmd);
- free(cmd);
+ FREE(cmd);
if (ret < 0) {
fprintf(stderr, "Unable to de-compile %s\n", ptr);
@@ -124,11 +124,11 @@
new_fname = (char *)calloc(len, sizeof(char));
snprintf(new_fname, len, "%s/%s/%s", work_dir, ptr,
MAIN_EDC_NAME);
- free(old_fname);
+ FREE(old_fname);
enf = engrave_load_edc(new_fname, work_dir, work_dir);
- free(work_dir);
+ FREE(work_dir);
return enf;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_macros.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_macros.h 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_macros.h 22 Oct 2004 01:43:14 -0000 1.2
@@ -3,5 +3,25 @@
#define NEW(type, num) calloc(num, sizeof(type))
+#undef FREE
+/**
+ * @def FREE(val)
+ * Free the data pointed to by @a val and set to NULL
+ */
+#define FREE(val) \
+{ \
+ free(val); val = NULL; \
+}
+
+#undef IF_FREE
+/**
+ * @def IF_FREE(val)
+ * If @a val is non-NULL, free @a val and assign to NULL
+ */
+#define IF_FREE(val) \
+{ \
+ if (val) FREE(val) \
+}
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- engrave_out.c 7 Oct 2004 16:05:33 -0000 1.4
+++ engrave_out.c 22 Oct 2004 01:43:14 -0000 1.5
@@ -74,7 +74,7 @@
{
char *buf = engrave_output_mk_tabs();
fprintf(out, "%s%s {\n", buf, type);
- free(buf);
+ FREE(buf);
level ++;
}
@@ -87,7 +87,7 @@
level--;
buf = engrave_output_mk_tabs();
fprintf(out, "%s}\n", buf);
- free(buf);
+ FREE(buf);
}
@@ -103,7 +103,7 @@
vfprintf(out, fmt_new, ap);
va_end(ap);
- free(buf);
+ FREE(buf);
}
int
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_parse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- engrave_parse.c 21 Oct 2004 06:56:38 -0000 1.3
+++ engrave_parse.c 22 Oct 2004 01:43:14 -0000 1.4
@@ -460,22 +460,17 @@
Engrave_Group *group;
Engrave_Part *part;
Engrave_Part_State *state;
- Evas_List *l;
-
+ Engrave_Image *im;
+
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
- for (l = engrave_file->images; l; l = l->next)
- {
- Engrave_Image *im = l->data;
- if (im && !strcmp(im->name, name))
- {
- state->image.normal = im;
- return;
- }
- }
- printf("Error: image \"%s\" does not exist\n", name);
+ im = engrave_file_image_by_name_find(engrave_file, name);
+ if (im)
+ engrave_part_state_image_normal_set(state, im);
+ else
+ printf("Error: image \"%s\" does not exist\n", name);
}
void
@@ -484,22 +479,17 @@
Engrave_Group *group;
Engrave_Part *part;
Engrave_Part_State *state;
- Evas_List *l;
+ Engrave_Image *im;
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
- for (l = engrave_file->images; l; l = l->next)
- {
- Engrave_Image *im = l->data;
- if (im && !strcmp(im->name, name))
- {
- state->image.tween = evas_list_append(state->image.tween, im);
- return;
- }
- }
- printf("Error: image \"%s\" does not exist\n", name);
+ im = engrave_file_image_by_name_find(engrave_file, name);
+ if (im)
+ engrave_part_state_image_tween_add(state, im);
+ else
+ printf("Error: image \"%s\" does not exist\n", name);
}
void
@@ -512,11 +502,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->border.l = l;
- state->border.r = r;
- state->border.t = t;
- state->border.b = b;
+ engrave_part_state_border_set(state, l, r, t, b);
}
void
@@ -529,9 +515,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- if (state->color_class) free(state->color_class);
- state->color_class = (char *)strdup(color_class);
+ engrave_part_state_color_class_set(state, color_class);
}
void
@@ -544,11 +528,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->color.r = r;
- state->color.g = g;
- state->color.b = b;
- state->color.a = a;
+ engrave_part_state_color_set(state, r, g, b, a);
}
void
@@ -561,11 +541,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->color2.r = r;
- state->color2.g = g;
- state->color2.b = b;
- state->color2.a = a;
+ engrave_part_state_color2_set(state, r, g, b, a);
}
void
@@ -578,15 +554,9 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->color3.r = r;
- state->color3.g = g;
- state->color3.b = b;
- state->color3.a = a;
+ engrave_part_state_color3_set(state, r, g, b, a);
}
-/* FIXME fill and text handlers */
-
void
engrave_parse_state_fill_smooth(int smooth)
{
@@ -597,8 +567,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->fill.smooth = smooth;
+ engrave_part_state_fill_smooth_set(state, smooth);
}
void
@@ -611,9 +580,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->fill.pos_rel.x = x;
- state->fill.pos_rel.y = y;
+ engrave_part_state_fill_origin_relative_set(state, x, y);
}
void
@@ -626,9 +593,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->fill.rel.x = x;
- state->fill.rel.y = y;
+ engrave_part_state_fill_size_relative_set(state, x, y);
}
void
@@ -641,9 +606,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->fill.pos_abs.x = x;
- state->fill.pos_abs.y = y;
+ engrave_part_state_fill_origin_offset_set(state, x, y);
}
void
@@ -656,12 +619,9 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->fill.abs.x = x;
- state->fill.abs.y = y;
+ engrave_part_state_fill_size_offset_set(state, x, y);
}
-
void
engrave_parse_state_text_text(char *text)
{
@@ -672,9 +632,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- if (state->text.text) free(state->text.text);
- state->text.text = (char *)strdup(text);
+ engrave_part_state_text_text_set(state, text);
}
void
@@ -687,9 +645,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- if (state->text.text_class) free(state->text.text_class);
- state->text.text_class = (char *)strdup(text_class);
+ engrave_part_state_text_text_class_set(state, text_class);
}
void
@@ -702,9 +658,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- if (state->text.font) free(state->text.font);
- state->text.font = (char *)strdup(font);
+ engrave_part_state_text_font_set(state, font);
}
void
@@ -717,8 +671,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->text.size = size;
+ engrave_part_state_text_size_set(state, size);
}
void
@@ -731,9 +684,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->text.fit.x = x;
- state->text.fit.y = y;
+ engrave_part_state_text_fit_set(state, x, y);
}
void
@@ -746,9 +697,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->text.min.x = x;
- state->text.min.y = y;
+ engrave_part_state_text_min_set(state, x, y);
}
void
@@ -761,9 +710,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
-
- state->text.align.x = x;
- state->text.align.y = y;
+ engrave_part_state_text_align_set(state, x, y);
}
void
@@ -772,7 +719,7 @@
Engrave_Group *group;
Engrave_Program *program;
- program = (Engrave_Program *)calloc(1, sizeof(Engrave_Program));
+ program = engrave_program_new();
group = engrave_file_group_last_get(engrave_file);
group->programs = evas_list_append(group->programs, program);
@@ -786,10 +733,7 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- if(program->script) free(program->script);
- program->script = (char *)strdup(script);
- program->action = ENGRAVE_ACTION_SCRIPT;
+ engrave_program_script_set(program, script);
}
void
@@ -800,9 +744,7 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- if(program->name) free(program->name);
- program->name = (char *)strdup(name);
+ engrave_program_name_set(program, name);
}
void
@@ -813,9 +755,7 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- if(program->signal) free(program->signal);
- program->signal = (char *)strdup(signal);
+ engrave_program_signal_set(program, signal);
}
void
@@ -826,9 +766,7 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- if(program->source) free(program->source);
- program->source = (char *)strdup(source);
+ engrave_program_source_set(program, source);
}
void
@@ -839,8 +777,7 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- program->targets = evas_list_append(program->targets, (char *)strdup(target));
+ engrave_program_target_add(program, target);
}
void
@@ -851,8 +788,7 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- program->afters = evas_list_append(program->afters, (char *)strdup(after));
+ engrave_program_after_add(program, after);
}
void
@@ -863,29 +799,20 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- program->in.from = from;
- program->in.range = range;
+ engrave_program_in_set(program, from, range);
}
/* handle different action types */
void
-engrave_parse_program_action(Engrave_Action action, char *state, char *state2, double
value, double value2)
+engrave_parse_program_action(Engrave_Action action, char *state,
+ char *state2, double value, double value2)
{
Engrave_Group *group;
Engrave_Program *program;
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- if (program->state) free(program->state);
- if (program->state2) free(program->state2);
-
- program->action = action;
- if (state) program->state = (char *)strdup(state);
- if (state2) program->state2 = (char *)strdup(state2);
- program->value = value;
- program->value2 = value2;
+ engrave_program_action_set(program, action, state, state2, value, value2);
}
void
@@ -896,8 +823,6 @@
group = engrave_file_group_last_get(engrave_file);
program = engrave_group_program_last_get(group);
-
- program->transition = transition;
- program->duration = duration;
+ engrave_program_transition_set(program, transition, duration);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_part.c 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_part.c 22 Oct 2004 01:43:14 -0000 1.2
@@ -27,7 +27,7 @@
engrave_part_name_set(Engrave_Part *ep, char *name)
{
if (!ep) return;
- if (ep->name) free(ep->name);
+ IF_FREE(ep->name);
ep->name = (name ? strdup(name) : NULL);
}
@@ -49,7 +49,7 @@
engrave_part_clip_to_set(Engrave_Part *ep, char *clip_to)
{
if (!ep) return;
- if (ep->clip_to) free(ep->clip_to);
+ IF_FREE(ep->clip_to);
ep->clip_to = (clip_to ? strdup(clip_to) : NULL);
}
@@ -82,7 +82,7 @@
engrave_part_dragable_confine_set(Engrave_Part *ep, char *confine)
{
if (!ep) return;
- if (ep->dragable.confine) free (ep->dragable.confine);
+ IF_FREE(ep->dragable.confine);
ep->dragable.confine = (confine ? strdup(confine) : NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_part.h 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_part.h 22 Oct 2004 01:43:14 -0000 1.2
@@ -32,7 +32,9 @@
void engrave_part_type_set(Engrave_Part *ep, Engrave_Part_Type type);
void engrave_part_effect_set(Engrave_Part *ep, Engrave_Text_Effect effect);
void engrave_part_clip_to_set(Engrave_Part *ep, char *clip_to);
-Engrave_Part_State * engrave_part_state_last_get(Engrave_Part *ep);
+
+Engrave_Part_State *engrave_part_state_last_get(Engrave_Part *ep);
+
void engrave_part_dragable_x_set(Engrave_Part *ep, int x, int step, int count);
void engrave_part_dragable_y_set(Engrave_Part *ep, int y, int step, int count);
void engrave_part_dragable_confine_set(Engrave_Part *ep, char *confine);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_part_state.c 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_part_state.c 22 Oct 2004 01:43:14 -0000 1.2
@@ -55,7 +55,7 @@
engrave_part_state_name_set(Engrave_Part_State *eps, char *name, double value)
{
if (!eps) return;
- if (eps->name) free(eps->name);
+ IF_FREE(eps->name);
eps->name = (name ? strdup(name) : NULL);
eps->value = value;
}
@@ -151,7 +151,7 @@
engrave_part_state_rel1_to_x_set(Engrave_Part_State *eps, char *to)
{
if (!eps) return;
- if (eps->rel1.to_x) free(eps->rel1.to_x);
+ IF_FREE(eps->rel1.to_x);
eps->rel1.to_x = (to ? strdup(to) : NULL);
}
@@ -159,7 +159,7 @@
engrave_part_state_rel2_to_x_set(Engrave_Part_State *eps, char *to)
{
if (!eps) return;
- if (eps->rel2.to_x) free(eps->rel2.to_x);
+ IF_FREE(eps->rel2.to_x);
eps->rel2.to_x = (to ? strdup(to) : NULL);
}
@@ -167,7 +167,7 @@
engrave_part_state_rel1_to_y_set(Engrave_Part_State *eps, char *to)
{
if (!eps) return;
- if (eps->rel1.to_y) free(eps->rel1.to_y);
+ IF_FREE(eps->rel1.to_y);
eps->rel1.to_y = (to ? strdup(to) : NULL);
}
@@ -175,7 +175,7 @@
engrave_part_state_rel2_to_y_set(Engrave_Part_State *eps, char *to)
{
if (!eps) return;
- if (eps->rel2.to_y) free(eps->rel2.to_y);
+ IF_FREE(eps->rel2.to_y);
eps->rel2.to_y = (to ? strdup(to) : NULL);
}
@@ -193,3 +193,172 @@
engrave_part_state_rel2_to_y_set(eps, to);
}
+void
+engrave_part_state_image_normal_set(Engrave_Part_State *eps,
+ Engrave_Image *im)
+{
+ if (!eps) return;
+ eps->image.normal = im;
+}
+
+void
+engrave_part_state_image_tween_add(Engrave_Part_State *eps,
+ Engrave_Image *im)
+{
+ if (!eps || !im) return;
+ eps->image.tween = evas_list_append(eps->image.tween, im);
+}
+
+void
+engrave_part_state_border_set(Engrave_Part_State *eps,
+ int l, int r, int t, int b)
+{
+ if (!eps) return;
+ eps->border.l = l;
+ eps->border.r = r;
+ eps->border.t = t;
+ eps->border.b = b;
+}
+
+void
+engrave_part_state_color_class_set(Engrave_Part_State *eps, char *class)
+{
+ if (!eps) return;
+ IF_FREE(eps->color_class);
+ eps->color_class = (class ? strdup(class) : NULL);
+}
+
+void
+engrave_part_state_color_set(Engrave_Part_State *eps,
+ int r, int g, int b, int a)
+{
+ if (!eps) return;
+ eps->color.r = r;
+ eps->color.g = g;
+ eps->color.b = b;
+ eps->color.a = a;
+}
+
+void
+engrave_part_state_color2_set(Engrave_Part_State *eps,
+ int r, int g, int b, int a)
+{
+ if (!eps) return;
+ eps->color2.r = r;
+ eps->color2.g = g;
+ eps->color2.b = b;
+ eps->color2.a = a;
+}
+
+void
+engrave_part_state_color3_set(Engrave_Part_State *eps,
+ int r, int g, int b, int a)
+{
+ if (!eps) return;
+ eps->color3.r = r;
+ eps->color3.g = g;
+ eps->color3.b = b;
+ eps->color3.a = a;
+}
+
+void
+engrave_part_state_fill_smooth_set(Engrave_Part_State *eps, int smooth)
+{
+ if (!eps) return;
+ eps->fill.smooth = smooth;
+}
+
+void
+engrave_part_state_fill_origin_relative_set(Engrave_Part_State *eps,
+ double x, double y)
+{
+ if (!eps) return;
+ eps->fill.pos_rel.x = x;
+ eps->fill.pos_rel.y = y;
+}
+
+void
+engrave_part_state_fill_size_relative_set(Engrave_Part_State *eps,
+ double x, double y)
+{
+ if (!eps) return;
+ eps->fill.rel.x = x;
+ eps->fill.rel.y = y;
+}
+
+void
+engrave_part_state_fill_origin_offset_set(Engrave_Part_State *eps,
+ int x, int y)
+{
+ if (!eps) return;
+ eps->fill.pos_abs.x = x;
+ eps->fill.pos_abs.y = y;
+}
+
+void
+engrave_part_state_fill_size_offset_set(Engrave_Part_State *eps,
+ int x, int y)
+{
+ if (!eps) return;
+ eps->fill.abs.x = x;
+ eps->fill.abs.y = y;
+}
+
+void
+engrave_part_state_text_text_set(Engrave_Part_State *eps, char *text)
+{
+ if (!eps) return;
+ IF_FREE(eps->text.text);
+ eps->text.text = (text ? strdup(text) : NULL);
+}
+
+void
+engrave_part_state_text_text_class_set(Engrave_Part_State *eps,
+ char *text_class)
+{
+ if (!eps) return;
+ IF_FREE(eps->text.text_class);
+ eps->text.text_class = (text_class ? strdup(text_class) : NULL);
+}
+
+void
+engrave_part_state_text_font_set(Engrave_Part_State *eps,
+ char *font)
+{
+ if (!eps) return;
+ IF_FREE(eps->text.font);
+ eps->text.font = (font ? strdup(font) : NULL);
+}
+
+void
+engrave_part_state_text_size_set(Engrave_Part_State *eps, int size)
+{
+ if (!eps) return;
+ eps->text.size = size;
+}
+
+void
+engrave_part_state_text_fit_set(Engrave_Part_State *eps, int x, int y)
+{
+ if (!eps) return;
+ eps->text.fit.x = x;
+ eps->text.fit.y = y;
+}
+
+void
+engrave_part_state_text_min_set(Engrave_Part_State *eps, int x, int y)
+{
+ if (!eps) return;
+ eps->text.min.x = x;
+ eps->text.min.y = y;
+}
+
+void
+engrave_part_state_text_align_set(Engrave_Part_State *eps, double x, double y)
+{
+ if (!eps) return;
+ eps->text.align.x = x;
+ eps->text.align.y = y;
+}
+
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_part_state.h 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_part_state.h 22 Oct 2004 01:43:14 -0000 1.2
@@ -92,7 +92,8 @@
};
Engrave_Part_State * engrave_part_state_new(void);
-void engrave_part_state_name_set(Engrave_Part_State *eps, char *name, double value);
+void engrave_part_state_name_set(Engrave_Part_State *eps, char *name,
+ double value);
void engrave_part_state_visible_set(Engrave_Part_State *eps, int visible);
void engrave_part_state_align_set(Engrave_Part_State *eps, int x, int y);
void engrave_part_state_step_set(Engrave_Part_State *eps, int x, int y);
@@ -101,17 +102,55 @@
void engrave_part_state_aspect_set(Engrave_Part_State *eps, int w, int h);
void engrave_part_state_aspect_preference_set(Engrave_Part_State *eps,
Engrave_Aspect_Preference prefer);
-void engrave_part_state_rel1_relative_set(Engrave_Part_State *eps, int x, int y);
+void engrave_part_state_rel1_relative_set(Engrave_Part_State *eps,
+ int x, int y);
void engrave_part_state_rel1_offset_set(Engrave_Part_State *eps, int x, int y);
void engrave_part_state_rel1_to_set(Engrave_Part_State *eps, char *to);
void engrave_part_state_rel1_to_x_set(Engrave_Part_State *eps, char *to);
void engrave_part_state_rel1_to_y_set(Engrave_Part_State *eps, char *to);
-void engrave_part_state_rel2_relative_set(Engrave_Part_State *eps, int x, int y);
+void engrave_part_state_rel2_relative_set(Engrave_Part_State *eps,
+ int x, int y);
void engrave_part_state_rel2_offset_set(Engrave_Part_State *eps, int x, int y);
void engrave_part_state_rel2_to_set(Engrave_Part_State *eps, char *to);
void engrave_part_state_rel2_to_x_set(Engrave_Part_State *eps, char *to);
void engrave_part_state_rel2_to_y_set(Engrave_Part_State *eps, char *to);
+void engrave_part_state_image_normal_set(Engrave_Part_State *eps,
+ Engrave_Image *im);
+void engrave_part_state_image_tween_add(Engrave_Part_State *eps,
+ Engrave_Image *im);
+
+void engrave_part_state_border_set(Engrave_Part_State *eps,
+ int l, int r, int t, int b);
+void engrave_part_state_color_class_set(Engrave_Part_State *eps,
+ char *class);
+void engrave_part_state_color_set(Engrave_Part_State *eps,
+ int r, int g, int b, int a);
+void engrave_part_state_color2_set(Engrave_Part_State *eps,
+ int r, int g, int b, int a);
+void engrave_part_state_color3_set(Engrave_Part_State *eps,
+ int r, int g, int b, int a);
+void engrave_part_state_fill_smooth_set(Engrave_Part_State *eps,
+ int smooth);
+void engrave_part_state_fill_origin_relative_set(Engrave_Part_State *state,
+ double x, double y);
+void engrave_part_state_fill_size_relative_set(Engrave_Part_State *eps,
+ double x, double y);
+void engrave_part_state_fill_origin_offset_set(Engrave_Part_State *eps,
+ int x, int y);
+void engrave_part_state_fill_size_offset_set(Engrave_Part_State *eps,
+ int x, int y);
+
+void engrave_part_state_text_text_set(Engrave_Part_State *eps, char *text);
+void engrave_part_state_text_text_class_set(Engrave_Part_State *eps,
+ char *text);
+void engrave_part_state_text_font_set(Engrave_Part_State *eps, char *font);
+void engrave_part_state_text_size_set(Engrave_Part_State *eps, int size);
+void engrave_part_state_text_fit_set(Engrave_Part_State *eps, int x, int y);
+void engrave_part_state_text_min_set(Engrave_Part_State *eps, int x, int y);
+void engrave_part_state_text_align_set(Engrave_Part_State *eps,
+ double x, double y);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_program.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engrave_program.h 21 Oct 2004 06:56:38 -0000 1.1
+++ engrave_program.h 22 Oct 2004 01:43:14 -0000 1.2
@@ -24,5 +24,19 @@
char *script;
};
+Engrave_Program *engrave_program_new(void);
+void engrave_program_script_set(Engrave_Program *ep, char *script);
+void engrave_program_name_set(Engrave_Program *ep, char *name);
+void engrave_program_signal_set(Engrave_Program *ep, char *signal);
+void engrave_program_source_set(Engrave_Program *ep, char *source);
+void engrave_program_target_add(Engrave_Program *ep, char *target);
+void engrave_program_after_add(Engrave_Program *ep, char *after);
+void engrave_program_in_set(Engrave_Program *ep, double from, double range);
+void engrave_program_action_set(Engrave_Program *ep, Engrave_Action action,
+ char *state, char *state2,
+ double value, double value2);
+void engrave_program_transition_set(Engrave_Program *ep,
+ Engrave_Transition trans, double duration);
+
#endif
-------------------------------------------------------
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
