Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/engrave

Dir     : e17/libs/engrave/src/lib


Modified Files:
        engrave_out.c engrave_part_state.c engrave_part_state.h 


Log Message:
- fill out the engrave_part_state api

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- engrave_out.c       13 Nov 2004 21:06:57 -0000      1.15
+++ engrave_out.c       13 Nov 2004 23:18:11 -0000      1.16
@@ -396,137 +396,174 @@
 _engrave_output_state(Engrave_Part_State *state, Engrave_Part *part, void 
*data)
 {
   FILE *out = data;
-  
-  engrave_out_start(out, "description");
-
-  engrave_out_data(out, "state", "\"%s\" %.2f", state->name, state->value);
-  engrave_out_data(out, "visible", "%d", state->visible);
-
-  if (state->align.x != .5 || state->align.y != .5)
-    engrave_out_data(out, "align", "%.2f %.2f", state->align.x, 
state->align.y);
-
-  if (state->step.x || state->step.y)
-    engrave_out_data(out, "step", "%.2f %.2f", state->step.x, state->step.y);
-
-  if (state->min.w > 0 || state->min.h > 0)
-    engrave_out_data(out, "min", "%d %d", state->min.w, state->min.h);
+  char *tmp, *tmp2;
+  double x, y;
+  int w, h, ix, iy;
+  int r, g, b, a, l, t;
+  Engrave_Aspect_Preference aspect_pref;
+  Engrave_Image *im;
 
-  if (state->max.w >= 0 || state->max.h >= 0)
-    engrave_out_data(out, "max", "%d %d", state->max.w, state->max.h);
+  engrave_out_start(out, "description");
 
-  if (state->aspect.w || state->aspect.h)
-    engrave_out_data(out, "aspect", "%.2f %.2f", 
-            state->aspect.w, state->aspect.h);
+  tmp = engrave_part_state_name_get(state, &x);
+  engrave_out_data(out, "state", "\"%s\" %.2f", tmp, x);
+  IF_FREE(tmp);
+
+  engrave_out_data(out, "visible", "%d",
+                          engrave_part_state_visible_get(state));
+
+  engrave_part_state_align_get(state, &x, &y);
+  if (x != .5 || y != .5)
+    engrave_out_data(out, "align", "%.2f %.2f", x, y);
+
+  engrave_part_state_step_get(state, &x, &y);
+  if (x || y)
+    engrave_out_data(out, "step", "%.2f %.2f", x, y);
+
+  engrave_part_state_min_get(state, &w, &h);
+  if (w > 0 || h > 0)
+    engrave_out_data(out, "min", "%d %d", w, h);
+
+  engrave_part_state_max_get(state, &w, &h);
+  if (w >= 0 || h >= 0)
+    engrave_out_data(out, "max", "%d %d", w, h);
+
+  engrave_part_state_aspect_get(state, &x, &y);
+  if (x || y)
+    engrave_out_data(out, "aspect", "%.2f %.2f", x, y);
 
-  if (state->aspect.prefer)
+  aspect_pref = engrave_part_state_aspect_preference_get(state);
+  if (aspect_pref)
     engrave_out_data(out, "aspect_preference", "%s",
-            _aspect_preference_string[state->aspect.prefer]);
+            _aspect_preference_string[aspect_pref]);
   
   /* rel 1 */ 
   engrave_out_start(out, "rel1");
-  engrave_out_data(out, "relative", "%.2f %.2f",
-          state->rel1.relative.x, state->rel1.relative.y);
-  engrave_out_data(out, "offset", "%d %d",
-          state->rel1.offset.x, state->rel1.offset.y);
 
-  if ( state->rel1.to_x || state->rel1.to_y)
+  engrave_part_state_rel1_relative_get(state, &x, &y);
+  engrave_out_data(out, "relative", "%.2f %.2f", x, y);
+  
+  engrave_part_state_rel1_offset_get(state, &ix, &iy);
+  engrave_out_data(out, "offset", "%d %d", ix, iy);
+
+  tmp = engrave_part_state_rel1_to_x_get(state);
+  tmp2 = engrave_part_state_rel1_to_y_get(state);
+  if (tmp || tmp2)
   {
-    if (!strcmp(state->rel1.to_x, state->rel1.to_y))
-    {
-      engrave_out_data(out, "to", "\"%s\"", state->rel1.to_x);
-    }
+    if (!strcmp(tmp, tmp2))
+      engrave_out_data(out, "to", "\"%s\"", tmp);
     else
     {
-      engrave_out_data(out, "to_x", "\"%s\"", state->rel1.to_x);
-      engrave_out_data(out, "to_y", "\"%s\"", state->rel1.to_y);
+      engrave_out_data(out, "to_x", "\"%s\"", tmp);
+      engrave_out_data(out, "to_y", "\"%s\"", tmp2);
     }
   }
+  IF_FREE(tmp);
+  IF_FREE(tmp2);
+
   engrave_out_end(out);
 
   /* rel 2 */ 
   engrave_out_start(out, "rel2");
-  engrave_out_data(out, "relative", "%.2f %.2f",
-          state->rel2.relative.x, state->rel2.relative.y);
-  engrave_out_data(out, "offset", "%d %d",
-          state->rel2.offset.x, state->rel2.offset.y);
 
-  if ( state->rel2.to_x || state->rel2.to_y)
+  engrave_part_state_rel2_relative_get(state, &x, &y);
+  engrave_out_data(out, "relative", "%.2f %.2f", x, y);
+
+  engrave_part_state_rel2_offset_get(state, &ix, &iy);
+  engrave_out_data(out, "offset", "%d %d", ix, iy);
+
+  tmp = engrave_part_state_rel2_to_x_get(state);
+  tmp2 = engrave_part_state_rel2_to_y_get(state);
+  if (tmp || tmp2)
   {
-    if (!strcmp(state->rel2.to_x, state->rel2.to_y))
-    {
-      engrave_out_data(out, "to", "\"%s\"", state->rel2.to_x);
-    }
+    if (!strcmp(tmp, tmp2))
+      engrave_out_data(out, "to", "\"%s\"", tmp);
     else
     {
-      engrave_out_data(out, "to_x", "\"%s\"", state->rel2.to_x);
-      engrave_out_data(out, "to_y", "\"%s\"", state->rel2.to_y);
+      engrave_out_data(out, "to_x", "\"%s\"", tmp);
+      engrave_out_data(out, "to_y", "\"%s\"", tmp2);
     }
   }
+  IF_FREE(tmp);
+  IF_FREE(tmp2);
+
   engrave_out_end(out);
 
-  if (state->color_class)
-    engrave_out_data(out, "color_class", "\"%s\"", state->color_class);
+  tmp = engrave_part_state_color_class_get(state);
+  if (tmp) {
+    engrave_out_data(out, "color_class", "\"%s\"", tmp); 
+    FREE(tmp);
+  }
 
-  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", 
-            state->color.r, state->color.g, state->color.b, state->color.a);
-
-  if (state->color2.r != 0 || state->color2.g != 0 ||
-      state->color2.b != 0 || state->color2.a != 255)
-    engrave_out_data(out, "color2", "%d %d %d %d",
-            state->color2.r, state->color2.g, state->color2.b, 
state->color2.a);
-
-  if (state->color3.r != 0 || state->color3.g != 0 ||
-      state->color3.b != 0 || state->color3.a != 128)
-    engrave_out_data(out, "color3", "%d %d %d %d", 
-            state->color3.r, state->color3.g, state->color3.b, 
state->color3.a);
+  engrave_part_state_color_get(state, &r, &g, &b, &a);
+  if (r != 255 || g != 255 || b != 255 || a != 255)
+    engrave_out_data(out, "color", "%d %d %d %d", r, g, b, a);
+
+  engrave_part_state_color2_get(state, &r, &g, &b, &a);
+  if (r != 0 || g != 0 || b != 0 || a != 255)
+    engrave_out_data(out, "color2", "%d %d %d %d", r, g, b, a);
+
+  engrave_part_state_color3_get(state, &r, &g, &b, &a);
+  if (r != 0 || g != 0 || b != 0 || a != 128)
+    engrave_out_data(out, "color3", "%d %d %d %d", r, g, b, a);
 
-  if (part->type == ENGRAVE_PART_TYPE_IMAGE && state->image.normal )
+  im = engrave_part_state_image_normal_get(state);
+  if ((engrave_part_type_get(part) == ENGRAVE_PART_TYPE_IMAGE) && im)
   {
     engrave_out_start(out, "image");
-    engrave_out_data(out, "normal", "\"%s\"", state->image.normal->name);
+
+    tmp = engrave_image_name_get(im);
+    engrave_out_data(out, "normal", "\"%s\"", tmp);
+    IF_FREE(tmp);
+
     engrave_part_state_tween_foreach(state,
                         _engrave_part_state_output_tween, out);
 
-    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_part_state_image_border_get(state, &l, &r, &t, &b);
+    if (l || r || t || b)
+      engrave_out_data(out, "border", "%d %d %d %d", l, r, t, b);
     engrave_out_end(out);
   }
-  else if (part->type == ENGRAVE_PART_TYPE_TEXT)
+  else if (engrave_part_type_get(part) == ENGRAVE_PART_TYPE_TEXT)
   {
     engrave_out_start(out, "text");
 
-    if (state->text.text)
-      engrave_out_data(out, "text", "\"%s\"", state->text.text);
-    
-    if (state->text.text_class)
-      engrave_out_data(out, "text_class", "\"%s\"", state->text.text_class);
-
-    if (state->text.font)
-      engrave_out_data(out, "font", "\"%s\"", state->text.font);
-    
-    if (state->text.size)
-      engrave_out_data(out, "size", "%d", state->text.size);
-
-    if (state->text.fit.x || state->text.fit.y)
-      engrave_out_data(out, "fit", "%d %d", 
-              state->text.fit.x, state->text.fit.y);
+    tmp = engrave_part_state_text_text_get(state);
+    if (tmp) {
+      engrave_out_data(out, "text", "\"%s\"", tmp);
+      FREE(tmp);
+    }
+   
+    tmp = engrave_part_state_text_text_class_get(state);
+    if (tmp) {
+      engrave_out_data(out, "text_class", "\"%s\"", tmp);
+      FREE(tmp);
+    }
   
-    if (state->text.min.x || state->text.min.y)
-      engrave_out_data(out, "min", "%d %d",
-              state->text.min.x, state->text.min.y);
-
-    if (state->text.align.x || state->text.align.y)
-      engrave_out_data(out, "align", "%.2f %.2f",
-              state->text.align.x, state->text.align.y);
+    tmp = engrave_part_state_text_font_get(state);
+    if (tmp) {
+      engrave_out_data(out, "font", "\"%s\"", tmp);
+      FREE(tmp);
+    }
+   
+    h = engrave_part_state_text_size_get(state);
+    if (h)
+      engrave_out_data(out, "size", "%d", h);
+
+    engrave_part_state_text_fit_get(state, &ix, &iy); 
+    if (x || y)
+      engrave_out_data(out, "fit", "%d %d", ix, iy);
+ 
+    engrave_part_state_text_min_get(state, &ix, &iy);
+    if (x || y)
+      engrave_out_data(out, "min", "%d %d", ix, iy);
+
+    engrave_part_state_text_align_get(state, &x, &y);
+    if (x || y)
+      engrave_out_data(out, "align", "%.2f %.2f", x, y);
 
     engrave_out_end(out);
   }
-
   engrave_out_end(out);
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- engrave_part_state.c        13 Nov 2004 21:06:57 -0000      1.9
+++ engrave_part_state.c        13 Nov 2004 23:18:11 -0000      1.10
@@ -77,23 +77,6 @@
 }
 
 /**
- * engrave_part_state_name_get- Get the name of the state
- * @param eps: The Engrave_Part_State to retrieve the name from
- * @param value: If not NULL will return the value param.
- *
- * @return Returns a copy of the name of the state this pointer must be
- * freed by the application, or NULL if no name found.
- */
-char *
-engrave_part_state_name_get(Engrave_Part_State *eps, double *value)
-{
-  if (!eps || !eps->name) return NULL;
-
-  if (value) *value = eps->value;
-  return strdup(eps->name);
-}
-
-/**
  * 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
@@ -743,6 +726,448 @@
   }
 }
 
+/** 
+ * engrave_part_state_name_get - get the state name/value
+ * @param eps: The Engave_Part_State to get the values from
+ * @param val: Where to put the value setting
+ *
+ * @return Returns the state name, or NULL on failure.
+ */
+char *
+engrave_part_state_name_get(Engrave_Part_State *eps, double *val)
+{
+  char *str = NULL;
+
+  if (eps)
+    str = (eps->name ? strdup(eps->name) : NULL);
+
+  if (val) *val = (eps ? eps->value : 0);
+  return str;
+}
+
+/**
+ * engrave_part_state_visible_get - get the visiblity flag
+ * @param eps: The Engrave_Part_State to get the visiblity from
+ *
+ * @return Returns the visiblity of the state
+ */
+int
+engrave_part_state_visible_get(Engrave_Part_State *eps)
+{
+  if (!eps) return 1;
+  return eps->visible;
+}
+
+/**
+ * engrave_part_state_align_get - get the alignment of the state
+ * @param eps: The Engrave_Part_State to get the info from
+ * @param x: Where to store the x value or 0.5 if not set
+ * @param y: Where to store the y value or 0.5 if not set
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_align_get(Engrave_Part_State *eps, double *x, double *y)
+{
+  if (x) *x = (eps ? eps->align.x : 0.5);
+  if (y) *y = (eps ? eps->align.y : 0.5);
+}
+
+/**
+ * engrave_part_state_step_get - get the stepping info for the state
+ * @param eps: The Engrave_Part_State to get the info from
+ * @param x: Where to store the x value
+ * @parma y: Where to store the y value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_step_get(Engrave_Part_State *eps, double *x, double *y)
+{
+  if (x) *x = (eps ? eps->step.x : 0);
+  if (y) *y = (eps ? eps->step.y : 0);
+}
+
+/**
+ * engrave_part_state_min_get - get the minimum size of the state
+ * @param eps: The Engrave_Part_State to get the min from
+ * @param w: Where to store the w value
+ * @param h: Where to store the h value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_min_get(Engrave_Part_State *eps, int *w, int *h)
+{
+  if (w) *w = (eps ? eps->min.w : 0);
+  if (h) *h = (eps ? eps->min.h : 0);
+}
+
+/**
+ * engrave_part_state_max_get - get the maximum size of the state
+ * @param eps: The Engrave_Part_State to get the max from
+ * @param w: Where to store the w value
+ * @param h: Where to store the h value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_max_get(Engrave_Part_State *eps, int *w, int *h)
+{
+  if (w) *w = (eps ? eps->max.w : -1);
+  if (h) *h = (eps ? eps->max.h : -1);
+}
+
+/**
+ * engrave_part_state_aspect_get - get the aspect ratio for the state
+ * @param eps: The Engrave_Part_State to get the aspect info from
+ * @param h: Where to store the w value
+ * @param w: Where to store the h value
+ * 
+ * @return Returns no value
+ */
+void
+engrave_part_state_aspect_get(Engrave_Part_State *eps, double *w, double *h)
+{
+  if (w) *w = (eps ? eps->aspect.w : 0);
+  if (h) *h = (eps ? eps->aspect.h : 0);
+}
+
+/**
+ * engrave_part_state_aspect_preference_get - get the aspect preference
+ * @param eps: The Engrave_Part_State to get the aspect preference from
+ *
+ * @return Returns the Engrave_Aspect_Preference for the state
+ */
+Engrave_Aspect_Preference
+engrave_part_state_aspect_preference_get(Engrave_Part_State *eps)
+{
+  if (!eps) return ENGRAVE_ASPECT_PREFERENCE_NONE;
+  return eps->aspect.prefer;
+}
+
+/** 
+ * engrave_part_state_rel1_relative_get - get the rel1 relative values
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ * 
+ * @return Returns no value.
+ */
+void
+engrave_part_state_rel1_relative_get(Engrave_Part_State *eps, 
+                                          double *x, double *y)
+{
+  if (x) *x = (eps ? eps->rel1.relative.x : 0);
+  if (y) *y = (eps ? eps->rel1.relative.y : 0);
+}
+
+/**
+ * engrave_part_state_rel1_offset_get - get the rel1 offset values
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_rel1_offset_get(Engrave_Part_State *eps, int *x, int*y)
+{
+  if (x) *x = (eps ? eps->rel1.offset.x : 0);
+  if (y) *y = (eps ? eps->rel1.offset.y : 0);
+}
+
+/**
+ * engrave_part_state_rel1_to_x_get - get the to_x value for rel1
+ * @param eps: The Engrave_Part_State to get the value from
+ * 
+ * @return Returns a pointer to the to_x value or NULL on failure.
+ * This pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_rel1_to_x_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->rel1.to_x ? strdup(eps->rel1.to_x) : NULL);
+}
+
+/**
+ * engrave_part_state_rel1_to_y_get - get the to_y value for rel1
+ * @param eps: The Engrave_Part_State to get the value from
+ * 
+ * @return Returns a pointer to the to_y value or NULL on failure.
+ * This pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_rel1_to_y_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->rel1.to_y ? strdup(eps->rel1.to_y) : NULL);
+}
+
+/** 
+ * engrave_part_state_rel2_relative_get - get the rel2 relative values
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ * 
+ * @return Returns no value.
+ */
+void
+engrave_part_state_rel2_relative_get(Engrave_Part_State *eps, 
+                                          double *x, double *y)
+{
+  if (x) *x = (eps ? eps->rel2.relative.x : 1.0);
+  if (y) *y = (eps ? eps->rel2.relative.y : 1.0);
+}
+
+/**
+ * engrave_part_state_rel2_offset_get - get the rel2 offset values
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_rel2_offset_get(Engrave_Part_State *eps, int *x, int*y)
+{
+  if (x) *x = (eps ? eps->rel2.offset.x : -1);
+  if (y) *y = (eps ? eps->rel2.offset.y : -1);
+}
+
+/**
+ * engrave_part_state_rel2_to_x_get - get the to_x value for rel2
+ * @param eps: The Engrave_Part_State to get the value from
+ * 
+ * @return Returns a pointer to the to_x value or NULL on failure.
+ * This pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_rel2_to_x_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->rel2.to_x ? strdup(eps->rel2.to_x) : NULL);
+}
+
+/**
+ * engrave_part_state_rel2_to_y_get - get the to_y value for rel2
+ * @param eps: The Engrave_Part_State to get the value from
+ * 
+ * @return Returns a pointer to the to_y value or NULL on failure.
+ * This pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_rel2_to_y_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->rel2.to_y ? strdup(eps->rel2.to_y) : NULL);
+}
+
+/**
+ * engrave_part_state_color_class_get - get the color class for the state
+ * @param eps: The Engrave_Part_State to get the colour class from
+ * 
+ * @return Returns a pointer to the colour class on success or NULL on
+ * failure. This pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_color_class_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->color_class ? strdup(eps->color_class) : NULL);
+}
+
+/**
+ * engrave_part_state_color_get - get the color value from the state
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param r: Where to store the r value
+ * @param g: Where to store the g value
+ * @param b: Where to store the b value
+ * @param a: Where to store the a value
+ *
+ * @return Returns no value.
+ */
+void engrave_part_state_color_get(Engrave_Part_State *eps, 
+                                  int *r, int *g, int *b, int *a)
+{
+  if (r) *r = (eps ? eps->color.r : 255);
+  if (g) *g = (eps ? eps->color.g : 255);
+  if (b) *b = (eps ? eps->color.b : 255);
+  if (a) *a = (eps ? eps->color.a : 255);
+}
+
+/**
+ * engrave_part_state_color2_get - get the color2 value from the state
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param r: Where to store the r value
+ * @param g: Where to store the g value
+ * @param b: Where to store the b value
+ * @param a: Where to store the a value
+ *
+ * @return Returns no value.
+ */
+void engrave_part_state_color2_get(Engrave_Part_State *eps, 
+                                  int *r, int *g, int *b, int *a)
+{
+  if (r) *r = (eps ? eps->color2.r : 0);
+  if (g) *g = (eps ? eps->color2.g : 0);
+  if (b) *b = (eps ? eps->color2.b : 0);
+  if (a) *a = (eps ? eps->color2.a : 255);
+}
+
+/**
+ * engrave_part_state_color3_get - get the color3 value from the state
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param r: Where to store the r value
+ * @param g: Where to store the g value
+ * @param b: Where to store the b value
+ * @param a: Where to store the a value
+ *
+ * @return Returns no value.
+ */
+void engrave_part_state_color3_get(Engrave_Part_State *eps, 
+                                  int *r, int *g, int *b, int *a)
+{
+  if (r) *r = (eps ? eps->color3.r : 0);
+  if (g) *g = (eps ? eps->color3.g : 0);
+  if (b) *b = (eps ? eps->color3.b : 0);
+  if (a) *a = (eps ? eps->color3.a : 128);
+}
+
+/**
+ * engrave_part_state_image_normal_get - get the Engrave_Image for the normal 
setting
+ * @param eps: The Engrave_Part_State to get the image from
+ *
+ * @return Returns the Engrave_Image for the normal setting or NULL on
+ * failure.
+ */
+Engrave_Image *
+engrave_part_state_image_normal_get(Engrave_Part_State *eps)
+{
+  return (eps ? eps->image.normal : NULL);
+}
+
+/**
+ * engrave_part_state_image_border_get - get the border settings
+ * @param eps: The Engrave_Part_State to get the settings from
+ * @param l: Where to store the left value
+ * @param r: Where to store the right value
+ * @param t: Where to store the top value
+ * @param b: Where to store the bottom value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_image_border_get(Engrave_Part_State *eps,
+                                  int *l, int *r, int *t, int *b)
+{
+  if (l) *l = (eps ? eps->image.border.l : 0);
+  if (r) *r = (eps ? eps->image.border.r : 0);
+  if (t) *t = (eps ? eps->image.border.t : 0);
+  if (b) *b = (eps ? eps->image.border.b : 0);
+}
+
+/**
+ * engrave_part_state_text_text_get - get the text value
+ * @param eps: The Engrave_Part_State to get the text from
+ *
+ * @return Returns a pointer to the text value on success or NULL on
+ * failure. This pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_text_text_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->text.text ? strdup(eps->text.text) : NULL);
+}
+
+/**
+ * engrave_part_state_text_text_class_get - get the text class
+ * @param eps: The Engrave_Part_State to get the value from
+ *
+ * @return Returns a pointer to the text class or NULL on failure. This
+ * pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_text_text_class_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->text.text_class ? strdup(eps->text.text_class) : NULL);
+}
+
+/**
+ * engrave_part_state_text_font_get - get the text font
+ * @param eps: The Engrave_Part_State to get the font from
+ *
+ * @return Returns a pointer to the font on success or NULL on failure. This
+ * pointer must be free'd by the user.
+ */
+char *
+engrave_part_state_text_font_get(Engrave_Part_State *eps)
+{
+  if (!eps) return NULL;
+  return (eps->text.font ? strdup(eps->text.font) : NULL);
+}
+
+/**
+ * engrave_part_state_text_size_get - get the font size
+ * @param eps: The Engrave_Part_State to get the font size from
+ *
+ * @return Returns the font size.
+ */
+int
+engrave_part_state_text_size_get(Engrave_Part_State *eps)
+{
+  return (eps ? eps->text.size : 0);
+}
+
+/**
+ * engrave_part_state_text_fit_get - get the text fit settings
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ * 
+ * @return Returns no value.
+ */
+void
+engrave_part_state_text_fit_get(Engrave_Part_State *eps, int *x, int *y)
+{
+  if (x) *x = (eps ? eps->text.fit.x : 0);
+  if (y) *y = (eps ? eps->text.fit.y : 0);
+}
+
+/**
+ * engrave_part_state_text_min_get - get the text min size
+ * @param eps: The Engrave_Part_State to get the values from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ * 
+ * @return Returns no value.
+ */
+void
+engrave_part_state_text_min_get(Engrave_Part_State *eps, int *x, int *y)
+{
+  if (x) *x = (eps ? eps->text.min.x : 0);
+  if (y) *y = (eps ? eps->text.min.y : 0);
+}
+
+/**
+ * engrave_part_state_text_align_get - get the text alignment settings
+ * @param eps: The Engrave_Part_State to get the align from
+ * @param x: Where to store the x value
+ * @param y: Where to store the y value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_state_text_align_get(Engrave_Part_State *eps,
+                                      double *x, double *y)
+{
+  if (x) *x = (eps ? eps->text.align.x : 0.5);
+  if (y) *y = (eps ? eps->text.align.y : 0.5);
+}
+
 /**
  * engrave_part_state_tweens_count - get the number of tweens in the state
  * @param eps: The Engrave_Part_State to check for tweens
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- engrave_part_state.h        13 Nov 2004 21:06:57 -0000      1.6
+++ engrave_part_state.h        13 Nov 2004 23:18:11 -0000      1.7
@@ -234,8 +234,52 @@
 void engrave_part_state_copy(Engrave_Part_State *from, 
                                           Engrave_Part_State *to);
 
-int engrave_part_state_tweens_count(Engrave_Part_State *eps);
+char *engrave_part_state_name_get(Engrave_Part_State *eps, double *val);
+int engrave_part_state_visible_get(Engrave_Part_State *eps);
+void engrave_part_state_align_get(Engrave_Part_State *eps,
+                                                      double *x, double *y);
+void engrave_part_state_step_get(Engrave_Part_State *eps,
+                                                      double *x, double *y);
+void engrave_part_state_min_get(Engrave_Part_State *eps, int *w, int *h);
+void engrave_part_state_max_get(Engrave_Part_State *eps, int *w, int *h);
+void engrave_part_state_aspect_get(Engrave_Part_State *eps,
+                                                      double *w, double *h);
+Engrave_Aspect_Preference
+    engrave_part_state_aspect_preference_get(Engrave_Part_State *eps);
+void engrave_part_state_rel1_relative_get(Engrave_Part_State *eps, 
+                                                      double *x, double *y);
+void engrave_part_state_rel1_offset_get(Engrave_Part_State *eps,
+                                                      int *x, int*y);
+char *engrave_part_state_rel1_to_x_get(Engrave_Part_State *eps);
+char *engrave_part_state_rel1_to_y_get(Engrave_Part_State *eps);
+void engrave_part_state_rel2_relative_get(Engrave_Part_State *eps, 
+                                                      double *x, double *y);
+void engrave_part_state_rel2_offset_get(Engrave_Part_State *eps,
+                                                      int *x, int*y);
+char *engrave_part_state_rel2_to_x_get(Engrave_Part_State *eps);
+char *engrave_part_state_rel2_to_y_get(Engrave_Part_State *eps);
+char *engrave_part_state_color_class_get(Engrave_Part_State *eps);
+void engrave_part_state_color_get(Engrave_Part_State *eps, 
+                                  int *r, int *g, int *b, int *a);
+void engrave_part_state_color2_get(Engrave_Part_State *eps, 
+                                  int *r, int *g, int *b, int *a);
+void engrave_part_state_color3_get(Engrave_Part_State *eps, 
+                                  int *r, int *g, int *b, int *a);
+Engrave_Image *engrave_part_state_image_normal_get(Engrave_Part_State *eps);
+void engrave_part_state_image_border_get(Engrave_Part_State *eps,
+                                  int *l, int *r, int *t, int *b);
+char *engrave_part_state_text_text_get(Engrave_Part_State *eps);
+char *engrave_part_state_text_text_class_get(Engrave_Part_State *eps);
+char *engrave_part_state_text_font_get(Engrave_Part_State *eps);
+int engrave_part_state_text_size_get(Engrave_Part_State *eps);
+void engrave_part_state_text_fit_get(Engrave_Part_State *eps,
+                                            int *x, int *y);
+void engrave_part_state_text_min_get(Engrave_Part_State *eps,
+                                            int *x, int *y);
+void engrave_part_state_text_align_get(Engrave_Part_State *eps,
+                                            double *x, double *y);
 
+int engrave_part_state_tweens_count(Engrave_Part_State *eps);
 void engrave_part_state_tween_foreach(Engrave_Part_State *eps,
                 void (*func)(Engrave_Image *, void *), void *data);
 




-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to