Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave_out.c engrave_part.c engrave_part.h
Log Message:
- more api work
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- engrave_out.c 12 Nov 2004 20:08:57 -0000 1.11
+++ engrave_out.c 12 Nov 2004 22:31:22 -0000 1.12
@@ -248,37 +248,54 @@
_engrave_output_part(Engrave_Part *part, void *data)
{
FILE *out = data;
+ char *tmp;
+ int x, step_x, count_x;
+ int y, step_y, count_y;
engrave_out_start(out, "part");
- engrave_out_data(out, "name", "\"%s\"", part->name);
- engrave_out_data(out, "type", "%s", _part_type_string[part->type]);
+ tmp = engrave_part_name_get(part);
+ engrave_out_data(out, "name", "\"%s\"", tmp);
+ if (tmp) free(tmp);
+
+ engrave_out_data(out, "type", "%s",
+ _part_type_string[engrave_part_type_get(part)]);
+
+ if (!engrave_part_mouse_events_get(part))
+ engrave_out_data(out, "mouse_events", "%d",
+ engrave_part_mouse_events_get(part));
+
+ if (engrave_part_repeat_events_get(part))
+ engrave_out_data(out, "repeat_events", "%d",
+ engrave_part_repeat_events_get(part));
+
+ if (engrave_part_effect_get(part) != ENGRAVE_TEXT_EFFECT_NONE)
+ engrave_out_data(out, "effect", "%s",
+ _text_effect_string[engrave_part_effect_get(part)]);
- if (!part->mouse_events)
- engrave_out_data(out, "mouse_events", "%d", part->mouse_events);
-
- if (part->repeat_events)
- engrave_out_data(out, "repeat_events", "%d", part->repeat_events);
-
- if (part->effect)
- engrave_out_data(out, "effect", "%s", _text_effect_string[part->effect]);
-
- if (part->clip_to)
- engrave_out_data(out, "clip_to", "\"%s\"", part->clip_to);
+ tmp = engrave_part_clip_to_get(part);
+ if (tmp)
+ {
+ engrave_out_data(out, "clip_to", "\"%s\"", tmp);
+ free(tmp);
+ }
- if (part->dragable.x || part->dragable.y)
+ engrave_part_dragable_x_get(part, &x, &step_x, &count_x);
+ engrave_part_dragable_y_get(part, &y, &step_y, &count_y);
+ if (x || y)
{
engrave_out_start(out, "dragable");
- engrave_out_data(out, "x", "%d %d %d", part->dragable.x,
- part->dragable.step.x, part->dragable.count.x);
- engrave_out_data(out, "y", "%d %d %d", part->dragable.y,
- part->dragable.step.y, part->dragable.count.y);
- if (part->dragable.confine)
- engrave_out_data(out, "confine", "\"%s\"", part->dragable.confine);
+ engrave_out_data(out, "x", "%d %d %d", x, step_x, count_x);
+ engrave_out_data(out, "y", "%d %d %d", y, step_y, count_y);
+ tmp = engrave_part_dragable_confine_get(part);
+ if (tmp)
+ {
+ engrave_out_data(out, "confine", "\"%s\"", tmp);
+ free(tmp);
+ }
engrave_out_end(out);
}
-
engrave_part_state_foreach(part, _engrave_output_state, out);
engrave_out_end(out);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- engrave_part.c 12 Nov 2004 20:08:57 -0000 1.6
+++ engrave_part.c 12 Nov 2004 22:31:22 -0000 1.7
@@ -76,6 +76,143 @@
}
/**
+ * engrave_part_type_get - Get the type of the part
+ * @param ep: The Engrave_Part to get the type from
+ *
+ * @return Returns the Engrave_Part_Type of the part
+ */
+Engrave_Part_Type
+engrave_part_type_get(Engrave_Part *ep)
+{
+ /* XXX Default to RECT if non set ??? */
+ return (ep ? ep->type : ENGRAVE_PART_TYPE_RECT);
+}
+
+/**
+ * engrave_part_mouse_events_get - Get the mouse events setting
+ * @param ep: The Engrave_Part to get the mouse events from
+ *
+ * @return Returns the mouse events setting for the part
+ */
+int
+engrave_part_mouse_events_get(Engrave_Part *ep)
+{
+ if (!ep) return 1;
+ return ep->mouse_events;
+}
+
+/**
+ * engrave_part_repeat_events_get - Get the repeat events setting
+ * @param ep: The Engrave_Part to get the repeat event setting from
+ *
+ * @return Returns the repeat event setting of the part
+ */
+int
+engrave_part_repeat_events_get(Engrave_Part *ep)
+{
+ if (!ep) return 0;
+ return ep->repeat_events;
+}
+
+/**
+ * engrave_part_effect_get - Get the text effect on the part
+ * @param ep: The Engrave_Part to get the effect from
+ *
+ * @return Returns the Engrave_Text_Effect setting for the part or
+ * ENGRAVE_TEXT_EFFECT_NONE if non set
+ */
+Engrave_Text_Effect
+engrave_part_effect_get(Engrave_Part *ep)
+{
+ if (!ep) return ENGRAVE_TEXT_EFFECT_NONE;
+ return ep->effect;
+}
+
+/**
+ * engrave_part_clip_to_get - Get the clip_to setting of the part
+ * @param ep: The Engrave_Part to get the clip_to from
+ *
+ * @return Returns a pointer to the clip_to string for the part or
+ * NULL on failure. This pointer must be free'd by the user.
+ */
+char *
+engrave_part_clip_to_get(Engrave_Part *ep)
+{
+ if (!ep) return NULL;
+ return (ep->clip_to ? strdup(ep->clip_to) : NULL);
+}
+
+/**
+ * engrave_part_dragable_x_get - Get the dragable info in the x direction
+ * @param ep: The Engrave_Part to get the dragable information from
+ * @param x: Where to place the x value
+ * @param step: Where to place the step value
+ * @param count: Where to place the count value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_dragable_x_get(Engrave_Part *ep, int *x, int *step, int *count)
+{
+ int tx, tstep, tcount;
+
+ if (!ep) {
+ tx = 0;
+ tstep = 0;
+ tcount = 0;
+ } else {
+ tx = ep->dragable.x;
+ tstep = ep->dragable.step.x;
+ tcount = ep->dragable.count.x;
+ }
+ if (x) *x = tx;
+ if (step) *step = tstep;
+ if (count) *count = tcount;
+}
+
+/**
+ * engrave_part_dragable_y_get - Get the dragable info in the y direction
+ * @param ep: The Engrave_Part to get the dragable information from
+ * @param y: Where to place the y value
+ * @param step: Where to place the step value
+ * @param count: Where to place the count value
+ *
+ * @return Returns no value.
+ */
+void
+engrave_part_dragable_y_get(Engrave_Part *ep, int *y, int *step, int *count)
+{
+ int ty, tstep, tcount;
+
+ if (!ep) {
+ ty = 0;
+ tstep = 0;
+ tcount = 0;
+ } else {
+ ty = ep->dragable.y;
+ tstep = ep->dragable.step.y;
+ tcount = ep->dragable.count.y;
+ }
+ if (y) *y = ty;
+ if (step) *step = tstep;
+ if (count) *count = tcount;
+}
+
+/**
+ * engrave_part_dragable_confine_get - Get the dragable confine setting
+ * @param ep: The Engrave_Part to get the confine setting from
+ *
+ * @return Returns a pointer to the confine setting or NULL on error.
+ * This pointer must be free'd by the user.
+ */
+char *
+engrave_part_dragable_confine_get(Engrave_Part *ep)
+{
+ if (!ep) return NULL;
+ return (ep->dragable.confine ? strdup(ep->dragable.confine) : NULL);
+}
+
+/**
* engrave_part_type_set - set the type of the part
* @param ep: The Engrave_Part to set the type on.
* @param type: The Engrave_Part_Type to set on the part
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave_part.h 12 Nov 2004 20:08:57 -0000 1.5
+++ engrave_part.h 12 Nov 2004 22:31:22 -0000 1.6
@@ -54,7 +54,6 @@
Engrave_Part * engrave_part_new(Engrave_Part_Type type);
void engrave_part_name_set(Engrave_Part *ep, char *name);
-char *engrave_part_name_get(Engrave_Part *ep);
void engrave_part_mouse_events_set(Engrave_Part *ep, int val);
void engrave_part_repeat_events_set(Engrave_Part *ep, int val);
void engrave_part_type_set(Engrave_Part *ep, Engrave_Part_Type type);
@@ -70,6 +69,16 @@
Engrave_Part_State * engrave_part_state_by_name_value_find(Engrave_Part *ep,
char *name, double val);
+char *engrave_part_name_get(Engrave_Part *ep);
+Engrave_Part_Type engrave_part_type_get(Engrave_Part *ep);
+int engrave_part_mouse_events_get(Engrave_Part *ep);
+int engrave_part_repeat_events_get(Engrave_Part *ep);
+Engrave_Text_Effect engrave_part_effect_get(Engrave_Part *ep);
+char *engrave_part_clip_to_get(Engrave_Part *ep);
+void engrave_part_dragable_x_get(Engrave_Part *ep, int *x, int *step, int
*count);
+void engrave_part_dragable_y_get(Engrave_Part *ep, int *y, int *step, int
*count);
+char *engrave_part_dragable_confine_get(Engrave_Part *ep);
+
int engrave_part_has_states(Engrave_Part *ep);
void engrave_part_state_foreach(Engrave_Part *ep,
-------------------------------------------------------
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