Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave.y engrave_font.h engrave_out.c engrave_parse.c
engrave_part_state.c engrave_part_state.h engrave_program.c
Log Message:
- add docs to engrave_part_state.
- fix segv in engrave_program code
- fix fonts to print the correct font name
- fix border to only appear inside image blocks
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave.y,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave.y 24 Oct 2004 06:28:37 -0000 1.5
+++ engrave.y 24 Oct 2004 20:46:29 -0000 1.6
@@ -346,6 +346,7 @@
part_preamble: part_preamble_entry
| part_preamble_entry part_preamble
+ ;
part_preamble_entry: name
| type
@@ -507,8 +508,7 @@
desc_body_entry: rel1
| rel2
- | image
- | border
+ | desc_image
| fill
| color_class
| color
@@ -625,7 +625,7 @@
}
;
-image: IMAGE OPEN_BRACE { section = IMAGE; } image_state_statement CLOSE_BRACE {
section = STATE; }
+desc_image: IMAGE OPEN_BRACE { section = IMAGE; } image_state_statement CLOSE_BRACE {
section = STATE; }
| IMAGE DOT { section = IMAGE; } image_body { section = STATE; }
;
@@ -636,6 +636,7 @@
image_body: normal
| tween
+ | border
;
normal: NORMAL COLON STRING SEMICOLON {
@@ -649,7 +650,7 @@
;
border: BORDER COLON exp exp exp exp SEMICOLON {
- engrave_parse_state_border((int)$3, (int)$4, (int)$5, (int)$6);
+ engrave_parse_image_border((int)$3, (int)$4, (int)$5, (int)$6);
}
;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_font.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engrave_font.h 24 Oct 2004 07:06:37 -0000 1.2
+++ engrave_font.h 24 Oct 2004 20:46:30 -0000 1.3
@@ -23,11 +23,10 @@
struct _Engrave_Font
{
char *name; /**< The font alias */
- char *file; /**< The font name */
char *path; /**< The font path */
};
-Engrave_Font * engrave_font_new(char *path, char *name);
+Engrave_Font *engrave_font_new(char *path, char *name);
/**
* @}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- engrave_out.c 24 Oct 2004 07:06:37 -0000 1.8
+++ engrave_out.c 24 Oct 2004 20:46:30 -0000 1.9
@@ -170,7 +170,7 @@
{
Engrave_Font *font = l->data;
if (font)
- engrave_out_data(out, "font", "\"%s\" \"%s\"", font->file, font->name);
+ engrave_out_data(out, "font", "\"%s\" \"%s\"", font->path, font->name);
}
engrave_out_end(out);
@@ -487,10 +487,6 @@
if (state->color_class)
engrave_out_data(out, "color_class", "\"%s\"", state->color_class);
- if (state->border.l || state->border.r || state->border.t || state->border.b)
- engrave_out_data(out, "border", "%d %d %d %d",
- 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)
engrave_out_data(out, "color", "%d %d %d %d",
@@ -515,6 +511,12 @@
Engrave_Image *tw = l->data;
engrave_out_data(out, "tween", "\"%s\"", tw->name);
}
+
+ if (state->image.border.l || state->image.border.r
+ || state->image.border.t || state->image.border.b)
+ engrave_out_data(out, "border", "%d %d %d %d",
+ state->image.border.l, state->image.border.r,
+ state->image.border.t, state->image.border.b);
engrave_out_end(out);
}
else if (part->type == ENGRAVE_PART_TYPE_TEXT)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_parse.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- engrave_parse.c 22 Oct 2004 01:43:14 -0000 1.4
+++ engrave_parse.c 24 Oct 2004 20:46:30 -0000 1.5
@@ -493,7 +493,7 @@
}
void
-engrave_parse_state_border(int l, int r, int t, int b)
+engrave_parse_image_border(int l, int r, int t, int b)
{
Engrave_Group *group;
Engrave_Part *part;
@@ -502,7 +502,7 @@
group = engrave_file_group_last_get(engrave_file);
part = engrave_group_part_last_get(group);
state = engrave_part_state_last_get(part);
- engrave_part_state_border_set(state, l, r, t, b);
+ engrave_part_state_image_border_set(state, l, r, t, b);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- engrave_part_state.c 24 Oct 2004 06:28:37 -0000 1.3
+++ engrave_part_state.c 24 Oct 2004 20:46:30 -0000 1.4
@@ -1,5 +1,11 @@
#include <Engrave.h>
+/**
+ * engrave_part_state_new - create a new Engrave_Part_State object.
+ *
+ * @return Returns a pointer to a newly allocated Engrave_Part_State object
+ * on success or NULL on failure
+ */
Engrave_Part_State *
engrave_part_state_new(void)
{
@@ -52,6 +58,14 @@
return state;
}
+/**
+ * engrave_part_state_name_set - Set the name of the state
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param name: The name to set to the state.
+ * @param value: The value to set to the state.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_name_set(Engrave_Part_State *eps, char *name, double value)
{
@@ -61,6 +75,13 @@
eps->value = value;
}
+/**
+ * engrave_part_state_visible_set - Set the visiblity of the state
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param visible: The visibility value to set to the state
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_visible_set(Engrave_Part_State *eps, int visible)
{
@@ -68,6 +89,14 @@
eps->visible = visible;
}
+/**
+ * engrave_part_state_align_set - Set the alignment of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x alignment value to set
+ * @param y: The y alignment value to set
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_align_set(Engrave_Part_State *eps, int x, int y)
{
@@ -76,6 +105,14 @@
eps->align.y = y;
}
+/**
+ * engrave_part_state_step_set - Set the step value of the state
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x step value to set
+ * @param y: The y step value to set
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_step_set(Engrave_Part_State *eps, int x, int y)
{
@@ -84,6 +121,14 @@
eps->step.y = y;
}
+/**
+ * engrave_part_state_min_size_set - Set the min size of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param w: The minimum width to set
+ * @param h: The minimum height to set
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_min_size_set(Engrave_Part_State *eps, int w, int h)
{
@@ -92,6 +137,14 @@
eps->min.h = h;
}
+/**
+ * engrave_part_state_max_size_set - Set the max size of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param w: The maximum width of the state.
+ * @param h: The maximum height of the state.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_max_size_set(Engrave_Part_State *eps, int w, int h)
{
@@ -100,6 +153,14 @@
eps->max.h = h;
}
+/**
+ * engrave_part_state_aspect_set - Set the width and height of the aspect ratio
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param w: The width value to set.
+ * @param h: The height value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_aspect_set(Engrave_Part_State *eps, int w, int h)
{
@@ -108,6 +169,13 @@
eps->aspect.h = h;
}
+/**
+ * engrave_part_state_aspect_preference_set - Set the aspect preferenece.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param prefer: The Engrave_Aspect_Preference value to set on the state.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_aspect_preference_set(Engrave_Part_State *eps,
Engrave_Aspect_Preference prefer)
@@ -116,6 +184,14 @@
eps->aspect.prefer = prefer;
}
+/**
+ * engrave_part_state_rel1_relative_set - Set the relative value of rel1.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set.
+ * @param y: The y value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel1_relative_set(Engrave_Part_State *eps, int x, int y)
{
@@ -124,6 +200,14 @@
eps->rel1.relative.y = y;
}
+/**
+ * engrave_part_state_rel2_relative_set - Set the rel2 relative value
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set.
+ * @param y: The y value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel2_relative_set(Engrave_Part_State *eps, int x, int y)
{
@@ -132,6 +216,14 @@
eps->rel2.relative.y = y;
}
+/**
+ * engrave_part_state_rel1_offset_set - Set the rel1 offset value.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set.
+ * @param y: The y value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel1_offset_set(Engrave_Part_State *eps, int x, int y)
{
@@ -140,6 +232,14 @@
eps->rel1.offset.y = y;
}
+/**
+ * engrave_part_state_rel2_offset_set - Set the rel2 offset value.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set.
+ * @param y: The y value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel2_offset_set(Engrave_Part_State *eps, int x, int y)
{
@@ -148,6 +248,13 @@
eps->rel2.offset.y = y;
}
+/**
+ * engrave_part_state_rel1_to_x_set - Set what rel1 is relative too in the x dir.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param to: The name of the part we are relative too.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel1_to_x_set(Engrave_Part_State *eps, char *to)
{
@@ -156,6 +263,13 @@
eps->rel1.to_x = (to ? strdup(to) : NULL);
}
+/**
+ * engrave_part_state_rel2_to_x_set - Set what rel2 is relative too in the x dir.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param to: The name of the part we are relative too.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel2_to_x_set(Engrave_Part_State *eps, char *to)
{
@@ -164,6 +278,13 @@
eps->rel2.to_x = (to ? strdup(to) : NULL);
}
+/**
+ * engrave_part_state_rel1_to_y_set - Set what rel1 is relative too in the y dir.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param to: The name of the part we are relative too.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel1_to_y_set(Engrave_Part_State *eps, char *to)
{
@@ -172,6 +293,13 @@
eps->rel1.to_y = (to ? strdup(to) : NULL);
}
+/**
+ * engrave_part_state_rel2_to_y_set - Set what rel2 is relative too in the y dir.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param to: The name of the part we are relative too.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel2_to_y_set(Engrave_Part_State *eps, char *to)
{
@@ -180,6 +308,13 @@
eps->rel2.to_y = (to ? strdup(to) : NULL);
}
+/**
+ * engrave_part_state_rel1_to_set - Set the rel1 to value for both x and y dirs.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param to: The name of the part we are relative too.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel1_to_set(Engrave_Part_State *eps, char *to)
{
@@ -187,6 +322,13 @@
engrave_part_state_rel1_to_y_set(eps, to);
}
+/**
+ * engrave_part_state_rel2_to_set - Set the rel2 to value for both x and y dirs.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param to: The name of the part we are relative too.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_rel2_to_set(Engrave_Part_State *eps, char *to)
{
@@ -194,6 +336,13 @@
engrave_part_state_rel2_to_y_set(eps, to);
}
+/**
+ * engrave_part_state_image_normal_set - Set the image we are associated with.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param im: The Engrave_Image attached to this state.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_image_normal_set(Engrave_Part_State *eps,
Engrave_Image *im)
@@ -202,6 +351,13 @@
eps->image.normal = im;
}
+/**
+ * engrave_part_state_image_tween_add - Add a tween to the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param im: The Engrave_Image to add to the tween list.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_image_tween_add(Engrave_Part_State *eps,
Engrave_Image *im)
@@ -210,17 +366,34 @@
eps->image.tween = evas_list_append(eps->image.tween, im);
}
+/**
+ * engrave_part_state_image_border_set - Set the border on the image.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param l: The left border value.
+ * @param r: The right border value.
+ * @param t: The top border value.
+ * @param b: The bottom border value.
+ *
+ * @return Returns no value k
+ */
void
-engrave_part_state_border_set(Engrave_Part_State *eps,
+engrave_part_state_image_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;
+ eps->image.border.l = l;
+ eps->image.border.r = r;
+ eps->image.border.t = t;
+ eps->image.border.b = b;
}
+/**
+ * engrave_part_state_color_class_set - Set the colour class on the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param class: The colour class to associate with the state.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_color_class_set(Engrave_Part_State *eps, char *class)
{
@@ -229,6 +402,16 @@
eps->color_class = (class ? strdup(class) : NULL);
}
+/**
+ * engrave_part_state_color_set - Set the colour of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param r: The red value.
+ * @param g: The green value.
+ * @param b: the blue value.
+ * @param a: The alpha value.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_color_set(Engrave_Part_State *eps,
int r, int g, int b, int a)
@@ -240,6 +423,16 @@
eps->color.a = a;
}
+/**
+ * engrave_part_state_color2_set - Set the colour2 of the state
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param r: The red value.
+ * @param g: The green value.
+ * @param b: the blue value.
+ * @param a: The alpha value.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_color2_set(Engrave_Part_State *eps,
int r, int g, int b, int a)
@@ -251,6 +444,16 @@
eps->color2.a = a;
}
+/**
+ * engrave_part_state_color3_set - Set the colour 3 of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param r: The red value.
+ * @param g: The green value.
+ * @param b: the blue value.
+ * @param a: The alpha value.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_color3_set(Engrave_Part_State *eps,
int r, int g, int b, int a)
@@ -262,6 +465,13 @@
eps->color3.a = a;
}
+/**
+ * engrave_part_state_fill_smooth_set - Set the fill smooth value of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param smooth: The smooth value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_fill_smooth_set(Engrave_Part_State *eps, int smooth)
{
@@ -269,6 +479,14 @@
eps->fill.smooth = smooth;
}
+/**
+ * engrave_part_state_fill_origin_relative_set - Set the relative value of the fill.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set
+ * @param y: The y value to set
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_fill_origin_relative_set(Engrave_Part_State *eps,
double x, double y)
@@ -278,6 +496,14 @@
eps->fill.pos_rel.y = y;
}
+/**
+ * engrave_part_state_fill_size_relative_set - Set the fills relative size on the
state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value.
+ * @param y: The y value.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_fill_size_relative_set(Engrave_Part_State *eps,
double x, double y)
@@ -287,6 +513,14 @@
eps->fill.rel.y = y;
}
+/**
+ * engrave_part_state_fill_origin_offset_set - Set the offset of the fill position
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value.
+ * @param y: The y value.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_fill_origin_offset_set(Engrave_Part_State *eps,
int x, int y)
@@ -296,6 +530,14 @@
eps->fill.pos_abs.y = y;
}
+/**
+ * engrave_part_state_fill_size_offset_set - Set the fill size offset.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value.
+ * @param y: The y value.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_fill_size_offset_set(Engrave_Part_State *eps,
int x, int y)
@@ -305,6 +547,13 @@
eps->fill.abs.y = y;
}
+/**
+ * engrave_part_state_text_text_set - Set the text string of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param text: The text string to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_text_set(Engrave_Part_State *eps, char *text)
{
@@ -313,6 +562,13 @@
eps->text.text = (text ? strdup(text) : NULL);
}
+/**
+ * engrave_part_state_text_text_class_set - Set the text class of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param text_class: The text class to set to the state.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_text_class_set(Engrave_Part_State *eps,
char *text_class)
@@ -322,6 +578,13 @@
eps->text.text_class = (text_class ? strdup(text_class) : NULL);
}
+/**
+ * engrave_part_state_text_font_set - Set the font for the text
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param font: The font to apply to the text.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_font_set(Engrave_Part_State *eps,
char *font)
@@ -331,6 +594,13 @@
eps->text.font = (font ? strdup(font) : NULL);
}
+/**
+ * engrave_part_state_text_size_set - Set the text size.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param size: The font size to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_size_set(Engrave_Part_State *eps, int size)
{
@@ -338,6 +608,14 @@
eps->text.size = size;
}
+/**
+ * engrave_part_state_text_fit_set - Set the fit parameter of the text
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set.
+ * @param y: The y value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_fit_set(Engrave_Part_State *eps, int x, int y)
{
@@ -346,6 +624,14 @@
eps->text.fit.y = y;
}
+/**
+ * engrave_part_state_text_min_set - Set the text min value.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x value to set.
+ * @param y: The y value to set.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_min_set(Engrave_Part_State *eps, int x, int y)
{
@@ -354,6 +640,14 @@
eps->text.min.y = y;
}
+/**
+ * engrave_part_state_text_align_set - Set the text alignment of the state.
+ * @param eps: The Engrave_Part_State to set the value too.
+ * @param x: The x alignment setting.
+ * @param y: the y alignment setting.
+ *
+ * @return Returns no value
+ */
void
engrave_part_state_text_align_set(Engrave_Part_State *eps, double x, double y)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engrave_part_state.h 22 Oct 2004 01:43:14 -0000 1.2
+++ engrave_part_state.h 24 Oct 2004 20:46:30 -0000 1.3
@@ -1,92 +1,170 @@
#ifndef ENGRAVE_PART_STATE_H
#define ENGRAVe_PART_STATE_H
+/**
+ * @file engrave_part_state.h Engrave_Part_State object.
+ * @brief Contains all of the functions to work with an Engrave_Part_State object.
+ */
+
+/**
+ * @defgroup Engrave_Part_State Engrave_Part_State: Functions to work with the
Engrave_Part_State objects
+ *
+ * @{
+ */
+
+/**
+ * The Engrave_Part_State typedef.
+ */
typedef struct _Engrave_Part_State Engrave_Part_State;
+
+/**
+ * Stores the information for the Engrave_Part_State object.
+ */
struct _Engrave_Part_State
{
- char *name;
- double value;
+ char *name; /**< The name of the state */
+ double value; /**< The value assigned to the state */
- unsigned char visible;
+ unsigned char visible; /**< Flag for if the state is visible */
+ /**
+ * Store the align and step information for the state */
struct
{
- double x, y;
+ double x; /** x value */
+ double y; /** y value */
} align, step;
+ /**
+ * The min and max settings for the state
+ */
struct
{
- double w, h;
+ double w; /**< width value */
+ double h; /**< height value */
} min, max;
+ /**
+ * The aspect ratio settings for the state
+ */
struct
{
- double w, h;
- Engrave_Aspect_Preference prefer;
+ double w; /**< The width */
+ double h; /**< The height */
+ Engrave_Aspect_Preference prefer; /** The aspect flag */
} aspect;
+ /**
+ * The relative orientation settings for the state
+ */
struct
{
+ /**
+ * The relative positions
+ */
struct
{
- double x, y;
+ double x; /**< The x position */
+ double y; /**< The y position */
} relative;
-
+
+ /**
+ * The offset values
+ */
struct
{
- int x, y;
+ int x; /**< The x value */
+ int y; /**< The y value */
} offset;
-
- char *to_x;
- char *to_y;
+
+ char *to_x; /**< The x part relativity */
+ char *to_y; /**< The y part relativity */
} rel1, rel2;
+ /**
+ * image information for the state
+ */
struct
{
- Engrave_Image *normal;
- Evas_List *tween;
- } image;
+ Engrave_Image *normal; /**< The image itself */
+ Evas_List *tween; /**< List of tween images */
- struct
- {
- int l, r, t, b;
- } border;
+ /**
+ * The border information
+ */
+ struct
+ {
+ int l; /**< Left value */
+ int r; /**< Right value */
+ int t; /**< Top value */
+ int b; /**< Bottom value */
+ } border;
+ } image;
- char *color_class;
+ char *color_class; /**< Colour class setting */
+ /**
+ * Colour settings for the state
+ */
struct
{
- int r, g, b, a;
+ int r; /**< Red setting */
+ int g; /**< Green setting */
+ int b; /**< Blue setting */
+ int a; /**< Alpha setting */
} color, color2, color3;
+ /**
+ * Fill information for the state
+ */
struct
{
- int smooth;
+ int smooth; /**< The smooth setting */
+ /**
+ * relitivity settings for the fill position
+ */
struct
{
- double x, y;
+ double x; /**< The x value */
+ double y; /**< The y value */
} pos_rel, rel;
+
+ /**
+ * absolute settings for the fill position
+ */
struct
{
- int x, y;
+ int x; /**< The x value */
+ int y; /**< The y value */
} pos_abs, abs;
} fill;
+ /**
+ * State text settings
+ */
struct
{
- char *text;
- char *text_class;
- char *font;
+ char *text; /**< The text string */
+ char *text_class; /**< The text class */
+ char *font; /**< The font to use */
- int size;
+ int size; /**< Size to display as */
+ /**
+ * Fit and min size information
+ */
struct {
- int x, y;
+ int x; /**< The x value */
+ int y; /**< The y value */
} fit, min;
+ /**
+ * Alignment settings for the text
+ */
struct {
- double x, y;
+ double x; /**< The x value */
+ double y; /**< The y value */
} align;
} text;
};
@@ -121,7 +199,7 @@
void engrave_part_state_image_tween_add(Engrave_Part_State *eps,
Engrave_Image *im);
-void engrave_part_state_border_set(Engrave_Part_State *eps,
+void engrave_part_state_image_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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_program.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- engrave_program.c 24 Oct 2004 07:06:37 -0000 1.3
+++ engrave_program.c 24 Oct 2004 20:46:30 -0000 1.4
@@ -42,7 +42,7 @@
{
if (!ep) return;
IF_FREE(ep->name);
- ep->name = (name ? strdup(ep->name) : NULL);
+ ep->name = (name ? strdup(name) : NULL);
}
/**
-------------------------------------------------------
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
