Enlightenment

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/debian


Added Files:
	libestyle0.postinst 
Removed Files:
	libetox0.postinst 


Log Message:
Oops, I remembered to replace etox with estyle inside the files, but forgot to
rename this file.

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	Makefile.am 


Log Message:
Forgot to remove the efence linking.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- Makefile.am	2002/01/26 07:37:27	1.1.1.1
+++ Makefile.am	2002/01/26 17:43:39	1.2
@@ -11,4 +11,4 @@
 estyle_test_simple_DEPENDENCIES	=	$(top_builddir)/src/libestyle.la
 estyle_test_simple_SOURCES	=	estyle_test_simple.c
 estyle_test_simple_LDFLAGS	=	-static
-estyle_test_simple_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@ -lefence
+estyle_test_simple_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Made some minor updates to the docs to give credit where it is due, and filled
out the api a bit more.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle_test_simple.c	2002/01/26 07:37:27	1.1.1.1
+++ estyle_test_simple.c	2002/01/29 21:26:45	1.2
@@ -88,11 +88,12 @@
 				&w, &h);
 		if (index < 0)
 			printf("Click occurred outside of estyle\n");
-		else
+		else {
 			printf("Clicked letter %c at %d, %d size %d x %d\n",
 				last[index], x, y, w, h);
-		evas_move(evas, cursor, x, y);
-		evas_resize(evas, cursor, w, h);
+			evas_move(evas, cursor, x, y);
+			evas_resize(evas, cursor, w, h);
+		}
 
 	} else if (eemd->button == 2) {
 		layer = -layer;
@@ -233,11 +234,12 @@
 	estyle_set_color(e, 128, 255, 255, 255);
 	estyle_set_clip(e, clip_rect);
 	estyle_show(e);
+	estyle_text_at(e, 0, &curs_x, &curs_y, &curs_w, &curs_h);
 
 	/* add a cursor */
 	cursor = evas_add_rectangle(evas);
-	evas_resize(evas, cursor, 10, 20);
-	evas_move(evas, cursor, 30, 30);
+	evas_move(evas, cursor, curs_x, curs_y);
+	evas_resize(evas, cursor, curs_w, curs_h);
 	evas_set_layer(evas, cursor, 10000);
 	evas_set_color(evas, cursor, 255, 255, 255, 128);
 	evas_show(evas, cursor);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h estyle.c estyle_color.c 
	estyle_font.c estyle_style.c 
Removed Files:
	estyle_font.h 


Log Message:
Made some minor updates to the docs to give credit where it is due, and filled
out the api a bit more.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- Estyle.h	2002/01/26 07:37:24	1.1.1.1
+++ Estyle.h	2002/01/29 21:26:45	1.2
@@ -18,29 +18,60 @@
 };
 
 /*
- * The bit holds all information necessary for display and layout of the text
+ * The estyle holds all information necessary for display and layout of the text
  */
 typedef struct _estyle Estyle;
 
+/*
+ * Constructor/destructor
+ */
 Estyle *estyle_new(Evas evas, char *text, char *style);
 void estyle_free(Estyle * es);
-void estyle_set_text(Estyle * es, char *text);
+
+/*
+ * Visibility modifiers
+ */
 void estyle_show(Estyle * es);
 void estyle_hide(Estyle * es);
-void estyle_set_layer(Estyle * es, int layer);
+
+/*
+ * Content and appearance manipulators
+ */
+char *estyle_get_text(Estyle * es);
 void estyle_set_text(Estyle * es, char *text);
-void estyle_merge(Estyle * es1, Estyle * es2);
+int estyle_get_layer(Estyle * es);
+void estyle_set_layer(Estyle * es, int layer);
+char *estyle_get_style(Estyle * es);
 void estyle_set_style(Estyle * es, char *name);
 void estyle_set_color(Estyle * es, int r, int g, int b, int a);
 void estyle_set_color_db(Estyle * es, char *name);
+int estyle_get_color_red(Estyle * es);
+int estyle_get_color_green(Estyle * es);
+int estyle_get_color_blue(Estyle * es);
+int estyle_get_color_alpha(Estyle * es);
+
+/*
+ * Geometry querying
+ */
 void estyle_geometry(Estyle *es, int *x, int *y, int *w, int *h);
 void estyle_text_at(Estyle *es, int index, int *char_x, int *char_y,
 		int *char_w, int *char_h);
 int estyle_text_at_position(Estyle *es, int x, int y, int *char_x, int *char_y,
 		int *char_w, int *char_h);
+
+/*
+ * Fixing the reported geometry to set values.
+ */
+inline int estyle_fixed(Estyle *es);
+void estyle_fix_geometry(Estyle *es, int x, int y, int w, int h);
+void estyle_unfix_geometry(Estyle *es);
+
+/*
+ * Joining and splitting estyles.
+ */
+Estyle *estyle_split(Estyle * es, int index);
+void estyle_merge(Estyle * es1, Estyle * es2);
 
-#define BIT_MERGEABLE(es1, es2) (es1 && es2 && \
-		!(es1->flags & ESTYLE_BIT_FIXED) && \
-		!(es2->flags & ESTYLE_BIT_FIXED) && es1 != es2)
+#define ESTYLE_HASH_COLOR(r, g, b, a) ((r << 24) | (g << 16) | (b << 8) | a)
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- Estyle_private.h	2002/01/26 07:37:24	1.1.1.1
+++ Estyle_private.h	2002/01/29 21:26:45	1.2
@@ -32,7 +32,6 @@
 	Ewd_List *bits;
 };
 
-#include "estyle_font.h"
 #include "estyle_style.h"
 #include "estyle_color.h"
 
@@ -51,9 +50,14 @@
 	/*
 	 * The bits can also have different fonts
 	 */
-	Estyle_Font *font;
+	char *font;
 
 	/*
+	 * Or different font sizes
+	 */
+	int font_size;
+
+	/*
 	 * Keep track of the geometry of the text to aid in layout. In the
 	 * case of a tab character, the width of the bit does not match the
 	 * width of the actual character printed.
@@ -82,5 +86,15 @@
 	 */
 	int length;
 };
+
+char *estyle_font_instance(char *name);
+
+/*
+ * This rounds the double to the nearest integer and returns it as an int
+ */
+#define D2I_ROUND(d) (int)(d + 0.5)
+#define BIT_MERGEABLE(es1, es2) (es1 && es2 && \
+		!(es1->flags & ESTYLE_BIT_FIXED) && \
+		!(es2->flags & ESTYLE_BIT_FIXED) && es1 != es2)
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle.c	2002/01/26 07:37:25	1.1.1.1
+++ estyle.c	2002/01/29 21:26:45	1.2
@@ -42,7 +42,7 @@
 	 */
 	es->color = estyle_color_instance(255, 255, 255, 255);
 	es->font = estyle_font_instance("nationff");
-	es->font->size = 14;
+	es->font_size = 14;
 
 	if (style)
 		es->style = estyle_style_instance(style);
@@ -206,6 +206,26 @@
 }
 
 /**
+ * estyle_get_text - retrieve the text in the specified estyle
+ * @es: the estyle to retrieve text
+ *
+ * Returns a pointer to a copy of the text in the estyle @es on success, NULL
+ * on failure.
+ */
+char *estyle_get_text(Estyle *es)
+{
+	char *ret;
+
+	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+
+	ret = evas_get_text_string(es->evas, es->bit);
+	if (ret)
+		ret = strdup(ret);
+
+	return ret;
+}
+
+/**
  * estyle_set_text - change the text on a specified estyle
  * @es: the estyle to change text
  * @text: the new text for the estyle
@@ -225,24 +245,27 @@
 	 */
 	if (es->bit)
 		evas_set_text(es->evas, es->bit, text);
-
 	else {
-		es->bit = evas_add_text(es->evas, es->font->name,
-					 es->font->size, text);
+		es->bit = evas_add_text(es->evas, es->font,
+					 es->font_size, text);
 	}
 
 	es->length = strlen(text);
-	evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
 
 	/*
-	 * This essentially performs a round operation, since
-	 * casting a double's value to an int discards the decimal
-	 * portion of the number. Adding 0.5 to the value will round
-	 * it up if it is appropriate.
+	 * If the estyle doesn't have fixed dimensions then set it to the
+	 * geometry of it's contents.
 	 */
-	es->w = (int) (w + 0.5);
-	es->h = (int) (h + 0.5);
+	if (!(es->flags & ESTYLE_BIT_FIXED)) {
+		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
+
+		es->w = D2I_ROUND(w);
+		es->h = D2I_ROUND(h);
+	}
 
+	/*
+	 * Setup the color of the evas object and move it into position.
+	 */
 	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
 			es->color->b, es->color->a);
 	evas_move(es->evas, es->bit, (double)(es->x), (double)(es->y));
@@ -257,6 +280,19 @@
 }
 
 /**
+ * estyle_get_layer - retrieve the layer of the estyle
+ * @es: the estyle to retrieve the current layer
+ *
+ * Returns the current layer of the estyle @es.
+ */
+int estyle_get_layer(Estyle *es)
+{
+	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+
+	return evas_get_layer(es->evas, es->bit);
+}
+
+/**
  * estyle_set_layer - change the layer of a estyle and it's style
  * @es: the estyle to change layer
  * @layer: the new layer for the estyle
@@ -284,16 +320,39 @@
 }
 
 /**
+ * estyle_get_font - retrieve a copy of the current font for an estyle
+ * @es: the estyle to retrieve the current font
+ *
+ * Returns a pointer to a copy of the current font of the estyle @es.
+ */
+char *estyle_get_font(Estyle *es)
+{
+	char *ret = NULL;
+
+	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+
+	if (es->font)
+		ret = strdup(es->font);
+
+	return ret;
+}
+
+/**
  * estyle_set_font - change the font used for the specified estyle
  * @es: the estyle to change fonts
  * @font: the name of the font to use for the estyle
  *
  * Returns no value. Changes the font for the specified estyle to @name.
  */
-void estyle_set_font(Estyle * es, char *name)
+void estyle_set_font(Estyle * es, char *name, int size)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
+
+	es->font = estyle_font_instance(name);
+	es->font_size = size;
+
+	evas_set_font(es->evas, es->bit, es->font, es->font_size);
 }
 
 /**
@@ -426,17 +485,12 @@
 {
 	double xx, yy, ww, hh;
 
-	*char_x = 0;
-	*char_y = 0;
-	*char_w = 0;
-	*char_h = 0;
-
 	evas_text_at(es->evas, es->bit, index, &xx, &yy, &ww, &hh);
 
-	*char_x = (int)(xx + 0.5) + es->x;
-	*char_y = (int)(yy + 0.5) + es->y;
-	*char_w = (int)(ww + 0.5);
-	*char_h = (int)(hh + 0.5);
+	*char_x = D2I_ROUND(xx) + es->x;
+	*char_y = D2I_ROUND(yy) + es->y;
+	*char_w = D2I_ROUND(ww);
+	*char_h = D2I_ROUND(hh);
 }
 
 /**
@@ -457,20 +511,70 @@
 		int *char_w, int *char_h)
 {
 	int ret;
-	double xx, yy, ww, hh;
-
-	*char_x = 0;
-	*char_y = 0;
-	*char_w = 0;
-	*char_h = 0;
+	double xx = 0, yy = 0, ww = 0, hh = 0;
 
 	ret = evas_text_at_position(es->evas, es->bit, (double)(x - es->x),
 			(double)(y - es->y), &xx, &yy, &ww, &hh);
 
-	*char_x = (int)(xx + 0.5) + es->x;
-	*char_y = (int)(yy + 0.5) + es->y;
-	*char_w = (int)(ww + 0.5);
-	*char_h = (int)(hh + 0.5);
+	*char_x = D2I_ROUND(xx) + es->x;
+	*char_y = D2I_ROUND(yy) + es->y;
+	*char_w = D2I_ROUND(ww);
+	*char_h = D2I_ROUND(hh);
 
 	return ret;
+}
+
+/**
+ * estyle_fixed - determine if the specified estyle has fixed geometry
+ * @es: the estyle to check for fixed geometry
+ *
+ * Returns 0 if the estyle does not have fixed geometry, > 0 otherwise.
+ */
+inline int estyle_fixed(Estyle *es)
+{
+	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+
+	return es->flags & ESTYLE_BIT_FIXED;
+}
+
+/**
+ * estyle_fix_geometry - report a fixed geometry to querying functions
+ * @es: the estyle to fix the geometry
+ * @x: the x coordinate to report
+ * @y: the y coordinate to report
+ * @w: the width to report
+ * @h: the height to report
+ *
+ * Returns no value. Fixes the reported geometry of @es to @x, @y, @w, and @h
+ * respectively.
+ */
+void estyle_fix_geometry(Estyle *es, int x, int y, int w, int h)
+{
+	CHECK_PARAM_POINTER("es", es);
+
+	es->flags |= ESTYLE_BIT_FIXED;
+	es->x = x;
+	es->y = y;
+	es->w = w;
+	es->h = h;
+}
+
+/**
+ * estyle_unfix_geometry - remove the fixed property of the estyle
+ * @es: the estyle to remove the fixed property
+ *
+ * Returns no value. Removes the fixed property of the estyle and updates its
+ * geometry to the actual geometry of the contents.
+ */
+void estyle_unfix_geometry(Estyle *es)
+{
+	double x, y, w, h;
+
+	CHECK_PARAM_POINTER("es", es);
+
+	evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
+	es->x = D2I_ROUND(x);
+	es->y = D2I_ROUND(y);
+	es->w = D2I_ROUND(w);
+	es->h = D2I_ROUND(h);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle_color.c	2002/01/26 15:09:05	1.2
+++ estyle_color.c	2002/01/29 21:26:45	1.3
@@ -1,8 +1,6 @@
 #include "../estyle-config.h"
 #include "Estyle_private.h"
 
-#define HASH_COLOR(r, g, b, a) ((r << 24) | (g << 16) | (b << 8) | a)
-
 static Ewd_Hash *color_table = NULL;
 static E_DB_File *sys_colors = NULL;
 static E_DB_File *user_colors = NULL;
@@ -27,7 +25,7 @@
 	/*
 	 * Check the hash table for a previous malloc of the color
 	 */
-	value = HASH_COLOR(r, g, b, a);
+	value = ESTYLE_HASH_COLOR(r, g, b, a);
 	ret = (Estyle_Color *) ewd_hash_get(color_table, (void *) value);
 	if (!ret) {
 		ret = (Estyle_Color *) malloc(sizeof(Estyle_Color));
@@ -89,7 +87,7 @@
 	if (!a)
 		e_db_int_get(sys_colors, key, &a);
 
-	value = HASH_COLOR(r, g, b, a);
+	value = ESTYLE_HASH_COLOR(r, g, b, a);
 
 	/*
 	 * Check for a previous allocation for this color.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_font.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle_font.c	2002/01/26 07:37:26	1.1.1.1
+++ estyle_font.c	2002/01/29 21:26:45	1.2
@@ -8,9 +8,9 @@
  *
  * Returns a pointer to a the font on success, NULL on failure.
  */
-Estyle_Font *estyle_font_instance(char *name)
+char *estyle_font_instance(char *name)
 {
-	Estyle_Font *fn;
+	char *fn;
 
 	CHECK_PARAM_POINTER_RETURN("name", name, NULL);
 
@@ -23,8 +23,7 @@
 
 	fn = ewd_hash_get(fonts, name);
 	if (!fn) {
-		fn = (Estyle_Font *)malloc(sizeof(Estyle_Font));
-		fn->name = strdup(name);
+		fn = strdup(name);
 
 		ewd_hash_set(fonts, name, fn);
 	}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle_style.c	2002/01/26 07:37:26	1.1.1.1
+++ estyle_style.c	2002/01/29 21:26:45	1.2
@@ -512,8 +512,8 @@
 	/*
 	 * Create the text at the correct size and move it into position
 	 */
-	ret = evas_add_text(es->evas, es->font->name,
-			es->font->size + layer->size_change, text);
+	ret = evas_add_text(es->evas, es->font,
+			es->font_size + layer->size_change, text);
 
 	evas_move(es->evas, ret, (double)(es->x + layer->x_offset),
 			(double)(es->y + layer->y_offset));

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/doc


Modified Files:
	manual.raw 


Log Message:
Made some minor updates to the docs to give credit where it is due, and filled
out the api a bit more.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/doc/manual.raw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- manual.raw	2002/01/26 15:12:56	1.1
+++ manual.raw	2002/01/29 21:26:45	1.2
@@ -8,12 +8,12 @@
     <authorgroup>
 
       <author>
-	<firstname></firstname>
-	<othername></othername>
-	<surname></surname>
+	<firstname>Nathan</firstname>
+	<othername>"RbdPngn"</othername>
+	<surname>Ingersoll</surname>
 	<affiliation>
 	  <address>
-	    <email></email>
+	    <email>ningerso@...>
 	  </address>
 	</affiliation>
       </author>
@@ -22,7 +22,7 @@
 
     <copyright>
       <year>2001</year>
-      <holder></holder>
+      <holder>Nathan Ingersoll</holder>
     </copyright>
 
     <legalnotice>
@@ -88,8 +88,19 @@
     <biblioentry id="bib-efsd">
       <bookbiblio>
 	<author>	  
-	  <firstname></firstname>
-	  <surname></surname>
+	  <firstname>Till</firstname>
+	  <surname>Adam</surname>
+	</author>
+	<title>Initial Documentation Setup</title>
+	<date>2001</date>
+      </bookbiblio>
+    </biblioentry>	
+
+    <biblioentry id="bib-efsd">
+      <bookbiblio>
+	<author>	  
+	  <firstname>Christian</firstname>
+	  <surname>Kreibich</surname>
 	</author>
 	<title>The Estyle Programming Manual</title>
 	<date>2001</date>

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h estyle.c 


Log Message:
Filled in a few of the querying functions.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Estyle.h	2002/01/29 21:26:45	1.2
+++ Estyle.h	2002/01/30 06:48:01	1.3
@@ -44,11 +44,9 @@
 char *estyle_get_style(Estyle * es);
 void estyle_set_style(Estyle * es, char *name);
 void estyle_set_color(Estyle * es, int r, int g, int b, int a);
+void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a);
+void estyle_lookup_color_db(char *name, int *r, int *g, int *b, int *a);
 void estyle_set_color_db(Estyle * es, char *name);
-int estyle_get_color_red(Estyle * es);
-int estyle_get_color_green(Estyle * es);
-int estyle_get_color_blue(Estyle * es);
-int estyle_get_color_alpha(Estyle * es);
 
 /*
  * Geometry querying
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle.c	2002/01/29 21:26:45	1.2
+++ estyle.c	2002/01/30 06:48:01	1.3
@@ -125,6 +125,34 @@
 }
 
 /**
+ * estyle_get_color - get the color of the estyle
+ * @es: the estyle to get the color
+ * @r: the pointer to the int to store the red value of the estyle
+ * @g: the pointer to the int to store the green value of the estyle
+ * @b: the pointer to the int to store the blue value of the estyle
+ * @a: the pointer to the int to store the alpha value of the estyle
+ *
+ * Returns no value. Retrieves the color of the estyle into the integer pointers
+ * @r, @g, @b and @a.
+ */
+void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a)
+{
+	CHECK_PARAM_POINTER("es", es);
+
+	if (r)
+		*r = es->color->r;
+
+	if (g)
+		*g = es->color->g;
+
+	if (b)
+		*b = es->color->b;
+
+	if (a)
+		*a = es->color->a;
+}
+
+/**
  * estyle_set_color - change the color of the estyle
  * @es: the estyle to change color
  * @r: the red value of the estyle
@@ -145,6 +173,38 @@
 }
 
 /**
+ * estyle_lookup_color_db - lookup a colors values by name in color db
+ * @name: the name of the color to lookup in the color db
+ * @r: the pointer to the int to store the red value of the estyle
+ * @g: the pointer to the int to store the green value of the estyle
+ * @b: the pointer to the int to store the blue value of the estyle
+ * @a: the pointer to the int to store the alpha value of the estyle
+ *
+ * Returns no value. Looks up the color name in the color db and stores the
+ * values in the integers pointed to by @r, @g, @b, and @a.
+ */
+void estyle_lookup_color_db(char *name, int *r, int *g, int *b, int *a)
+{
+	Estyle_Color *color;
+
+	CHECK_PARAM_POINTER("name", name);
+
+	color = estyle_color_instance_db(name);
+
+	if (r)
+		*r = color->r;
+
+	if (g)
+		*g = color->g;
+
+	if (b)
+		*b = color->b;
+
+	if (a)
+		*a = color->a;
+}
+
+/**
  * estyle_set_color_db - set the color of an estyle based on color name
  * @es: the estyle to change the color
  */
@@ -486,11 +546,18 @@
 	double xx, yy, ww, hh;
 
 	evas_text_at(es->evas, es->bit, index, &xx, &yy, &ww, &hh);
+
+	if (char_x)
+		*char_x = D2I_ROUND(xx) + es->x;
+
+	if (char_y)
+		*char_y = D2I_ROUND(yy) + es->y;
+
+	if (char_w)
+		*char_w = D2I_ROUND(ww);
 
-	*char_x = D2I_ROUND(xx) + es->x;
-	*char_y = D2I_ROUND(yy) + es->y;
-	*char_w = D2I_ROUND(ww);
-	*char_h = D2I_ROUND(hh);
+	if (char_h)
+		*char_h = D2I_ROUND(hh);
 }
 
 /**

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h estyle.c 


Log Message:
Oops, probably should have the move function in the header file.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Estyle.h	2002/01/30 06:48:01	1.3
+++ Estyle.h	2002/01/30 23:04:12	1.4
@@ -37,6 +37,7 @@
 /*
  * Content and appearance manipulators
  */
+void estyle_move(Estyle *es, int x, int y);
 char *estyle_get_text(Estyle * es);
 void estyle_set_text(Estyle * es, char *text);
 int estyle_get_layer(Estyle * es);
@@ -51,6 +52,7 @@
 /*
  * Geometry querying
  */
+inline int estyle_length(Estyle *es);
 void estyle_geometry(Estyle *es, int *x, int *y, int *w, int *h);
 void estyle_text_at(Estyle *es, int index, int *char_x, int *char_y,
 		int *char_w, int *char_h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle.c	2002/01/30 06:48:01	1.3
+++ estyle.c	2002/01/30 23:04:12	1.4
@@ -501,6 +501,19 @@
 }
 
 /**
+ * estyle_length - retrieve the length of the text in an estyle
+ * @es: the estyle to retrieve the length
+ *
+ * Returns the length of the text in the estyle @es.
+ */
+inline int estyle_length(Estyle *es)
+{
+	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+
+	return es->length;
+}
+
+/**
  * estyle_geometry - retrieve the dimensions of the estyle
  * @es: the estyle to retrieve dimensions
  * @x: a pointer to an integer to store the x coordinate of the estyle

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h 


Log Message:
And the clipping function would be a good thing to have in there.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Estyle.h	2002/01/30 23:04:12	1.4
+++ Estyle.h	2002/01/30 23:20:18	1.5
@@ -38,6 +38,7 @@
  * Content and appearance manipulators
  */
 void estyle_move(Estyle *es, int x, int y);
+void estyle_set_clip(Estyle *es, Evas_Object clip);
 char *estyle_get_text(Estyle * es);
 void estyle_set_text(Estyle * es, char *text);
 int estyle_get_layer(Estyle * es);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h estyle.c 


Log Message:
A slight API change, and an optimizations and bug fix.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Estyle.h	2002/01/30 23:20:18	1.5
+++ Estyle.h	2002/02/04 22:24:06	1.6
@@ -71,7 +71,7 @@
  * Joining and splitting estyles.
  */
 Estyle *estyle_split(Estyle * es, int index);
-void estyle_merge(Estyle * es1, Estyle * es2);
+int estyle_merge(Estyle * es1, Estyle * es2);
 
 #define ESTYLE_HASH_COLOR(r, g, b, a) ((r << 24) | (g << 16) | (b << 8) | a)
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle.c	2002/01/30 23:04:12	1.4
+++ estyle.c	2002/02/04 22:24:06	1.5
@@ -118,6 +118,9 @@
 {
 	CHECK_PARAM_POINTER("es", es);
 
+	if (es->x == x && es->y == y)
+		return;
+
 	es->x = x;
 	es->y = y;
 	evas_move(es->evas, es->bit, (double)(x), (double)(y));
@@ -439,16 +442,19 @@
  * @es1: the destination estyle that will contain the final text
  * @es2: the estyle that will be freed, but it's text will be added to @es1
  *
- * Returns no value. Appends the text in @es2 to the text in @es1 and destroys
- * @es2.
+ * Returns TRUE if the bits are able to be merged, otherwise FALSE. Appends the
+ * text in @es2 to the text in @es1 and destroys @es2.
  */
-void estyle_merge(Estyle * es1, Estyle * es2)
+int estyle_merge(Estyle * es1, Estyle * es2)
 {
 	char *new_text, *text1, *text2;
 
-	CHECK_PARAM_POINTER("es1", es1);
-	CHECK_PARAM_POINTER("es2", es2);
+	CHECK_PARAM_POINTER_RETURN("es1", es1, FALSE);
+	CHECK_PARAM_POINTER_RETURN("es2", es2, FALSE);
 
+	if (!BIT_MERGEABLE(es1, es2))
+		return FALSE;
+
 	/*
 	 * These return a pointer to the actual text in the evas object, not a
 	 * copy of it. So don't free them.
@@ -470,6 +476,8 @@
 	FREE(new_text);
 
 	estyle_free(es2);
+
+	return TRUE;
 }
 
 /**

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle_private.h estyle.c estyle_style.c 


Log Message:
Some compensation for layer offsets when determining geometry and performing
layout.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Estyle_private.h	29 Jan 2002 21:26:45 -0000	1.2
+++ Estyle_private.h	15 Feb 2002 04:50:50 -0000	1.3
@@ -19,6 +19,8 @@
 	char *name;
 	E_DB_File *style_db;
 	Ewd_Sheap *layers;
+	int left_push, right_push, top_push, bottom_push;
+
 	int references;
 };
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- estyle.c	4 Feb 2002 22:24:06 -0000	1.5
+++ estyle.c	15 Feb 2002 04:50:50 -0000	1.6
@@ -123,7 +123,8 @@
 
 	es->x = x;
 	es->y = y;
-	evas_move(es->evas, es->bit, (double)(x), (double)(y));
+	evas_move(es->evas, es->bit, (double)(x + es->style->info->left_push),
+			(double)(y + es->style->info->left_push));
 	estyle_style_move(es);
 }
 
@@ -322,8 +323,10 @@
 	if (!(es->flags & ESTYLE_BIT_FIXED)) {
 		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
 
-		es->w = D2I_ROUND(w);
-		es->h = D2I_ROUND(h);
+		es->w = D2I_ROUND(w) + es->style->info->left_push
+			+ es->style->info->right_push;
+		es->h = D2I_ROUND(h) + es->style->info->top_push
+			+ es->style->info->bottom_push;
 	}
 
 	/*
@@ -331,7 +334,9 @@
 	 */
 	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
 			es->color->b, es->color->a);
-	evas_move(es->evas, es->bit, (double)(es->x), (double)(es->y));
+	evas_move(es->evas, es->bit,
+			(double)(es->x + es->style->info->left_push),
+			(double)(es->y + es->style->info->top_push));
 
 	/*
 	 * Draw style altering bits below the text.
@@ -606,8 +611,10 @@
 
 	*char_x = D2I_ROUND(xx) + es->x;
 	*char_y = D2I_ROUND(yy) + es->y;
-	*char_w = D2I_ROUND(ww);
-	*char_h = D2I_ROUND(hh);
+	*char_w = D2I_ROUND(ww) + es->style->info->left_push
+		+ es->style->info->right_push;
+	*char_h = D2I_ROUND(hh) + es->style->info->top_push
+		+ es->style->info->bottom_push;
 
 	return ret;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle_style.c	29 Jan 2002 21:26:45 -0000	1.2
+++ estyle_style.c	15 Feb 2002 04:50:50 -0000	1.3
@@ -335,8 +335,10 @@
 	 */
 	while ((layer = ewd_sheap_item(info->layers, i++)) &&
 			(ob = ewd_list_next(es->style->bits)))
-		evas_move(es->evas, ob, (double)(es->x + layer->x_offset),
-				(double)(es->y + layer->y_offset));
+		evas_move(es->evas, ob, (double)(es->x + layer->x_offset +
+					info->left_push),
+				(double)(es->y + layer->y_offset +
+					 info->right_push));
 }
 
 /*
@@ -515,8 +517,10 @@
 	ret = evas_add_text(es->evas, es->font,
 			es->font_size + layer->size_change, text);
 
-	evas_move(es->evas, ret, (double)(es->x + layer->x_offset),
-			(double)(es->y + layer->y_offset));
+	evas_move(es->evas, ret, (double)(es->x + layer->x_offset +
+				 es->style->info->left_push),
+			(double)(es->y + layer->y_offset +
+				 es->style->info->top_push));
 
 	/*
 	 * Now determine if it has relative or absolute color and change it's
@@ -650,6 +654,22 @@
 
 		sprintf(key, "/layers/%d/color/b", i);
 		e_db_int_get(info->style_db, key, &layer->b);
+
+		/*
+		 * Adjust the push of the left and right edges of the estyle.
+		 */
+		if (layer->x_offset > info->right_push)
+			info->right_push = layer->x_offset;
+		else if (-layer->x_offset > info->left_push)
+			info->left_push = -layer->x_offset;
+
+		/*
+		 * Adjust the push of the top and bottom edges of the estyle.
+		 */
+		if (layer->y_offset > info->bottom_push)
+			info->bottom_push = layer->y_offset;
+		else if (-layer->y_offset > info->top_push)
+			info->top_push = -layer->y_offset;
 
 		ewd_sheap_insert(info->layers, layer);
 	}

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Added a few checks that will hopefully avoid any problems when there is no
style set.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- estyle.c	15 Feb 2002 04:50:50 -0000	1.6
+++ estyle.c	15 Feb 2002 04:57:09 -0000	1.7
@@ -123,8 +123,10 @@
 
 	es->x = x;
 	es->y = y;
-	evas_move(es->evas, es->bit, (double)(x + es->style->info->left_push),
-			(double)(y + es->style->info->left_push));
+	evas_move(es->evas, es->bit, (double)(x + (es->style ?
+					es->style->info->left_push : 0)),
+			(double)(y + (es->style ?
+				      es->style->info->top_push : 0)));
 	estyle_style_move(es);
 }
 
@@ -323,10 +325,10 @@
 	if (!(es->flags & ESTYLE_BIT_FIXED)) {
 		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
 
-		es->w = D2I_ROUND(w) + es->style->info->left_push
-			+ es->style->info->right_push;
-		es->h = D2I_ROUND(h) + es->style->info->top_push
-			+ es->style->info->bottom_push;
+		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
+			+ es->style->info->right_push : 0);
+		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
 	}
 
 	/*
@@ -335,8 +337,10 @@
 	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
 			es->color->b, es->color->a);
 	evas_move(es->evas, es->bit,
-			(double)(es->x + es->style->info->left_push),
-			(double)(es->y + es->style->info->top_push));
+			(double)(es->x + (es->style ?
+					  es->style->info->left_push : 0)),
+			(double)(es->y + (es->style ?
+					  es->style->info->top_push : 0)));
 
 	/*
 	 * Draw style altering bits below the text.
@@ -611,10 +615,10 @@
 
 	*char_x = D2I_ROUND(xx) + es->x;
 	*char_y = D2I_ROUND(yy) + es->y;
-	*char_w = D2I_ROUND(ww) + es->style->info->left_push
-		+ es->style->info->right_push;
-	*char_h = D2I_ROUND(hh) + es->style->info->top_push
-		+ es->style->info->bottom_push;
+	*char_w = D2I_ROUND(ww) + (es->style ? es->style->info->left_push
+		+ es->style->info->right_push : 0);
+	*char_h = D2I_ROUND(hh) + (es->style ? es->style->info->top_push
+		+ es->style->info->bottom_push : 0);
 
 	return ret;
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h estyle.c estyle_style.c estyle_style.h 


Log Message:
Forgot to update the font on the style portions of the text when
estyle_set_font is called.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Estyle.h	4 Feb 2002 22:24:06 -0000	1.6
+++ Estyle.h	21 Feb 2002 05:07:13 -0000	1.7
@@ -38,15 +38,24 @@
  * Content and appearance manipulators
  */
 void estyle_move(Estyle *es, int x, int y);
+
 void estyle_set_clip(Estyle *es, Evas_Object clip);
+
 char *estyle_get_text(Estyle * es);
 void estyle_set_text(Estyle * es, char *text);
+
+char *estyle_get_font(Estyle *es);
+void estyle_set_font(Estyle * es, char *name, int size);
+
 int estyle_get_layer(Estyle * es);
 void estyle_set_layer(Estyle * es, int layer);
+
 char *estyle_get_style(Estyle * es);
 void estyle_set_style(Estyle * es, char *name);
+
 void estyle_set_color(Estyle * es, int r, int g, int b, int a);
 void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a);
+
 void estyle_lookup_color_db(char *name, int *r, int *g, int *b, int *a);
 void estyle_set_color_db(Estyle * es, char *name);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- estyle.c	15 Feb 2002 04:57:09 -0000	1.7
+++ estyle.c	21 Feb 2002 05:07:13 -0000	1.8
@@ -425,6 +425,8 @@
 	es->font_size = size;
 
 	evas_set_font(es->evas, es->bit, es->font, es->font_size);
+	if (es->style)
+		estyle_style_set_font(es);
 }
 
 /**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle_style.c	15 Feb 2002 04:50:50 -0000	1.3
+++ estyle_style.c	21 Feb 2002 05:07:13 -0000	1.4
@@ -396,6 +396,43 @@
 }
 
 /*
+ * estyle_style_set_font - set the font for the style portion of the estyle
+ * @es: the estyle to use for updating the font for the estyle
+ *
+ * Returns no value. Updates the font for the estyle @es.
+ */
+void estyle_style_set_font(Estyle *es)
+{
+	int i;
+	Evas_Object sob;
+	Estyle_Style_Info *info;
+	Estyle_Style_Layer *layer;
+
+	CHECK_PARAM_POINTER("es", es);
+
+	/*
+	 * Prepare to traverse the list of bits and layers to get the correct
+	 * layout.
+	 */
+	info = (Estyle_Style_Info *)es->style->info;
+
+	if (!es->style->bits)
+		return;
+	ewd_list_goto_first(es->style->bits);
+	i = 0;
+
+	/*
+	 * Each layer corresponds to a bit in the evas. So we need to
+	 * increment through each list at the same time. Both lists should
+	 * have the same number of items in them, but check for that just in
+	 * case there isn't.
+	 */
+	while ((layer = ewd_sheap_item(info->layers, i++)) &&
+			(sob = ewd_list_next(es->style->bits)))
+		evas_set_font(es->evas, sob, es->font, es->font_size);
+}
+
+/*
  * estyle_style_set_clip - change the clip rectangle used by the style objects
  * @es: the estyle to change the style clip rectangle
  * @ob: the evas object to be used as a clip rectangle
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle_style.h	26 Jan 2002 07:37:26 -0000	1.1.1.1
+++ estyle_style.h	21 Feb 2002 05:07:13 -0000	1.2
@@ -28,6 +28,7 @@
 void estyle_style_move(Estyle * bit);
 void estyle_style_set_clip(Estyle * bit, Evas_Object ob);
 void estyle_style_set_color(Estyle * bit);
+void estyle_style_set_font(Estyle *es);
 int estyle_style_set_layer_lower(Estyle * bit, int layer);
 int estyle_style_set_layer_upper(Estyle * bit, int layer, int start);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Fixed up the changing of style when changing text. Also added support for
ewd's shared strings.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle_test_simple.c	29 Jan 2002 21:26:45 -0000	1.2
+++ estyle_test_simple.c	25 Feb 2002 23:57:53 -0000	1.3
@@ -73,17 +73,15 @@
 	    (Ecore_Event_Mouse_Down *) ev->event;
 
 	if (eemd->button == 1) {
-		/*
 		if (last == string1) {
-			estyle_context_set_style(e, "shadow");
+			estyle_set_style(e, "raised");
 			estyle_set_text(e, string2);
 			last = string2;
 		} else {
-			estyle_context_set_style(e, "raised");
+			estyle_set_style(e, "shadow");
 			estyle_set_text(e, string1);
 			last = string1;
 		}
-		*/
 		index = estyle_text_at_position(e, eemd->x, eemd->y, &x, &y,
 				&w, &h);
 		if (index < 0)

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle_private.h Makefile.am Makefile.in estyle.c 
	estyle_style.c estyle_style.h 
Removed Files:
	estyle_font.c 


Log Message:
Fixed up the changing of style when changing text. Also added support for
ewd's shared strings.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Estyle_private.h	15 Feb 2002 04:50:50 -0000	1.3
+++ Estyle_private.h	25 Feb 2002 23:57:53 -0000	1.4
@@ -89,8 +89,6 @@
 	int length;
 };
 
-char *estyle_font_instance(char *name);
-
 /*
  * This rounds the double to the nearest integer and returns it as an int
  */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- Makefile.am	26 Jan 2002 07:37:24 -0000	1.1.1.1
+++ Makefile.am	25 Feb 2002 23:57:53 -0000	1.2
@@ -12,7 +12,6 @@
 libestyle_la_SOURCES = \
 Estyle.h \
 estyle.c \
-estyle_font.c \
 estyle_style.c \
 estyle_color.c
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.in	26 Jan 2002 15:09:05 -0000	1.2
+++ Makefile.in	25 Feb 2002 23:57:53 -0000	1.3
@@ -98,7 +98,7 @@
 installed_headers_DATA =  Estyle.h
 
 
-libestyle_la_SOURCES =  Estyle.h estyle.c estyle_font.c estyle_style.c estyle_color.c
+libestyle_la_SOURCES =  Estyle.h estyle.c estyle_style.c estyle_color.c
 
 
 libestyle_la_LIBADD = @evas_libs@ @ewd_libs@
@@ -114,8 +114,7 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libestyle_la_OBJECTS =  estyle.lo estyle_font.lo estyle_style.lo \
-estyle_color.lo
+libestyle_la_OBJECTS =  estyle.lo estyle_style.lo estyle_color.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -130,8 +129,7 @@
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/estyle.P .deps/estyle_color.P .deps/estyle_font.P \
-.deps/estyle_style.P
+DEP_FILES =  .deps/estyle.P .deps/estyle_color.P .deps/estyle_style.P
 SOURCES = $(libestyle_la_SOURCES)
 OBJECTS = $(libestyle_la_OBJECTS)
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- estyle.c	21 Feb 2002 05:07:13 -0000	1.8
+++ estyle.c	25 Feb 2002 23:57:53 -0000	1.9
@@ -41,7 +41,7 @@
 	 * Set some default colors, font, and font size.
 	 */
 	es->color = estyle_color_instance(255, 255, 255, 255);
-	es->font = estyle_font_instance("nationff");
+	es->font = ewd_string_instance("nationff");
 	es->font_size = 14;
 
 	if (style)
@@ -309,11 +309,22 @@
 	 * Create the text if no evas object is present, otherwise just change
 	 * of the evas object.
 	 */
-	if (es->bit)
+	if (es->bit) {
 		evas_set_text(es->evas, es->bit, text);
+
+		/*
+		 * Set the text for the style bits.
+		 */
+		estyle_style_set_text(es);
+	}
 	else {
 		es->bit = evas_add_text(es->evas, es->font,
 					 es->font_size, text);
+
+		/*
+		 * Draw style altering bits below the text.
+		 */
+		estyle_style_draw(es, text);
 	}
 
 	es->length = strlen(text);
@@ -342,11 +353,6 @@
 			(double)(es->y + (es->style ?
 					  es->style->info->top_push : 0)));
 
-	/*
-	 * Draw style altering bits below the text.
-	 */
-	estyle_style_draw(es, text);
-
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
 }
@@ -421,7 +427,7 @@
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
 
-	es->font = estyle_font_instance(name);
+	es->font = ewd_string_instance(name);
 	es->font_size = size;
 
 	evas_set_font(es->evas, es->bit, es->font, es->font_size);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_style.c	21 Feb 2002 05:07:13 -0000	1.4
+++ estyle_style.c	25 Feb 2002 23:57:53 -0000	1.5
@@ -433,6 +433,49 @@
 }
 
 /*
+ * estyle_style_set_text - set the text for the style portion of the estyle
+ * @es: the estyle to use for updating the text for the estyle
+ *
+ * Returns no value. Updates the text for the estyle @es.
+ */
+void estyle_style_set_text(Estyle *es)
+{
+	int i;
+	char *text;
+	Evas_Object sob;
+	Estyle_Style_Info *info;
+	Estyle_Style_Layer *layer;
+
+	CHECK_PARAM_POINTER("es", es);
+
+	/*
+	 * Prepare to traverse the list of bits and layers to get the correct
+	 * layout.
+	 */
+	text = evas_get_text_string(es->evas, es->bit);
+	if (!text)
+		return;
+
+	info = (Estyle_Style_Info *)es->style->info;
+
+	if (!es->style->bits)
+		return;
+
+	ewd_list_goto_first(es->style->bits);
+	i = 0;
+
+	/*
+	 * Each layer corresponds to a bit in the evas. So we need to
+	 * increment through each list at the same time. Both lists should
+	 * have the same number of items in them, but check for that just in
+	 * case there isn't.
+	 */
+	while ((layer = ewd_sheap_item(info->layers, i++)) &&
+			(sob = ewd_list_next(es->style->bits)))
+		evas_set_text(es->evas, sob, text);
+}
+
+/*
  * estyle_style_set_clip - change the clip rectangle used by the style objects
  * @es: the estyle to change the style clip rectangle
  * @ob: the evas object to be used as a clip rectangle
@@ -504,7 +547,7 @@
 		/*
 		 * Load the information for this style info
 		 */
-		found->name = strdup(name);
+		found->name = ewd_string_instance(name);
 		_estyle_style_info_load(found);
 		ewd_hash_set(styles, name, found);
 	}
@@ -533,7 +576,9 @@
 		ewd_hash_remove(styles, info->name);
 		if (info->layers)
 			ewd_sheap_destroy(info->layers);
-		FREE(info->name);
+		ewd_string_release(info->name);
+
+		FREE(info);
 	}
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle_style.h	21 Feb 2002 05:07:13 -0000	1.2
+++ estyle_style.h	25 Feb 2002 23:57:53 -0000	1.3
@@ -29,6 +29,7 @@
 void estyle_style_set_clip(Estyle * bit, Evas_Object ob);
 void estyle_style_set_color(Estyle * bit);
 void estyle_style_set_font(Estyle *es);
+void estyle_style_set_text(Estyle *es);
 int estyle_style_set_layer_lower(Estyle * bit, int layer);
 int estyle_style_set_layer_upper(Estyle * bit, int layer, int start);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Pointless to keep a copy of the font and font size since evas keeps all of
this information internally.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle_test_simple.c	25 Feb 2002 23:57:53 -0000	1.3
+++ estyle_test_simple.c	27 Feb 2002 00:19:02 -0000	1.4
@@ -128,8 +128,8 @@
 				       ecore_window_expose);
 	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN,
 				       ecore_mouse_down);
-/*	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE,
-				       ecore_mouse_move); */
+	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE,
+				       ecore_mouse_move);
 	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN,
 				       ecore_mouse_in);
 	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT,

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle_private.h estyle.c estyle_style.c estyle_style.h 


Log Message:
Pointless to keep a copy of the font and font size since evas keeps all of
this information internally.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Estyle_private.h	25 Feb 2002 23:57:53 -0000	1.4
+++ Estyle_private.h	27 Feb 2002 00:19:02 -0000	1.5
@@ -50,16 +50,6 @@
 	Estyle_Color *color;
 
 	/*
-	 * The bits can also have different fonts
-	 */
-	char *font;
-
-	/*
-	 * Or different font sizes
-	 */
-	int font_size;
-
-	/*
 	 * Keep track of the geometry of the text to aid in layout. In the
 	 * case of a tab character, the width of the bit does not match the
 	 * width of the actual character printed.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- estyle.c	25 Feb 2002 23:57:53 -0000	1.9
+++ estyle.c	27 Feb 2002 00:19:02 -0000	1.10
@@ -3,6 +3,8 @@
 #include <ctype.h>
 
 #define ESTYLE_TABWIDTH 8
+#define DEFAULT_FONT "nationff"
+#define DEFAULT_SIZE 12
 
 static int estyle_setup_complete = 0;
 
@@ -41,8 +43,6 @@
 	 * Set some default colors, font, and font size.
 	 */
 	es->color = estyle_color_instance(255, 255, 255, 255);
-	es->font = ewd_string_instance("nationff");
-	es->font_size = 14;
 
 	if (style)
 		es->style = estyle_style_instance(style);
@@ -318,8 +318,8 @@
 		estyle_style_set_text(es);
 	}
 	else {
-		es->bit = evas_add_text(es->evas, es->font,
-					 es->font_size, text);
+		es->bit = evas_add_text(es->evas, DEFAULT_FONT,
+					 DEFAULT_SIZE, text);
 
 		/*
 		 * Draw style altering bits below the text.
@@ -405,14 +405,9 @@
  */
 char *estyle_get_font(Estyle *es)
 {
-	char *ret = NULL;
-
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
-	if (es->font)
-		ret = strdup(es->font);
-
-	return ret;
+	return evas_get_text_font(es->evas, es->bit);
 }
 
 /**
@@ -422,17 +417,14 @@
  *
  * Returns no value. Changes the font for the specified estyle to @name.
  */
-void estyle_set_font(Estyle * es, char *name, int size)
+void estyle_set_font(Estyle * es, char *font, int size)
 {
 	CHECK_PARAM_POINTER("es", es);
-	CHECK_PARAM_POINTER("name", name);
-
-	es->font = ewd_string_instance(name);
-	es->font_size = size;
+	CHECK_PARAM_POINTER("font", font);
 
-	evas_set_font(es->evas, es->bit, es->font, es->font_size);
+	evas_set_font(es->evas, es->bit, font, size);
 	if (es->style)
-		estyle_style_set_font(es);
+		estyle_style_set_font(es, font, size);
 }
 
 /**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- estyle_style.c	25 Feb 2002 23:57:53 -0000	1.5
+++ estyle_style.c	27 Feb 2002 00:19:02 -0000	1.6
@@ -401,7 +401,7 @@
  *
  * Returns no value. Updates the font for the estyle @es.
  */
-void estyle_style_set_font(Estyle *es)
+void estyle_style_set_font(Estyle *es, char *font, int size)
 {
 	int i;
 	Evas_Object sob;
@@ -409,6 +409,7 @@
 	Estyle_Style_Layer *layer;
 
 	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER("font", font);
 
 	/*
 	 * Prepare to traverse the list of bits and layers to get the correct
@@ -429,7 +430,7 @@
 	 */
 	while ((layer = ewd_sheap_item(info->layers, i++)) &&
 			(sob = ewd_list_next(es->style->bits)))
-		evas_set_font(es->evas, sob, es->font, es->font_size);
+		evas_set_font(es->evas, sob, font, size);
 }
 
 /*
@@ -591,13 +592,16 @@
 		Estyle * es, char *text)
 {
 	int r, g, b, a;
+	char *font;
+	int size;
 	Evas_Object ret;
 
 	/*
 	 * Create the text at the correct size and move it into position
 	 */
-	ret = evas_add_text(es->evas, es->font,
-			es->font_size + layer->size_change, text);
+	font = evas_get_text_font(es->evas, es->bit);
+	size = evas_get_text_size(es->evas, es->bit);
+	ret = evas_add_text(es->evas, font, size + layer->size_change, text);
 
 	evas_move(es->evas, ret, (double)(es->x + layer->x_offset +
 				 es->style->info->left_push),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle_style.h	25 Feb 2002 23:57:53 -0000	1.3
+++ estyle_style.h	27 Feb 2002 00:19:02 -0000	1.4
@@ -28,7 +28,7 @@
 void estyle_style_move(Estyle * bit);
 void estyle_style_set_clip(Estyle * bit, Evas_Object ob);
 void estyle_style_set_color(Estyle * bit);
-void estyle_style_set_font(Estyle *es);
+void estyle_style_set_font(Estyle *es, char *font, int size);
 void estyle_style_set_text(Estyle *es);
 int estyle_style_set_layer_lower(Estyle * bit, int layer);
 int estyle_style_set_layer_upper(Estyle * bit, int layer, int start);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Minor modification to ensure that size and position get updated when changing
settings on the estyle.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- estyle.c	27 Feb 2002 00:19:02 -0000	1.10
+++ estyle.c	21 Mar 2002 07:55:14 -0000	1.11
@@ -6,6 +6,8 @@
 #define DEFAULT_FONT "nationff"
 #define DEFAULT_SIZE 12
 
+void __estyle_update(Estyle *es);
+
 static int estyle_setup_complete = 0;
 
 /**
@@ -269,6 +271,8 @@
 
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
+
+	__estyle_update(es);
 }
 
 /**
@@ -301,8 +305,6 @@
  */
 void estyle_set_text(Estyle * es, char *text)
 {
-	double x, y, w, h;
-
 	CHECK_PARAM_POINTER("es", es);
 
 	/*
@@ -329,32 +331,10 @@
 
 	es->length = strlen(text);
 
-	/*
-	 * If the estyle doesn't have fixed dimensions then set it to the
-	 * geometry of it's contents.
-	 */
-	if (!(es->flags & ESTYLE_BIT_FIXED)) {
-		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
-
-		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
-			+ es->style->info->right_push : 0);
-		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
-			+ es->style->info->bottom_push : 0);
-	}
-
-	/*
-	 * Setup the color of the evas object and move it into position.
-	 */
-	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
-			es->color->b, es->color->a);
-	evas_move(es->evas, es->bit,
-			(double)(es->x + (es->style ?
-					  es->style->info->left_push : 0)),
-			(double)(es->y + (es->style ?
-					  es->style->info->top_push : 0)));
-
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
+
+	__estyle_update(es);
 }
 
 /**
@@ -425,6 +405,8 @@
 	evas_set_font(es->evas, es->bit, font, size);
 	if (es->style)
 		estyle_style_set_font(es, font, size);
+
+	__estyle_update(es);
 }
 
 /**
@@ -676,4 +658,36 @@
 	es->y = D2I_ROUND(y);
 	es->w = D2I_ROUND(w);
 	es->h = D2I_ROUND(h);
+}
+
+/*
+ * __estyle_update - update the sizing and position of the estyle
+ */
+void __estyle_update(Estyle *es)
+{
+	double x, y, w, h;
+
+	/*
+	 * If the estyle doesn't have fixed dimensions then set it to the
+	 * geometry of it's contents.
+	 */
+	if (!(es->flags & ESTYLE_BIT_FIXED)) {
+		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
+
+		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
+			+ es->style->info->right_push : 0);
+		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
+	}
+
+	/*
+	 * Setup the color of the evas object and move it into position.
+	 */
+	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
+			es->color->b, es->color->a);
+	evas_move(es->evas, es->bit,
+			(double)(es->x + (es->style ?
+					  es->style->info->left_push : 0)),
+			(double)(es->y + (es->style ?
+					  es->style->info->top_push : 0)));
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle


Modified Files:
	AUTHORS COPYING 


Log Message:
Updated author and copyright information that I had just copied from etox.


===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/AUTHORS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- AUTHORS	26 Jan 2002 07:37:07 -0000	1.1.1.1
+++ AUTHORS	21 Mar 2002 07:57:15 -0000	1.2
@@ -1,4 +1 @@
-Mandrake <mandrake@...>
-Adam Kisiel <kisiel@...>
-BLAdER (redalb) <blader@...>
 RbdPngn <ningerso@...>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/COPYING,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- COPYING	26 Jan 2002 07:37:07 -0000	1.1.1.1
+++ COPYING	21 Mar 2002 07:57:15 -0000	1.2
@@ -1,4 +1,4 @@
-Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+Copyright (C) 2002 Nathan Ingersoll and various contributors (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
      Tag: SPLIT
	estyle.c 


Log Message:
Sync up SPLIT with HEAD.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -3 -r1.10 -r1.10.2.1
--- estyle.c	27 Feb 2002 00:19:02 -0000	1.10
+++ estyle.c	21 Mar 2002 20:28:03 -0000	1.10.2.1
@@ -6,6 +6,8 @@
 #define DEFAULT_FONT "nationff"
 #define DEFAULT_SIZE 12
 
+void __estyle_update(Estyle *es);
+
 static int estyle_setup_complete = 0;
 
 /**
@@ -269,6 +271,8 @@
 
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
+
+	__estyle_update(es);
 }
 
 /**
@@ -301,8 +305,6 @@
  */
 void estyle_set_text(Estyle * es, char *text)
 {
-	double x, y, w, h;
-
 	CHECK_PARAM_POINTER("es", es);
 
 	/*
@@ -329,32 +331,10 @@
 
 	es->length = strlen(text);
 
-	/*
-	 * If the estyle doesn't have fixed dimensions then set it to the
-	 * geometry of it's contents.
-	 */
-	if (!(es->flags & ESTYLE_BIT_FIXED)) {
-		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
-
-		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
-			+ es->style->info->right_push : 0);
-		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
-			+ es->style->info->bottom_push : 0);
-	}
-
-	/*
-	 * Setup the color of the evas object and move it into position.
-	 */
-	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
-			es->color->b, es->color->a);
-	evas_move(es->evas, es->bit,
-			(double)(es->x + (es->style ?
-					  es->style->info->left_push : 0)),
-			(double)(es->y + (es->style ?
-					  es->style->info->top_push : 0)));
-
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
+
+	__estyle_update(es);
 }
 
 /**
@@ -425,6 +405,8 @@
 	evas_set_font(es->evas, es->bit, font, size);
 	if (es->style)
 		estyle_style_set_font(es, font, size);
+
+	__estyle_update(es);
 }
 
 /**
@@ -676,4 +658,36 @@
 	es->y = D2I_ROUND(y);
 	es->w = D2I_ROUND(w);
 	es->h = D2I_ROUND(h);
+}
+
+/*
+ * __estyle_update - update the sizing and position of the estyle
+ */
+void __estyle_update(Estyle *es)
+{
+	double x, y, w, h;
+
+	/*
+	 * If the estyle doesn't have fixed dimensions then set it to the
+	 * geometry of it's contents.
+	 */
+	if (!(es->flags & ESTYLE_BIT_FIXED)) {
+		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
+
+		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
+			+ es->style->info->right_push : 0);
+		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
+	}
+
+	/*
+	 * Setup the color of the evas object and move it into position.
+	 */
+	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
+			es->color->b, es->color->a);
+	evas_move(es->evas, es->bit,
+			(double)(es->x + (es->style ?
+					  es->style->info->left_push : 0)),
+			(double)(es->y + (es->style ?
+					  es->style->info->top_push : 0)));
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle


Modified Files:
      Tag: SPLIT
	AUTHORS COPYING autogen.sh 


Log Message:
Sync up SPLIT with HEAD.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/AUTHORS,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -3 -r1.1.1.1 -r1.1.1.1.2.1
--- AUTHORS	26 Jan 2002 07:37:07 -0000	1.1.1.1
+++ AUTHORS	21 Mar 2002 20:28:03 -0000	1.1.1.1.2.1
@@ -1,4 +1 @@
-Mandrake <mandrake@...>
-Adam Kisiel <kisiel@...>
-BLAdER (redalb) <blader@...>
 RbdPngn <ningerso@...>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/COPYING,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -3 -r1.1.1.1 -r1.1.1.1.2.1
--- COPYING	26 Jan 2002 07:37:07 -0000	1.1.1.1
+++ COPYING	21 Mar 2002 20:28:03 -0000	1.1.1.1.2.1
@@ -1,4 +1,4 @@
-Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+Copyright (C) 2002 Nathan Ingersoll and various contributors (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/autogen.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -3 -r1.1.1.1 -r1.1.1.1.2.1
--- autogen.sh	26 Jan 2002 07:37:07 -0000	1.1.1.1
+++ autogen.sh	21 Mar 2002 20:28:03 -0000	1.1.1.1.2.1
@@ -1,5 +1,10 @@
 #! /bin/sh
 
+abort () {
+    echo "$1 not found or command failed. Aborting!"
+    exit 1
+}
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
@@ -8,11 +13,11 @@
 DIE=0
 
 set -x
-autoheader
-libtoolize --ltdl --force --copy
-aclocal
-automake --foreign --add-missing
-autoconf
+aclocal || abort "aclocal"
+libtoolize --ltdl --force --copy || abort "libtoolize"
+autoheader || abort "autoheader"
+automake --foreign --add-missing || abort "automake"
+autoconf || abort "autoconf"
 
 if test -z "$*"; then
         echo "I am going to run ./configure with no arguments - if you wish "
@@ -21,7 +26,7 @@
 
 cd "$THEDIR"
 
-$srcdir/configure "$@"
+$srcdir/configure "$@" || abort "configure"
 
 set +x

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Set the layer when the estyle_set_text is called, this should fix a problem
with the stacking order being wrong when no layer has been set.

Also added a font change in the test program to try and duplicate a bug
reported by smugg, but so far have not seen it.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_test_simple.c	27 Feb 2002 00:19:02 -0000	1.4
+++ estyle_test_simple.c	26 Mar 2002 18:55:17 -0000	1.5
@@ -75,9 +75,11 @@
 	if (eemd->button == 1) {
 		if (last == string1) {
 			estyle_set_style(e, "raised");
+			estyle_set_font(e, "morpheus", 14);
 			estyle_set_text(e, string2);
 			last = string2;
 		} else {
+			estyle_set_font(e, "nationff", 14);
 			estyle_set_style(e, "shadow");
 			estyle_set_text(e, string1);
 			last = string1;

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Set the layer when the estyle_set_text is called, this should fix a problem
with the stacking order being wrong when no layer has been set.

Also added a font change in the test program to try and duplicate a bug
reported by smugg, but so far have not seen it.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- estyle.c	21 Mar 2002 07:55:14 -0000	1.11
+++ estyle.c	26 Mar 2002 18:55:17 -0000	1.12
@@ -305,6 +305,8 @@
  */
 void estyle_set_text(Estyle * es, char *text)
 {
+	int layer;
+
 	CHECK_PARAM_POINTER("es", es);
 
 	/*
@@ -333,6 +335,12 @@
 
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
+
+	/*
+	 * Must adjust the layer of the text to ensure proper style stacking.
+	 */
+	layer = evas_get_layer(es->evas, es->bit);
+	estyle_set_layer(es, layer);
 
 	__estyle_update(es);
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle


Modified Files:
	AUTHORS estyle-config.h.in 


Log Message:
Synced the work from SPLIT by Pat Cervasco and redalb.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- AUTHORS	21 Mar 2002 07:57:15 -0000	1.2
+++ AUTHORS	2 Apr 2002 01:30:53 -0000	1.3
@@ -1 +1,3 @@
 RbdPngn <ningerso@...>
+redalb <blader@...>
+Pat Cevasco <pcevasco@...>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/estyle-config.h.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle-config.h.in	26 Jan 2002 07:37:08 -0000	1.1.1.1
+++ estyle-config.h.in	2 Apr 2002 01:30:53 -0000	1.2
@@ -1,15 +1,57 @@
-/* estyle-config.h.in.  Generated automatically from configure.ac by autoheader.  */
+/* estyle-config.h.in.  Generated from configure.ac by autoheader.  */
 #undef PACKAGE_DATA_DIR
 #undef PACKAGE_LOCALE_DIR
 #undef PACKAGE_SOURCE_DIR
 
-/* Define if you have the <dlfcn.h> header file. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
 /* Name of package */
 #undef PACKAGE
 
-/* Define if you have the ANSI C header files. */
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Version number of package */

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h Makefile.am Makefile.in estyle.c 
	estyle_style.c 
Added Files:
	estyle_heap.c estyle_heap.h 


Log Message:
Synced the work from SPLIT by Pat Cervasco and redalb.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Estyle.h	21 Feb 2002 05:07:13 -0000	1.7
+++ Estyle.h	2 Apr 2002 01:30:53 -0000	1.8
@@ -8,7 +8,6 @@
 /*
  * Simple alignment bitfield
  */
-typedef enum _estyle_alignment Estyle_Alignment;
 enum _estyle_alignment {
 	ESTYLE_ALIGN_CENTER = 0,
 	ESTYLE_ALIGN_LEFT = 1,
@@ -16,12 +15,21 @@
 	ESTYLE_ALIGN_TOP = 4,
 	ESTYLE_ALIGN_BOTTOM = 8
 };
+typedef enum _estyle_alignment Estyle_Alignment;
 
 /*
  * The estyle holds all information necessary for display and layout of the text
  */
 typedef struct _estyle Estyle;
 
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
 /*
  * Constructor/destructor
  */
@@ -83,5 +91,11 @@
 int estyle_merge(Estyle * es1, Estyle * es2);
 
 #define ESTYLE_HASH_COLOR(r, g, b, a) ((r << 24) | (g << 16) | (b << 8) | a)
+
+
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Estyle_private.h	27 Feb 2002 00:19:02 -0000	1.5
+++ Estyle_private.h	2 Apr 2002 01:30:53 -0000	1.6
@@ -2,6 +2,7 @@
 #define _ESTYLE_PRIVATE_H
 
 #include "Estyle.h"
+#include "estyle_heap.h"
 #include <Edb.h>
 
 typedef enum _estyle_bit_flags Estyle_Bit_Flags;
@@ -18,7 +19,7 @@
 struct _estyle_style_info {
 	char *name;
 	E_DB_File *style_db;
-	Ewd_Sheap *layers;
+	Estyle_Heap *layers;
 	int left_push, right_push, top_push, bottom_push;
 
 	int references;
@@ -31,7 +32,7 @@
 typedef struct _estyle_style Estyle_Style;
 struct _estyle_style {
 	Estyle_Style_Info *info;
-	Ewd_List *bits;
+	Evas_List bits;
 };
 
 #include "estyle_style.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am	25 Feb 2002 23:57:53 -0000	1.2
+++ Makefile.am	2 Apr 2002 01:30:53 -0000	1.3
@@ -13,7 +13,8 @@
 Estyle.h \
 estyle.c \
 estyle_style.c \
-estyle_color.c
+estyle_color.c \
+estyle_heap.c
 
 
 libestyle_la_LIBADD       = @evas_libs@ @ewd_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.in	25 Feb 2002 23:57:53 -0000	1.3
+++ Makefile.in	2 Apr 2002 01:30:53 -0000	1.4
@@ -98,7 +98,7 @@
 installed_headers_DATA =  Estyle.h
 
 
-libestyle_la_SOURCES =  Estyle.h estyle.c estyle_style.c estyle_color.c
+libestyle_la_SOURCES =  Estyle.h estyle.c estyle_style.c estyle_color.c estyle_heap.c
 
 
 libestyle_la_LIBADD = @evas_libs@ @ewd_libs@
@@ -114,7 +114,8 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libestyle_la_OBJECTS =  estyle.lo estyle_style.lo estyle_color.lo
+libestyle_la_OBJECTS =  estyle.lo estyle_style.lo estyle_color.lo \
+estyle_heap.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -129,7 +130,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/estyle.P .deps/estyle_color.P .deps/estyle_style.P
+DEP_FILES =  .deps/estyle.P .deps/estyle_color.P .deps/estyle_heap.P \
+.deps/estyle_style.P
 SOURCES = $(libestyle_la_SOURCES)
 OBJECTS = $(libestyle_la_OBJECTS)
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- estyle.c	26 Mar 2002 18:55:17 -0000	1.12
+++ estyle.c	2 Apr 2002 01:30:53 -0000	1.13
@@ -6,7 +6,8 @@
 #define DEFAULT_FONT "nationff"
 #define DEFAULT_SIZE 12
 
-void __estyle_update(Estyle *es);
+void __estyle_update_position(Estyle *es);
+void __estyle_update_dimensions(Estyle *es);
 
 static int estyle_setup_complete = 0;
 
@@ -37,23 +38,40 @@
 	es = (Estyle *) malloc(sizeof(Estyle));
 	if (!es)
 		return NULL;
-
 	memset(es, 0, sizeof(Estyle));
+
 	es->evas = evas;
+	evas_font_add_path(es->evas, PACKAGE_DATA_DIR"/fonts");
+
+	/*
+	 * Create the Evas_Object and set the default font and font size.
+	 */
+	es->bit = evas_add_text(es->evas, DEFAULT_FONT, DEFAULT_SIZE, text);
 
 	/*
 	 * Set some default colors, font, and font size.
 	 */
 	es->color = estyle_color_instance(255, 255, 255, 255);
 
+	/*
+	 * Create the style and set the default color.
+	 */
 	if (style)
 		es->style = estyle_style_instance(style);
+	estyle_set_color(es, 255, 255, 255, 255);
+	if (es->style)
+		estyle_style_draw(es, text);
+
+	/*
+	 * Set length and dimensions.
+	 */
+	es->length = strlen(text);
+	__estyle_update_dimensions(es);
 
 	/*
-	 * Display the text on the evas
+	 * move to (0,0) by default. (is this necessary? -redalb)
 	 */
-	evas_font_add_path(evas, PACKAGE_DATA_DIR"/fonts");
-	estyle_set_text(es, text);
+	estyle_move(es, 0, 0);
 
 	return es;
 }
@@ -64,7 +82,7 @@
  *
  * Returns no value. Frees the data in @es as well as @es itself.
  */
-void estyle_free(Estyle * es)
+void estyle_free(Estyle *es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -83,7 +101,7 @@
  *
  * Returns no value. Updates the display to reflect changes to @estyle.
  */
-void estyle_show(Estyle * es)
+void estyle_show(Estyle *es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -99,7 +117,7 @@
  *
  * Returns no value
  */
-void estyle_hide(Estyle * es)
+void estyle_hide(Estyle *es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -125,11 +143,13 @@
 
 	es->x = x;
 	es->y = y;
-	evas_move(es->evas, es->bit, (double)(x + (es->style ?
+	evas_move(es->evas, es->bit, 
+			(double)(x + (es->style ?
 					es->style->info->left_push : 0)),
-			(double)(y + (es->style ?
-				      es->style->info->top_push : 0)));
-	estyle_style_move(es);
+			(double)(y + (es->style ? 
+					es->style->info->top_push : 0)));
+	if (es->style)
+		estyle_style_move(es);
 }
 
 /**
@@ -149,13 +169,10 @@
 
 	if (r)
 		*r = es->color->r;
-
 	if (g)
 		*g = es->color->g;
-
 	if (b)
 		*b = es->color->b;
-
 	if (a)
 		*a = es->color->a;
 }
@@ -201,13 +218,10 @@
 
 	if (r)
 		*r = color->r;
-
 	if (g)
 		*g = color->g;
-
 	if (b)
 		*b = color->b;
-
 	if (a)
 		*a = color->a;
 }
@@ -216,7 +230,7 @@
  * estyle_set_color_db - set the color of an estyle based on color name
  * @es: the estyle to change the color
  */
-void estyle_set_color_db(Estyle * es, char *name)
+void estyle_set_color_db(Estyle *es, char *name)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
@@ -224,7 +238,24 @@
 	es->color = estyle_color_instance_db(name);
 	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
 			es->color->b, es->color->a);
-	estyle_style_set_color(es);
+	if (es->style)
+		estyle_style_set_color(es);
+}
+
+/**
+ * estyle_get_style - get the style of the specified estyle
+ * @es: the estyle to get the style of
+ *
+ * Returns the name the style or NULL if no style specified.
+ */
+char *estyle_get_style(Estyle *es)
+{
+	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+
+	if (!es->style)
+		return NULL;
+
+	return es->style->info->name;
 }
 
 /**
@@ -234,13 +265,14 @@
  *
  * Returns no value. The style of @es is changed to @name.
  */
-void estyle_set_style(Estyle * es, char *name)
+void estyle_set_style(Estyle *es, char *name)
 {
 	int layer;
 	char *text;
 	Evas_Object clip;
 
 	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER("name", name);
 
 	/*
 	 * Set the style for this particular es.
@@ -248,11 +280,9 @@
 	if (es->style)
 		estyle_style_release(es->style, es->evas);
 
-	if (!name)
+	if ((es->style = estyle_style_instance(name)) == NULL)
 		return;
 
-	es->style = estyle_style_instance(name);
-
 	text = evas_get_text_string(es->evas, es->bit);
 
 	/*
@@ -266,13 +296,14 @@
 
 	estyle_style_move(es);
 
-	clip = evas_get_clip_object(es->evas, es->bit);
-	estyle_style_set_clip(es, clip);
+	if ((clip = evas_get_clip_object(es->evas, es->bit)) != NULL)
+		estyle_style_set_clip(es, clip);
+
+	__estyle_update_position(es);
+	__estyle_update_dimensions(es);
 
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
-
-	__estyle_update(es);
 }
 
 /**
@@ -303,7 +334,7 @@
  * Returns no value. Changes the text in @es to @text and updates the display
  * if visible.
  */
-void estyle_set_text(Estyle * es, char *text)
+void estyle_set_text(Estyle *es, char *text)
 {
 	int layer;
 
@@ -313,25 +344,19 @@
 	 * Create the text if no evas object is present, otherwise just change
 	 * of the evas object.
 	 */
-	if (es->bit) {
-		evas_set_text(es->evas, es->bit, text);
+	evas_set_text(es->evas, es->bit, text);
 
-		/*
-		 * Set the text for the style bits.
-		 */
+	/*
+	 * Set the text for the style bits.
+	 */
+	if (es->style)
 		estyle_style_set_text(es);
-	}
-	else {
-		es->bit = evas_add_text(es->evas, DEFAULT_FONT,
-					 DEFAULT_SIZE, text);
-
-		/*
-		 * Draw style altering bits below the text.
-		 */
-		estyle_style_draw(es, text);
-	}
 
+	/*
+	 * Set new length and dimensions.
+	 */
 	es->length = strlen(text);
+	__estyle_update_dimensions(es);
 
 	if (es->flags & ESTYLE_BIT_VISIBLE)
 		estyle_style_show(es);
@@ -341,8 +366,6 @@
 	 */
 	layer = evas_get_layer(es->evas, es->bit);
 	estyle_set_layer(es, layer);
-
-	__estyle_update(es);
 }
 
 /**
@@ -366,10 +389,12 @@
  * Returns no value. Changes the layer of @es to @layer along with all of
  * it's style bits.
  */
-void estyle_set_layer(Estyle * es, int layer)
+void estyle_set_layer(Estyle *es, int layer)
 {
 	int index = 0;
 
+	CHECK_PARAM_POINTER("es", es);
+
 	evas_set_layer(es->evas, es->bit, layer - 1);
 
 	/*
@@ -405,7 +430,7 @@
  *
  * Returns no value. Changes the font for the specified estyle to @name.
  */
-void estyle_set_font(Estyle * es, char *font, int size)
+void estyle_set_font(Estyle *es, char *font, int size)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("font", font);
@@ -414,7 +439,7 @@
 	if (es->style)
 		estyle_style_set_font(es, font, size);
 
-	__estyle_update(es);
+	__estyle_update_dimensions(es);
 }
 
 /**
@@ -433,7 +458,8 @@
 	else
 		evas_unset_clip(es->evas, es->bit);
 
-	estyle_style_set_clip(es, clip);
+	if (es->style)
+		estyle_style_set_clip(es, clip);
 }
 
 /**
@@ -444,7 +470,7 @@
  * Returns TRUE if the bits are able to be merged, otherwise FALSE. Appends the
  * text in @es2 to the text in @es1 and destroys @es2.
  */
-int estyle_merge(Estyle * es1, Estyle * es2)
+int estyle_merge(Estyle *es1, Estyle *es2)
 {
 	char *new_text, *text1, *text2;
 
@@ -487,12 +513,14 @@
  * Returns the newly created estyle on success, NULL on failure. The old
  * estyle is updated to reflect the changes.
  */
-Estyle *estyle_split(Estyle * es, int index)
+Estyle *estyle_split(Estyle *es, int index)
 {
 	char temp;
 	char *content;
 	Estyle *new_es;
 
+	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+
 	content = strdup(evas_get_text_string(es->evas, es->bit));
 	if (strlen(content) > index)
 		return NULL;
@@ -537,13 +565,10 @@
 
 	if (x)
 		*x = es->x;
-
 	if (y)
 		*y = es->y;
-
 	if (w)
 		*w = es->w;
-
 	if (h)
 		*h = es->h;
 }
@@ -565,19 +590,22 @@
 {
 	double xx, yy, ww, hh;
 
+	CHECK_PARAM_POINTER("es", es);
+
 	evas_text_at(es->evas, es->bit, index, &xx, &yy, &ww, &hh);
 
 	if (char_x)
 		*char_x = D2I_ROUND(xx) + es->x;
-
 	if (char_y)
 		*char_y = D2I_ROUND(yy) + es->y;
-
 	if (char_w)
-		*char_w = D2I_ROUND(ww);
-
-	if (char_h)
-		*char_h = D2I_ROUND(hh);
+		*char_w = D2I_ROUND(ww) + (es->style ? 
+			es->style->info->left_push
+			+ es->style->info->right_push : 0);
+        if (char_h)
+		*char_h = D2I_ROUND(hh) + (es->style ? 
+			es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
 }
 
 /**
@@ -600,15 +628,23 @@
 	int ret;
 	double xx = 0, yy = 0, ww = 0, hh = 0;
 
+	CHECK_PARAM_POINTER("es", es);
+
 	ret = evas_text_at_position(es->evas, es->bit, (double)(x - es->x),
 			(double)(y - es->y), &xx, &yy, &ww, &hh);
 
-	*char_x = D2I_ROUND(xx) + es->x;
-	*char_y = D2I_ROUND(yy) + es->y;
-	*char_w = D2I_ROUND(ww) + (es->style ? es->style->info->left_push
-		+ es->style->info->right_push : 0);
-	*char_h = D2I_ROUND(hh) + (es->style ? es->style->info->top_push
-		+ es->style->info->bottom_push : 0);
+	if (char_x)
+		*char_x = D2I_ROUND(xx) + es->x;
+	if (char_y)
+		*char_y = D2I_ROUND(yy) + es->y;
+	if (char_w)
+		*char_w = D2I_ROUND(ww) + (es->style ? 
+			es->style->info->left_push
+			+ es->style->info->right_push : 0);
+	if (char_h)
+		*char_h = D2I_ROUND(hh) + (es->style ? 
+			es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
 
 	return ret;
 }
@@ -669,12 +705,25 @@
 }
 
 /*
- * __estyle_update - update the sizing and position of the estyle
+ * __estyle_update_position - update the position of the estyle
  */
-void __estyle_update(Estyle *es)
+void __estyle_update_position(Estyle *es)
 {
-	double x, y, w, h;
+	if (es->style)
+		evas_move(es->evas, es->bit,
+			(double)(es->x + (es->style ?
+				es->style->info->left_push : 0)),
+			(double)(es->y + (es->style ?
+				es->style->info->top_push : 0)));
+}
 
+/*
+ * __estyle_update_dimensions - update the dimensions of the estyle
+ */
+void __estyle_update_dimensions(Estyle *es)
+{
+	double x, y, w, h;
+	
 	/*
 	 * If the estyle doesn't have fixed dimensions then set it to the
 	 * geometry of it's contents.
@@ -687,15 +736,4 @@
 		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
 			+ es->style->info->bottom_push : 0);
 	}
-
-	/*
-	 * Setup the color of the evas object and move it into position.
-	 */
-	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
-			es->color->b, es->color->a);
-	evas_move(es->evas, es->bit,
-			(double)(es->x + (es->style ?
-					  es->style->info->left_push : 0)),
-			(double)(es->y + (es->style ?
-					  es->style->info->top_push : 0)));
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- estyle_style.c	27 Feb 2002 00:19:02 -0000	1.6
+++ estyle_style.c	2 Apr 2002 01:30:54 -0000	1.7
@@ -44,9 +44,10 @@
  * Returns no value. The reference to the style is released and the style is
  * freed if appropriate.
  */
-void estyle_style_release(Estyle_Style * style, Evas ev)
+void estyle_style_release(Estyle_Style *style, Evas ev)
 {
 	Evas_Object ob;
+	Evas_List ptr_list;
 
 	CHECK_PARAM_POINTER("style", style);
 
@@ -56,12 +57,14 @@
 	 * Destroy the list of evas_objects
 	 */
 	if (style->bits) {
-		ewd_list_goto_first(style->bits);
 
 		/*
 		 * Destroy all of the objects for this estyle
 		 */
-		while ((ob = ewd_list_next(style->bits))) {
+		for (ptr_list = style->bits; ptr_list; 
+			ptr_list = ptr_list->next) {
+
+			ob = ptr_list->data;
 			evas_hide(ev, ob);
 			evas_del_object(ev, ob);
 		}
@@ -69,7 +72,7 @@
 		/*
 		 * Destroy the list that held the objects
 		 */
-		ewd_list_destroy(style->bits);
+		evas_list_free(style->bits);
 	}
 
 	FREE(style);
@@ -84,6 +87,9 @@
 void estyle_style_hide(Estyle *es)
 {
 	Evas_Object ob;
+	Evas_List ptr_list;
+	
+	CHECK_PARAM_POINTER("es", es);
 
 	/*
 	 * Check if we need to hide any style bits.
@@ -91,13 +97,15 @@
 	if (!es->style || !es->style->bits)
 		return;
 
-	ewd_list_goto_first(es->style->bits);
-
 	/*
 	 * Hide each bit of the style representation
 	 */
-	while ((ob = ewd_list_next(es->style->bits)))
+	for (ptr_list = es->style->bits; ptr_list; 
+		ptr_list = ptr_list->next ) {
+
+		ob = ptr_list->data;
 		evas_hide(es->evas, ob);
+	}
 }
 
 /*
@@ -109,6 +117,9 @@
 void estyle_style_show(Estyle *es)
 {
 	Evas_Object ob;
+	Evas_List ptr_list;
+
+	CHECK_PARAM_POINTER("es", es);
 
 	/*
 	 * Check if we need to show any style bits.
@@ -116,13 +127,15 @@
 	if (!es->style || !es->style->bits)
 		return;
 
-	ewd_list_goto_first(es->style->bits);
-
 	/*
 	 * Hide each bit of the style representation
 	 */
-	while ((ob = ewd_list_next(es->style->bits)))
+	for (ptr_list = es->style->bits; ptr_list; 
+		ptr_list = ptr_list->next ) {
+
+		ob = ptr_list->data;
 		evas_show(es->evas, ob);
+	}
 }
 
 /**
@@ -166,7 +179,7 @@
  * Returns no value. Adds the evas objects for the style bits of the main text
  * layer.
  */
-void estyle_style_draw(Estyle * es, char *text)
+void estyle_style_draw(Estyle *es, char *text)
 {
 	int i = 0;
 	Estyle_Style_Info *info;
@@ -184,21 +197,12 @@
 		return;
 
 	/*
-	 * Make sure there is a list available for storing the evas objects if
-	 * one is necessary.
-	 */
-	if (!((Estyle_Style *)es->style)->bits
-			&& ewd_sheap_item(info->layers, 0)) {
-		((Estyle_Style *)es->style)->bits = ewd_list_new();
-	}
-
-	/*
 	 * Draw each of the lower layers and add their bits to the style
 	 * instance for later manipulation.
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i))) {
+	while ((layer = estyle_heap_item(info->layers, i))) {
 		ob = _estyle_style_layer_draw(layer, es, text);
-		ewd_list_append(((Estyle_Style *)es->style)->bits, ob);
+		((Estyle_Style *) es->style)->bits = evas_list_append( ((Estyle_Style *)es->style)->bits, ob );
 		i++;
 	}
 
@@ -220,6 +224,7 @@
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 	Evas_Object ob;
+	Evas_List ptr_list;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
@@ -232,22 +237,16 @@
 		return 0;
 
 	/*
-	 * Make sure there is a list available for storing the evas objects if
-	 * one is necessary.
-	 */
-	if (!((Estyle_Style *)es->style)->bits
-			&& ewd_sheap_item(info->layers, 0)) {
-		((Estyle_Style *)es->style)->bits = ewd_list_new();
-	}
-
-	/*
 	 * Move all of the lower layers bits into the correct layer
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i)) && layer->stack < 0) {
-		ewd_list_goto_first(es->style->bits);
+	while ((layer = estyle_heap_item(info->layers, i)) && layer->stack < 0) {
 
-		while ((ob = ewd_list_next(es->style->bits)))
+		for (ptr_list = es->style->bits; ptr_list; 
+			ptr_list = ptr_list->next ) {
+
+			ob = ptr_list->data;
 			evas_set_layer(es->evas, ob, l);
+		}
 		i++;
 	}
 
@@ -263,13 +262,14 @@
  * Returns no value. Adds the evas objects for the style bits that are above
  * the main text layer.
  */
-int estyle_style_set_layer_upper(Estyle * es, int l, int start)
+int estyle_style_set_layer_upper(Estyle *es, int l, int start)
 {
 	char *text;
 	int i = start;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 	Evas_Object ob;
+	Evas_List ptr_list;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
@@ -289,11 +289,15 @@
 	/*
 	 * Move all of the upper bits into the correct layer
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i)) && layer->stack) {
-		ewd_list_goto_first(es->style->bits);
+	while ((layer = estyle_heap_item(info->layers, i)) && layer->stack) {
+
+		for (ptr_list = es->style->bits; ptr_list; 
+			ptr_list = ptr_list->next ) {
 
-		while ((ob = ewd_list_next(es->style->bits)))
+			ob = ptr_list->data;
 			evas_set_layer(es->evas, ob, l);
+		}
+
 		i++;
 	}
 
@@ -311,6 +315,7 @@
 {
 	int i;
 	Evas_Object ob;
+	Evas_List ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -324,7 +329,7 @@
 	 * layout.
 	 */
 	info = (Estyle_Style_Info *)es->style->info;
-	ewd_list_goto_first(es->style->bits);
+	ptr_list = es->style->bits;
 	i = 0;
 
 	/*
@@ -333,12 +338,17 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i++)) &&
-			(ob = ewd_list_next(es->style->bits)))
+	while (ptr_list && 
+		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(ob = ptr_list->data) != NULL) {
+		
 		evas_move(es->evas, ob, (double)(es->x + layer->x_offset +
 					info->left_push),
-				(double)(es->y + layer->y_offset +
-					 info->right_push));
+					(double)(es->y + layer->y_offset +
+					info->right_push));
+
+		ptr_list = ptr_list->next;
+	}
 }
 
 /*
@@ -352,6 +362,7 @@
 {
 	int i;
 	Evas_Object sob;
+	Evas_List ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -371,7 +382,8 @@
 	if (!es->style->bits)
 		return;
 
-	ewd_list_goto_first(es->style->bits);
+	ptr_list = es->style->bits;
+
 	i = 0;
 
 	/*
@@ -380,8 +392,10 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i++)) &&
-			(sob = ewd_list_next(es->style->bits))) {
+	while (ptr_list &&
+		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
+
 		if (layer->relative_color) {
 			int r, g, b, a;
 
@@ -392,6 +406,8 @@
 
 			evas_set_color(es->evas, sob, r, g, b, a);
 		}
+
+		ptr_list = ptr_list->next;
 	}
 }
 
@@ -405,21 +421,24 @@
 {
 	int i;
 	Evas_Object sob;
+	Evas_List ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("font", font);
 
+	if (!es->style || !es->style->bits)
+		return;
+
 	/*
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
 	info = (Estyle_Style_Info *)es->style->info;
 
-	if (!es->style->bits)
-		return;
-	ewd_list_goto_first(es->style->bits);
+	ptr_list = es->style->bits;
+	
 	i = 0;
 
 	/*
@@ -428,9 +447,13 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i++)) &&
-			(sob = ewd_list_next(es->style->bits)))
+	while (ptr_list &&
+		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
+
 		evas_set_font(es->evas, sob, font, size);
+		ptr_list = ptr_list->next;
+	}
 }
 
 /*
@@ -444,11 +467,15 @@
 	int i;
 	char *text;
 	Evas_Object sob;
+	Evas_List ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
 	CHECK_PARAM_POINTER("es", es);
 
+	if (!es->style || !es->style->bits)
+		return;
+
 	/*
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
@@ -459,10 +486,8 @@
 
 	info = (Estyle_Style_Info *)es->style->info;
 
-	if (!es->style->bits)
-		return;
+	ptr_list = es->style->bits;
 
-	ewd_list_goto_first(es->style->bits);
 	i = 0;
 
 	/*
@@ -471,9 +496,13 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i++)) &&
-			(sob = ewd_list_next(es->style->bits)))
+	while (ptr_list &&
+		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
+			
 		evas_set_text(es->evas, sob, text);
+		ptr_list = ptr_list->next;
+	}
 }
 
 /*
@@ -488,20 +517,23 @@
 {
 	int i;
 	Evas_Object sob;
+	Evas_List ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
 	CHECK_PARAM_POINTER("es", es);
 
+	if (!es->style || !es->style->bits)
+		return;
+
 	/*
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
 	info = (Estyle_Style_Info *)es->style->info;
+	
+	ptr_list = es->style->bits;
 
-	if (!es->style->bits)
-		return;
-	ewd_list_goto_first(es->style->bits);
 	i = 0;
 
 	/*
@@ -510,12 +542,15 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while ((layer = ewd_sheap_item(info->layers, i++)) &&
-			(sob = ewd_list_next(es->style->bits))) {
+	while (ptr_list &&
+		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
 		if (!ob)
 			evas_unset_clip(es->evas, sob);
 		else
 			evas_set_clip(es->evas, sob, ob);
+
+		ptr_list = ptr_list->next;
 	}
 }
 
@@ -529,6 +564,8 @@
 {
 	Estyle_Style_Info *found;
 
+	CHECK_PARAM_POINTER_RETURN("name", name, NULL);
+
 	if (!styles)
 		styles = ewd_hash_new(ewd_str_hash, ewd_str_compare);
 
@@ -576,7 +613,7 @@
 
 		ewd_hash_remove(styles, info->name);
 		if (info->layers)
-			ewd_sheap_destroy(info->layers);
+			estyle_heap_destroy(info->layers);
 		ewd_string_release(info->name);
 
 		FREE(info);
@@ -588,8 +625,8 @@
  * @layer: the layer to be drawn
  * @es: used to get info about the evas for drawing
  */
-static Evas_Object _estyle_style_layer_draw(Estyle_Style_Layer * layer,
-		Estyle * es, char *text)
+static Evas_Object _estyle_style_layer_draw(Estyle_Style_Layer *layer,
+		Estyle *es, char *text)
 {
 	int r, g, b, a;
 	char *font;
@@ -690,7 +727,7 @@
 		return;
 	/*
 	   if (info->layers)
-	   ewd_sheap_destroy(info->layers);
+	   estyle_heap_destroy(info->layers);
 	 */
 
 	/*
@@ -705,7 +742,7 @@
 		return;
 	}
 
-	info->layers = ewd_sheap_new(_estyle_style_stack_compare, layers);
+	info->layers = estyle_heap_new(_estyle_style_stack_compare, layers);
 
 	/*
 	 * Read in each layer
@@ -757,7 +794,7 @@
 		else if (-layer->y_offset > info->top_push)
 			info->top_push = -layer->y_offset;
 
-		ewd_sheap_insert(info->layers, layer);
+		estyle_heap_insert(info->layers, layer);
 	}
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
      Tag: SPLIT
	estyle.c 


Log Message:
Fixed some problems in the splitting function caught by Peter Kjellerstedt.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -3 -r1.10.2.5 -r1.10.2.6
--- estyle.c	14 Apr 2002 21:47:52 -0000	1.10.2.5
+++ estyle.c	15 Apr 2002 14:13:11 -0000	1.10.2.6
@@ -532,8 +532,8 @@
 
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
-	content = strdup(evas_get_text_string(es->evas, es->bit));
-	if (index > strlen(content))
+	content = estyle_get_text(es);
+	if (!content || index > strlen(content))
 		return NULL;
 
 	temp = content[index];
@@ -542,6 +542,7 @@
 
 	content[index] = temp;
 	new_es = estyle_new(es->evas, &(content[index]), es->style->info->name);
+	FREE(content);
 
 	return new_es;
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h estyle.c estyle_color.c 
	estyle_color.h estyle_heap.c estyle_heap.h estyle_style.c 
	estyle_style.h 


Log Message:
Synchronize with SPLIT.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Estyle.h	2 Apr 2002 01:30:53 -0000	1.8
+++ Estyle.h	15 Apr 2002 18:36:55 -0000	1.9
@@ -5,17 +5,6 @@
 #include <Edb.h>
 #include <Evas.h>
 
-/*
- * Simple alignment bitfield
- */
-enum _estyle_alignment {
-	ESTYLE_ALIGN_CENTER = 0,
-	ESTYLE_ALIGN_LEFT = 1,
-	ESTYLE_ALIGN_RIGHT = 2,
-	ESTYLE_ALIGN_TOP = 4,
-	ESTYLE_ALIGN_BOTTOM = 8
-};
-typedef enum _estyle_alignment Estyle_Alignment;
 
 /*
  * The estyle holds all information necessary for display and layout of the text
@@ -47,12 +36,14 @@
  */
 void estyle_move(Estyle *es, int x, int y);
 
+Evas_Object estyle_get_clip(Estyle *es);
 void estyle_set_clip(Estyle *es, Evas_Object clip);
 
 char *estyle_get_text(Estyle * es);
 void estyle_set_text(Estyle * es, char *text);
 
 char *estyle_get_font(Estyle *es);
+int estyle_get_font_size(Estyle *es);
 void estyle_set_font(Estyle * es, char *name, int size);
 
 int estyle_get_layer(Estyle * es);
@@ -61,8 +52,8 @@
 char *estyle_get_style(Estyle * es);
 void estyle_set_style(Estyle * es, char *name);
 
-void estyle_set_color(Estyle * es, int r, int g, int b, int a);
 void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a);
+void estyle_set_color(Estyle * es, int r, int g, int b, int a);
 
 void estyle_lookup_color_db(char *name, int *r, int *g, int *b, int *a);
 void estyle_set_color_db(Estyle * es, char *name);
@@ -87,11 +78,8 @@
 /*
  * Joining and splitting estyles.
  */
-Estyle *estyle_split(Estyle * es, int index);
-int estyle_merge(Estyle * es1, Estyle * es2);
-
-#define ESTYLE_HASH_COLOR(r, g, b, a) ((r << 24) | (g << 16) | (b << 8) | a)
-
+Estyle *estyle_split(Estyle *es, int index);
+int estyle_merge(Estyle *es1, Estyle *es2);
 
 
 #ifdef __cplusplus
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Estyle_private.h	2 Apr 2002 01:30:53 -0000	1.6
+++ Estyle_private.h	15 Apr 2002 18:36:55 -0000	1.7
@@ -3,6 +3,8 @@
 
 #include "Estyle.h"
 #include "estyle_heap.h"
+#include "estyle_color.h"
+#include "estyle_style.h"
 #include <Edb.h>
 
 typedef enum _estyle_bit_flags Estyle_Bit_Flags;
@@ -10,33 +12,6 @@
 	ESTYLE_BIT_FIXED = 1,
 	ESTYLE_BIT_VISIBLE = 2,
 };
-
-/*
- * The info structure keeps the important information about the style, but not
- * the bits used to display the text.
- */
-typedef struct _estyle_style_info Estyle_Style_Info;
-struct _estyle_style_info {
-	char *name;
-	E_DB_File *style_db;
-	Estyle_Heap *layers;
-	int left_push, right_push, top_push, bottom_push;
-
-	int references;
-};
-
-/*
- * The style of a text keeps a reference to style info for deciding how to
- * alter the text, and a list of the bits that are created by the style.
- */
-typedef struct _estyle_style Estyle_Style;
-struct _estyle_style {
-	Estyle_Style_Info *info;
-	Evas_List bits;
-};
-
-#include "estyle_style.h"
-#include "estyle_color.h"
 
 struct _estyle {
 	/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- estyle.c	2 Apr 2002 01:30:53 -0000	1.13
+++ estyle.c	15 Apr 2002 18:36:55 -0000	1.14
@@ -30,8 +30,8 @@
 	 * Check to see if the internal data structures has been completed.
 	 */
 	if (!estyle_setup_complete) {
-		estyle_color_init();
-		estyle_style_add_path(PACKAGE_DATA_DIR "/styles");
+		_estyle_color_init();
+		_estyle_style_add_path(PACKAGE_DATA_DIR "/styles");
 		estyle_setup_complete = 1;
 	}
 
@@ -51,16 +51,16 @@
 	/*
 	 * Set some default colors, font, and font size.
 	 */
-	es->color = estyle_color_instance(255, 255, 255, 255);
+	es->color = _estyle_color_instance(255, 255, 255, 255);
 
 	/*
 	 * Create the style and set the default color.
 	 */
 	if (style)
-		es->style = estyle_style_instance(style);
+		es->style = _estyle_style_instance(style);
 	estyle_set_color(es, 255, 255, 255, 255);
 	if (es->style)
-		estyle_style_draw(es, text);
+		_estyle_style_draw(es, text);
 
 	/*
 	 * Set length and dimensions.
@@ -71,7 +71,7 @@
 	/*
 	 * move to (0,0) by default. (is this necessary? -redalb)
 	 */
-	estyle_move(es, 0, 0);
+	/* estyle_move(es, 0, 0); */
 
 	return es;
 }
@@ -90,7 +90,7 @@
 		evas_del_object(es->evas, es->bit);
 
 	if (es->style)
-		estyle_style_release(es->style, es->evas);
+		_estyle_style_release(es->style, es->evas);
 
 	FREE(es);
 }
@@ -106,7 +106,7 @@
 	CHECK_PARAM_POINTER("es", es);
 
 	es->flags |= ESTYLE_BIT_VISIBLE;
-	estyle_style_show(es);
+	_estyle_style_show(es);
 	evas_show(es->evas, es->bit);
 }
 
@@ -122,7 +122,7 @@
 	CHECK_PARAM_POINTER("es", es);
 
 	es->flags &= ~ESTYLE_BIT_VISIBLE;
-	estyle_style_hide(es);
+	_estyle_style_hide(es);
 	evas_hide(es->evas, es->bit);
 }
 
@@ -149,7 +149,7 @@
 			(double)(y + (es->style ? 
 					es->style->info->top_push : 0)));
 	if (es->style)
-		estyle_style_move(es);
+		_estyle_style_move(es);
 }
 
 /**
@@ -192,9 +192,9 @@
 {
 	CHECK_PARAM_POINTER("es", es);
 
-	es->color = estyle_color_instance(r, g, b, a);
+	es->color = _estyle_color_instance(r, g, b, a);
 	evas_set_color(es->evas, es->bit, r, g, b, a);
-	estyle_style_set_color(es);
+	_estyle_style_set_color(es);
 }
 
 /**
@@ -214,7 +214,7 @@
 
 	CHECK_PARAM_POINTER("name", name);
 
-	color = estyle_color_instance_db(name);
+	color = _estyle_color_instance_db(name);
 
 	if (r)
 		*r = color->r;
@@ -235,11 +235,11 @@
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
 
-	es->color = estyle_color_instance_db(name);
+	es->color = _estyle_color_instance_db(name);
 	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
 			es->color->b, es->color->a);
 	if (es->style)
-		estyle_style_set_color(es);
+		_estyle_style_set_color(es);
 }
 
 /**
@@ -278,9 +278,9 @@
 	 * Set the style for this particular es.
 	 */
 	if (es->style)
-		estyle_style_release(es->style, es->evas);
+		_estyle_style_release(es->style, es->evas);
 
-	if ((es->style = estyle_style_instance(name)) == NULL)
+	if ((es->style = _estyle_style_instance(name)) == NULL)
 		return;
 
 	text = evas_get_text_string(es->evas, es->bit);
@@ -289,21 +289,21 @@
 	 * Draw the new style bits and set the correct layer for all of the
 	 * estyle contents. Also clip the contents to the clip rectangle.
 	 */
-	estyle_style_draw(es, text);
+	_estyle_style_draw(es, text);
 
 	layer = evas_get_layer(es->evas, es->bit);
 	estyle_set_layer(es, layer);
 
-	estyle_style_move(es);
+	_estyle_style_move(es);
 
 	if ((clip = evas_get_clip_object(es->evas, es->bit)) != NULL)
-		estyle_style_set_clip(es, clip);
+		_estyle_style_set_clip(es, clip);
 
 	__estyle_update_position(es);
 	__estyle_update_dimensions(es);
 
 	if (es->flags & ESTYLE_BIT_VISIBLE)
-		estyle_style_show(es);
+		_estyle_style_show(es);
 }
 
 /**
@@ -336,36 +336,21 @@
  */
 void estyle_set_text(Estyle *es, char *text)
 {
-	int layer;
-
 	CHECK_PARAM_POINTER("es", es);
 
-	/*
-	 * Create the text if no evas object is present, otherwise just change
-	 * of the evas object.
-	 */
 	evas_set_text(es->evas, es->bit, text);
 
 	/*
 	 * Set the text for the style bits.
 	 */
 	if (es->style)
-		estyle_style_set_text(es);
+		_estyle_style_set_text(es);
 
 	/*
 	 * Set new length and dimensions.
 	 */
 	es->length = strlen(text);
 	__estyle_update_dimensions(es);
-
-	if (es->flags & ESTYLE_BIT_VISIBLE)
-		estyle_style_show(es);
-
-	/*
-	 * Must adjust the layer of the text to ensure proper style stacking.
-	 */
-	layer = evas_get_layer(es->evas, es->bit);
-	estyle_set_layer(es, layer);
 }
 
 /**
@@ -376,7 +361,7 @@
  */
 int estyle_get_layer(Estyle *es)
 {
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
 
 	return evas_get_layer(es->evas, es->bit);
 }
@@ -402,12 +387,12 @@
 	 * ensure the relative ordering remains the same.
 	 */
 	if (es->style)
-		index = estyle_style_set_layer_lower(es, layer);
+		index = _estyle_style_set_layer_lower(es, layer);
 
 	evas_set_layer(es->evas, es->bit, layer);
 
 	if (es->style)
-		estyle_style_set_layer_upper(es, layer, index);
+		_estyle_style_set_layer_upper(es, layer, index);
 }
 
 /**
@@ -424,6 +409,19 @@
 }
 
 /**
+ * estyle_get_font_size - retrieve the font size
+ * @es: the estyle to get the font size from
+ *
+ * Returns the font size (an int) or FALSE if an error occurs.
+ */  
+int estyle_get_font_size(Estyle *es)
+{
+	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
+
+	return evas_get_text_size(es->evas, es->bit);
+}
+
+/**
  * estyle_set_font - change the font used for the specified estyle
  * @es: the estyle to change fonts
  * @font: the name of the font to use for the estyle
@@ -437,12 +435,25 @@
 
 	evas_set_font(es->evas, es->bit, font, size);
 	if (es->style)
-		estyle_style_set_font(es, font, size);
+		_estyle_style_set_font(es, font, size);
 
 	__estyle_update_dimensions(es);
 }
 
 /**
+ * estyle_get_clip - get the clip box of an estyle
+ * @es: the estyle to get the clip box from
+ *
+ * Returns an Evas_Object or NULL if no clip box specified.
+ */
+Evas_Object estyle_get_clip(Estyle *es)
+{
+	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+
+	return evas_get_clip_object(es->evas, es->bit);
+} 
+
+/**
  * estyle_set_clip - set the clip box for the estyle
  * @es: the estyle to set the clip box
  * @clip: the clip box to set
@@ -459,7 +470,7 @@
 		evas_unset_clip(es->evas, es->bit);
 
 	if (es->style)
-		estyle_style_set_clip(es, clip);
+		_estyle_style_set_clip(es, clip);
 }
 
 /**
@@ -521,16 +532,17 @@
 
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
-	content = strdup(evas_get_text_string(es->evas, es->bit));
-	if (strlen(content) > index)
+	content = estyle_get_text(es);
+	if (!content || index > strlen(content))
 		return NULL;
 
 	temp = content[index];
 	content[index] = '\0';
-	estyle_set_text(es->bit, content);
+	estyle_set_text(es, content);
 
 	content[index] = temp;
 	new_es = estyle_new(es->evas, &(content[index]), es->style->info->name);
+	FREE(content);
 
 	return new_es;
 }
@@ -543,7 +555,7 @@
  */
 inline int estyle_length(Estyle *es)
 {
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
 
 	return es->length;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle_color.c	29 Jan 2002 21:26:45 -0000	1.3
+++ estyle_color.c	15 Apr 2002 18:36:55 -0000	1.4
@@ -1,4 +1,4 @@
-#include "../estyle-config.h"
+#include "estyle-config.h"
 #include "Estyle_private.h"
 
 static Ewd_Hash *color_table = NULL;
@@ -8,7 +8,7 @@
 static int __estyle_color_cmp(void *c1, void *c2);
 
 /**
- * estyle_color_instance - get a pointer to a color structure
+ * _estyle_color_instance - get a pointer to a color structure
  * @r: the red value of the color
  * @g: the green value of the color
  * @b: the blue value of the color
@@ -17,7 +17,7 @@
  * Returns a pointer to the color structure for use by contexts, NULL returned
  * on failure.
  */
-Estyle_Color *estyle_color_instance(int r, int g, int b, int a)
+Estyle_Color *_estyle_color_instance(int r, int g, int b, int a)
 {
 	unsigned int value;
 	Estyle_Color *ret;
@@ -40,21 +40,19 @@
 }
 
 /**
- * estyle_color_instance_db - get a pointer to a color structure by name
+ * _estyle_color_instance_db - get a pointer to a color structure by name
  * @color: the name of the color to retrieve from the colors dbs
  *
  * Returns a pointer to the color structure for use by contexts, NULL returned
  * on failure.
  */
-Estyle_Color *estyle_color_instance_db(char *color)
+Estyle_Color *_estyle_color_instance_db(char *color)
 {
 	int r, g, b, a;
 	unsigned int value;
 	char key[PATH_MAX];
 	Estyle_Color *found;
 
-	CHECK_PARAM_POINTER_RETURN("color", color, NULL);
-
 	/*
 	 * Retrieve the red value
 	 */
@@ -110,7 +108,7 @@
  *
  * Returns no value. Sets up necessary internal variables for color handling.
  */
-void estyle_color_init()
+void _estyle_color_init()
 {
 	char *home;
 	char user_path[PATH_MAX];
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle_color.h	26 Jan 2002 07:37:25 -0000	1.1.1.1
+++ estyle_color.h	15 Apr 2002 18:36:55 -0000	1.2
@@ -9,8 +9,11 @@
 	int a, r, g, b;
 };
 
-Estyle_Color *estyle_color_instance(int r, int g, int b, int a);
-Estyle_Color *estyle_color_instance_db(char *color);
-void estyle_color_init();
+Estyle_Color *_estyle_color_instance(int r, int g, int b, int a);
+Estyle_Color *_estyle_color_instance_db(char *color);
+void _estyle_color_init();
+
+#define ESTYLE_HASH_COLOR(r, g, b, a) ((r << 24) | (g << 16) | (b << 8) | a)
+
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle_heap.c	2 Apr 2002 01:30:54 -0000	1.2
+++ estyle_heap.c	15 Apr 2002 18:36:55 -0000	1.3
@@ -1,17 +1,17 @@
 #include "Estyle_private.h"
 
-static void _estyle_heap_heapify(Estyle_Heap *heap, int i);
-static void _estyle_heap_update_data(Estyle_Heap *heap);
+static void __estyle_heap_heapify(Estyle_Heap *heap, int i);
+static void __estyle_heap_update_data(Estyle_Heap *heap);
 
 /**
- * estyle_heap_new - allocate and initialize a new binary heap
+ * _estyle_heap_new - allocate and initialize a new binary heap
  * @compare: the function for comparing keys, NULL for direct comparison
  * @size: the number of elements to allow in the heap
  *
  * Returns a pointer to the newly allocated binary heap on success, NULL on
  * failure.
  */
-Estyle_Heap *estyle_heap_new(Ewd_Compare_Cb compare, int size)
+Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size)
 {
 	Estyle_Heap *heap = NULL;
 
@@ -20,7 +20,7 @@
 		return NULL;
 	memset(heap, 0, sizeof(Estyle_Heap));
 
-	if (!estyle_heap_init(heap, compare, size)) {
+	if (!_estyle_heap_init(heap, compare, size)) {
 		FREE(heap);
 		return NULL;
 	}
@@ -29,17 +29,15 @@
 }
 
 /**
- * estyle_heap_init - initialize a binary heap to default values
+ * _estyle_heap_init - initialize a binary heap to default values
  * @heap: the heap to initialize
  * @compare: the function for comparing keys, NULL for direct comparison
  * @size: the number of elements to allow in the heap
  *
  * Returns TRUE on success, FALSE on failure
  */
-int estyle_heap_init(Estyle_Heap *heap, Ewd_Compare_Cb compare, int size)
+int _estyle_heap_init(Estyle_Heap *heap, Ewd_Compare_Cb compare, int size)
 {
-	CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
-
 	heap->space = size;
 	if (!compare)
 		heap->compare = ewd_direct_compare;
@@ -56,16 +54,14 @@
 }
 
 /**
- * estyle_heap_destroy - free up the memory used by the heap
+ * _estyle_heap_destroy - free up the memory used by the heap
  * @heap: the heap to be freed
  *
  * Returns no value. Free's the memory used by @heap, calls the destroy
  * function on each data item if necessary.
  */
-void estyle_heap_destroy(Estyle_Heap *heap)
+void _estyle_heap_destroy(Estyle_Heap *heap)
 {
-	CHECK_PARAM_POINTER("heap", heap);
-
 	/*
 	 * FIXME: Need to setup destructor callbacks for this class.
 	 */
@@ -75,22 +71,20 @@
 }
 
 /**
- * estyle_heap_insert - insert new data into the heap
+ * _estyle_heap_insert - insert new data into the heap
  * @heap: the heap to insert @data
  * @data: the data to add to @heap
  *
  * Returns TRUE on success, NULL on failure. Increases the size of the heap if
  * it becomes larger than available space.
  */
-int estyle_heap_insert(Estyle_Heap *heap, void *data)
+int _estyle_heap_insert(Estyle_Heap *heap, void *data)
 {
 	int i;
 	void *temp;
 	int parent;
 	int position;
 
-	CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
-
 	/*
 	 * Increase the size of the allocated data area if there isn't enough
 	 * space available to add this data
@@ -164,13 +158,13 @@
 }
 
 /**
- * estyle_heap_extract - extract the item at the top of the heap
+ * _estyle_heap_extract - extract the item at the top of the heap
  * @heap: the heap to remove the top item
  *
  * Returns the top item of the heap on success, NULL on failure. The extract
  * function maintains the heap properties after the extract.
  */
-void *estyle_heap_extract(Estyle_Heap *heap)
+void *_estyle_heap_extract(Estyle_Heap *heap)
 {
 	void *extreme;
 
@@ -183,19 +177,19 @@
 	heap->size--;
 	heap->data[0] = heap->data[heap->size];
 
-	_estyle_heap_heapify(heap, 1);
+	__estyle_heap_heapify(heap, 1);
 
 	return extreme;
 }
 
 /**
- * estyle_heap_extreme - examine the item at the top of the heap
+ * _estyle_heap_extreme - examine the item at the top of the heap
  * @heap: the heap to examine the top item
  *
  * Returns the top item of the heap on success, NULL on failure. The function
  * does not alter the heap.
  */
-void *estyle_heap_extreme(Estyle_Heap *heap)
+void *_estyle_heap_extreme(Estyle_Heap *heap)
 {
 	if (heap->size < 1)
 		return NULL;
@@ -204,7 +198,7 @@
 }
 
 /**
- * estyle_heap_change - change the value of the specified item in the heap
+ * _estyle_heap_change - change the value of the specified item in the heap
  * @heap: the heap to search for the item to change
  * @item: the item in the heap to change
  * @newval: the new value assigned to the item in the heap
@@ -213,12 +207,10 @@
  * data since it must be passed in, so the caller can perform the free if
  * desired.
  */
-int estyle_heap_change(Estyle_Heap *heap, void *item, void *newval)
+int _estyle_heap_change(Estyle_Heap *heap, void *item, void *newval)
 {
 	int i;
 
-	CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
-
 	for (i = 0; i < heap->size && heap->data[i] != item; heap++);
 
 	if (i < heap->size)
@@ -229,71 +221,65 @@
 	/*
 	 * FIXME: This is not the correct procedure when a change occurs.
 	 */
-	_estyle_heap_heapify(heap, 1);
+	__estyle_heap_heapify(heap, 1);
 
 	return TRUE;
 }
 
 /**
- * estyle_heap_set_compare - change the comparison function for the heap
+ * _estyle_heap_set_compare - change the comparison function for the heap
  * @heap: the heap to change comparison function
  * @compare: the new function for comparing nodes
  *
  * Returns TRUE on success, FALSE on failure. The comparison function is
  * changed to @compare and the heap is heapified by the new comparison.
  */
-int estyle_heap_set_compare(Estyle_Heap *heap, Ewd_Compare_Cb compare)
+int _estyle_heap_set_compare(Estyle_Heap *heap, Ewd_Compare_Cb compare)
 {
-	CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
-
 	if (!compare)
 		heap->compare = ewd_direct_compare;
 	else
 		heap->compare = compare;
 
-	_estyle_heap_update_data(heap);
+	__estyle_heap_update_data(heap);
 
 	return TRUE;
 }
 
 /**
- * estyle_heap_set_order - change the order of the heap
+ * _estyle_heap_set_order - change the order of the heap
  * @heap: the heap to change the order
  * @order: the new order of the heap
  *
  * Returns no value. Changes the heap order of @heap and re-heapifies the data
  * to this new order. The default order is a min heap.
  */
-void estyle_heap_set_order(Estyle_Heap *heap, char order)
+void _estyle_heap_set_order(Estyle_Heap *heap, char order)
 {
-	CHECK_PARAM_POINTER("heap", heap);
-
 	heap->order = order;
 
-	_estyle_heap_update_data(heap);
+	__estyle_heap_update_data(heap);
 }
 
 /**
- * estyle_heap_sort - sort the data in the heap
+ * _estyle_heap_sort - sort the data in the heap
  * @heap: the heap to be sorted
  *
  * Returns no value. Sorts the data in the heap into the order that is used
  * for the heap's data.
  */
-void estyle_heap_sort(Estyle_Heap *heap)
+void _estyle_heap_sort(Estyle_Heap *heap)
 {
 	int i = 0;
 	void **new_data;
 
-	CHECK_PARAM_POINTER("heap", heap);
-
 	new_data = (void **)malloc(heap->size * sizeof(void *));
 
 	/*
 	 * Extract the heap and insert into the new data array in order.
 	 */
 	while (heap->size > 0)
-		new_data[i++] = estyle_heap_extract(heap);
+		new_data[i++] = _estyle_heap_extract(heap);
 
 	/*
 	 * Free the old data array and update the heap with the new data, also
@@ -306,14 +292,14 @@
 }
 
 /*
- * estyle_heap_item - access the item at the ith position in the heap
+ * _estyle_heap_item - access the item at the ith position in the heap
  * @heap: the heap to access the internal data
  * @i: the index of the data within the heap
  *
  * Returns the data located at the ith position within @heap on success, NULL
  * on failure. The data is guaranteed to be in sorted order.
  */
-inline void *estyle_heap_item(Estyle_Heap *heap, int i)
+inline void *_estyle_heap_item(Estyle_Heap *heap, int i)
 {
 	if (i >= heap->size)
 		return NULL;
@@ -322,19 +308,19 @@
 	 * Make sure the data is sorted so we return the correct value.
 	 */
 	if (!heap->sorted)
-		estyle_heap_sort(heap);
+		_estyle_heap_sort(heap);
 
 	return heap->data[i];
 }
 
 /*
- * _estyle_heap_heapify - regain the heap properties starting at position i
+ * __estyle_heap_heapify - regain the heap properties starting at position i
  * @heap: the heap to regain heap properties
  * @i: the position to start heapifying
  *
  * Returns no value.
  */
-static void _estyle_heap_heapify(Estyle_Heap *heap, int i)
+static void __estyle_heap_heapify(Estyle_Heap *heap, int i)
 {
 	int extreme;
 	int left = LEFT(i);
@@ -374,11 +360,11 @@
 		heap->data[extreme - 1] = heap->data[i - 1];
 		heap->data[i - 1] = temp;
 
-		_estyle_heap_heapify(heap, extreme);
+		__estyle_heap_heapify(heap, extreme);
 	}
 }
 
-static void _estyle_heap_update_data(Estyle_Heap *heap)
+static void __estyle_heap_update_data(Estyle_Heap *heap)
 {
 	int i, old_size;
 	void **data;
@@ -396,7 +382,7 @@
 	heap->data = malloc(heap->space * sizeof(void *));
 
 	for (i = 0; i < old_size; i++)
-		estyle_heap_insert(heap, data[i]);
+		_estyle_heap_insert(heap, data[i]);
 
 	FREE(data);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- estyle_heap.h	2 Apr 2002 01:30:54 -0000	1.2
+++ estyle_heap.h	15 Apr 2002 18:36:55 -0000	1.3
@@ -23,16 +23,16 @@
 	Ewd_Compare_Cb compare;
 };
 
-Estyle_Heap *estyle_heap_new(Ewd_Compare_Cb compare, int size);
-void estyle_heap_destroy(Estyle_Heap *heap);
-int estyle_heap_init(Estyle_Heap *heap, Ewd_Compare_Cb compare, int size);
-int estyle_heap_insert(Estyle_Heap *heap, void *data);
-void *estyle_heap_extract(Estyle_Heap *heap);
-void *estyle_heap_extreme(Estyle_Heap *heap);
-int estyle_heap_change(Estyle_Heap *heap, void *item, void *newval);
-void estyle_heap_destroy(Estyle_Heap *heap);
-void estyle_heap_sort(Estyle_Heap *heap);
+Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size);
+void _estyle_heap_destroy(Estyle_Heap *heap);
+int _estyle_heap_init(Estyle_Heap *heap, Ewd_Compare_Cb compare, int size);
+int _estyle_heap_insert(Estyle_Heap *heap, void *data);
+void *_estyle_heap_extract(Estyle_Heap *heap);
+void *_estyle_heap_extreme(Estyle_Heap *heap);
+int _estyle_heap_change(Estyle_Heap *heap, void *item, void *newval);
+void _estyle_heap_destroy(Estyle_Heap *heap);
+void _estyle_heap_sort(Estyle_Heap *heap);
 
-inline void *estyle_heap_item(Estyle_Heap *heap, int i);
+inline void *_estyle_heap_item(Estyle_Heap *heap, int i);
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- estyle_style.c	2 Apr 2002 01:30:54 -0000	1.7
+++ estyle_style.c	15 Apr 2002 18:36:56 -0000	1.8
@@ -1,3 +1,4 @@
+#include "estyle-config.h"
 #include "Estyle_private.h"
 
 #define SET_REL_COLOR(a, b) ((a + b) > 255 ? 255 : ((a + b) < 0 ? 0 : a + b))
@@ -5,20 +6,20 @@
 static Ewd_Hash *styles = NULL;
 static int style_path = 0;
 
-static void _estyle_style_read(Estyle_Style_Info * info);
-static void _estyle_style_info_load(Estyle_Style_Info * info);
-static Evas_Object _estyle_style_layer_draw(Estyle_Style_Layer * layer,
+static void __estyle_style_read(Estyle_Style_Info * info);
+static void __estyle_style_info_load(Estyle_Style_Info * info);
+static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer * layer,
 		Estyle * es, char *text);
-static int _estyle_style_stack_compare(void *style1, void *style2);
+static int __estyle_style_stack_compare(void *style1, void *style2);
 
 /*
- * estyle_style_instance - get an instance of a style
+ * _estyle_style_instance - get an instance of a style
  * @name: the name of the style to get an instance
  *
  * Returns a pointer to the style instance found and increments the reference
  * count to that style.
  */
-Estyle_Style *estyle_style_instance(char *name)
+Estyle_Style *_estyle_style_instance(char *name)
 {
 	Estyle_Style *ret;
 	Estyle_Style_Info *found;
@@ -29,7 +30,7 @@
 	 * Get a reference to the info and create the instance to be
 	 * returned to the calling function.
 	 */
-	found = estyle_style_info_reference(name);
+	found = _estyle_style_info_reference(name);
 	ret = (Estyle_Style *) malloc(sizeof(Estyle_Style));
 	memset(ret, 0, sizeof(Estyle_Style));
 	ret->info = found;
@@ -38,20 +39,20 @@
 }
 
 /*
- * estyle_style_release - release an instance of a style
+ * _estyle_style_release - release an instance of a style
  * @style: a pointer to a style instance that will be released
  *
  * Returns no value. The reference to the style is released and the style is
  * freed if appropriate.
  */
-void estyle_style_release(Estyle_Style *style, Evas ev)
+void _estyle_style_release(Estyle_Style *style, Evas ev)
 {
 	Evas_Object ob;
 	Evas_List ptr_list;
 
 	CHECK_PARAM_POINTER("style", style);
 
-	estyle_style_info_dereference((Estyle_Style_Info *)style->info);
+	_estyle_style_info_dereference((Estyle_Style_Info *)style->info);
 
 	/*
 	 * Destroy the list of evas_objects
@@ -79,17 +80,15 @@
 }
 
 /*
- * estyle_style_hide - hide the bits of the style
+ * _estyle_style_hide - hide the bits of the style
  * @es: the estyle to hide style bits
  *
  * Returns no value. Hides the style bits associated with the estyle @es.
  */
-void estyle_style_hide(Estyle *es)
+void _estyle_style_hide(Estyle *es)
 {
 	Evas_Object ob;
 	Evas_List ptr_list;
-	
-	CHECK_PARAM_POINTER("es", es);
 
 	/*
 	 * Check if we need to hide any style bits.
@@ -109,18 +108,16 @@
 }
 
 /*
- * estyle_style_show - show the bits of the style
+ * _estyle_style_show - show the bits of the style
  * @es: the estyle to show style bits
  *
  * Returns no value. Shows the style bits associated with the estyle @es.
  */
-void estyle_style_show(Estyle *es)
+void _estyle_style_show(Estyle *es)
 {
 	Evas_Object ob;
 	Evas_List ptr_list;
 
-	CHECK_PARAM_POINTER("es", es);
-
 	/*
 	 * Check if we need to show any style bits.
 	 */
@@ -139,16 +136,14 @@
 }
 
 /**
- * estyle_style_add_path - add a path to search for style names
+ * _estyle_style_add_path - add a path to search for style names
  * @path: the path to add to the search path
  *
  * Returns no value. Add @path to the path group that will be searched to find
  * styles.
  */
-void estyle_style_add_path(char *path)
+void _estyle_style_add_path(char *path)
 {
-	CHECK_PARAM_POINTER("path", path);
-
 	if (!style_path)
 		style_path = ewd_path_group_new("/estyle/styles");
 
@@ -156,16 +151,14 @@
 }
 
 /**
- * estyle_style_remove_path - remove a path from being searched for styles
+ * _estyle_style_remove_path - remove a path from being searched for styles
  * @path: the path that will no longer be searched for styles
  *
  * Returns no value. Removes @path from the list of directories to search
  * through when loading a style.
  */
-void estyle_style_remove_path(char *path)
+void _estyle_style_remove_path(char *path)
 {
-	CHECK_PARAM_POINTER("path", path);
-
 	if (!style_path)
 		return;
 
@@ -173,21 +166,19 @@
 }
 
 /*
- * estyle_style_draw - display the style parts for the text
+ * _estyle_style_draw - display the style parts for the text
  * @et: the estyle that will display the style bits
  *
  * Returns no value. Adds the evas objects for the style bits of the main text
  * layer.
  */
-void estyle_style_draw(Estyle *es, char *text)
+void _estyle_style_draw(Estyle *es, char *text)
 {
 	int i = 0;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 	Evas_Object ob;
 
-	CHECK_PARAM_POINTER("es", es);
-
 	if (!es->style)
 		return;
 
@@ -200,25 +191,25 @@
 	 * Draw each of the lower layers and add their bits to the style
 	 * instance for later manipulation.
 	 */
-	while ((layer = estyle_heap_item(info->layers, i))) {
-		ob = _estyle_style_layer_draw(layer, es, text);
+	while ((layer = _estyle_heap_item(info->layers, i))) {
+		ob = __estyle_style_layer_draw(layer, es, text);
 		((Estyle_Style *) es->style)->bits = evas_list_append( ((Estyle_Style *)es->style)->bits, ob );
 		i++;
 	}
 
 	ob = evas_get_clip_object(es->evas, es->bit);
 	if (ob)
-		estyle_style_set_clip(es, ob);
+		_estyle_style_set_clip(es, ob);
 }
 
 /*
- * estyle_style_set_layer_lower - set the layer of layers below the main text
+ * _estyle_style_set_layer_lower - set the layer of layers below the main text
  * @es: the estyle containing the style to change layer
  * @l: the new layer for the style to be displayed
  *
  * Returns no value. Changes the layer of the style bits in @es to @layer.
  */
-int estyle_style_set_layer_lower(Estyle * es, int l)
+int _estyle_style_set_layer_lower(Estyle * es, int l)
 {
 	int i = 0;
 	Estyle_Style_Info *info;
@@ -226,8 +217,6 @@
 	Evas_Object ob;
 	Evas_List ptr_list;
 
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
-
 	if (!es->style)
 		return 0;
 
@@ -239,7 +228,8 @@
 	/*
 	 * Move all of the lower layers bits into the correct layer
 	 */
-	while ((layer = estyle_heap_item(info->layers, i)) && layer->stack < 0) {
+	while ((layer = _estyle_heap_item(info->layers, i)) 
+		&& layer->stack < 0) {
 
 		for (ptr_list = es->style->bits; ptr_list; 
 			ptr_list = ptr_list->next ) {
@@ -254,7 +244,7 @@
 }
 
 /*
- * estyle_style_set_layer_upper - set the layer of style parts above the main text
+ * _estyle_style_set_layer_upper - set the layer of style parts above the main text
  * @es: the estyle containing style bits to change layer
  * @l: the layer to move the style bits
  * @start: the index of the style at which to start changing layers
@@ -262,7 +252,7 @@
  * Returns no value. Adds the evas objects for the style bits that are above
  * the main text layer.
  */
-int estyle_style_set_layer_upper(Estyle *es, int l, int start)
+int _estyle_style_set_layer_upper(Estyle *es, int l, int start)
 {
 	char *text;
 	int i = start;
@@ -271,8 +261,6 @@
 	Evas_Object ob;
 	Evas_List ptr_list;
 
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
-
 	if (!es->bit)
 		return 0;
 
@@ -289,7 +277,8 @@
 	/*
 	 * Move all of the upper bits into the correct layer
 	 */
-	while ((layer = estyle_heap_item(info->layers, i)) && layer->stack) {
+	while ((layer = _estyle_heap_item(info->layers, i)) 
+		&& layer->stack) {
 
 		for (ptr_list = es->style->bits; ptr_list; 
 			ptr_list = ptr_list->next ) {
@@ -305,13 +294,13 @@
 }
 
 /*
- * estyle_style_move - move the style bits into their correct positions
+ * _estyle_style_move - move the style bits into their correct positions
  * @es: the estyle to move style bits
  *
  * Returns no value. Moves all of the evas objects representing style bits
  * into their correct relative positions to @es.
  */
-void estyle_style_move(Estyle *es)
+void _estyle_style_move(Estyle *es)
 {
 	int i;
 	Evas_Object ob;
@@ -319,8 +308,6 @@
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
-	CHECK_PARAM_POINTER("es", es);
-
 	if (!es->style || !es->style->bits)
 		return;
 
@@ -339,7 +326,7 @@
 	 * case there isn't.
 	 */
 	while (ptr_list && 
-		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(ob = ptr_list->data) != NULL) {
 		
 		evas_move(es->evas, ob, (double)(es->x + layer->x_offset +
@@ -352,13 +339,13 @@
 }
 
 /*
- * estyle_style_set_color - change the color used by the relative style objects
+ * _estyle_style_set_color - change the color used by the relative style objects
  * @es: the estyle to change the style relative color
  *
  * Returns no value. Changes the color for the relative layers of the style for
  * @es.
  */
-void estyle_style_set_color(Estyle *es)
+void _estyle_style_set_color(Estyle *es)
 {
 	int i;
 	Evas_Object sob;
@@ -366,8 +353,6 @@
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
-	CHECK_PARAM_POINTER("es", es);
-
 	if (!es->style)
 		return;
 
@@ -393,7 +378,7 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(sob = ptr_list->data) != NULL) {
 
 		if (layer->relative_color) {
@@ -412,12 +397,12 @@
 }
 
 /*
- * estyle_style_set_font - set the font for the style portion of the estyle
+ * _estyle_style_set_font - set the font for the style portion of the estyle
  * @es: the estyle to use for updating the font for the estyle
  *
  * Returns no value. Updates the font for the estyle @es.
  */
-void estyle_style_set_font(Estyle *es, char *font, int size)
+void _estyle_style_set_font(Estyle *es, char *font, int size)
 {
 	int i;
 	Evas_Object sob;
@@ -425,9 +410,6 @@
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
-	CHECK_PARAM_POINTER("es", es);
-	CHECK_PARAM_POINTER("font", font);
-
 	if (!es->style || !es->style->bits)
 		return;
 
@@ -448,7 +430,7 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(sob = ptr_list->data) != NULL) {
 
 		evas_set_font(es->evas, sob, font, size);
@@ -457,12 +439,12 @@
 }
 
 /*
- * estyle_style_set_text - set the text for the style portion of the estyle
+ * _estyle_style_set_text - set the text for the style portion of the estyle
  * @es: the estyle to use for updating the text for the estyle
  *
  * Returns no value. Updates the text for the estyle @es.
  */
-void estyle_style_set_text(Estyle *es)
+void _estyle_style_set_text(Estyle *es)
 {
 	int i;
 	char *text;
@@ -471,8 +453,6 @@
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
-	CHECK_PARAM_POINTER("es", es);
-
 	if (!es->style || !es->style->bits)
 		return;
 
@@ -497,7 +477,7 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(sob = ptr_list->data) != NULL) {
 			
 		evas_set_text(es->evas, sob, text);
@@ -506,14 +486,14 @@
 }
 
 /*
- * estyle_style_set_clip - change the clip rectangle used by the style objects
+ * _estyle_style_set_clip - change the clip rectangle used by the style objects
  * @es: the estyle to change the style clip rectangle
  * @ob: the evas object to be used as a clip rectangle
  *
  * Returns no value. Changes the clip rectangle for each evas object used to
  * represent the style for @es.
  */
-void estyle_style_set_clip(Estyle *es, Evas_Object ob)
+void _estyle_style_set_clip(Estyle *es, Evas_Object ob)
 {
 	int i;
 	Evas_Object sob;
@@ -521,8 +501,6 @@
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
-	CHECK_PARAM_POINTER("es", es);
-
 	if (!es->style || !es->style->bits)
 		return;
 
@@ -543,7 +521,7 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = estyle_heap_item(info->layers, i++)) != NULL &&
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(sob = ptr_list->data) != NULL) {
 		if (!ob)
 			evas_unset_clip(es->evas, sob);
@@ -555,17 +533,15 @@
 }
 
 /*
- * estyle_style_info_reference - get a reference to a style info
+ * _estyle_style_info_reference - get a reference to a style info
  * @name: the name of the style to get a style info reference
  *
  * Returns a poiner to the style info on success, NULL on failure.
  */
-Estyle_Style_Info *estyle_style_info_reference(char *name)
+Estyle_Style_Info *_estyle_style_info_reference(char *name)
 {
 	Estyle_Style_Info *found;
 
-	CHECK_PARAM_POINTER_RETURN("name", name, NULL);
-
 	if (!styles)
 		styles = ewd_hash_new(ewd_str_hash, ewd_str_compare);
 
@@ -586,7 +562,7 @@
 		 * Load the information for this style info
 		 */
 		found->name = ewd_string_instance(name);
-		_estyle_style_info_load(found);
+		__estyle_style_info_load(found);
 		ewd_hash_set(styles, name, found);
 	}
 
@@ -596,13 +572,11 @@
 }
 
 /*
- * estyle_style_info_dereference - remove a reference to a style_info structure
+ * _estyle_style_info_dereference - remove a reference to a style_info structure
  * @info: the style info struct to dereference
  */
-void estyle_style_info_dereference(Estyle_Style_Info *info)
+void _estyle_style_info_dereference(Estyle_Style_Info *info)
 {
-	CHECK_PARAM_POINTER("info", info);
-
 	info->references--;
 
 	/*
@@ -613,7 +587,7 @@
 
 		ewd_hash_remove(styles, info->name);
 		if (info->layers)
-			estyle_heap_destroy(info->layers);
+			_estyle_heap_destroy(info->layers);
 		ewd_string_release(info->name);
 
 		FREE(info);
@@ -621,11 +595,11 @@
 }
 
 /*
- * _estyle_style_layer_draw - draw a specified layer for a estyle
+ * __estyle_style_layer_draw - draw a specified layer for a estyle
  * @layer: the layer to be drawn
  * @es: used to get info about the evas for drawing
  */
-static Evas_Object _estyle_style_layer_draw(Estyle_Style_Layer *layer,
+static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer *layer,
 		Estyle *es, char *text)
 {
 	int r, g, b, a;
@@ -672,10 +646,10 @@
 }
 
 /*
- * _estyle_style_info_load - load the info for the specified info from it's db
+ * __estyle_style_info_load - load the info for the specified info from it's db
  * @info: the info to be loaded
  */
-static void _estyle_style_info_load(Estyle_Style_Info * info)
+static void __estyle_style_info_load(Estyle_Style_Info * info)
 {
 	char *real_path;
 	char file_name[PATH_MAX];
@@ -701,7 +675,7 @@
 	if (!info->style_db)
 		goto load_exit;
 
-	_estyle_style_read(info);
+	__estyle_style_read(info);
 	e_db_close(info->style_db);
 
 load_exit:
@@ -710,13 +684,13 @@
 }
 
 /*
- * _estyle_style_read - read in the data from the db to the style
+ * __estyle_style_read - read in the data from the db to the style
  * @info: the info structure that will hold the data read in
  *
  * Returns no value. Read in the data from the db into the info structure
  * creating layers as needed.
  */
-static void _estyle_style_read(Estyle_Style_Info * info)
+static void __estyle_style_read(Estyle_Style_Info * info)
 {
 	int i;
 	int layers;
@@ -727,7 +701,7 @@
 		return;
 	/*
 	   if (info->layers)
-	   estyle_heap_destroy(info->layers);
+	   	_estyle_heap_destroy(info->layers);
 	 */
 
 	/*
@@ -742,7 +716,7 @@
 		return;
 	}
 
-	info->layers = estyle_heap_new(_estyle_style_stack_compare, layers);
+	info->layers = _estyle_heap_new(__estyle_style_stack_compare, layers);
 
 	/*
 	 * Read in each layer
@@ -794,7 +768,7 @@
 		else if (-layer->y_offset > info->top_push)
 			info->top_push = -layer->y_offset;
 
-		estyle_heap_insert(info->layers, layer);
+		_estyle_heap_insert(info->layers, layer);
 	}
 }
 
@@ -802,7 +776,7 @@
  * Compare two styles and return an integer in the style of strcmp that
  * indicates which style has a higher stacking order.
  */
-static int _estyle_style_stack_compare(void *style1, void *style2)
+static int __estyle_style_stack_compare(void *style1, void *style2)
 {
 	if (((Estyle_Style_Layer *)style1)->stack <
 			((Estyle_Style_Layer *)style2)->stack)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_style.h	27 Feb 2002 00:19:02 -0000	1.4
+++ estyle_style.h	15 Apr 2002 18:36:56 -0000	1.5
@@ -1,6 +1,7 @@
 #ifndef _ESTYLE_STYLE_H
 #define _ESTYLE_STYLE_H
 
+
 /*
  * The style layer must keep track of the positioning and color modifications
  * of the bits appearance.
@@ -16,39 +17,64 @@
 };
 
 /*
+ * The info structure keeps the important information about the style, but not
+ * the bits used to display the text.
+ */
+typedef struct _estyle_style_info Estyle_Style_Info;
+struct _estyle_style_info {
+	char *name;
+	E_DB_File *style_db;
+	Estyle_Heap *layers;
+	int left_push, right_push, top_push, bottom_push;
+
+	int references;
+};
+
+/*
+ * The style of a text keeps a reference to style info for deciding how to
+ * alter the text, and a list of the bits that are created by the style.
+ */
+typedef struct _estyle_style Estyle_Style;
+struct _estyle_style {
+	Estyle_Style_Info *info;
+	Evas_List bits;
+};
+
+
+/*
  * Style constructors and destructors
  */
-Estyle_Style *estyle_style_instance(char *name);
-void estyle_style_release(Estyle_Style * style, Evas ev);
+Estyle_Style *_estyle_style_instance(char *name);
+void _estyle_style_release(Estyle_Style * style, Evas ev);
 
 /*
  * Style display modifiers.
  */
-void estyle_style_draw(Estyle * et, char *text);
-void estyle_style_move(Estyle * bit);
-void estyle_style_set_clip(Estyle * bit, Evas_Object ob);
-void estyle_style_set_color(Estyle * bit);
-void estyle_style_set_font(Estyle *es, char *font, int size);
-void estyle_style_set_text(Estyle *es);
-int estyle_style_set_layer_lower(Estyle * bit, int layer);
-int estyle_style_set_layer_upper(Estyle * bit, int layer, int start);
+void _estyle_style_draw(Estyle * et, char *text);
+void _estyle_style_move(Estyle * bit);
+void _estyle_style_set_clip(Estyle * bit, Evas_Object ob);
+void _estyle_style_set_color(Estyle * bit);
+void _estyle_style_set_font(Estyle *es, char *font, int size);
+void _estyle_style_set_text(Estyle *es);
+int _estyle_style_set_layer_lower(Estyle * bit, int layer);
+int _estyle_style_set_layer_upper(Estyle * bit, int layer, int start);
 
 /*
  * Style info access functions
  */
-void estyle_style_info_dereference(Estyle_Style_Info *info);
-Estyle_Style_Info *estyle_style_info_reference(char *name);
+void _estyle_style_info_dereference(Estyle_Style_Info *info);
+Estyle_Style_Info *_estyle_style_info_reference(char *name);
 
 /*
  * Style show and hide functions
  */
-void estyle_style_show(Estyle *es);
-void estyle_style_hide(Estyle *es);
+void _estyle_style_show(Estyle *es);
+void _estyle_style_hide(Estyle *es);
 
 /*
  * Style search path manipulators
  */
-void estyle_style_add_path(char *path);
-void estyle_style_remove_path(char *path);
+void _estyle_style_add_path(char *path);
+void _estyle_style_remove_path(char *path);
 
 #endif

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h estyle.c 


Log Message:
A couple fixups in the split and merge functions. Should avoid creating empty
estyles on split.

rephorm: Since you're the only one that has tested this to any extent, please
let me know if you run into any problems. Thanks.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Estyle.h	15 Apr 2002 18:36:55 -0000	1.9
+++ Estyle.h	19 Apr 2002 18:07:39 -0000	1.10
@@ -78,7 +78,7 @@
 /*
  * Joining and splitting estyles.
  */
-Estyle *estyle_split(Estyle *es, int index);
+Estyle *estyle_split(Estyle *es, unsigned int index);
 int estyle_merge(Estyle *es1, Estyle *es2);
 
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- estyle.c	15 Apr 2002 18:36:55 -0000	1.14
+++ estyle.c	19 Apr 2002 18:07:39 -0000	1.15
@@ -504,6 +504,9 @@
 	 * since evas will strdup it.
 	 */
 	new_text = (char *) malloc(strlen(text1) + strlen(text2) + 1);
+	if (!new_text)
+		return FALSE;
+
 	strcpy(new_text, text1);
 	strcat(new_text, text2);
 
@@ -524,24 +527,68 @@
  * Returns the newly created estyle on success, NULL on failure. The old
  * estyle is updated to reflect the changes.
  */
-Estyle *estyle_split(Estyle *es, int index)
+Estyle *estyle_split(Estyle *es, unsigned int index)
 {
 	char temp;
 	char *content;
 	Estyle *new_es;
+	int r, g, b, a;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
+	/*
+	 * Don't bother to split if it will result in an empty string.
+	 */
+	if (!index)
+		return NULL;
+
+	/*
+	 * Retrieve the contents of the estyle to be split.
+	 */
 	content = estyle_get_text(es);
-	if (!content || index > strlen(content))
+	if (!content)
+		return NULL;
+
+	/*
+	 * Check if the index is within the bounds of the string, and won't
+	 * result in an empty string.
+	 */
+	if (index >= strlen(content) - 1) {
+		FREE(content);
 		return NULL;
+	}
 
+	/*
+	 * Terminate the string at the index and set the old estyle's content to
+	 * the resulting string.
+	 */
 	temp = content[index];
 	content[index] = '\0';
 	estyle_set_text(es, content);
 
+	/*
+	 * Now place the content from index onwards into a new estyle.
+	 */
 	content[index] = temp;
 	new_es = estyle_new(es->evas, &(content[index]), es->style->info->name);
+
+	/*
+	 * Give this new estyle the same settings as the previous estyle.
+	 */
+	estyle_set_clip(new_es, estyle_get_clip(es));
+	estyle_set_font(new_es, estyle_get_font(es), estyle_get_font_size(es));
+
+	/*
+	 * Set the new color for the estyle.
+	 */
+	estyle_get_color(es, &r, &g, &b, &a);
+	estyle_set_color(new_es, r, g, b, a);
+
+	/*
+	 * Put it on the same layer as the old estyle
+	 */
+	estyle_set_layer(new_es, estyle_get_layer(es));
+
 	FREE(content);
 
 	return new_es;
@@ -640,7 +687,7 @@
 	int ret;
 	double xx = 0, yy = 0, ww = 0, hh = 0;
 
-	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
 	ret = evas_text_at_position(es->evas, es->bit, (double)(x - es->x),
 			(double)(y - es->y), &xx, &yy, &ww, &hh);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
      Tag: SPLIT
	estyle.c 


Log Message:
Same as the split/merge fix in HEAD.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -3 -r1.10.2.6 -r1.10.2.7
--- estyle.c	15 Apr 2002 14:13:11 -0000	1.10.2.6
+++ estyle.c	19 Apr 2002 18:30:36 -0000	1.10.2.7
@@ -504,6 +504,9 @@
 	 * since evas will strdup it.
 	 */
 	new_text = (char *) malloc(strlen(text1) + strlen(text2) + 1);
+	if (!new_text)
+		return FALSE;
+
 	strcpy(new_text, text1);
 	strcat(new_text, text2);
 
@@ -524,24 +527,68 @@
  * Returns the newly created estyle on success, NULL on failure. The old
  * estyle is updated to reflect the changes.
  */
-Estyle *estyle_split(Estyle *es, int index)
+Estyle *estyle_split(Estyle *es, unsigned int index)
 {
 	char temp;
 	char *content;
 	Estyle *new_es;
+	int r, g, b, a;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
+	/*
+	 * Don't bother to split if it will result in an empty string.
+	 */
+	if (!index)
+		return NULL;
+
+	/*
+	 * Retrieve the contents of the estyle to be split.
+	 */
 	content = estyle_get_text(es);
-	if (!content || index > strlen(content))
+	if (!content)
+		return NULL;
+
+	/*
+	 * Check if the index is within the bounds of the string, and won't
+	 * result in an empty string.
+	 */
+	if (index >= strlen(content) - 1) {
+		FREE(content);
 		return NULL;
+	}
 
+	/*
+	 * Terminate the string at the index and set the old estyle's content to
+	 * the resulting string.
+	 */
 	temp = content[index];
 	content[index] = '\0';
 	estyle_set_text(es, content);
 
+	/*
+	 * Now place the content from index onwards into a new estyle.
+	 */
 	content[index] = temp;
 	new_es = estyle_new(es->evas, &(content[index]), es->style->info->name);
+
+	/*
+	 * Give this new estyle the same settings as the previous estyle.
+	 */
+	estyle_set_clip(new_es, estyle_get_clip(es));
+	estyle_set_font(new_es, estyle_get_font(es), estyle_get_font_size(es));
+
+	/*
+	 * Set the new color for the estyle.
+	 */
+	estyle_get_color(es, &r, &g, &b, &a);
+	estyle_set_color(new_es, r, g, b, a);
+
+	/*
+	 * Put it on the same layer as the old estyle
+	 */
+	estyle_set_layer(new_es, estyle_get_layer(es));
+
 	FREE(content);
 
 	return new_es;
@@ -640,7 +687,7 @@
 	int ret;
 	double xx = 0, yy = 0, ww = 0, hh = 0;
 
-	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
 	ret = evas_text_at_position(es->evas, es->bit, (double)(x - es->x),
 			(double)(y - es->y), &xx, &yy, &ww, &hh);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
      Tag: SPLIT
	Estyle.h 


Log Message:
Missed a file when syncing with HEAD.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -3 -r1.7.2.3 -r1.7.2.4
--- Estyle.h	2 Apr 2002 12:08:27 -0000	1.7.2.3
+++ Estyle.h	20 Apr 2002 22:46:33 -0000	1.7.2.4
@@ -78,7 +78,7 @@
 /*
  * Joining and splitting estyles.
  */
-Estyle *estyle_split(Estyle *es, int index);
+Estyle *estyle_split(Estyle *es, unsigned int index);
 int estyle_merge(Estyle *es1, Estyle *es2);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test/img


Removed Files:
	Makefile.am arrow_down.png arrow_up.png evas_test_image_0.png 
	evas_test_image_1.png evas_test_image_2.png sky001.png 


Log Message:
Removed a variety of images that were in etox that aren't needed for estyle.
The entire img directory should actually be removed.

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	Makefile.am 


Log Message:
Removed a variety of images that were in etox that aren't needed for estyle.
The entire img directory should actually be removed.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am	26 Jan 2002 17:43:39 -0000	1.2
+++ Makefile.am	27 Apr 2002 03:49:26 -0000	1.3
@@ -1,8 +1,6 @@
 AUTOMAKE_OPTIONS = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS       = img
-
 CFLAGS			=	-g -W -Wall -Wno-implicit
 INCLUDES		=	-I$(top_srcdir)/src @evas_cflags@ @ewd_cflags@ @ecore_cflags@ @edb_cflags@

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle


Modified Files:
	configure.ac configure.in 


Log Message:
Missed a couple mentions of the img directory.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.ac	26 Jan 2002 15:09:04 -0000	1.2
+++ configure.ac	27 Apr 2002 05:04:45 -0000	1.3
@@ -100,7 +100,6 @@
 doc/html-customizations.dsl
 doc/Makefile
 test/Makefile
-test/img/Makefile
 ])
 AC_CONFIG_COMMANDS([default],[[
 chmod +x estyle-config
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.in	26 Jan 2002 23:04:45 -0000	1.3
+++ configure.in	27 Apr 2002 05:04:45 -0000	1.4
@@ -272,7 +272,6 @@
 estyle-config
 src/Makefile
 test/Makefile
-test/img/Makefile
 ], [
 chmod +x estyle-config
 chmod +x doc/kernel-doc

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle_color.c 


Log Message:
Silly mistake when searching for a previous instance of a color.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_color.c	15 Apr 2002 18:36:55 -0000	1.4
+++ estyle_color.c	7 May 2002 01:25:27 -0000	1.5
@@ -5,8 +5,6 @@
 static E_DB_File *sys_colors = NULL;
 static E_DB_File *user_colors = NULL;
 
-static int __estyle_color_cmp(void *c1, void *c2);
-
 /**
  * _estyle_color_instance - get a pointer to a color structure
  * @r: the red value of the color
@@ -122,64 +120,5 @@
 		sys_colors = e_db_open_read(user_path);
 	}
 
-	color_table = ewd_hash_new(NULL, __estyle_color_cmp);
-}
-
-/**
- * Comparison function for hashing colors.
- */
-static int __estyle_color_cmp(void *c1, void *c2)
-{
-	Estyle_Color *col1 = (Estyle_Color *) c1;
-	Estyle_Color *col2 = (Estyle_Color *) c2;
-
-	/*
-	 * Check for cases of NULL being passed in.
-	 */
-	if (c1 == c2)
-		return 0;
-
-	if (!c1 && c2)
-		return -1;
-
-	if (!c2 && c1)
-		return 1;
-
-	/*
-	 * Check red colors first
-	 */
-	if (col1->r > col2->r)
-		return -1;
-
-	if (col1->r < col2->r)
-		return 1;
-
-	/*
-	 * Check green colors next
-	 */
-	if (col1->g > col2->g)
-		return -1;
-
-	if (col1->g < col2->g)
-		return 1;
-
-	/*
-	 * Check blue colors now
-	 */
-	if (col1->b > col2->b)
-		return -1;
-
-	if (col1->b < col2->b)
-		return 1;
-
-	/*
-	 * Finally check alpha colors
-	 */
-	if (col1->a > col2->a)
-		return -1;
-
-	if (col1->a < col2->a)
-		return 1;
-
-	return 0;
+	color_table = ewd_hash_new(NULL, NULL);
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle_style.c 


Log Message:
Temporary fix for an error encountered by ddamian.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- estyle_style.c	15 Apr 2002 18:36:56 -0000	1.8
+++ estyle_style.c	7 May 2002 03:21:08 -0000	1.9
@@ -325,7 +325,7 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while (ptr_list && 
+	while (ptr_list && info->layers &&
 		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(ob = ptr_list->data) != NULL) {

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	Makefile.am estyle_test_simple.c 
Added Files:
	estyle_test_callbacks.c 


Log Message:
Beginnings of callback code started by ddamian and myself. Also added a test
program written by ddamian to excersize this new code.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am	27 Apr 2002 03:49:26 -0000	1.3
+++ Makefile.am	19 May 2002 07:19:42 -0000	1.4
@@ -4,9 +4,14 @@
 CFLAGS			=	-g -W -Wall -Wno-implicit
 INCLUDES		=	-I$(top_srcdir)/src @evas_cflags@ @ewd_cflags@ @ecore_cflags@ @edb_cflags@
 
-bin_PROGRAMS			=	estyle_test_simple
+bin_PROGRAMS			=	estyle_test_simple estyle_test_callbacks
 
 estyle_test_simple_DEPENDENCIES	=	$(top_builddir)/src/libestyle.la
 estyle_test_simple_SOURCES	=	estyle_test_simple.c
 estyle_test_simple_LDFLAGS	=	-static
 estyle_test_simple_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
+
+estyle_test_callbacks_DEPENDENCIES	=	$(top_builddir)/src/libestyle.la
+estyle_test_callbacks_SOURCES	=	estyle_test_callbacks.c
+estyle_test_callbacks_LDFLAGS	=	-static
+estyle_test_callbacks_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- estyle_test_simple.c	26 Mar 2002 18:55:17 -0000	1.5
+++ estyle_test_simple.c	19 May 2002 07:19:42 -0000	1.6
@@ -84,13 +84,15 @@
 			estyle_set_text(e, string1);
 			last = string1;
 		}
-		index = estyle_text_at_position(e, eemd->x, eemd->y, &x, &y,
-				&w, &h);
+		index =
+		    estyle_text_at_position(e, eemd->x, eemd->y, &x, &y,
+					    &w, &h);
 		if (index < 0)
 			printf("Click occurred outside of estyle\n");
 		else {
-			printf("Clicked letter %c at %d, %d size %d x %d\n",
-				last[index], x, y, w, h);
+			printf
+			    ("Clicked letter %c at %d, %d size %d x %d\n",
+			     last[index], x, y, w, h);
 			evas_move(evas, cursor, x, y);
 			evas_resize(evas, cursor, w, h);
 		}
@@ -146,9 +148,8 @@
 	ewin = evas_get_window(evas);
 
 	ecore_window_show(ewin);
-	ecore_window_set_events(ewin,
-				XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE /* |
-				XEV_IN_OUT */);
+	ecore_window_set_events(ewin, XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE	/* |
+										   XEV_IN_OUT */ );
 	ecore_window_show(win);
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h Makefile.in estyle.c estyle_color.c 
	estyle_heap.c estyle_heap.h estyle_style.c estyle_style.h 


Log Message:
Beginnings of callback code started by ddamian and myself. Also added a test
program written by ddamian to excersize this new code.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Estyle.h	19 Apr 2002 18:07:39 -0000	1.10
+++ Estyle.h	19 May 2002 07:19:42 -0000	1.11
@@ -14,76 +14,86 @@
 
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 
 /*
  * Constructor/destructor
  */
-Estyle *estyle_new(Evas evas, char *text, char *style);
-void estyle_free(Estyle * es);
+	Estyle *estyle_new(Evas evas, char *text, char *style);
+	void estyle_free(Estyle * es);
 
 /*
  * Visibility modifiers
  */
-void estyle_show(Estyle * es);
-void estyle_hide(Estyle * es);
+	void estyle_show(Estyle * es);
+	void estyle_hide(Estyle * es);
 
 /*
  * Content and appearance manipulators
  */
-void estyle_move(Estyle *es, int x, int y);
+	void estyle_move(Estyle * es, int x, int y);
 
-Evas_Object estyle_get_clip(Estyle *es);
-void estyle_set_clip(Estyle *es, Evas_Object clip);
+	Evas_Object estyle_get_clip(Estyle * es);
+	void estyle_set_clip(Estyle * es, Evas_Object clip);
 
-char *estyle_get_text(Estyle * es);
-void estyle_set_text(Estyle * es, char *text);
+	char *estyle_get_text(Estyle * es);
+	void estyle_set_text(Estyle * es, char *text);
 
-char *estyle_get_font(Estyle *es);
-int estyle_get_font_size(Estyle *es);
-void estyle_set_font(Estyle * es, char *name, int size);
+	char *estyle_get_font(Estyle * es);
+	int estyle_get_font_size(Estyle * es);
+	void estyle_set_font(Estyle * es, char *name, int size);
 
-int estyle_get_layer(Estyle * es);
-void estyle_set_layer(Estyle * es, int layer);
+	int estyle_get_layer(Estyle * es);
+	void estyle_set_layer(Estyle * es, int layer);
 
-char *estyle_get_style(Estyle * es);
-void estyle_set_style(Estyle * es, char *name);
+	char *estyle_get_style(Estyle * es);
+	void estyle_set_style(Estyle * es, char *name);
 
-void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a);
-void estyle_set_color(Estyle * es, int r, int g, int b, int a);
+	void estyle_get_color(Estyle * es, int *r, int *g, int *b, int *a);
+	void estyle_set_color(Estyle * es, int r, int g, int b, int a);
 
-void estyle_lookup_color_db(char *name, int *r, int *g, int *b, int *a);
-void estyle_set_color_db(Estyle * es, char *name);
+	void estyle_lookup_color_db(char *name, int *r, int *g, int *b,
+				    int *a);
+	void estyle_set_color_db(Estyle * es, char *name);
 
 /*
  * Geometry querying
  */
-inline int estyle_length(Estyle *es);
-void estyle_geometry(Estyle *es, int *x, int *y, int *w, int *h);
-void estyle_text_at(Estyle *es, int index, int *char_x, int *char_y,
-		int *char_w, int *char_h);
-int estyle_text_at_position(Estyle *es, int x, int y, int *char_x, int *char_y,
-		int *char_w, int *char_h);
+	inline int estyle_length(Estyle * es);
+	void estyle_geometry(Estyle * es, int *x, int *y, int *w, int *h);
+	void estyle_text_at(Estyle * es, int index, int *char_x,
+			    int *char_y, int *char_w, int *char_h);
+	int estyle_text_at_position(Estyle * es, int x, int y, int *char_x,
+				    int *char_y, int *char_w, int *char_h);
 
 /*
  * Fixing the reported geometry to set values.
  */
-inline int estyle_fixed(Estyle *es);
-void estyle_fix_geometry(Estyle *es, int x, int y, int w, int h);
-void estyle_unfix_geometry(Estyle *es);
+	inline int estyle_fixed(Estyle * es);
+	void estyle_fix_geometry(Estyle * es, int x, int y, int w, int h);
+	void estyle_unfix_geometry(Estyle * es);
 
 /*
  * Joining and splitting estyles.
  */
-Estyle *estyle_split(Estyle *es, unsigned int index);
-int estyle_merge(Estyle *es1, Estyle *es2);
+	Estyle *estyle_split(Estyle * es, unsigned int index);
+	int estyle_merge(Estyle * es1, Estyle * es2);
 
+/*
+ * Callbacks.
+ */
+	void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
+				 void (*func) (void *_data, Estyle * _es,
+					       int _b, int _x, int _y),
+				 void *data);
+/*
+void estyle_callback_add(Evas evas, Estyle *es, Evas_Callback_Type callback,
+     void (*func) (void *_data,  Estyle *es, int _b, int _x, int _y))
+*/
 
 #ifdef __cplusplus
 }
 #endif
-
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Estyle_private.h	15 Apr 2002 18:36:55 -0000	1.7
+++ Estyle_private.h	19 May 2002 07:19:42 -0000	1.8
@@ -2,6 +2,7 @@
 #define _ESTYLE_PRIVATE_H
 
 #include "Estyle.h"
+#include "../estyle-config.h"
 #include "estyle_heap.h"
 #include "estyle_color.h"
 #include "estyle_style.h"
@@ -13,6 +14,16 @@
 	ESTYLE_BIT_VISIBLE = 2,
 };
 
+typedef void (*Estyle_Callback_Function) (void *_data, Estyle * _es,
+					  int _b, int _x, int _y);
+
+typedef struct _estyle_callback Estyle_Callback;
+struct _estyle_callback {
+	Estyle *estyle;
+	void *data;
+	Estyle_Callback_Function callback;
+};
+
 struct _estyle {
 	/*
 	 * Keep a pointer in the estyle to the evas.
@@ -53,6 +64,11 @@
 	 * needing to recalculate this often.
 	 */
 	int length;
+
+	/*
+	 * Callbacks.
+	 */
+	Evas_List callbacks;
 };
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.in	2 Apr 2002 01:30:53 -0000	1.4
+++ Makefile.in	19 May 2002 07:19:42 -0000	1.5
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
 
 SHELL = @SHELL@
 
@@ -31,13 +33,9 @@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,16 +57,19 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AMTAR = @AMTAR@
 AS = @AS@
+AWK = @AWK@
 CC = @CC@
 DB_STYLESHEETS = @DB_STYLESHEETS@
+DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
 EXEEXT = @EXEEXT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JADE = @JADE@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -76,6 +77,8 @@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
 ebits_cflags = @ebits_cflags@
 ebits_libs = @ebits_libs@
 ecore_cflags = @ecore_cflags@
@@ -88,6 +91,7 @@
 ewd_libs = @ewd_libs@
 imlib2_cflags = @imlib2_cflags@
 imlib2_libs = @imlib2_libs@
+install_sh = @install_sh@
 
 INCLUDES = @evas_cflags@ @ewd_cflags@
 
@@ -95,301 +99,283 @@
 
 installed_headersdir = $(prefix)/include
 
-installed_headers_DATA =  Estyle.h
+installed_headers_DATA = \
+Estyle.h
 
 
-libestyle_la_SOURCES =  Estyle.h estyle.c estyle_style.c estyle_color.c estyle_heap.c
+libestyle_la_SOURCES = \
+Estyle.h \
+estyle.c \
+estyle_style.c \
+estyle_color.c \
+estyle_heap.c
 
 
 libestyle_la_LIBADD = @evas_libs@ @ewd_libs@
 libestyle_la_DEPENDENCIES = $(top_builddir)/estyle-config.h
 libestyle_la_LDFLAGS = -version-info 0:1:0
+subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../estyle-config.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
+CONFIG_HEADER = $(top_builddir)/estyle-config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+am_libestyle_la_OBJECTS = estyle.lo estyle_style.lo estyle_color.lo \
+	estyle_heap.lo
+libestyle_la_OBJECTS = $(am_libestyle_la_OBJECTS)
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libestyle_la_OBJECTS =  estyle.lo estyle_style.lo estyle_color.lo \
-estyle_heap.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@... = $(DEPDIR)/estyle.Plo $(DEPDIR)/estyle_color.Plo \
+@AMDEP_TRUE@	$(DEPDIR)/estyle_heap.Plo \
+@AMDEP_TRUE@	$(DEPDIR)/estyle_style.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(installed_headers_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(libestyle_la_SOURCES)
+DATA = $(installed_headers_DATA)
 
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES =  .deps/estyle.P .deps/estyle_color.P .deps/estyle_heap.P \
-.deps/estyle_style.P
+DIST_COMMON = Makefile.am Makefile.in
 SOURCES = $(libestyle_la_SOURCES)
-OBJECTS = $(libestyle_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+all: all-am
 
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
 
-distclean-libLTLIBRARIES:
+mostlyclean-libtool:
+	-rm -f *.lo
 
-maintainer-clean-libLTLIBRARIES:
+clean-libtool:
+	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  src/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+libestyle.la: $(libestyle_la_OBJECTS) $(libestyle_la_DEPENDENCIES) 
+	$(LINK) -rpath $(libdir) $(libestyle_la_LDFLAGS) $(libestyle_la_OBJECTS) $(libestyle_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
+@AMDEP_TRUE@...@ @am__quote@...@
+@AMDEP_TRUE@...@ @am__quote@...@
+@AMDEP_TRUE@...@ @am__quote@...@
+@AMDEP_TRUE@...@ @am__quote@...@
 
-distclean-libtool:
+distclean-depend:
+	-rm -rf $(DEPDIR)
 
-maintainer-clean-libtool:
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
 
-libestyle.la: $(libestyle_la_OBJECTS) $(libestyle_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libestyle_la_LDFLAGS) $(libestyle_la_OBJECTS) $(libestyle_la_LIBADD) $(LIBS)
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
 
+.c.lo:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+CCDEPMODE = @CCDEPMODE@
+uninstall-info-am:
 install-installed_headersDATA: $(installed_headers_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(installed_headersdir)
 	@list='$(installed_headers_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(installed_headersdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(installed_headersdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(installed_headersdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(installed_headersdir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(installed_headersdir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(installed_headersdir)/$$f; \
 	done
 
 uninstall-installed_headersDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(installed_headers_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(installed_headersdir)/$$p; \
+	@list='$(installed_headers_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(installed_headersdir)/$$f"; \
+	  rm -f $(DESTDIR)$(installed_headersdir)/$$f; \
 	done
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
-clean-tags:
+GTAGS:
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
-maintainer-clean-tags:
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-libLTLIBRARIES
-install-exec: install-exec-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
 
-install-data-am: install-installed_headersDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(installed_headersdir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-libLTLIBRARIES uninstall-installed_headersDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(installed_headersdir)
 
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
 
-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-libtool distclean-tags
 
-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am: install-installed_headersDATA
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool uninstall-installed_headersDATA \
-install-installed_headersDATA tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+uninstall-am: uninstall-info-am uninstall-installed_headersDATA \
+	uninstall-libLTLIBRARIES
 
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
+	distclean-depend distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am \
+	install-installed_headersDATA install-libLTLIBRARIES \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool tags uninstall uninstall-am \
+	uninstall-info-am uninstall-installed_headersDATA \
+	uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- estyle.c	19 Apr 2002 18:07:39 -0000	1.15
+++ estyle.c	19 May 2002 07:19:42 -0000	1.16
@@ -1,4 +1,3 @@
-#include "estyle-config.h"
 #include "Estyle_private.h"
 #include <ctype.h>
 
@@ -6,8 +5,10 @@
 #define DEFAULT_FONT "nationff"
 #define DEFAULT_SIZE 12
 
-void __estyle_update_position(Estyle *es);
-void __estyle_update_dimensions(Estyle *es);
+void __estyle_update_position(Estyle * es);
+void __estyle_update_dimensions(Estyle * es);
+void __estyle_callback_dispatcher(void *_data, Evas _e, Evas_Object _o,
+				  int _b, int _x, int _y);
 
 static int estyle_setup_complete = 0;
 
@@ -41,12 +42,13 @@
 	memset(es, 0, sizeof(Estyle));
 
 	es->evas = evas;
-	evas_font_add_path(es->evas, PACKAGE_DATA_DIR"/fonts");
+	evas_font_add_path(es->evas, PACKAGE_DATA_DIR "/fonts");
 
 	/*
 	 * Create the Evas_Object and set the default font and font size.
 	 */
-	es->bit = evas_add_text(es->evas, DEFAULT_FONT, DEFAULT_SIZE, text);
+	es->bit =
+	    evas_add_text(es->evas, DEFAULT_FONT, DEFAULT_SIZE, text);
 
 	/*
 	 * Set some default colors, font, and font size.
@@ -82,7 +84,7 @@
  *
  * Returns no value. Frees the data in @es as well as @es itself.
  */
-void estyle_free(Estyle *es)
+void estyle_free(Estyle * es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -101,7 +103,7 @@
  *
  * Returns no value. Updates the display to reflect changes to @estyle.
  */
-void estyle_show(Estyle *es)
+void estyle_show(Estyle * es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -117,7 +119,7 @@
  *
  * Returns no value
  */
-void estyle_hide(Estyle *es)
+void estyle_hide(Estyle * es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -134,7 +136,7 @@
  *
  * Returns no value. Moves the requested estyle into the requested position.
  */
-void estyle_move(Estyle *es, int x, int y)
+void estyle_move(Estyle * es, int x, int y)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -143,11 +145,11 @@
 
 	es->x = x;
 	es->y = y;
-	evas_move(es->evas, es->bit, 
-			(double)(x + (es->style ?
-					es->style->info->left_push : 0)),
-			(double)(y + (es->style ? 
-					es->style->info->top_push : 0)));
+	evas_move(es->evas, es->bit,
+		  (double) (x + (es->style ?
+				 es->style->info->left_push : 0)),
+		  (double) (y + (es->style ?
+				 es->style->info->top_push : 0)));
 	if (es->style)
 		_estyle_style_move(es);
 }
@@ -163,7 +165,7 @@
  * Returns no value. Retrieves the color of the estyle into the integer pointers
  * @r, @g, @b and @a.
  */
-void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a)
+void estyle_get_color(Estyle * es, int *r, int *g, int *b, int *a)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -188,7 +190,7 @@
  * Returns no value. Changes the color of the estyle to that represented by
  * @r, @g, @b and @a.
  */
-void estyle_set_color(Estyle *es, int r, int g, int b, int a)
+void estyle_set_color(Estyle * es, int r, int g, int b, int a)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -230,14 +232,14 @@
  * estyle_set_color_db - set the color of an estyle based on color name
  * @es: the estyle to change the color
  */
-void estyle_set_color_db(Estyle *es, char *name)
+void estyle_set_color_db(Estyle * es, char *name)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
 
 	es->color = _estyle_color_instance_db(name);
 	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
-			es->color->b, es->color->a);
+		       es->color->b, es->color->a);
 	if (es->style)
 		_estyle_style_set_color(es);
 }
@@ -248,7 +250,7 @@
  *
  * Returns the name the style or NULL if no style specified.
  */
-char *estyle_get_style(Estyle *es)
+char *estyle_get_style(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
@@ -265,7 +267,7 @@
  *
  * Returns no value. The style of @es is changed to @name.
  */
-void estyle_set_style(Estyle *es, char *name)
+void estyle_set_style(Estyle * es, char *name)
 {
 	int layer;
 	char *text;
@@ -313,7 +315,7 @@
  * Returns a pointer to a copy of the text in the estyle @es on success, NULL
  * on failure.
  */
-char *estyle_get_text(Estyle *es)
+char *estyle_get_text(Estyle * es)
 {
 	char *ret;
 
@@ -334,7 +336,7 @@
  * Returns no value. Changes the text in @es to @text and updates the display
  * if visible.
  */
-void estyle_set_text(Estyle *es, char *text)
+void estyle_set_text(Estyle * es, char *text)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -359,7 +361,7 @@
  *
  * Returns the current layer of the estyle @es.
  */
-int estyle_get_layer(Estyle *es)
+int estyle_get_layer(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
 
@@ -374,7 +376,7 @@
  * Returns no value. Changes the layer of @es to @layer along with all of
  * it's style bits.
  */
-void estyle_set_layer(Estyle *es, int layer)
+void estyle_set_layer(Estyle * es, int layer)
 {
 	int index = 0;
 
@@ -401,7 +403,7 @@
  *
  * Returns a pointer to a copy of the current font of the estyle @es.
  */
-char *estyle_get_font(Estyle *es)
+char *estyle_get_font(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
@@ -413,8 +415,8 @@
  * @es: the estyle to get the font size from
  *
  * Returns the font size (an int) or FALSE if an error occurs.
- */  
-int estyle_get_font_size(Estyle *es)
+ */
+int estyle_get_font_size(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
 
@@ -428,7 +430,7 @@
  *
  * Returns no value. Changes the font for the specified estyle to @name.
  */
-void estyle_set_font(Estyle *es, char *font, int size)
+void estyle_set_font(Estyle * es, char *font, int size)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("font", font);
@@ -446,12 +448,12 @@
  *
  * Returns an Evas_Object or NULL if no clip box specified.
  */
-Evas_Object estyle_get_clip(Estyle *es)
+Evas_Object estyle_get_clip(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
 	return evas_get_clip_object(es->evas, es->bit);
-} 
+}
 
 /**
  * estyle_set_clip - set the clip box for the estyle
@@ -460,7 +462,7 @@
  *
  * Returns no value. Sets the clip box of the estyle to @clip.
  */
-void estyle_set_clip(Estyle *es, Evas_Object clip)
+void estyle_set_clip(Estyle * es, Evas_Object clip)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -481,7 +483,7 @@
  * Returns TRUE if the bits are able to be merged, otherwise FALSE. Appends the
  * text in @es2 to the text in @es1 and destroys @es2.
  */
-int estyle_merge(Estyle *es1, Estyle *es2)
+int estyle_merge(Estyle * es1, Estyle * es2)
 {
 	char *new_text, *text1, *text2;
 
@@ -527,7 +529,7 @@
  * Returns the newly created estyle on success, NULL on failure. The old
  * estyle is updated to reflect the changes.
  */
-Estyle *estyle_split(Estyle *es, unsigned int index)
+Estyle *estyle_split(Estyle * es, unsigned int index)
 {
 	char temp;
 	char *content;
@@ -570,13 +572,15 @@
 	 * Now place the content from index onwards into a new estyle.
 	 */
 	content[index] = temp;
-	new_es = estyle_new(es->evas, &(content[index]), es->style->info->name);
+	new_es =
+	    estyle_new(es->evas, &(content[index]), es->style->info->name);
 
 	/*
 	 * Give this new estyle the same settings as the previous estyle.
 	 */
 	estyle_set_clip(new_es, estyle_get_clip(es));
-	estyle_set_font(new_es, estyle_get_font(es), estyle_get_font_size(es));
+	estyle_set_font(new_es, estyle_get_font(es),
+			estyle_get_font_size(es));
 
 	/*
 	 * Set the new color for the estyle.
@@ -600,7 +604,7 @@
  *
  * Returns the length of the text in the estyle @es.
  */
-inline int estyle_length(Estyle *es)
+inline int estyle_length(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
 
@@ -618,7 +622,7 @@
  * Returns no value. Stores the current x, y coordinates and the width, height
  * dimensions into @x, @y, @w, and @h respectively.
  */
-void estyle_geometry(Estyle *es, int *x, int *y, int *w, int *h)
+void estyle_geometry(Estyle * es, int *x, int *y, int *w, int *h)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -644,8 +648,8 @@
  * Returns no value. The dimensions of the found character are stored in
  * @char_x, @char_y, @char_w, and @char_h.
  */
-void estyle_text_at(Estyle *es, int index, int *char_x, int *char_y,
-		int *char_w, int *char_h)
+void estyle_text_at(Estyle * es, int index, int *char_x, int *char_y,
+		    int *char_w, int *char_h)
 {
 	double xx, yy, ww, hh;
 
@@ -658,13 +662,17 @@
 	if (char_y)
 		*char_y = D2I_ROUND(yy) + es->y;
 	if (char_w)
-		*char_w = D2I_ROUND(ww) + (es->style ? 
-			es->style->info->left_push
-			+ es->style->info->right_push : 0);
-        if (char_h)
-		*char_h = D2I_ROUND(hh) + (es->style ? 
-			es->style->info->top_push
-			+ es->style->info->bottom_push : 0);
+		*char_w = D2I_ROUND(ww) + (es->style ?
+					   es->style->info->left_push
+					   +
+					   es->style->info->
+					   right_push : 0);
+	if (char_h)
+		*char_h = D2I_ROUND(hh) + (es->style ?
+					   es->style->info->top_push
+					   +
+					   es->style->info->
+					   bottom_push : 0);
 }
 
 /**
@@ -681,29 +689,35 @@
  * dimensions of the found character are stored in @char_x, @char_y, @char_w,
  * and @char_h.
  */
-int estyle_text_at_position(Estyle *es, int x, int y, int *char_x, int *char_y,
-		int *char_w, int *char_h)
+int estyle_text_at_position(Estyle * es, int x, int y, int *char_x,
+			    int *char_y, int *char_w, int *char_h)
 {
 	int ret;
 	double xx = 0, yy = 0, ww = 0, hh = 0;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
-	ret = evas_text_at_position(es->evas, es->bit, (double)(x - es->x),
-			(double)(y - es->y), &xx, &yy, &ww, &hh);
+	ret =
+	    evas_text_at_position(es->evas, es->bit, (double) (x - es->x),
+				  (double) (y - es->y), &xx, &yy, &ww,
+				  &hh);
 
 	if (char_x)
 		*char_x = D2I_ROUND(xx) + es->x;
 	if (char_y)
 		*char_y = D2I_ROUND(yy) + es->y;
 	if (char_w)
-		*char_w = D2I_ROUND(ww) + (es->style ? 
-			es->style->info->left_push
-			+ es->style->info->right_push : 0);
+		*char_w = D2I_ROUND(ww) + (es->style ?
+					   es->style->info->left_push
+					   +
+					   es->style->info->
+					   right_push : 0);
 	if (char_h)
-		*char_h = D2I_ROUND(hh) + (es->style ? 
-			es->style->info->top_push
-			+ es->style->info->bottom_push : 0);
+		*char_h = D2I_ROUND(hh) + (es->style ?
+					   es->style->info->top_push
+					   +
+					   es->style->info->
+					   bottom_push : 0);
 
 	return ret;
 }
@@ -714,7 +728,7 @@
  *
  * Returns 0 if the estyle does not have fixed geometry, > 0 otherwise.
  */
-inline int estyle_fixed(Estyle *es)
+inline int estyle_fixed(Estyle * es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
@@ -732,7 +746,7 @@
  * Returns no value. Fixes the reported geometry of @es to @x, @y, @w, and @h
  * respectively.
  */
-void estyle_fix_geometry(Estyle *es, int x, int y, int w, int h)
+void estyle_fix_geometry(Estyle * es, int x, int y, int w, int h)
 {
 	CHECK_PARAM_POINTER("es", es);
 
@@ -750,7 +764,7 @@
  * Returns no value. Removes the fixed property of the estyle and updates its
  * geometry to the actual geometry of the contents.
  */
-void estyle_unfix_geometry(Estyle *es)
+void estyle_unfix_geometry(Estyle * es)
 {
 	double x, y, w, h;
 
@@ -766,23 +780,25 @@
 /*
  * __estyle_update_position - update the position of the estyle
  */
-void __estyle_update_position(Estyle *es)
+void __estyle_update_position(Estyle * es)
 {
 	if (es->style)
 		evas_move(es->evas, es->bit,
-			(double)(es->x + (es->style ?
-				es->style->info->left_push : 0)),
-			(double)(es->y + (es->style ?
-				es->style->info->top_push : 0)));
+			  (double) (es->x + (es->style ?
+					     es->style->info->
+					     left_push : 0)),
+			  (double) (es->y +
+				    (es->style ? es->style->info->
+				     top_push : 0)));
 }
 
 /*
  * __estyle_update_dimensions - update the dimensions of the estyle
  */
-void __estyle_update_dimensions(Estyle *es)
+void __estyle_update_dimensions(Estyle * es)
 {
 	double x, y, w, h;
-	
+
 	/*
 	 * If the estyle doesn't have fixed dimensions then set it to the
 	 * geometry of it's contents.
@@ -790,9 +806,66 @@
 	if (!(es->flags & ESTYLE_BIT_FIXED)) {
 		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
 
-		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
-			+ es->style->info->right_push : 0);
-		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
-			+ es->style->info->bottom_push : 0);
+		es->w =
+		    D2I_ROUND(w) +
+		    (es->style ? es->style->info->left_push +
+		     es->style->info->right_push : 0);
+		es->h =
+		    D2I_ROUND(h) + (es->style ? es->style->info->top_push +
+				    es->style->info->bottom_push : 0);
 	}
+}
+
+/**
+ * estyle_callback_add - add a callback to the desired estyle
+ * @es: the estyle to add the callback
+ * @callback: the event type that triggers the callback function
+ * @func: the function to call when the event occurs
+ * @data: the data to pass to the function when called
+ *
+ * Returns no value. Adds a callback to @es that will be triggered when event
+ * @callback occurs, function @func will be called with argument @data.
+ */
+void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
+			 void (*func) (void *_data, Estyle * _es, int _b,
+				       int _x, int _y), void *data)
+{
+	Estyle_Callback *cb;
+
+	Evas evas = es->evas;
+	Evas_Object bit = es->bit;
+
+
+	if (!es)
+		return;
+	if (!es->evas)
+		return;
+
+	/*
+	 * Allocate the new estyle callback
+	 */
+	cb = malloc(sizeof(Estyle_Callback));
+	cb->estyle = es;
+	cb->data = data;
+	cb->callback = func;
+
+
+	/*
+	 * Append the callback to the estyle's list, and add the callback to
+	 * the evas bits so that the wrapper function gets called.
+	 */
+	es->callbacks = evas_list_append(es->callbacks, cb);
+	evas_callback_add(evas, bit, callback,
+			  __estyle_callback_dispatcher, cb);
+}
+
+/*
+ * The dispatcher redirects the callback to the appropriate function with the
+ * correct arguments.
+ */
+void __estyle_callback_dispatcher(void *_data, Evas _e, Evas_Object _o,
+				  int _b, int _x, int _y)
+{
+	Estyle_Callback *cb = _data;
+	cb->callback(cb->data, cb->estyle, _b, _x, _y);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- estyle_color.c	7 May 2002 01:25:27 -0000	1.5
+++ estyle_color.c	19 May 2002 07:19:42 -0000	1.6
@@ -1,4 +1,3 @@
-#include "estyle-config.h"
 #include "Estyle_private.h"
 
 static Ewd_Hash *color_table = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle_heap.c	15 Apr 2002 18:36:55 -0000	1.3
+++ estyle_heap.c	19 May 2002 07:19:42 -0000	1.4
@@ -1,7 +1,7 @@
 #include "Estyle_private.h"
 
-static void __estyle_heap_heapify(Estyle_Heap *heap, int i);
-static void __estyle_heap_update_data(Estyle_Heap *heap);
+static void __estyle_heap_heapify(Estyle_Heap * heap, int i);
+static void __estyle_heap_update_data(Estyle_Heap * heap);
 
 /**
  * _estyle_heap_new - allocate and initialize a new binary heap
@@ -15,7 +15,7 @@
 {
 	Estyle_Heap *heap = NULL;
 
-	heap = (Estyle_Heap *)malloc(sizeof(Estyle_Heap));
+	heap = (Estyle_Heap *) malloc(sizeof(Estyle_Heap));
 	if (!heap)
 		return NULL;
 	memset(heap, 0, sizeof(Estyle_Heap));
@@ -36,7 +36,7 @@
  *
  * Returns TRUE on success, FALSE on failure
  */
-int _estyle_heap_init(Estyle_Heap *heap, Ewd_Compare_Cb compare, int size)
+int _estyle_heap_init(Estyle_Heap * heap, Ewd_Compare_Cb compare, int size)
 {
 	heap->space = size;
 	if (!compare)
@@ -45,7 +45,7 @@
 		heap->compare = compare;
 	heap->order = EWD_SHEAP_MIN;
 
-	heap->data = (void **)malloc(heap->space * sizeof(void *));
+	heap->data = (void **) malloc(heap->space * sizeof(void *));
 	if (!heap->data)
 		return FALSE;
 	memset(heap->data, 0, heap->space * sizeof(void *));
@@ -60,7 +60,7 @@
  * Returns no value. Free's the memory used by @heap, calls the destroy
  * function on each data item if necessary.
  */
-void _estyle_heap_destroy(Estyle_Heap *heap)
+void _estyle_heap_destroy(Estyle_Heap * heap)
 {
 	/*
 	 * FIXME: Need to setup destructor callbacks for this class.
@@ -78,7 +78,7 @@
  * Returns TRUE on success, NULL on failure. Increases the size of the heap if
  * it becomes larger than available space.
  */
-int _estyle_heap_insert(Estyle_Heap *heap, void *data)
+int _estyle_heap_insert(Estyle_Heap * heap, void *data)
 {
 	int i;
 	void *temp;
@@ -111,7 +111,9 @@
 	 */
 	if (heap->order == EWD_SHEAP_MIN) {
 		while ((position > 0) && heap->compare(heap->data[parent],
-						heap->data[position]) > 0) {
+						       heap->
+						       data[position]) >
+		       0) {
 
 			/*
 			 * Swap the data with it's parents to move it up in
@@ -130,10 +132,11 @@
 			position = i - 1;
 			parent = PARENT(i) - 1;
 		}
-	}
-	else {
+	} else {
 		while ((position > 0) && heap->compare(heap->data[parent],
-						heap->data[position]) < 0) {
+						       heap->
+						       data[position]) <
+		       0) {
 
 			/*
 			 * Swap the data with it's parents to move it up in
@@ -164,7 +167,7 @@
  * Returns the top item of the heap on success, NULL on failure. The extract
  * function maintains the heap properties after the extract.
  */
-void *_estyle_heap_extract(Estyle_Heap *heap)
+void *_estyle_heap_extract(Estyle_Heap * heap)
 {
 	void *extreme;
 
@@ -189,7 +192,7 @@
  * Returns the top item of the heap on success, NULL on failure. The function
  * does not alter the heap.
  */
-void *_estyle_heap_extreme(Estyle_Heap *heap)
+void *_estyle_heap_extreme(Estyle_Heap * heap)
 {
 	if (heap->size < 1)
 		return NULL;
@@ -207,7 +210,7 @@
  * data since it must be passed in, so the caller can perform the free if
  * desired.
  */
-int _estyle_heap_change(Estyle_Heap *heap, void *item, void *newval)
+int _estyle_heap_change(Estyle_Heap * heap, void *item, void *newval)
 {
 	int i;
 
@@ -234,7 +237,7 @@
  * Returns TRUE on success, FALSE on failure. The comparison function is
  * changed to @compare and the heap is heapified by the new comparison.
  */
-int _estyle_heap_set_compare(Estyle_Heap *heap, Ewd_Compare_Cb compare)
+int _estyle_heap_set_compare(Estyle_Heap * heap, Ewd_Compare_Cb compare)
 {
 	if (!compare)
 		heap->compare = ewd_direct_compare;
@@ -254,7 +257,7 @@
  * Returns no value. Changes the heap order of @heap and re-heapifies the data
  * to this new order. The default order is a min heap.
  */
-void _estyle_heap_set_order(Estyle_Heap *heap, char order)
+void _estyle_heap_set_order(Estyle_Heap * heap, char order)
 {
 	heap->order = order;
 
@@ -268,12 +271,12 @@
  * Returns no value. Sorts the data in the heap into the order that is used
  * for the heap's data.
  */
-void _estyle_heap_sort(Estyle_Heap *heap)
+void _estyle_heap_sort(Estyle_Heap * heap)
 {
 	int i = 0;
 	void **new_data;
 
-	new_data = (void **)malloc(heap->size * sizeof(void *));
+	new_data = (void **) malloc(heap->size * sizeof(void *));
 
 	/*
 	 * Extract the heap and insert into the new data array in order.
@@ -299,7 +302,7 @@
  * Returns the data located at the ith position within @heap on success, NULL
  * on failure. The data is guaranteed to be in sorted order.
  */
-inline void *_estyle_heap_item(Estyle_Heap *heap, int i)
+inline void *_estyle_heap_item(Estyle_Heap * heap, int i)
 {
 	if (i >= heap->size)
 		return NULL;
@@ -320,32 +323,35 @@
  *
  * Returns no value.
  */
-static void __estyle_heap_heapify(Estyle_Heap *heap, int i)
+static void __estyle_heap_heapify(Estyle_Heap * heap, int i)
 {
 	int extreme;
 	int left = LEFT(i);
 	int right = RIGHT(i);
 
 	if (heap->order == EWD_SHEAP_MIN) {
-		if (left <= heap->size && heap->compare(heap->data[left - 1],
-					heap->data[i - 1]) < 0)
+		if (left <= heap->size
+		    && heap->compare(heap->data[left - 1],
+				     heap->data[i - 1]) < 0)
 			extreme = left;
 		else
 			extreme = i;
 
-		if (right <= heap->size && heap->compare(heap->data[right - 1],
-					heap->data[extreme - 1]) < 0)
+		if (right <= heap->size
+		    && heap->compare(heap->data[right - 1],
+				     heap->data[extreme - 1]) < 0)
 			extreme = right;
-	}
-	else {
-		if (left <= heap->size && heap->compare(heap->data[left - 1],
-					heap->data[i - 1]) > 0)
+	} else {
+		if (left <= heap->size
+		    && heap->compare(heap->data[left - 1],
+				     heap->data[i - 1]) > 0)
 			extreme = left;
 		else
 			extreme = i;
 
-		if (right <= heap->size && heap->compare(heap->data[right - 1],
-					heap->data[extreme - 1]) > 0)
+		if (right <= heap->size
+		    && heap->compare(heap->data[right - 1],
+				     heap->data[extreme - 1]) > 0)
 			extreme = right;
 	}
 
@@ -364,7 +370,7 @@
 	}
 }
 
-static void __estyle_heap_update_data(Estyle_Heap *heap)
+static void __estyle_heap_update_data(Estyle_Heap * heap)
 {
 	int i, old_size;
 	void **data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- estyle_heap.h	15 Apr 2002 18:36:55 -0000	1.3
+++ estyle_heap.h	19 May 2002 07:19:42 -0000	1.4
@@ -24,15 +24,16 @@
 };
 
 Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size);
-void _estyle_heap_destroy(Estyle_Heap *heap);
-int _estyle_heap_init(Estyle_Heap *heap, Ewd_Compare_Cb compare, int size);
-int _estyle_heap_insert(Estyle_Heap *heap, void *data);
-void *_estyle_heap_extract(Estyle_Heap *heap);
-void *_estyle_heap_extreme(Estyle_Heap *heap);
-int _estyle_heap_change(Estyle_Heap *heap, void *item, void *newval);
-void _estyle_heap_destroy(Estyle_Heap *heap);
-void _estyle_heap_sort(Estyle_Heap *heap);
+void _estyle_heap_destroy(Estyle_Heap * heap);
+int _estyle_heap_init(Estyle_Heap * heap, Ewd_Compare_Cb compare,
+		      int size);
+int _estyle_heap_insert(Estyle_Heap * heap, void *data);
+void *_estyle_heap_extract(Estyle_Heap * heap);
+void *_estyle_heap_extreme(Estyle_Heap * heap);
+int _estyle_heap_change(Estyle_Heap * heap, void *item, void *newval);
+void _estyle_heap_destroy(Estyle_Heap * heap);
+void _estyle_heap_sort(Estyle_Heap * heap);
 
-inline void *_estyle_heap_item(Estyle_Heap *heap, int i);
+inline void *_estyle_heap_item(Estyle_Heap * heap, int i);
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- estyle_style.c	7 May 2002 03:21:08 -0000	1.9
+++ estyle_style.c	19 May 2002 07:19:42 -0000	1.10
@@ -1,4 +1,3 @@
-#include "estyle-config.h"
 #include "Estyle_private.h"
 
 #define SET_REL_COLOR(a, b) ((a + b) > 255 ? 255 : ((a + b) < 0 ? 0 : a + b))
@@ -9,7 +8,7 @@
 static void __estyle_style_read(Estyle_Style_Info * info);
 static void __estyle_style_info_load(Estyle_Style_Info * info);
 static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer * layer,
-		Estyle * es, char *text);
+					     Estyle * es, char *text);
 static int __estyle_style_stack_compare(void *style1, void *style2);
 
 /*
@@ -45,14 +44,14 @@
  * Returns no value. The reference to the style is released and the style is
  * freed if appropriate.
  */
-void _estyle_style_release(Estyle_Style *style, Evas ev)
+void _estyle_style_release(Estyle_Style * style, Evas ev)
 {
 	Evas_Object ob;
 	Evas_List ptr_list;
 
 	CHECK_PARAM_POINTER("style", style);
 
-	_estyle_style_info_dereference((Estyle_Style_Info *)style->info);
+	_estyle_style_info_dereference((Estyle_Style_Info *) style->info);
 
 	/*
 	 * Destroy the list of evas_objects
@@ -62,8 +61,8 @@
 		/*
 		 * Destroy all of the objects for this estyle
 		 */
-		for (ptr_list = style->bits; ptr_list; 
-			ptr_list = ptr_list->next) {
+		for (ptr_list = style->bits; ptr_list;
+		     ptr_list = ptr_list->next) {
 
 			ob = ptr_list->data;
 			evas_hide(ev, ob);
@@ -85,7 +84,7 @@
  *
  * Returns no value. Hides the style bits associated with the estyle @es.
  */
-void _estyle_style_hide(Estyle *es)
+void _estyle_style_hide(Estyle * es)
 {
 	Evas_Object ob;
 	Evas_List ptr_list;
@@ -99,8 +98,8 @@
 	/*
 	 * Hide each bit of the style representation
 	 */
-	for (ptr_list = es->style->bits; ptr_list; 
-		ptr_list = ptr_list->next ) {
+	for (ptr_list = es->style->bits; ptr_list;
+	     ptr_list = ptr_list->next) {
 
 		ob = ptr_list->data;
 		evas_hide(es->evas, ob);
@@ -113,7 +112,7 @@
  *
  * Returns no value. Shows the style bits associated with the estyle @es.
  */
-void _estyle_style_show(Estyle *es)
+void _estyle_style_show(Estyle * es)
 {
 	Evas_Object ob;
 	Evas_List ptr_list;
@@ -127,8 +126,8 @@
 	/*
 	 * Hide each bit of the style representation
 	 */
-	for (ptr_list = es->style->bits; ptr_list; 
-		ptr_list = ptr_list->next ) {
+	for (ptr_list = es->style->bits; ptr_list;
+	     ptr_list = ptr_list->next) {
 
 		ob = ptr_list->data;
 		evas_show(es->evas, ob);
@@ -172,7 +171,7 @@
  * Returns no value. Adds the evas objects for the style bits of the main text
  * layer.
  */
-void _estyle_style_draw(Estyle *es, char *text)
+void _estyle_style_draw(Estyle * es, char *text)
 {
 	int i = 0;
 	Estyle_Style_Info *info;
@@ -193,7 +192,9 @@
 	 */
 	while ((layer = _estyle_heap_item(info->layers, i))) {
 		ob = __estyle_style_layer_draw(layer, es, text);
-		((Estyle_Style *) es->style)->bits = evas_list_append( ((Estyle_Style *)es->style)->bits, ob );
+		((Estyle_Style *) es->style)->bits =
+		    evas_list_append(((Estyle_Style *) es->style)->bits,
+				     ob);
 		i++;
 	}
 
@@ -228,11 +229,11 @@
 	/*
 	 * Move all of the lower layers bits into the correct layer
 	 */
-	while ((layer = _estyle_heap_item(info->layers, i)) 
-		&& layer->stack < 0) {
+	while ((layer = _estyle_heap_item(info->layers, i))
+	       && layer->stack < 0) {
 
-		for (ptr_list = es->style->bits; ptr_list; 
-			ptr_list = ptr_list->next ) {
+		for (ptr_list = es->style->bits; ptr_list;
+		     ptr_list = ptr_list->next) {
 
 			ob = ptr_list->data;
 			evas_set_layer(es->evas, ob, l);
@@ -252,7 +253,7 @@
  * Returns no value. Adds the evas objects for the style bits that are above
  * the main text layer.
  */
-int _estyle_style_set_layer_upper(Estyle *es, int l, int start)
+int _estyle_style_set_layer_upper(Estyle * es, int l, int start)
 {
 	char *text;
 	int i = start;
@@ -277,11 +278,11 @@
 	/*
 	 * Move all of the upper bits into the correct layer
 	 */
-	while ((layer = _estyle_heap_item(info->layers, i)) 
-		&& layer->stack) {
+	while ((layer = _estyle_heap_item(info->layers, i))
+	       && layer->stack) {
 
-		for (ptr_list = es->style->bits; ptr_list; 
-			ptr_list = ptr_list->next ) {
+		for (ptr_list = es->style->bits; ptr_list;
+		     ptr_list = ptr_list->next) {
 
 			ob = ptr_list->data;
 			evas_set_layer(es->evas, ob, l);
@@ -300,7 +301,7 @@
  * Returns no value. Moves all of the evas objects representing style bits
  * into their correct relative positions to @es.
  */
-void _estyle_style_move(Estyle *es)
+void _estyle_style_move(Estyle * es)
 {
 	int i;
 	Evas_Object ob;
@@ -315,7 +316,7 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	info = (Estyle_Style_Info *)es->style->info;
+	info = (Estyle_Style_Info *) es->style->info;
 	ptr_list = es->style->bits;
 	i = 0;
 
@@ -345,7 +346,7 @@
  * Returns no value. Changes the color for the relative layers of the style for
  * @es.
  */
-void _estyle_style_set_color(Estyle *es)
+void _estyle_style_set_color(Estyle * es)
 {
 	int i;
 	Evas_Object sob;
@@ -360,7 +361,7 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	info = (Estyle_Style_Info *)es->style->info;
+	info = (Estyle_Style_Info *) es->style->info;
 	if (!info)
 		return;
 
@@ -378,8 +379,8 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-		(sob = ptr_list->data) != NULL) {
+	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+	       (sob = ptr_list->data) != NULL) {
 
 		if (layer->relative_color) {
 			int r, g, b, a;
@@ -402,7 +403,7 @@
  *
  * Returns no value. Updates the font for the estyle @es.
  */
-void _estyle_style_set_font(Estyle *es, char *font, int size)
+void _estyle_style_set_font(Estyle * es, char *font, int size)
 {
 	int i;
 	Evas_Object sob;
@@ -417,10 +418,10 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	info = (Estyle_Style_Info *)es->style->info;
+	info = (Estyle_Style_Info *) es->style->info;
 
 	ptr_list = es->style->bits;
-	
+
 	i = 0;
 
 	/*
@@ -430,8 +431,8 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-		(sob = ptr_list->data) != NULL) {
+	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+	       (sob = ptr_list->data) != NULL) {
 
 		evas_set_font(es->evas, sob, font, size);
 		ptr_list = ptr_list->next;
@@ -444,7 +445,7 @@
  *
  * Returns no value. Updates the text for the estyle @es.
  */
-void _estyle_style_set_text(Estyle *es)
+void _estyle_style_set_text(Estyle * es)
 {
 	int i;
 	char *text;
@@ -464,7 +465,7 @@
 	if (!text)
 		return;
 
-	info = (Estyle_Style_Info *)es->style->info;
+	info = (Estyle_Style_Info *) es->style->info;
 
 	ptr_list = es->style->bits;
 
@@ -477,9 +478,9 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-		(sob = ptr_list->data) != NULL) {
-			
+	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+	       (sob = ptr_list->data) != NULL) {
+
 		evas_set_text(es->evas, sob, text);
 		ptr_list = ptr_list->next;
 	}
@@ -493,7 +494,7 @@
  * Returns no value. Changes the clip rectangle for each evas object used to
  * represent the style for @es.
  */
-void _estyle_style_set_clip(Estyle *es, Evas_Object ob)
+void _estyle_style_set_clip(Estyle * es, Evas_Object ob)
 {
 	int i;
 	Evas_Object sob;
@@ -508,8 +509,8 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	info = (Estyle_Style_Info *)es->style->info;
-	
+	info = (Estyle_Style_Info *) es->style->info;
+
 	ptr_list = es->style->bits;
 
 	i = 0;
@@ -521,8 +522,8 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-		(sob = ptr_list->data) != NULL) {
+	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+	       (sob = ptr_list->data) != NULL) {
 		if (!ob)
 			evas_unset_clip(es->evas, sob);
 		else
@@ -555,7 +556,9 @@
 		 * No previous instance found, so create one and read in it's
 		 * fields from the appropriate db.
 		 */
-		found = (Estyle_Style_Info *)malloc(sizeof(Estyle_Style_Info));
+		found =
+		    (Estyle_Style_Info *)
+		    malloc(sizeof(Estyle_Style_Info));
 		memset(found, 0, sizeof(Estyle_Style_Info));
 
 		/*
@@ -575,7 +578,7 @@
  * _estyle_style_info_dereference - remove a reference to a style_info structure
  * @info: the style info struct to dereference
  */
-void _estyle_style_info_dereference(Estyle_Style_Info *info)
+void _estyle_style_info_dereference(Estyle_Style_Info * info)
 {
 	info->references--;
 
@@ -599,8 +602,8 @@
  * @layer: the layer to be drawn
  * @es: used to get info about the evas for drawing
  */
-static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer *layer,
-		Estyle *es, char *text)
+static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer * layer,
+					     Estyle * es, char *text)
 {
 	int r, g, b, a;
 	char *font;
@@ -612,12 +615,13 @@
 	 */
 	font = evas_get_text_font(es->evas, es->bit);
 	size = evas_get_text_size(es->evas, es->bit);
-	ret = evas_add_text(es->evas, font, size + layer->size_change, text);
+	ret =
+	    evas_add_text(es->evas, font, size + layer->size_change, text);
 
-	evas_move(es->evas, ret, (double)(es->x + layer->x_offset +
-				 es->style->info->left_push),
-			(double)(es->y + layer->y_offset +
-				 es->style->info->top_push));
+	evas_move(es->evas, ret, (double) (es->x + layer->x_offset +
+					   es->style->info->left_push),
+		  (double) (es->y + layer->y_offset +
+			    es->style->info->top_push));
 
 	/*
 	 * Now determine if it has relative or absolute color and change it's
@@ -632,8 +636,7 @@
 		g = SET_REL_COLOR(es->color->g, layer->g);
 		b = SET_REL_COLOR(es->color->b, layer->b);
 		a = SET_REL_COLOR(es->color->a, layer->a);
-	}
-	else {
+	} else {
 		r = layer->r;
 		g = layer->g;
 		b = layer->b;
@@ -678,7 +681,7 @@
 	__estyle_style_read(info);
 	e_db_close(info->style_db);
 
-load_exit:
+      load_exit:
 	FREE(real_path);
 	return;
 }
@@ -701,7 +704,7 @@
 		return;
 	/*
 	   if (info->layers)
-	   	_estyle_heap_destroy(info->layers);
+	   _estyle_heap_destroy(info->layers);
 	 */
 
 	/*
@@ -711,19 +714,21 @@
 	e_db_int_get(info->style_db, key, &layers);
 	if (layers < 1) {
 		fprintf(stderr, "Estyle style %s is empty, no formatting "
-				"will be displayed for text using this style\n",
-				info->name);
+			"will be displayed for text using this style\n",
+			info->name);
 		return;
 	}
 
-	info->layers = _estyle_heap_new(__estyle_style_stack_compare, layers);
+	info->layers =
+	    _estyle_heap_new(__estyle_style_stack_compare, layers);
 
 	/*
 	 * Read in each layer
 	 */
 	for (i = 0; i < layers; i++) {
 		layer =
-		    (Estyle_Style_Layer *) malloc(sizeof(Estyle_Style_Layer));
+		    (Estyle_Style_Layer *)
+		    malloc(sizeof(Estyle_Style_Layer));
 
 		sprintf(key, "/layers/%d/stack", i);
 		e_db_int_get(info->style_db, key, &layer->stack);
@@ -778,12 +783,12 @@
  */
 static int __estyle_style_stack_compare(void *style1, void *style2)
 {
-	if (((Estyle_Style_Layer *)style1)->stack <
-			((Estyle_Style_Layer *)style2)->stack)
+	if (((Estyle_Style_Layer *) style1)->stack <
+	    ((Estyle_Style_Layer *) style2)->stack)
 		return -1;
 
-	if (((Estyle_Style_Layer *)style1)->stack >
-			((Estyle_Style_Layer *)style2)->stack)
+	if (((Estyle_Style_Layer *) style1)->stack >
+	    ((Estyle_Style_Layer *) style2)->stack)
 		return 1;
 
 	return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- estyle_style.h	15 Apr 2002 18:36:56 -0000	1.5
+++ estyle_style.h	19 May 2002 07:19:42 -0000	1.6
@@ -54,22 +54,22 @@
 void _estyle_style_move(Estyle * bit);
 void _estyle_style_set_clip(Estyle * bit, Evas_Object ob);
 void _estyle_style_set_color(Estyle * bit);
-void _estyle_style_set_font(Estyle *es, char *font, int size);
-void _estyle_style_set_text(Estyle *es);
+void _estyle_style_set_font(Estyle * es, char *font, int size);
+void _estyle_style_set_text(Estyle * es);
 int _estyle_style_set_layer_lower(Estyle * bit, int layer);
 int _estyle_style_set_layer_upper(Estyle * bit, int layer, int start);
 
 /*
  * Style info access functions
  */
-void _estyle_style_info_dereference(Estyle_Style_Info *info);
+void _estyle_style_info_dereference(Estyle_Style_Info * info);
 Estyle_Style_Info *_estyle_style_info_reference(char *name);
 
 /*
  * Style show and hide functions
  */
-void _estyle_style_show(Estyle *es);
-void _estyle_style_hide(Estyle *es);
+void _estyle_style_show(Estyle * es);
+void _estyle_style_hide(Estyle * es);
 
 /*
  * Style search path manipulators

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Moved the layering call to a place where it should always get updated (I was
seeing mislayered estyles in etox_test).

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- estyle.c	22 May 2002 22:48:33 -0000	1.18
+++ estyle.c	28 May 2002 15:31:22 -0000	1.19
@@ -277,7 +277,6 @@
  */
 void estyle_set_style(Estyle * es, char *name)
 {
-	int layer;
 	char *text;
 	Evas_Object clip;
 
@@ -301,9 +300,6 @@
 	 */
 	_estyle_style_draw(es, text);
 
-	layer = evas_get_layer(es->evas, es->bit);
-	estyle_set_layer(es, layer);
-
 	_estyle_style_move(es);
 
 	if ((clip = evas_get_clip_object(es->evas, es->bit)) != NULL)
@@ -805,8 +801,12 @@
  */
 void __estyle_update_dimensions(Estyle * es)
 {
+	int layer;
 	double x, y, w, h;
 
+	layer = evas_get_layer(es->evas, es->bit);
+	estyle_set_layer(es, layer);
+
 	/*
 	 * If the estyle doesn't have fixed dimensions then set it to the
 	 * geometry of it's contents.
@@ -895,41 +895,37 @@
  */
 void estyle_callback_del(Estyle * es, Evas_Callback_Type callback)
 {
-	Evas_List l, ll;
-	int have_cb;
+	Evas_List l;
 
 	if (!es)
 		return;
 	if (!es->evas)
 		return;
 
-	have_cb = 1;
-	while (have_cb) {
-		have_cb = 0;
-		for (l = es->callbacks; l; l = l->next) {
-			Estyle_Callback *cb;
-
-			cb = l->data;
-			if (cb->type == callback) {
-				evas_callback_del(es->evas, es->bit,
-						  callback);
-				if (es->style->bits) {
-					for (ll = es->style->bits; ll;
-					     ll = ll->next) {
-						Evas_Object o;
-
-						o = ll->data;
-						evas_callback_del(es->evas,
-								  o,
-								  callback);
-					}
-				}
-				es->callbacks =
-				    evas_list_remove(es->callbacks, cb);
-				FREE(cb);
-				have_cb = 1;
-				break;
-			}
+	/*
+	 * Remove the evas callbacks from the evas_objects.
+	 */
+	evas_callback_del(es->evas, es->bit, callback);
+	for (l = es->style->bits; l; l = l->next) {
+		Evas_Object o;
+
+		o = l->data;
+		evas_callback_del(es->evas, o, callback);
+	}
+
+	for (l = es->callbacks; l; l = l->next) {
+		Estyle_Callback *cb;
+
+		cb = l->data;
+		if (cb->type == callback) {
+
+			/*
+			 * Move to the next item in the list, remove and free
+			 * the matched item.
+			 */
+			l = l->next;
+			es->callbacks = evas_list_remove(es->callbacks, cb);
+			FREE(cb);
 		}
 	}
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
      Tag: SPLIT
	estyle.c estyle_color.c 


Log Message:
Fix for a bad pointer dereference.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -3 -r1.10.2.8 -r1.10.2.9
--- estyle.c	2 Sep 2002 19:41:04 -0000	1.10.2.8
+++ estyle.c	23 Dec 2002 21:41:27 -0000	1.10.2.9
@@ -696,7 +696,7 @@
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
 	ret = evas_object_text_char_coords_get(es->bit, (double)(x - es->x),
-			(double)(y - es->y), &xx, &yy, &ww, &hh);
+			(double)(y - es->y + (es->h / 2)), &xx, &yy, &ww, &hh);
 
 	if (char_x)
 		*char_x = D2I_ROUND(xx) + es->x;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -3 -r1.3.2.1 -r1.3.2.2
--- estyle_color.c	2 Apr 2002 11:06:34 -0000	1.3.2.1
+++ estyle_color.c	23 Dec 2002 21:41:27 -0000	1.3.2.2
@@ -5,8 +5,6 @@
 static E_DB_File *sys_colors = NULL;
 static E_DB_File *user_colors = NULL;
 
-static int __estyle_color_cmp(void *c1, void *c2);
-
 /**
  * _estyle_color_instance - get a pointer to a color structure
  * @r: the red value of the color
@@ -122,64 +120,5 @@
 		sys_colors = e_db_open_read(user_path);
 	}
 
-	color_table = ewd_hash_new(NULL, __estyle_color_cmp);
-}
-
-/**
- * Comparison function for hashing colors.
- */
-static int __estyle_color_cmp(void *c1, void *c2)
-{
-	Estyle_Color *col1 = (Estyle_Color *) c1;
-	Estyle_Color *col2 = (Estyle_Color *) c2;
-
-	/*
-	 * Check for cases of NULL being passed in.
-	 */
-	if (c1 == c2)
-		return 0;
-
-	if (!c1 && c2)
-		return -1;
-
-	if (!c2 && c1)
-		return 1;
-
-	/*
-	 * Check red colors first
-	 */
-	if (col1->r > col2->r)
-		return -1;
-
-	if (col1->r < col2->r)
-		return 1;
-
-	/*
-	 * Check green colors next
-	 */
-	if (col1->g > col2->g)
-		return -1;
-
-	if (col1->g < col2->g)
-		return 1;
-
-	/*
-	 * Check blue colors now
-	 */
-	if (col1->b > col2->b)
-		return -1;
-
-	if (col1->b < col2->b)
-		return 1;
-
-	/*
-	 * Finally check alpha colors
-	 */
-	if (col1->a > col2->a)
-		return -1;
-
-	if (col1->a < col2->a)
-		return 1;
-
-	return 0;
+	color_table = ewd_hash_new(NULL, NULL);
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test/img


Removed Files:
      Tag: SPLIT
	Makefile.am arrow_down.png arrow_up.png evas_test_image_0.png 
	evas_test_image_1.png evas_test_image_2.png sky001.png 


Log Message:
Removed some unused images.

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/debian


Modified Files:
	rules 


Log Message:
Merge of estyle from SPLIT.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rules	15 Mar 2002 00:18:24 -0000	1.2
+++ rules	14 Jan 2003 18:50:28 -0000	1.3
@@ -67,7 +67,7 @@
 	dh_testroot
 	dh_installdocs AUTHORS README
 	dh_installchangelogs
-	dh_strip
+#	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	Makefile.am estyle_test_simple.c 
Removed Files:
	estyle_test_callbacks.c 


Log Message:
Merge of estyle from SPLIT.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am	19 May 2002 07:19:42 -0000	1.4
+++ Makefile.am	14 Jan 2003 18:51:02 -0000	1.5
@@ -4,14 +4,9 @@
 CFLAGS			=	-g -W -Wall -Wno-implicit
 INCLUDES		=	-I$(top_srcdir)/src @evas_cflags@ @ewd_cflags@ @ecore_cflags@ @edb_cflags@
 
-bin_PROGRAMS			=	estyle_test_simple estyle_test_callbacks
+bin_PROGRAMS			=	estyle_test_simple
 
 estyle_test_simple_DEPENDENCIES	=	$(top_builddir)/src/libestyle.la
 estyle_test_simple_SOURCES	=	estyle_test_simple.c
 estyle_test_simple_LDFLAGS	=	-static
 estyle_test_simple_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
-
-estyle_test_callbacks_DEPENDENCIES	=	$(top_builddir)/src/libestyle.la
-estyle_test_callbacks_SOURCES	=	estyle_test_callbacks.c
-estyle_test_callbacks_LDFLAGS	=	-static
-estyle_test_callbacks_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- estyle_test_simple.c	19 May 2002 07:19:42 -0000	1.6
+++ estyle_test_simple.c	14 Jan 2003 18:51:11 -0000	1.7
@@ -3,6 +3,7 @@
 #include <math.h>
 #include <Evas.h>
 #include <Ecore.h>
+#include <Evas_Engine_Software_X11.h>
 #include "src/Estyle.h"
 #include "estyle-config.h"
 
@@ -15,7 +16,7 @@
 #define OBST_X 100.0
 #define OBST_Y 100.0
 
-char string1[] = "This text should test the basic styles";
+char string1[] = "This text should\ntest the basic styles";
 
 char string2[] = "This is the alternate text to test";
 char *last = string1;
@@ -35,9 +36,11 @@
 
 void setup(void);
 
-Evas evas;
-Evas_Render_Method render_method = RENDER_ENGINE;
-Evas_Object cursor = NULL;
+Evas *evas;
+#if 0
+int render_method = RENDER_ENGINE;
+#endif
+Evas_Object *cursor = NULL;
 Estyle *e;
 
 static void e_idle(void *data)
@@ -52,7 +55,7 @@
 	Ecore_Event_Window_Expose *e;
 
 	e = (Ecore_Event_Window_Expose *) ev->event;
-	evas_update_rect(evas, e->x, e->y, e->w, e->h);
+	evas_damage_rectangle_add(evas, e->x, e->y, e->w, e->h);
 }
 
 static void ecore_mouse_in(Ecore_Event * ev)
@@ -90,11 +93,10 @@
 		if (index < 0)
 			printf("Click occurred outside of estyle\n");
 		else {
-			printf
-			    ("Clicked letter %c at %d, %d size %d x %d\n",
-			     last[index], x, y, w, h);
-			evas_move(evas, cursor, x, y);
-			evas_resize(evas, cursor, w, h);
+			printf("Clicked letter %c at %d, %d size %d x %d\n",
+				last[index], x, y, w, h);
+			evas_object_move(cursor, x, y);
+			evas_object_resize(cursor, w, h);
 		}
 
 	} else if (eemd->button == 2) {
@@ -127,6 +129,7 @@
 void setup(void)
 {
 	Window win, ewin;
+	Display *disp=ecore_display_get();
 
 	ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE,
 				       ecore_window_expose);
@@ -139,13 +142,35 @@
 	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT,
 				       ecore_mouse_out);
 	ecore_event_filter_idle_handler_add(e_idle, NULL);
-	win = ecore_window_new(0, 0, 0, 400, 400);
 
+#if 0
 	evas = evas_new_all(ecore_display_get(), win, 0, 0, 400, 400,
 			    render_method, MAX_EVAS_COLORS, MAX_FONT_CACHE,
 			    MAX_IMAGE_CACHE, PACKAGE_DATA_DIR "/fnt");
-
-	ewin = evas_get_window(evas);
+#else
+	evas=evas_new();
+#endif
+
+	ewin = ecore_window_new(0,0,0,400,400); /* evas_get_window(evas); */
+
+    evas_output_method_set(evas, evas_render_method_lookup("software_x11"));
+    evas_output_size_set(evas, 400, 400);
+    evas_output_viewport_set(evas, 0, 0, 400, 400);
+
+    {
+	Evas_Engine_Info_Software_X11 *einfo;
+	
+	einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+	einfo->info.display = disp;
+	einfo->info.visual = DefaultVisual(disp, DefaultScreen(disp));
+	einfo->info.colormap = DefaultColormap(disp, DefaultScreen(disp));
+	einfo->info.drawable = ewin;
+	einfo->info.depth = DefaultDepth(disp, DefaultScreen(disp));
+	einfo->info.rotation = 0;
+	einfo->info.debug = 0;
+	evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
+    }
 
 	ecore_window_show(ewin);
 	ecore_window_set_events(ewin, XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE	/* |
@@ -157,14 +182,15 @@
 {
 	int i;
 	int curs_x, curs_y, curs_w, curs_h;
-	Evas_Object clip_rect;
-	Evas_Object bg, et_bg, obst;
+	Evas_Object *clip_rect;
+	Evas_Object *bg, *et_bg, *obst;
 
 	obstacle_x = OBST_X;
 	obstacle_y = OBST_Y;
 
 
 	for (i = 1; i < argc; i++) {
+#if 0
 		if (!strcmp(argv[i], "soft") ||
 		    !strcmp(argv[i], "x11") || !strcmp(argv[i], "hard")) {
 			if (!strcmp(argv[i], "soft"))
@@ -176,6 +202,9 @@
 			if (!strcmp(argv[i], "hard"))
 				render_method = RENDER_METHOD_3D_HARDWARE;
 		} else {
+#else
+		  {
+#endif
 			if (obstacle_w < 0.0)
 				obstacle_w = atoi(argv[i]);
 			else if (obstacle_h < 0.0)
@@ -196,36 +225,36 @@
 	setup();
 
 	/* add a background */
-	bg = evas_add_rectangle(evas);
-	evas_resize(evas, bg, 400, 400);
-	evas_move(evas, bg, 0, 0);
-	evas_set_layer(evas, bg, -10000);
-	evas_set_color(evas, bg, 255, 255, 255, 255);
-	evas_show(evas, bg);
+	bg = evas_object_rectangle_add(evas);
+	evas_object_resize(bg, 400, 400);
+	evas_object_move(bg, 0, 0);
+	evas_object_layer_set(bg, -10000);
+	evas_object_color_set(bg, 255, 255, 255, 255);
+	evas_object_show(bg);
 
 	/* add an estyle-background */
-	et_bg = evas_add_rectangle(evas);
-	evas_resize(evas, et_bg, 380, 380);
-	evas_move(evas, et_bg, 10, 10);
-	evas_set_layer(evas, et_bg, -10000);
-	evas_set_color(evas, et_bg, 0, 0, 255, 50);
-	evas_show(evas, et_bg);
+	et_bg = evas_object_rectangle_add(evas);
+	evas_object_resize(et_bg, 380, 380);
+	evas_object_move(et_bg, 10, 10);
+	evas_object_layer_set(et_bg, -10000);
+	evas_object_color_set(et_bg, 0, 0, 255, 50);
+	evas_object_show(et_bg);
 
 	/* draw obstacle-rect */
-	obst = evas_add_rectangle(evas);
-	evas_resize(evas, obst, obstacle_w, obstacle_h);
-	evas_move(evas, obst, obstacle_x, obstacle_y);
-	evas_set_color(evas, obst, 255, 0, 0, 50);
-	evas_show(evas, obst);
+	obst = evas_object_rectangle_add(evas);
+	evas_object_resize(obst, obstacle_w, obstacle_h);
+	evas_object_move(obst, obstacle_x, obstacle_y);
+	evas_object_color_set(obst, 255, 0, 0, 50);
+	evas_object_show(obst);
 
 	/*
 	 * Create a clip rectangle for bounding where the text is drawn
 	 */
-	clip_rect = evas_add_rectangle(evas);
-	evas_move(evas, clip_rect, 100, 100);
-	evas_resize(evas, clip_rect, 200, 200);
-	evas_show(evas, clip_rect);
-	evas_set_color(evas, clip_rect, 255, 255, 255, 255);
+	clip_rect = evas_object_rectangle_add(evas);
+	evas_object_move(clip_rect, 100, 100);
+	evas_object_resize(clip_rect, 100, 100);
+	evas_object_show(clip_rect);
+	evas_object_color_set(clip_rect, 255, 255, 255, 255);
 
 	/*
 	 * Create an estyle.
@@ -237,13 +266,18 @@
 	estyle_show(e);
 	estyle_text_at(e, 0, &curs_x, &curs_y, &curs_w, &curs_h);
 
+	printf("size: %d\n",estyle_get_font_size(e));
+	printf("name: %s\n",estyle_get_font(e));
+
+	estyle_set_font(e,"andover",32);
+
 	/* add a cursor */
-	cursor = evas_add_rectangle(evas);
-	evas_move(evas, cursor, curs_x, curs_y);
-	evas_resize(evas, cursor, curs_w, curs_h);
-	evas_set_layer(evas, cursor, 10000);
-	evas_set_color(evas, cursor, 255, 255, 255, 128);
-	evas_show(evas, cursor);
+	cursor = evas_object_rectangle_add(evas);
+	evas_object_move(cursor, curs_x, curs_y);
+	evas_object_resize(cursor, curs_w, curs_h);
+	evas_object_layer_set(cursor, 10000);
+	evas_object_color_set(cursor, 255, 255, 255, 128);
+	evas_object_show(cursor);
 
 	ecore_event_loop();

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h estyle.c estyle_color.c 
	estyle_style.c estyle_style.h 


Log Message:
Merge of estyle from SPLIT.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Estyle.h	19 May 2002 21:48:25 -0000	1.12
+++ Estyle.h	14 Jan 2003 18:50:30 -0000	1.13
@@ -12,83 +12,87 @@
 typedef struct _estyle Estyle;
 
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 
 /*
  * Constructor/destructor
  */
-	Estyle *estyle_new(Evas evas, char *text, char *style);
-	void estyle_free(Estyle * es);
+Estyle *estyle_new(Evas *evas, char *text, char *style);
+void estyle_free(Estyle * es);
 
 /*
  * Visibility modifiers
  */
-	void estyle_show(Estyle * es);
-	void estyle_hide(Estyle * es);
+void estyle_show(Estyle * es);
+void estyle_hide(Estyle * es);
 
 /*
  * Content and appearance manipulators
  */
-	void estyle_move(Estyle * es, int x, int y);
+void estyle_move(Estyle * es, int x, int y);
 
-	Evas_Object estyle_get_clip(Estyle * es);
-	void estyle_set_clip(Estyle * es, Evas_Object clip);
+Evas_Object *estyle_get_clip(Estyle *es);
+void estyle_set_clip(Estyle *es, Evas_Object *clip);
 
-	char *estyle_get_text(Estyle * es);
-	void estyle_set_text(Estyle * es, char *text);
+char *estyle_get_text(Estyle * es);
+void estyle_set_text(Estyle * es, char *text);
 
-	char *estyle_get_font(Estyle * es);
-	int estyle_get_font_size(Estyle * es);
-	void estyle_set_font(Estyle * es, char *name, int size);
+char *estyle_get_font(Estyle *es);
+int estyle_get_font_size(Estyle *es);
+void estyle_set_font(Estyle * es, char *name, int size);
 
-	int estyle_get_layer(Estyle * es);
-	void estyle_set_layer(Estyle * es, int layer);
+int estyle_get_layer(Estyle * es);
+void estyle_set_layer(Estyle * es, int layer);
 
-	char *estyle_get_style(Estyle * es);
-	void estyle_set_style(Estyle * es, char *name);
+char *estyle_get_style(Estyle * es);
+void estyle_set_style(Estyle * es, char *name);
 
-	void estyle_get_color(Estyle * es, int *r, int *g, int *b, int *a);
-	void estyle_set_color(Estyle * es, int r, int g, int b, int a);
+void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a);
+void estyle_set_color(Estyle * es, int r, int g, int b, int a);
 
-	void estyle_lookup_color_db(char *name, int *r, int *g, int *b,
-				    int *a);
-	void estyle_set_color_db(Estyle * es, char *name);
+void estyle_lookup_color_db(char *name, int *r, int *g, int *b,
+			    int *a);
+void estyle_set_color_db(Estyle * es, char *name);
 
 /*
  * Geometry querying
  */
-	inline int estyle_length(Estyle * es);
-	void estyle_geometry(Estyle * es, int *x, int *y, int *w, int *h);
-	void estyle_text_at(Estyle * es, int index, int *char_x,
+inline int estyle_length(Estyle * es);
+void estyle_geometry(Estyle * es, int *x, int *y, int *w, int *h);
+void estyle_text_at(Estyle * es, int index, int *char_x,
+		    int *char_y, int *char_w, int *char_h);
+int estyle_text_at_position(Estyle * es, int x, int y, int *char_x,
 			    int *char_y, int *char_w, int *char_h);
-	int estyle_text_at_position(Estyle * es, int x, int y, int *char_x,
-				    int *char_y, int *char_w, int *char_h);
 
 /*
  * Fixing the reported geometry to set values.
  */
-	inline int estyle_fixed(Estyle * es);
-	void estyle_fix_geometry(Estyle * es, int x, int y, int w, int h);
-	void estyle_unfix_geometry(Estyle * es);
+inline int estyle_fixed(Estyle * es);
+void estyle_fix_geometry(Estyle * es, int x, int y, int w, int h);
+void estyle_unfix_geometry(Estyle * es);
 
 /*
  * Joining and splitting estyles.
  */
-	Estyle *estyle_split(Estyle * es, unsigned int index);
-	int estyle_merge(Estyle * es1, Estyle * es2);
+Estyle *estyle_split(Estyle *es, unsigned int index);
+int estyle_merge(Estyle *es1, Estyle *es2);
+
 
 /*
  * Callbacks.
  */
-	void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
-				 void (*func) (void *_data, Estyle * _es,
-					       int _b, int _x, int _y),
-				 void *data);
-	void estyle_callback_del(Estyle * es, Evas_Callback_Type callback);
+void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
+			 void (*func) (void *_data, Estyle * _es,
+				       void *event_info),
+			 void *data);
+void estyle_callback_del(Estyle * es, Evas_Callback_Type callback,
+			 void (*func) (void *_data, Estyle * _es,
+				       void *event_info));
+
 #ifdef __cplusplus
 }
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Estyle_private.h	19 May 2002 21:48:25 -0000	1.9
+++ Estyle_private.h	14 Jan 2003 18:50:37 -0000	1.10
@@ -15,7 +15,7 @@
 };
 
 typedef void (*Estyle_Callback_Function) (void *_data, Estyle * _es,
-					  int _b, int _x, int _y);
+					  void *event_info);
 
 typedef struct _estyle_callback Estyle_Callback;
 struct _estyle_callback {
@@ -29,7 +29,7 @@
 	/*
 	 * Keep a pointer in the estyle to the evas.
 	 */
-	Evas evas;
+	Evas *evas;
 
 	/*
 	 * Each estyle can have a different color than other bits in the
@@ -58,7 +58,7 @@
 	/*
 	 * The visual representation of the text.
 	 */
-	Evas_Object bit;
+	Evas_Object *bit;
 
 	/*
 	 * Keep track of the length of text stored in this bit to avoid
@@ -69,7 +69,7 @@
 	/*
 	 * Callbacks.
 	 */
-	Evas_List callbacks;
+	Evas_List *callbacks;
 };
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- estyle.c	28 May 2002 15:31:22 -0000	1.19
+++ estyle.c	14 Jan 2003 18:50:42 -0000	1.20
@@ -1,14 +1,15 @@
 #include "Estyle_private.h"
 #include <ctype.h>
+#include <Evas.h>
 
 #define ESTYLE_TABWIDTH 8
 #define DEFAULT_FONT "nationff"
 #define DEFAULT_SIZE 12
 
-void __estyle_update_position(Estyle * es);
-void __estyle_update_dimensions(Estyle * es);
-void __estyle_callback_dispatcher(void *_data, Evas _e, Evas_Object _o,
-				  int _b, int _x, int _y);
+void __estyle_update_position(Estyle *es);
+void __estyle_update_dimensions(Estyle *es);
+void __estyle_callback_dispatcher(void *_data, Evas *_e, Evas_Object *_o,
+				  void *event_info);
 
 static int estyle_setup_complete = 0;
 
@@ -21,7 +22,7 @@
  * Returns a pointer to the newly allocated estyle on success, NULL on
  * failure. The estyle doesn't get displayed until estyle_show gets called.
  */
-Estyle *estyle_new(Evas evas, char *text, char *style)
+Estyle *estyle_new(Evas *evas, char *text, char *style)
 {
 	Estyle *es;
 
@@ -42,13 +43,14 @@
 	memset(es, 0, sizeof(Estyle));
 
 	es->evas = evas;
-	evas_font_add_path(es->evas, PACKAGE_DATA_DIR "/fonts");
+	evas_object_font_path_append(es->evas, PACKAGE_DATA_DIR"/fonts");
 
 	/*
 	 * Create the Evas_Object and set the default font and font size.
 	 */
-	es->bit =
-	    evas_add_text(es->evas, DEFAULT_FONT, DEFAULT_SIZE, text);
+	es->bit = evas_object_text_add(es->evas);
+	evas_object_text_font_set(es->bit,DEFAULT_FONT,DEFAULT_SIZE);
+	evas_object_text_text_set(es->bit,text);
 
 	/*
 	 * Set some default colors, font, and font size.
@@ -84,14 +86,14 @@
  *
  * Returns no value. Frees the data in @es as well as @es itself.
  */
-void estyle_free(Estyle * es)
+void estyle_free(Estyle *es)
 {
-	Evas_List l;
+	Evas_List *l;
 
 	CHECK_PARAM_POINTER("es", es);
 
 	if (es->bit)
-		evas_del_object(es->evas, es->bit);
+		evas_object_del(es->bit);
 
 	if (es->style)
 		_estyle_style_release(es->style, es->evas);
@@ -111,13 +113,13 @@
  *
  * Returns no value. Updates the display to reflect changes to @estyle.
  */
-void estyle_show(Estyle * es)
+void estyle_show(Estyle *es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
 	es->flags |= ESTYLE_BIT_VISIBLE;
 	_estyle_style_show(es);
-	evas_show(es->evas, es->bit);
+	evas_object_show(es->bit);
 }
 
 
@@ -127,13 +129,13 @@
  *
  * Returns no value
  */
-void estyle_hide(Estyle * es)
+void estyle_hide(Estyle *es)
 {
 	CHECK_PARAM_POINTER("es", es);
 
 	es->flags &= ~ESTYLE_BIT_VISIBLE;
 	_estyle_style_hide(es);
-	evas_hide(es->evas, es->bit);
+	evas_object_hide(es->bit);
 }
 
 /**
@@ -153,11 +155,10 @@
 
 	es->x = x;
 	es->y = y;
-	evas_move(es->evas, es->bit,
-		  (double) (x + (es->style ?
-				 es->style->info->left_push : 0)),
-		  (double) (y + (es->style ?
-				 es->style->info->top_push : 0)));
+	evas_object_move(es->bit, 
+	      (double)(x + (es->style ? es->style->info->left_push : 0)),
+	      (double)(y + (es->style ? es->style->info->top_push : 0)));
+	
 	if (es->style)
 		_estyle_style_move(es);
 }
@@ -203,7 +204,7 @@
 	CHECK_PARAM_POINTER("es", es);
 
 	es->color = _estyle_color_instance(r, g, b, a);
-	evas_set_color(es->evas, es->bit, r, g, b, a);
+	evas_object_color_set(es->bit, r, g, b, a);
 	_estyle_style_set_color(es);
 }
 
@@ -240,14 +241,14 @@
  * estyle_set_color_db - set the color of an estyle based on color name
  * @es: the estyle to change the color
  */
-void estyle_set_color_db(Estyle * es, char *name)
+void estyle_set_color_db(Estyle *es, char *name)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
 
 	es->color = _estyle_color_instance_db(name);
-	evas_set_color(es->evas, es->bit, es->color->r, es->color->g,
-		       es->color->b, es->color->a);
+	evas_object_color_set(es->bit, es->color->r, es->color->g,
+			es->color->b, es->color->a);
 	if (es->style)
 		_estyle_style_set_color(es);
 }
@@ -258,7 +259,7 @@
  *
  * Returns the name the style or NULL if no style specified.
  */
-char *estyle_get_style(Estyle * es)
+char *estyle_get_style(Estyle *es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
@@ -275,10 +276,11 @@
  *
  * Returns no value. The style of @es is changed to @name.
  */
-void estyle_set_style(Estyle * es, char *name)
+void estyle_set_style(Estyle *es, char *name)
 {
-	char *text;
-	Evas_Object clip;
+	int layer;
+	const char *text;
+	Evas_Object *clip;
 
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("name", name);
@@ -292,17 +294,20 @@
 	if ((es->style = _estyle_style_instance(name)) == NULL)
 		return;
 
-	text = evas_get_text_string(es->evas, es->bit);
+	text = evas_object_text_text_get(es->bit);
 
 	/*
 	 * Draw the new style bits and set the correct layer for all of the
 	 * estyle contents. Also clip the contents to the clip rectangle.
 	 */
-	_estyle_style_draw(es, text);
+	_estyle_style_draw(es, (char *)text);
+
+	layer = evas_object_layer_get(es->bit);
+	estyle_set_layer(es, layer);
 
 	_estyle_style_move(es);
 
-	if ((clip = evas_get_clip_object(es->evas, es->bit)) != NULL)
+	if ((clip = evas_object_clip_get(es->bit)) != NULL)
 		_estyle_style_set_clip(es, clip);
 
 	__estyle_update_position(es);
@@ -321,15 +326,15 @@
  */
 char *estyle_get_text(Estyle * es)
 {
-	char *ret;
+	const char *ret;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
-	ret = evas_get_text_string(es->evas, es->bit);
+	ret = evas_object_text_text_get(es->bit);
 	if (ret)
 		ret = strdup(ret);
 
-	return ret;
+	return (char *)ret;
 }
 
 /**
@@ -340,11 +345,11 @@
  * Returns no value. Changes the text in @es to @text and updates the display
  * if visible.
  */
-void estyle_set_text(Estyle * es, char *text)
+void estyle_set_text(Estyle *es, char *text)
 {
 	CHECK_PARAM_POINTER("es", es);
 
-	evas_set_text(es->evas, es->bit, text);
+	evas_object_text_text_set(es->bit, text);
 
 	/*
 	 * Set the text for the style bits.
@@ -369,7 +374,7 @@
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
 
-	return evas_get_layer(es->evas, es->bit);
+	return evas_object_layer_get(es->bit);
 }
 
 /**
@@ -380,13 +385,13 @@
  * Returns no value. Changes the layer of @es to @layer along with all of
  * it's style bits.
  */
-void estyle_set_layer(Estyle * es, int layer)
+void estyle_set_layer(Estyle *es, int layer)
 {
 	int index = 0;
 
 	CHECK_PARAM_POINTER("es", es);
 
-	evas_set_layer(es->evas, es->bit, layer - 1);
+	evas_object_layer_set(es->bit, layer - 1);
 
 	/*
 	 * Changing the layer of the style bits must be broken into to steps to
@@ -395,7 +400,7 @@
 	if (es->style)
 		index = _estyle_style_set_layer_lower(es, layer);
 
-	evas_set_layer(es->evas, es->bit, layer);
+	evas_object_layer_set(es->bit, layer);
 
 	if (es->style)
 		_estyle_style_set_layer_upper(es, layer, index);
@@ -409,9 +414,11 @@
  */
 char *estyle_get_font(Estyle * es)
 {
+	char *font;
+	double size;
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
-
-	return evas_get_text_font(es->evas, es->bit);
+	evas_object_text_font_get(es->bit, &font, &size);
+	return font;
 }
 
 /**
@@ -419,12 +426,14 @@
  * @es: the estyle to get the font size from
  *
  * Returns the font size (an int) or FALSE if an error occurs.
- */
-int estyle_get_font_size(Estyle * es)
+ */  
+int estyle_get_font_size(Estyle *es)
 {
-	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
-
-	return evas_get_text_size(es->evas, es->bit);
+	char *font;
+	double size;
+	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+	evas_object_text_font_get(es->bit, &font, &size);
+	return (int)size;
 }
 
 /**
@@ -434,12 +443,12 @@
  *
  * Returns no value. Changes the font for the specified estyle to @name.
  */
-void estyle_set_font(Estyle * es, char *font, int size)
+void estyle_set_font(Estyle *es, char *font, int size)
 {
 	CHECK_PARAM_POINTER("es", es);
 	CHECK_PARAM_POINTER("font", font);
 
-	evas_set_font(es->evas, es->bit, font, size);
+	evas_object_text_font_set(es->bit, font, size);
 	if (es->style)
 		_estyle_style_set_font(es, font, size);
 
@@ -452,12 +461,12 @@
  *
  * Returns an Evas_Object or NULL if no clip box specified.
  */
-Evas_Object estyle_get_clip(Estyle * es)
+Evas_Object *estyle_get_clip(Estyle *es)
 {
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
-	return evas_get_clip_object(es->evas, es->bit);
-}
+	return evas_object_clip_get(es->bit);
+} 
 
 /**
  * estyle_set_clip - set the clip box for the estyle
@@ -466,14 +475,14 @@
  *
  * Returns no value. Sets the clip box of the estyle to @clip.
  */
-void estyle_set_clip(Estyle * es, Evas_Object clip)
+void estyle_set_clip(Estyle *es, Evas_Object *clip)
 {
 	CHECK_PARAM_POINTER("es", es);
 
 	if (clip)
-		evas_set_clip(es->evas, es->bit, clip);
+		evas_object_clip_set(es->bit, clip);
 	else
-		evas_unset_clip(es->evas, es->bit);
+		evas_object_clip_unset(es->bit);
 
 	if (es->style)
 		_estyle_style_set_clip(es, clip);
@@ -487,7 +496,7 @@
  * Returns TRUE if the bits are able to be merged, otherwise FALSE. Appends the
  * text in @es2 to the text in @es1 and destroys @es2.
  */
-int estyle_merge(Estyle * es1, Estyle * es2)
+int estyle_merge(Estyle *es1, Estyle *es2)
 {
 	char *new_text, *text1, *text2;
 
@@ -501,8 +510,8 @@
 	 * These return a pointer to the actual text in the evas object, not a
 	 * copy of it. So don't free them.
 	 */
-	text1 = evas_get_text_string(es1->evas, es1->bit);
-	text2 = evas_get_text_string(es2->evas, es2->bit);
+	text1 = (char *)evas_object_text_text_get(es1->bit);
+	text2 = (char *)evas_object_text_text_get(es2->bit);
 
 	/*
 	 * When the evas changes text it free's the old text, so malloc a new
@@ -533,7 +542,7 @@
  * Returns the newly created estyle on success, NULL on failure. The old
  * estyle is updated to reflect the changes.
  */
-Estyle *estyle_split(Estyle * es, unsigned int index)
+Estyle *estyle_split(Estyle *es, unsigned int index)
 {
 	char temp;
 	char *content;
@@ -599,6 +608,25 @@
 
 	FREE(content);
 
+	/*
+	 * Give this new estyle the same settings as the previous estyle.
+	 */
+	estyle_set_clip(new_es, estyle_get_clip(es));
+	estyle_set_font(new_es, estyle_get_font(es), estyle_get_font_size(es));
+
+	/*
+	 * Set the new color for the estyle.
+	 */
+	estyle_get_color(es, &r, &g, &b, &a);
+	estyle_set_color(new_es, r, g, b, a);
+
+	/*
+	 * Put it on the same layer as the old estyle
+	 */
+	estyle_set_layer(new_es, estyle_get_layer(es));
+
+	FREE(content);
+
 	return new_es;
 }
 
@@ -659,24 +687,20 @@
 
 	CHECK_PARAM_POINTER("es", es);
 
-	evas_text_at(es->evas, es->bit, index, &xx, &yy, &ww, &hh);
+	evas_object_text_char_pos_get(es->bit, index,  &xx, &yy, &ww, &hh);
 
 	if (char_x)
 		*char_x = D2I_ROUND(xx) + es->x;
 	if (char_y)
 		*char_y = D2I_ROUND(yy) + es->y;
 	if (char_w)
-		*char_w = D2I_ROUND(ww) + (es->style ?
-					   es->style->info->left_push
-					   +
-					   es->style->info->
-					   right_push : 0);
-	if (char_h)
-		*char_h = D2I_ROUND(hh) + (es->style ?
-					   es->style->info->top_push
-					   +
-					   es->style->info->
-					   bottom_push : 0);
+		*char_w = D2I_ROUND(ww) + (es->style ? 
+			es->style->info->left_push
+			+ es->style->info->right_push : 0);
+        if (char_h)
+		*char_h = D2I_ROUND(hh) + (es->style ? 
+			es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
 }
 
 /**
@@ -701,27 +725,21 @@
 
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
-	ret =
-	    evas_text_at_position(es->evas, es->bit, (double) (x - es->x),
-				  (double) (y - es->y), &xx, &yy, &ww,
-				  &hh);
+	ret = evas_object_text_char_coords_get(es->bit, (double)(x - es->x),
+			(double)(y - es->y + (es->h / 2)), &xx, &yy, &ww, &hh);
 
 	if (char_x)
 		*char_x = D2I_ROUND(xx) + es->x;
 	if (char_y)
 		*char_y = D2I_ROUND(yy) + es->y;
 	if (char_w)
-		*char_w = D2I_ROUND(ww) + (es->style ?
-					   es->style->info->left_push
-					   +
-					   es->style->info->
-					   right_push : 0);
+		*char_w = D2I_ROUND(ww) + (es->style ? 
+			es->style->info->left_push
+			+ es->style->info->right_push : 0);
 	if (char_h)
-		*char_h = D2I_ROUND(hh) + (es->style ?
-					   es->style->info->top_push
-					   +
-					   es->style->info->
-					   bottom_push : 0);
+		*char_h = D2I_ROUND(hh) + (es->style ? 
+			es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
 
 	return ret;
 }
@@ -774,7 +792,7 @@
 
 	CHECK_PARAM_POINTER("es", es);
 
-	evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
+	evas_object_geometry_get(es->bit, &x, &y, &w, &h);
 	es->x = D2I_ROUND(x);
 	es->y = D2I_ROUND(y);
 	es->w = D2I_ROUND(w);
@@ -784,43 +802,34 @@
 /*
  * __estyle_update_position - update the position of the estyle
  */
-void __estyle_update_position(Estyle * es)
+void __estyle_update_position(Estyle *es)
 {
 	if (es->style)
-		evas_move(es->evas, es->bit,
-			  (double) (es->x + (es->style ?
-					     es->style->info->
-					     left_push : 0)),
-			  (double) (es->y +
-				    (es->style ? es->style->info->
-				     top_push : 0)));
+		evas_object_move(es->bit,
+			(double)(es->x + (es->style ?
+				es->style->info->left_push : 0)),
+			(double)(es->y + (es->style ?
+				es->style->info->top_push : 0)));
 }
 
 /*
  * __estyle_update_dimensions - update the dimensions of the estyle
  */
-void __estyle_update_dimensions(Estyle * es)
+void __estyle_update_dimensions(Estyle *es)
 {
-	int layer;
 	double x, y, w, h;
-
-	layer = evas_get_layer(es->evas, es->bit);
-	estyle_set_layer(es, layer);
-
+	
 	/*
 	 * If the estyle doesn't have fixed dimensions then set it to the
 	 * geometry of it's contents.
 	 */
 	if (!(es->flags & ESTYLE_BIT_FIXED)) {
-		evas_get_geometry(es->evas, es->bit, &x, &y, &w, &h);
+		evas_object_geometry_get(es->bit, &x, &y, &w, &h);
 
-		es->w =
-		    D2I_ROUND(w) +
-		    (es->style ? es->style->info->left_push +
-		     es->style->info->right_push : 0);
-		es->h =
-		    D2I_ROUND(h) + (es->style ? es->style->info->top_push +
-				    es->style->info->bottom_push : 0);
+		es->w = D2I_ROUND(w) + (es->style ? es->style->info->left_push
+			+ es->style->info->right_push : 0);
+		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
+			+ es->style->info->bottom_push : 0);
 	}
 }
 
@@ -835,11 +844,11 @@
  * @callback occurs, function @func will be called with argument @data.
  */
 void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
-			 void (*func) (void *_data, Estyle * _es, int _b,
-				       int _x, int _y), void *data)
+			 void (*func) (void *_data, Estyle * _es, 
+				       void *event_info), void *data)
 {
 	Estyle_Callback *cb;
-	Evas_List l;
+	Evas_List *l;
 
 	if (!es)
 		return;
@@ -860,17 +869,16 @@
 	 * Append the callback to the estyle's list, and add the callback to
 	 * the evas bits so that the wrapper function gets called.
 	 */
-	es->callbacks = evas_list_append(es->callbacks, cb);
-	evas_callback_add(es->evas, es->bit, callback,
+	es->callbacks = evas_list_append(es->callbacks, (const void *)cb);
+	evas_object_event_callback_add(es->bit, callback,
 			  __estyle_callback_dispatcher, cb);
 	if (es->style->bits) {
 		for (l = es->style->bits; l; l = l->next) {
-			Evas_Object o;
+			Evas_Object *o;
 
 			o = l->data;
-			evas_callback_add(es->evas, o, callback,
-					  __estyle_callback_dispatcher,
-					  cb);
+			evas_object_event_callback_add(o, callback,
+					__estyle_callback_dispatcher, cb);
 		}
 	}
 }
@@ -879,11 +887,11 @@
  * The dispatcher redirects the callback to the appropriate function with the
  * correct arguments.
  */
-void __estyle_callback_dispatcher(void *_data, Evas _e, Evas_Object _o,
-				  int _b, int _x, int _y)
+void __estyle_callback_dispatcher(void *_data, Evas *_e, Evas_Object *_o,
+				  void *event_info)
 {
 	Estyle_Callback *cb = _data;
-	cb->callback(cb->data, cb->estyle, _b, _x, _y);
+	cb->callback(cb->data, cb->estyle, event_info);
 }
 
 /*
@@ -893,31 +901,21 @@
  *
  * Returns no value.
  */
-void estyle_callback_del(Estyle * es, Evas_Callback_Type callback)
+void estyle_callback_del(Estyle * es, Evas_Callback_Type callback,
+		Estyle_Callback_Function func)
 {
-	Evas_List l;
+	Evas_List *l;
 
 	if (!es)
 		return;
 	if (!es->evas)
 		return;
 
-	/*
-	 * Remove the evas callbacks from the evas_objects.
-	 */
-	evas_callback_del(es->evas, es->bit, callback);
-	for (l = es->style->bits; l; l = l->next) {
-		Evas_Object o;
-
-		o = l->data;
-		evas_callback_del(es->evas, o, callback);
-	}
-
 	for (l = es->callbacks; l; l = l->next) {
 		Estyle_Callback *cb;
 
 		cb = l->data;
-		if (cb->type == callback) {
+		if (cb->type == callback && cb->callback == func) {
 
 			/*
 			 * Move to the next item in the list, remove and free
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- estyle_color.c	19 May 2002 07:19:42 -0000	1.6
+++ estyle_color.c	14 Jan 2003 18:50:52 -0000	1.7
@@ -1,3 +1,4 @@
+#include "estyle-config.h"
 #include "Estyle_private.h"
 
 static Ewd_Hash *color_table = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- estyle_style.c	19 May 2002 07:19:42 -0000	1.10
+++ estyle_style.c	14 Jan 2003 18:50:56 -0000	1.11
@@ -1,3 +1,4 @@
+#include "estyle-config.h"
 #include "Estyle_private.h"
 
 #define SET_REL_COLOR(a, b) ((a + b) > 255 ? 255 : ((a + b) < 0 ? 0 : a + b))
@@ -7,8 +8,8 @@
 
 static void __estyle_style_read(Estyle_Style_Info * info);
 static void __estyle_style_info_load(Estyle_Style_Info * info);
-static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer * layer,
-					     Estyle * es, char *text);
+static Evas_Object *__estyle_style_layer_draw(Estyle_Style_Layer * layer,
+		Estyle * es, char *text);
 static int __estyle_style_stack_compare(void *style1, void *style2);
 
 /*
@@ -44,14 +45,14 @@
  * Returns no value. The reference to the style is released and the style is
  * freed if appropriate.
  */
-void _estyle_style_release(Estyle_Style * style, Evas ev)
+void _estyle_style_release(Estyle_Style *style, Evas *ev)
 {
-	Evas_Object ob;
-	Evas_List ptr_list;
+	Evas_Object *ob;
+	Evas_List *ptr_list;
 
 	CHECK_PARAM_POINTER("style", style);
 
-	_estyle_style_info_dereference((Estyle_Style_Info *) style->info);
+	_estyle_style_info_dereference((Estyle_Style_Info *)style->info);
 
 	/*
 	 * Destroy the list of evas_objects
@@ -61,12 +62,12 @@
 		/*
 		 * Destroy all of the objects for this estyle
 		 */
-		for (ptr_list = style->bits; ptr_list;
-		     ptr_list = ptr_list->next) {
+		for (ptr_list = style->bits; ptr_list; 
+			ptr_list = ptr_list->next) {
 
 			ob = ptr_list->data;
-			evas_hide(ev, ob);
-			evas_del_object(ev, ob);
+			evas_object_hide(ob);
+			evas_object_del(ob);
 		}
 
 		/*
@@ -84,10 +85,10 @@
  *
  * Returns no value. Hides the style bits associated with the estyle @es.
  */
-void _estyle_style_hide(Estyle * es)
+void _estyle_style_hide(Estyle *es)
 {
-	Evas_Object ob;
-	Evas_List ptr_list;
+	Evas_Object *ob;
+	Evas_List *ptr_list;
 
 	/*
 	 * Check if we need to hide any style bits.
@@ -98,11 +99,11 @@
 	/*
 	 * Hide each bit of the style representation
 	 */
-	for (ptr_list = es->style->bits; ptr_list;
-	     ptr_list = ptr_list->next) {
+	for (ptr_list = es->style->bits; ptr_list; 
+		ptr_list = ptr_list->next ) {
 
 		ob = ptr_list->data;
-		evas_hide(es->evas, ob);
+		evas_object_hide(ob);
 	}
 }
 
@@ -112,10 +113,10 @@
  *
  * Returns no value. Shows the style bits associated with the estyle @es.
  */
-void _estyle_style_show(Estyle * es)
+void _estyle_style_show(Estyle *es)
 {
-	Evas_Object ob;
-	Evas_List ptr_list;
+	Evas_Object *ob;
+	Evas_List *ptr_list;
 
 	/*
 	 * Check if we need to show any style bits.
@@ -126,11 +127,11 @@
 	/*
 	 * Hide each bit of the style representation
 	 */
-	for (ptr_list = es->style->bits; ptr_list;
-	     ptr_list = ptr_list->next) {
+	for (ptr_list = es->style->bits; ptr_list; 
+		ptr_list = ptr_list->next ) {
 
 		ob = ptr_list->data;
-		evas_show(es->evas, ob);
+		evas_object_show(ob);
 	}
 }
 
@@ -171,12 +172,12 @@
  * Returns no value. Adds the evas objects for the style bits of the main text
  * layer.
  */
-void _estyle_style_draw(Estyle * es, char *text)
+void _estyle_style_draw(Estyle *es, char *text)
 {
 	int i = 0;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
-	Evas_Object ob;
+	Evas_Object *ob;
 
 	if (!es->style)
 		return;
@@ -192,13 +193,11 @@
 	 */
 	while ((layer = _estyle_heap_item(info->layers, i))) {
 		ob = __estyle_style_layer_draw(layer, es, text);
-		((Estyle_Style *) es->style)->bits =
-		    evas_list_append(((Estyle_Style *) es->style)->bits,
-				     ob);
+		((Estyle_Style *) es->style)->bits = evas_list_append( ((Estyle_Style *)es->style)->bits, ob );
 		i++;
 	}
 
-	ob = evas_get_clip_object(es->evas, es->bit);
+	ob = evas_object_clip_get(es->bit);
 	if (ob)
 		_estyle_style_set_clip(es, ob);
 }
@@ -215,8 +214,8 @@
 	int i = 0;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
-	Evas_Object ob;
-	Evas_List ptr_list;
+	Evas_Object *ob;
+	Evas_List *ptr_list;
 
 	if (!es->style)
 		return 0;
@@ -229,14 +228,14 @@
 	/*
 	 * Move all of the lower layers bits into the correct layer
 	 */
-	while ((layer = _estyle_heap_item(info->layers, i))
-	       && layer->stack < 0) {
+	while ((layer = _estyle_heap_item(info->layers, i)) 
+		&& layer->stack < 0) {
 
-		for (ptr_list = es->style->bits; ptr_list;
-		     ptr_list = ptr_list->next) {
+		for (ptr_list = es->style->bits; ptr_list; 
+			ptr_list = ptr_list->next ) {
 
 			ob = ptr_list->data;
-			evas_set_layer(es->evas, ob, l);
+			evas_object_layer_set(ob, l);
 		}
 		i++;
 	}
@@ -253,14 +252,14 @@
  * Returns no value. Adds the evas objects for the style bits that are above
  * the main text layer.
  */
-int _estyle_style_set_layer_upper(Estyle * es, int l, int start)
+int _estyle_style_set_layer_upper(Estyle *es, int l, int start)
 {
 	char *text;
 	int i = start;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
-	Evas_Object ob;
-	Evas_List ptr_list;
+	Evas_Object *ob;
+	Evas_List *ptr_list;
 
 	if (!es->bit)
 		return 0;
@@ -268,7 +267,7 @@
 	if (!es->style)
 		return 0;
 
-	text = evas_get_text_string(es->evas, es->bit);
+	text = (char *)evas_object_text_text_get(es->bit);
 
 	info = ((Estyle_Style *) es->style)->info;
 
@@ -278,14 +277,14 @@
 	/*
 	 * Move all of the upper bits into the correct layer
 	 */
-	while ((layer = _estyle_heap_item(info->layers, i))
-	       && layer->stack) {
+	while ((layer = _estyle_heap_item(info->layers, i)) 
+		&& layer->stack) {
 
-		for (ptr_list = es->style->bits; ptr_list;
-		     ptr_list = ptr_list->next) {
+		for (ptr_list = es->style->bits; ptr_list; 
+			ptr_list = ptr_list->next ) {
 
 			ob = ptr_list->data;
-			evas_set_layer(es->evas, ob, l);
+			evas_object_layer_set(ob, l);
 		}
 
 		i++;
@@ -301,11 +300,11 @@
  * Returns no value. Moves all of the evas objects representing style bits
  * into their correct relative positions to @es.
  */
-void _estyle_style_move(Estyle * es)
+void _estyle_style_move(Estyle *es)
 {
 	int i;
-	Evas_Object ob;
-	Evas_List ptr_list;
+	Evas_Object *ob;
+	Evas_List *ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -316,7 +315,7 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	info = (Estyle_Style_Info *) es->style->info;
+	info = (Estyle_Style_Info *)es->style->info;
 	ptr_list = es->style->bits;
 	i = 0;
 
@@ -326,11 +325,11 @@
 	 * have the same number of items in them, but check for that just in
 	 * case there isn't.
 	 */
-	while (ptr_list && info->layers &&
+	while (ptr_list && 
 		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(ob = ptr_list->data) != NULL) {
 		
-		evas_move(es->evas, ob, (double)(es->x + layer->x_offset +
+		evas_object_move(ob, (double)(es->x + layer->x_offset +
 					info->left_push),
 					(double)(es->y + layer->y_offset +
 					info->right_push));
@@ -346,11 +345,11 @@
  * Returns no value. Changes the color for the relative layers of the style for
  * @es.
  */
-void _estyle_style_set_color(Estyle * es)
+void _estyle_style_set_color(Estyle *es)
 {
 	int i;
-	Evas_Object sob;
-	Evas_List ptr_list;
+	Evas_Object *sob;
+	Evas_List *ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -379,8 +378,8 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-	       (sob = ptr_list->data) != NULL) {
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
 
 		if (layer->relative_color) {
 			int r, g, b, a;
@@ -390,7 +389,7 @@
 			b = SET_REL_COLOR(es->color->b, layer->b);
 			a = SET_REL_COLOR(es->color->a, layer->a);
 
-			evas_set_color(es->evas, sob, r, g, b, a);
+			evas_object_color_set(sob, r, g, b, a);
 		}
 
 		ptr_list = ptr_list->next;
@@ -403,11 +402,11 @@
  *
  * Returns no value. Updates the font for the estyle @es.
  */
-void _estyle_style_set_font(Estyle * es, char *font, int size)
+void _estyle_style_set_font(Estyle *es, char *font, int size)
 {
 	int i;
-	Evas_Object sob;
-	Evas_List ptr_list;
+	Evas_Object *sob;
+	Evas_List *ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -431,10 +430,10 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-	       (sob = ptr_list->data) != NULL) {
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
 
-		evas_set_font(es->evas, sob, font, size);
+		evas_object_text_font_set(sob, font, size);
 		ptr_list = ptr_list->next;
 	}
 }
@@ -445,12 +444,12 @@
  *
  * Returns no value. Updates the text for the estyle @es.
  */
-void _estyle_style_set_text(Estyle * es)
+void _estyle_style_set_text(Estyle *es)
 {
 	int i;
 	char *text;
-	Evas_Object sob;
-	Evas_List ptr_list;
+	Evas_Object *sob;
+	Evas_List *ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -461,7 +460,7 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	text = evas_get_text_string(es->evas, es->bit);
+	text = (char *)evas_object_text_text_get(es->bit);
 	if (!text)
 		return;
 
@@ -478,10 +477,10 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-	       (sob = ptr_list->data) != NULL) {
-
-		evas_set_text(es->evas, sob, text);
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
+			
+		evas_object_text_text_set(sob, text);
 		ptr_list = ptr_list->next;
 	}
 }
@@ -494,11 +493,11 @@
  * Returns no value. Changes the clip rectangle for each evas object used to
  * represent the style for @es.
  */
-void _estyle_style_set_clip(Estyle * es, Evas_Object ob)
+void _estyle_style_set_clip(Estyle *es, Evas_Object *ob)
 {
 	int i;
-	Evas_Object sob;
-	Evas_List ptr_list;
+	Evas_Object *sob;
+	Evas_List *ptr_list;
 	Estyle_Style_Info *info;
 	Estyle_Style_Layer *layer;
 
@@ -509,8 +508,8 @@
 	 * Prepare to traverse the list of bits and layers to get the correct
 	 * layout.
 	 */
-	info = (Estyle_Style_Info *) es->style->info;
-
+	info = (Estyle_Style_Info *)es->style->info;
+	
 	ptr_list = es->style->bits;
 
 	i = 0;
@@ -522,12 +521,12 @@
 	 * case there isn't.
 	 */
 	while (ptr_list &&
-	       (layer = _estyle_heap_item(info->layers, i++)) != NULL &&
-	       (sob = ptr_list->data) != NULL) {
+		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
+		(sob = ptr_list->data) != NULL) {
 		if (!ob)
-			evas_unset_clip(es->evas, sob);
+			evas_object_clip_unset(sob);
 		else
-			evas_set_clip(es->evas, sob, ob);
+			evas_object_clip_set(sob, ob);
 
 		ptr_list = ptr_list->next;
 	}
@@ -578,7 +577,7 @@
  * _estyle_style_info_dereference - remove a reference to a style_info structure
  * @info: the style info struct to dereference
  */
-void _estyle_style_info_dereference(Estyle_Style_Info * info)
+void _estyle_style_info_dereference(Estyle_Style_Info *info)
 {
 	info->references--;
 
@@ -602,26 +601,26 @@
  * @layer: the layer to be drawn
  * @es: used to get info about the evas for drawing
  */
-static Evas_Object __estyle_style_layer_draw(Estyle_Style_Layer * layer,
-					     Estyle * es, char *text)
+static Evas_Object *__estyle_style_layer_draw(Estyle_Style_Layer *layer,
+		Estyle *es, char *text)
 {
 	int r, g, b, a;
 	char *font;
-	int size;
-	Evas_Object ret;
+	double size;
+	Evas_Object *ret;
 
 	/*
 	 * Create the text at the correct size and move it into position
 	 */
-	font = evas_get_text_font(es->evas, es->bit);
-	size = evas_get_text_size(es->evas, es->bit);
-	ret =
-	    evas_add_text(es->evas, font, size + layer->size_change, text);
-
-	evas_move(es->evas, ret, (double) (es->x + layer->x_offset +
-					   es->style->info->left_push),
-		  (double) (es->y + layer->y_offset +
-			    es->style->info->top_push));
+	evas_object_text_font_get(es->bit, &font, &size);
+	ret = evas_object_text_add(es->evas);
+	evas_object_text_font_set(ret, font, size + layer->size_change);
+	evas_object_text_text_set(ret, text); 
+
+	evas_object_move(ret, (double)(es->x + layer->x_offset +
+				 es->style->info->left_push),
+			(double)(es->y + layer->y_offset +
+				 es->style->info->top_push));
 
 	/*
 	 * Now determine if it has relative or absolute color and change it's
@@ -643,7 +642,7 @@
 		a = layer->a;
 	}
 
-	evas_set_color(es->evas, ret, r, g, b, a);
+	evas_object_color_set(ret, r, g, b, a);
 
 	return ret;
 }
@@ -704,7 +703,7 @@
 		return;
 	/*
 	   if (info->layers)
-	   _estyle_heap_destroy(info->layers);
+	   	_estyle_heap_destroy(info->layers);
 	 */
 
 	/*
@@ -719,8 +718,7 @@
 		return;
 	}
 
-	info->layers =
-	    _estyle_heap_new(__estyle_style_stack_compare, layers);
+	info->layers = _estyle_heap_new(__estyle_style_stack_compare, layers);
 
 	/*
 	 * Read in each layer
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- estyle_style.h	19 May 2002 07:19:42 -0000	1.6
+++ estyle_style.h	14 Jan 2003 18:51:01 -0000	1.7
@@ -37,7 +37,7 @@
 typedef struct _estyle_style Estyle_Style;
 struct _estyle_style {
 	Estyle_Style_Info *info;
-	Evas_List bits;
+	Evas_List *bits;
 };
 
 
@@ -45,31 +45,31 @@
  * Style constructors and destructors
  */
 Estyle_Style *_estyle_style_instance(char *name);
-void _estyle_style_release(Estyle_Style * style, Evas ev);
+void _estyle_style_release(Estyle_Style * style, Evas *ev);
 
 /*
  * Style display modifiers.
  */
 void _estyle_style_draw(Estyle * et, char *text);
 void _estyle_style_move(Estyle * bit);
-void _estyle_style_set_clip(Estyle * bit, Evas_Object ob);
+void _estyle_style_set_clip(Estyle * bit, Evas_Object *ob);
 void _estyle_style_set_color(Estyle * bit);
-void _estyle_style_set_font(Estyle * es, char *font, int size);
-void _estyle_style_set_text(Estyle * es);
+void _estyle_style_set_font(Estyle *es, char *font, int size);
+void _estyle_style_set_text(Estyle *es);
 int _estyle_style_set_layer_lower(Estyle * bit, int layer);
 int _estyle_style_set_layer_upper(Estyle * bit, int layer, int start);
 
 /*
  * Style info access functions
  */
-void _estyle_style_info_dereference(Estyle_Style_Info * info);
+void _estyle_style_info_dereference(Estyle_Style_Info *info);
 Estyle_Style_Info *_estyle_style_info_reference(char *name);
 
 /*
  * Style show and hide functions
  */
-void _estyle_style_show(Estyle * es);
-void _estyle_style_hide(Estyle * es);
+void _estyle_style_show(Estyle *es);
+void _estyle_style_hide(Estyle *es);
 
 /*
  * Style search path manipulators

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Fix some problems mapping coords to characters. This solves the cursor mapping
problem for EWL. Still need to determine why very thin characters get mapped
to extremely wide coords.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- estyle_test_simple.c	14 Jan 2003 18:51:11 -0000	1.7
+++ estyle_test_simple.c	1 Mar 2003 22:52:38 -0000	1.8
@@ -120,8 +120,10 @@
 {
 	Ecore_Event_Mouse_Move *eemm =
 	    (Ecore_Event_Mouse_Move *) ev->event;
+	/*
 	if (focused)
 		estyle_move(e, eemm->x, eemm->y);
+		*/
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Fix some problems mapping coords to characters. This solves the cursor mapping
problem for EWL. Still need to determine why very thin characters get mapped
to extremely wide coords.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- estyle.c	23 Jan 2003 15:13:14 -0000	1.21
+++ estyle.c	1 Mar 2003 22:52:38 -0000	1.22
@@ -726,7 +726,7 @@
 	CHECK_PARAM_POINTER_RETURN("es", es, 0);
 
 	ret = evas_object_text_char_coords_get(es->bit, (double)(x - es->x),
-			(double)(y - es->y + (es->h / 2)), &xx, &yy, &ww, &hh);
+			(double)(y - es->y), &xx, &yy, &ww, &hh);
 
 	if (char_x)
 		*char_x = D2I_ROUND(xx) + es->x;

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Update the test program to use ecore2.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- estyle_test_simple.c	1 Mar 2003 22:52:38 -0000	1.8
+++ estyle_test_simple.c	22 Jul 2003 15:25:23 -0000	1.9
@@ -3,6 +3,7 @@
 #include <math.h>
 #include <Evas.h>
 #include <Ecore.h>
+#include <Ecore_X.h>
 #include <Evas_Engine_Software_X11.h>
 #include "src/Estyle.h"
 #include "estyle-config.h"
@@ -27,12 +28,12 @@
 int visible = 1;
 int focused = 0;
 
-static void e_idle(void *data);
-static void ecore_window_expose(Ecore_Event * ev);
-static void ecore_mouse_down(Ecore_Event * ev);
-static void ecore_mouse_move(Ecore_Event * ev);
-static void ecore_mouse_in(Ecore_Event * ev);
-static void ecore_mouse_out(Ecore_Event * ev);
+static int e_idle(void *data);
+static int ecore_window_expose(void *data, int type, void * ev);
+static int ecore_mouse_down(void *data, int type, void * ev);
+static int ecore_mouse_move(void *data, int type, void * ev);
+static int ecore_mouse_in(void *data, int type, void * ev);
+static int ecore_mouse_out(void *data, int type, void * ev);
 
 void setup(void);
 
@@ -43,37 +44,52 @@
 Evas_Object *cursor = NULL;
 Estyle *e;
 
-static void e_idle(void *data)
+static int e_idle(void *data)
 {
 	evas_render(evas);
-	return;
+	return 1;
 	data = NULL;
 }
 
-static void ecore_window_expose(Ecore_Event * ev)
+static int ecore_window_expose(void *data, int type, void * ev)
 {
-	Ecore_Event_Window_Expose *e;
+	Ecore_X_Event_Window_Damage *e;
 
-	e = (Ecore_Event_Window_Expose *) ev->event;
+	e = (Ecore_X_Event_Window_Damage *) ev;
 	evas_damage_rectangle_add(evas, e->x, e->y, e->w, e->h);
+
+	return 1;
+	data = NULL;
+	type = 0;
+	ev = NULL;
 }
 
-static void ecore_mouse_in(Ecore_Event * ev)
+static int ecore_mouse_in(void *data, int type, void * ev)
 {
 	focused = 1;
+
+	return 1;
+	data = NULL;
+	type = 0;
+	ev = NULL;
 }
 
-static void ecore_mouse_out(Ecore_Event * ev)
+static int ecore_mouse_out(void *data, int type, void * ev)
 {
 	focused = 0;
+
+	return 1;
+	data = NULL;
+	type = 0;
+	ev = NULL;
 }
 
-static void ecore_mouse_down(Ecore_Event * ev)
+static int ecore_mouse_down(void *data, int type, void * ev)
 {
 	int index, x, y, w, h;
 
-	Ecore_Event_Mouse_Down *eemd =
-	    (Ecore_Event_Mouse_Down *) ev->event;
+	Ecore_X_Event_Mouse_Button_Down *eemd =
+	    (Ecore_X_Event_Mouse_Button_Down *) ev;
 
 	if (eemd->button == 1) {
 		if (last == string1) {
@@ -111,19 +127,22 @@
 			visible = 1;
 		}
 	}
+
+	return 1;
+	data = NULL;
+	type = 0;
+	ev = NULL;
 }
 
 /*
  * Follow the mouse around the window
  */
-static void ecore_mouse_move(Ecore_Event * ev)
+static int ecore_mouse_move(void *data, int type, void * ev)
 {
-	Ecore_Event_Mouse_Move *eemm =
-	    (Ecore_Event_Mouse_Move *) ev->event;
-	/*
-	if (focused)
-		estyle_move(e, eemm->x, eemm->y);
-		*/
+	return 1;
+	data = NULL;
+	type = 0;
+	ev = NULL;
 }
 
 
@@ -131,19 +150,17 @@
 void setup(void)
 {
 	Window win, ewin;
-	Display *disp=ecore_display_get();
+	Display *disp = ecore_x_display_get();
 
-	ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE,
-				       ecore_window_expose);
-	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN,
-				       ecore_mouse_down);
-	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE,
-				       ecore_mouse_move);
-	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN,
-				       ecore_mouse_in);
-	ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT,
-				       ecore_mouse_out);
-	ecore_event_filter_idle_handler_add(e_idle, NULL);
+	ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DAMAGE,
+			ecore_window_expose, NULL);
+	ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
+			ecore_mouse_down, NULL);
+	ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, ecore_mouse_move,
+			NULL);
+	ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, ecore_mouse_in, NULL);
+	ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, ecore_mouse_out, NULL);
+	ecore_idler_add(e_idle, NULL);
 
 #if 0
 	evas = evas_new_all(ecore_display_get(), win, 0, 0, 400, 400,
@@ -153,7 +170,7 @@
 	evas=evas_new();
 #endif
 
-	ewin = ecore_window_new(0,0,0,400,400); /* evas_get_window(evas); */
+	ewin = ecore_x_window_new(0,0,0,400,400); /* evas_get_window(evas); */
 
     evas_output_method_set(evas, evas_render_method_lookup("software_x11"));
     evas_output_size_set(evas, 400, 400);
@@ -174,17 +191,18 @@
 	evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
     }
 
-	ecore_window_show(ewin);
-	ecore_window_set_events(ewin, XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE	/* |
-										   XEV_IN_OUT */ );
-	ecore_window_show(win);
+	ecore_x_window_show(ewin);
+	/* ecore_window_set_events(ewin, XEV_EXPOSE | XEV_BUTTON |
+		 XEV_MOUSE_MOVE	| XEV_IN_OUT); */ 
+	ecore_x_window_show(win);
 }
 
 int main(int argc, char *argv[])
 {
-	int i;
+	int i, w, h;
 	int curs_x, curs_y, curs_w, curs_h;
 	Evas_Object *clip_rect;
+	Evas_Object *img_test;
 	Evas_Object *bg, *et_bg, *obst;
 
 	obstacle_x = OBST_X;
@@ -219,10 +237,9 @@
 	if (obstacle_h < 0.0)
 		obstacle_h = 100.0;
 
-	ecore_display_init(NULL);
-	ecore_event_signal_init();
-	ecore_event_filter_init();
-	ecore_event_x_init();
+	ecore_init();
+
+	ecore_x_init(NULL);
 
 	setup();
 
@@ -249,6 +266,16 @@
 	evas_object_color_set(obst, 255, 0, 0, 50);
 	evas_object_show(obst);
 
+	img_test = evas_object_image_add(evas);
+	evas_object_image_file_set(img_test, "/usr/share/pixmaps/dia-diagram.png", NULL);
+	evas_object_image_size_get(img_test, &w, &h);
+	printf("Image of size %d x %d\n", w, h);
+	evas_object_move(img_test, 10, 10);
+	evas_object_image_fill_set(img_test, 0, 0, w, h);
+	evas_object_resize(img_test, 5 * w, 5 * h);
+	evas_object_layer_set(img_test, 10000);
+	evas_object_show(img_test);
+
 	/*
 	 * Create a clip rectangle for bounding where the text is drawn
 	 */
@@ -281,7 +308,7 @@
 	evas_object_color_set(cursor, 255, 255, 255, 128);
 	evas_object_show(cursor);
 
-	ecore_event_loop();
+	ecore_main_loop_begin();
 
 	estyle_free(e);
 	evas_free(evas);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h estyle.c 


Log Message:
Remove a bunch of duplicated lines, these resulted in some memory corruption.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Estyle.h	14 Jan 2003 18:50:30 -0000	1.13
+++ Estyle.h	22 Jul 2003 22:04:43 -0000	1.14
@@ -6,16 +6,16 @@
 #include <Evas.h>
 
 
-/*
- * The estyle holds all information necessary for display and layout of the text
- */
-typedef struct _estyle Estyle;
-
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
+
+
+/*
+ * The estyle holds all information necessary for display and layout of the text
+ */
+typedef struct _estyle Estyle;
 
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- estyle.c	1 Mar 2003 22:52:38 -0000	1.22
+++ estyle.c	22 Jul 2003 22:04:43 -0000	1.23
@@ -608,25 +608,6 @@
 
 	FREE(content);
 
-	/*
-	 * Give this new estyle the same settings as the previous estyle.
-	 */
-	estyle_set_clip(new_es, estyle_get_clip(es));
-	estyle_set_font(new_es, estyle_get_font(es), estyle_get_font_size(es));
-
-	/*
-	 * Set the new color for the estyle.
-	 */
-	estyle_get_color(es, &r, &g, &b, &a);
-	estyle_set_color(new_es, r, g, b, a);
-
-	/*
-	 * Put it on the same layer as the old estyle
-	 */
-	estyle_set_layer(new_es, estyle_get_layer(es));
-
-	FREE(content);
-
 	return new_es;
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Off by one error in testing string length for splitting.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- estyle.c	22 Jul 2003 22:04:43 -0000	1.23
+++ estyle.c	23 Jul 2003 21:54:09 -0000	1.24
@@ -568,7 +568,7 @@
 	 * Check if the index is within the bounds of the string, and won't
 	 * result in an empty string.
 	 */
-	if (index >= strlen(content) - 1) {
+	if (index >= strlen(content)) {
 		FREE(content);
 		return NULL;
 	}
@@ -605,6 +605,9 @@
 	 * Put it on the same layer as the old estyle
 	 */
 	estyle_set_layer(new_es, estyle_get_layer(es));
+
+	if (evas_object_visible_get(es->bit))
+		estyle_show(new_es);
 
 	FREE(content);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle_private.h estyle.c 


Log Message:
Duplicate spaces at the end of a string, this works around the sizing issues
in evas text objects.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Estyle_private.h	14 Jan 2003 18:50:37 -0000	1.10
+++ Estyle_private.h	4 Aug 2003 17:17:13 -0000	1.11
@@ -67,6 +67,12 @@
 	int length;
 
 	/*
+	 * Count of spaces at end of string to determine what was duplicated
+	 * for sizing workaround.
+	 */
+	int spaces;
+
+	/*
 	 * Callbacks.
 	 */
 	Evas_List *callbacks;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- estyle.c	23 Jul 2003 21:54:09 -0000	1.24
+++ estyle.c	4 Aug 2003 17:17:13 -0000	1.25
@@ -49,8 +49,7 @@
 	 * Create the Evas_Object and set the default font and font size.
 	 */
 	es->bit = evas_object_text_add(es->evas);
-	evas_object_text_font_set(es->bit,DEFAULT_FONT,DEFAULT_SIZE);
-	evas_object_text_text_set(es->bit,text);
+	evas_object_text_font_set(es->bit, DEFAULT_FONT, DEFAULT_SIZE);
 
 	/*
 	 * Set some default colors, font, and font size.
@@ -66,16 +65,7 @@
 	if (es->style)
 		_estyle_style_draw(es, text);
 
-	/*
-	 * Set length and dimensions.
-	 */
-	es->length = strlen(text);
-	__estyle_update_dimensions(es);
-
-	/*
-	 * move to (0,0) by default. (is this necessary? -redalb)
-	 */
-	/* estyle_move(es, 0, 0); */
+	estyle_set_text(es, text);
 
 	return es;
 }
@@ -326,15 +316,25 @@
  */
 char *estyle_get_text(Estyle * es)
 {
-	const char *ret;
+	int scount, i;
+	const char *text;
+	char *temp = NULL;
 
 	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
 
-	ret = evas_object_text_text_get(es->bit);
-	if (ret)
-		ret = strdup(ret);
+	text = evas_object_text_text_get(es->bit);
+	if (text) {
+		temp = calloc(es->length + 1, sizeof(char));
+		if (temp) {
+			scount = es->length - es->spaces;
+			memmove(temp, text, scount);
+
+			for (i = 0; i < es->spaces; i++)
+				temp[scount + i] = text[scount + (2 * i)];
+		}
+	}
 
-	return (char *)ret;
+	return temp;
 }
 
 /**
@@ -347,9 +347,39 @@
  */
 void estyle_set_text(Estyle *es, char *text)
 {
+	int i, scount;
+	char *temp;
+
 	CHECK_PARAM_POINTER("es", es);
 
-	evas_object_text_text_set(es->bit, text);
+	/*
+	 * Wheee!! what fun, to get the sizing right when spaces end the
+	 * string we need to duplicate them. Start by counting the extra
+	 * characters needed.
+	 */
+	scount = es->length = strlen(text);
+	while (--scount > 0 && isspace(text[scount]));
+
+	scount++;
+	es->spaces = es->length - scount;
+
+	/*
+	 * Now copy in the starting string byte-by-byte, followed by the
+	 * doubled spaces.
+	 */
+	temp = calloc(es->length + es->spaces + 1, sizeof(char));
+	memmove(temp, text, scount);
+	for (i = 0; i < es->spaces; i++) {
+		temp[scount + (2 * i)] = text[scount + i];
+		temp[scount + (2 * i) + 1] = text[scount + i];
+	}
+
+	/*
+	 * Null terminate that sucka
+	 */
+	temp[scount + (2 * i)] = '\0';
+	evas_object_text_text_set(es->bit, temp);
+	FREE(temp);
 
 	/*
 	 * Set the text for the style bits.
@@ -360,7 +390,6 @@
 	/*
 	 * Set new length and dimensions.
 	 */
-	es->length = strlen(text);
 	__estyle_update_dimensions(es);
 }

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Duplicate spaces at the end of a string, this works around the sizing issues
in evas text objects.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- estyle_test_simple.c	22 Jul 2003 15:25:23 -0000	1.9
+++ estyle_test_simple.c	4 Aug 2003 17:17:13 -0000	1.10
@@ -17,9 +17,9 @@
 #define OBST_X 100.0
 #define OBST_Y 100.0
 
-char string1[] = "This text should\ntest the basic styles";
+char string1[] = "This text should\ntest the basic styles ";
 
-char string2[] = "This is the alternate text to test";
+char string2[] = "This is the alternate text to test ";
 char *last = string1;
 
 int obstacle_w = -1, obstacle_h = -1, obstacle_x, obstacle_y;

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Don't hog the cpu doing unnecessary render passes.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- estyle_test_simple.c	4 Aug 2003 17:17:13 -0000	1.10
+++ estyle_test_simple.c	5 Aug 2003 04:26:56 -0000	1.11
@@ -160,7 +160,7 @@
 			NULL);
 	ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, ecore_mouse_in, NULL);
 	ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, ecore_mouse_out, NULL);
-	ecore_idler_add(e_idle, NULL);
+	ecore_idle_enterer_add(e_idle, NULL);
 
 #if 0
 	evas = evas_new_all(ecore_display_get(), win, 0, 0, 400, 400,

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
API breakage. Converted estyle to be an evas smart object.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- estyle_test_simple.c	5 Aug 2003 04:26:56 -0000	1.11
+++ estyle_test_simple.c	5 Aug 2003 16:42:44 -0000	1.12
@@ -42,7 +42,7 @@
 int render_method = RENDER_ENGINE;
 #endif
 Evas_Object *cursor = NULL;
-Estyle *e;
+Evas_Object *e;
 
 static int e_idle(void *data)
 {
@@ -86,7 +86,8 @@
 
 static int ecore_mouse_down(void *data, int type, void * ev)
 {
-	int index, x, y, w, h;
+	int index;
+	double x, y, w, h;
 
 	Ecore_X_Event_Mouse_Button_Down *eemd =
 	    (Ecore_X_Event_Mouse_Button_Down *) ev;
@@ -109,7 +110,7 @@
 		if (index < 0)
 			printf("Click occurred outside of estyle\n");
 		else {
-			printf("Clicked letter %c at %d, %d size %d x %d\n",
+			printf("Clicked letter %c at %g, %g size %g x %g\n",
 				last[index], x, y, w, h);
 			evas_object_move(cursor, x, y);
 			evas_object_resize(cursor, w, h);
@@ -200,7 +201,7 @@
 int main(int argc, char *argv[])
 {
 	int i, w, h;
-	int curs_x, curs_y, curs_w, curs_h;
+	double curs_x, curs_y, curs_w, curs_h;
 	Evas_Object *clip_rect;
 	Evas_Object *img_test;
 	Evas_Object *bg, *et_bg, *obst;
@@ -289,10 +290,10 @@
 	 * Create an estyle.
 	 */
 	e = estyle_new(evas, string1, "raised");
-	estyle_move(e, 100, 100);
-	estyle_set_color(e, 128, 255, 255, 255);
-	estyle_set_clip(e, clip_rect);
-	estyle_show(e);
+	evas_object_move(e, 100, 100);
+	evas_object_color_set(e, 128, 255, 255, 255);
+	evas_object_clip_set(e, clip_rect);
+	evas_object_show(e);
 	estyle_text_at(e, 0, &curs_x, &curs_y, &curs_w, &curs_h);
 
 	printf("size: %d\n",estyle_get_font_size(e));

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle


Modified Files:
	README configure.ac configure.in 


Log Message:
API breakage. Converted estyle to be an evas smart object.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- README	26 Jan 2002 07:37:07 -0000	1.1.1.1
+++ README	5 Aug 2003 16:42:44 -0000	1.2
@@ -1,3 +1,3 @@
 Estyle - An evas based text stylization library
 -----------------------------------------------
-Estyle provides  simple API for adding text to an evas with a stylized effect.
+Estyle provides simple API for adding text to an evas with a stylized effect.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.ac	27 Apr 2002 05:04:45 -0000	1.3
+++ configure.ac	5 Aug 2003 16:42:44 -0000	1.4
@@ -2,7 +2,7 @@
 
 AC_INIT
 AC_CONFIG_SRCDIR([configure.in])
-AM_INIT_AUTOMAKE(estyle, 0.0.1)
+AM_INIT_AUTOMAKE(estyle, 0.0.2)
 AM_CONFIG_HEADER(estyle-config.h)
 
 AC_ISC_POSIX
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in	27 Apr 2002 05:04:45 -0000	1.4
+++ configure.in	5 Aug 2003 16:42:44 -0000	1.5
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(estyle, 0.0.1)
+AM_INIT_AUTOMAKE(estyle, 0.0.2)
 AM_CONFIG_HEADER(estyle-config.h)
 
 AC_ISC_POSIX

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h estyle.c estyle_style.c 
	estyle_style.h 


Log Message:
API breakage. Converted estyle to be an evas smart object.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Estyle.h	22 Jul 2003 22:04:43 -0000	1.14
+++ Estyle.h	5 Aug 2003 16:42:44 -0000	1.15
@@ -12,85 +12,62 @@
 #endif
 
 
-/*
- * The estyle holds all information necessary for display and layout of the text
- */
-typedef struct _estyle Estyle;
-
 
 /*
  * Constructor/destructor
  */
-Estyle *estyle_new(Evas *evas, char *text, char *style);
-void estyle_free(Estyle * es);
-
-/*
- * Visibility modifiers
- */
-void estyle_show(Estyle * es);
-void estyle_hide(Estyle * es);
+Evas_Object *estyle_new(Evas *evas, char *text, char *style);
 
 /*
  * Content and appearance manipulators
  */
-void estyle_move(Estyle * es, int x, int y);
-
-Evas_Object *estyle_get_clip(Estyle *es);
-void estyle_set_clip(Estyle *es, Evas_Object *clip);
-
-char *estyle_get_text(Estyle * es);
-void estyle_set_text(Estyle * es, char *text);
-
-char *estyle_get_font(Estyle *es);
-int estyle_get_font_size(Estyle *es);
-void estyle_set_font(Estyle * es, char *name, int size);
 
-int estyle_get_layer(Estyle * es);
-void estyle_set_layer(Estyle * es, int layer);
+char *estyle_get_text(Evas_Object * obj);
+void estyle_set_text(Evas_Object * obj, char *text);
 
-char *estyle_get_style(Estyle * es);
-void estyle_set_style(Estyle * es, char *name);
+char *estyle_get_font(Evas_Object *obj);
+int estyle_get_font_size(Evas_Object *obj);
+void estyle_set_font(Evas_Object *obj, char *name, int size);
 
-void estyle_get_color(Estyle *es, int *r, int *g, int *b, int *a);
-void estyle_set_color(Estyle * es, int r, int g, int b, int a);
+char *estyle_get_style(Evas_Object *obj);
+void estyle_set_style(Evas_Object *, char *name);
 
-void estyle_lookup_color_db(char *name, int *r, int *g, int *b,
-			    int *a);
-void estyle_set_color_db(Estyle * es, char *name);
+void estyle_lookup_color_db(char *name, int *r, int *g, int *b, int *a);
+void estyle_set_color_db(Evas_Object *obj, char *name);
 
 /*
  * Geometry querying
  */
-inline int estyle_length(Estyle * es);
-void estyle_geometry(Estyle * es, int *x, int *y, int *w, int *h);
-void estyle_text_at(Estyle * es, int index, int *char_x,
-		    int *char_y, int *char_w, int *char_h);
-int estyle_text_at_position(Estyle * es, int x, int y, int *char_x,
-			    int *char_y, int *char_w, int *char_h);
+inline int estyle_length(Evas_Object *obj);
+void estyle_text_at(Evas_Object *obj, int index, double *char_x,
+		    double *char_y, double *char_w, double *char_h);
+int estyle_text_at_position(Evas_Object *obj, double x, double y,
+		double *char_x, double *char_y, double *char_w, double *char_h);
 
 /*
  * Fixing the reported geometry to set values.
  */
-inline int estyle_fixed(Estyle * es);
-void estyle_fix_geometry(Estyle * es, int x, int y, int w, int h);
-void estyle_unfix_geometry(Estyle * es);
+inline int estyle_fixed(Evas_Object *obj);
+void estyle_fix_geometry(Evas_Object *obj, double x, double y, double w,
+		double h);
+void estyle_unfix_geometry(Evas_Object *obj);
 
 /*
  * Joining and splitting estyles.
  */
-Estyle *estyle_split(Estyle *es, unsigned int index);
-int estyle_merge(Estyle *es1, Estyle *es2);
+Evas_Object *estyle_split(Evas_Object *obj, unsigned int index);
+int estyle_merge(Evas_Object *obj1, Evas_Object *obj2);
 
 
 /*
  * Callbacks.
  */
-void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
-			 void (*func) (void *_data, Estyle * _es,
+void estyle_callback_add(Evas_Object *obj, Evas_Callback_Type callback,
+			 void (*func) (void *_data, Evas_Object * _es,
 				       void *event_info),
 			 void *data);
-void estyle_callback_del(Estyle * es, Evas_Callback_Type callback,
-			 void (*func) (void *_data, Estyle * _es,
+void estyle_callback_del(Evas_Object *obj, Evas_Callback_Type callback,
+			 void (*func) (void *_data, Evas_Object * _es,
 				       void *event_info));
 
 #ifdef __cplusplus
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Estyle_private.h	4 Aug 2003 17:17:13 -0000	1.11
+++ Estyle_private.h	5 Aug 2003 16:42:44 -0000	1.12
@@ -2,6 +2,12 @@
 #define _ESTYLE_PRIVATE_H
 
 #include "Estyle.h"
+
+/*
+ * The estyle holds all information necessary for display and layout of the text
+ */
+typedef struct _estyle Estyle;
+
 #include "../estyle-config.h"
 #include "estyle_heap.h"
 #include "estyle_color.h"
@@ -14,12 +20,12 @@
 	ESTYLE_BIT_VISIBLE = 2,
 };
 
-typedef void (*Estyle_Callback_Function) (void *_data, Estyle * _es,
+typedef void (*Estyle_Callback_Function) (void *_data, Evas_Object * _es,
 					  void *event_info);
 
 typedef struct _estyle_callback Estyle_Callback;
 struct _estyle_callback {
-	Estyle *estyle;
+	Evas_Object *obj;
 	Evas_Callback_Type type;
 	void *data;
 	Estyle_Callback_Function callback;
@@ -42,7 +48,7 @@
 	 * case of a tab character, the width of the bit does not match the
 	 * width of the actual character printed.
 	 */
-	int x, y, w, h;
+	double x, y, w, h;
 
 	/*
 	 * The flags field is used to indicate that the bit is not to be moved
@@ -61,6 +67,11 @@
 	Evas_Object *bit;
 
 	/*
+	 * The smart object to tie the structure together.
+	 */
+	Evas_Object *smart_obj;
+
+	/*
 	 * Keep track of the length of text stored in this bit to avoid
 	 * needing to recalculate this often.
 	 */
@@ -85,5 +96,14 @@
 #define BIT_MERGEABLE(es1, es2) (es1 && es2 && \
 		!(es1->flags & ESTYLE_BIT_FIXED) && \
 		!(es2->flags & ESTYLE_BIT_FIXED) && es1 != es2)
+
+void estyle_free(Evas_Object *obj);
+void estyle_show(Evas_Object *obj);
+void estyle_hide(Evas_Object *obj);
+void estyle_move(Evas_Object *obj, double x, double y);
+void estyle_set_layer(Evas_Object *obj, int layer);
+void estyle_set_color(Evas_Object *obj, int r, int g, int b, int a);
+void estyle_set_clip(Evas_Object *obj, Evas_Object *clip);
+void estyle_unset_clip(Evas_Object *obj);
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- estyle.c	4 Aug 2003 17:17:13 -0000	1.25
+++ estyle.c	5 Aug 2003 16:42:44 -0000	1.26
@@ -12,6 +12,7 @@
 				  void *event_info);
 
 static int estyle_setup_complete = 0;
+Evas_Smart *estyle_smart = NULL;
 
 /**
  * estyle_new - create a estyle with specified text
@@ -22,9 +23,10 @@
  * Returns a pointer to the newly allocated estyle on success, NULL on
  * failure. The estyle doesn't get displayed until estyle_show gets called.
  */
-Estyle *estyle_new(Evas *evas, char *text, char *style)
+Evas_Object *estyle_new(Evas *evas, char *text, char *style)
 {
 	Estyle *es;
+	Evas_Object *obj = NULL;
 
 	CHECK_PARAM_POINTER_RETURN("evas", evas, NULL);
 
@@ -32,6 +34,12 @@
 	 * Check to see if the internal data structures has been completed.
 	 */
 	if (!estyle_setup_complete) {
+		estyle_smart = evas_smart_new("estyle_smart", NULL,
+				estyle_free, estyle_set_layer, NULL,
+				NULL, NULL, NULL,
+				estyle_move, NULL, estyle_show,
+				estyle_hide, estyle_set_color, estyle_set_clip,
+				estyle_unset_clip, NULL);
 		_estyle_color_init();
 		_estyle_style_add_path(PACKAGE_DATA_DIR "/styles");
 		estyle_setup_complete = 1;
@@ -51,6 +59,11 @@
 	es->bit = evas_object_text_add(es->evas);
 	evas_object_text_font_set(es->bit, DEFAULT_FONT, DEFAULT_SIZE);
 
+	obj = evas_object_smart_add(evas, estyle_smart);
+	evas_object_smart_member_add(obj, es->bit);
+	evas_object_smart_data_set(obj, es);
+	es->smart_obj = obj;
+
 	/*
 	 * Set some default colors, font, and font size.
 	 */
@@ -61,13 +74,13 @@
 	 */
 	if (style)
 		es->style = _estyle_style_instance(style);
-	estyle_set_color(es, 255, 255, 255, 255);
+	estyle_set_color(obj, 255, 255, 255, 255);
 	if (es->style)
 		_estyle_style_draw(es, text);
 
-	estyle_set_text(es, text);
+	estyle_set_text(obj, text);
 
-	return es;
+	return obj;
 }
 
 /**
@@ -76,11 +89,12 @@
  *
  * Returns no value. Frees the data in @es as well as @es itself.
  */
-void estyle_free(Estyle *es)
+void estyle_free(Evas_Object *obj)
 {
 	Evas_List *l;
+	Estyle *es;
 
-	CHECK_PARAM_POINTER("es", es);
+	es = evas_object_smart_data_get(obj);
 
 	if (es->bit)
 		evas_object_del(es->bit);
@@ -103,9 +117,11 @@
  *
  * Returns no value. Updates the display to reflect changes to @estyle.
  */
-void estyle_show(Estyle *es)
+void estyle_show(Evas_Object *obj)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	es = evas_object_smart_data_get(obj);
 
 	es->flags |= ESTYLE_BIT_VISIBLE;
 	_estyle_style_show(es);
@@ -119,9 +135,11 @@
  *
  * Returns no value
  */
-void estyle_hide(Estyle *es)
+void estyle_hide(Evas_Object *obj)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	es = evas_object_smart_data_get(obj);
 
 	es->flags &= ~ESTYLE_BIT_VISIBLE;
 	_estyle_style_hide(es);
@@ -136,9 +154,11 @@
  *
  * Returns no value. Moves the requested estyle into the requested position.
  */
-void estyle_move(Estyle * es, int x, int y)
+void estyle_move(Evas_Object *obj, double x, double y)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	es = evas_object_smart_data_get(obj);
 
 	if (es->x == x && es->y == y)
 		return;
@@ -146,8 +166,8 @@
 	es->x = x;
 	es->y = y;
 	evas_object_move(es->bit, 
-	      (double)(x + (es->style ? es->style->info->left_push : 0)),
-	      (double)(y + (es->style ? es->style->info->top_push : 0)));
+	      (x + (es->style ? es->style->info->left_push : 0)),
+	      (y + (es->style ? es->style->info->top_push : 0)));
 	
 	if (es->style)
 		_estyle_style_move(es);
@@ -164,9 +184,13 @@
  * Returns no value. Retrieves the color of the estyle into the integer pointers
  * @r, @g, @b and @a.
  */
-void estyle_get_color(Estyle * es, int *r, int *g, int *b, int *a)
+void estyle_get_color(Evas_Object *obj, int *r, int *g, int *b, int *a)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	CHECK_PARAM_POINTER("obj", obj);
+
+	es = evas_object_smart_data_get(obj);
 
 	if (r)
 		*r = es->color->r;
@@ -189,9 +213,11 @@
  * Returns no value. Changes the color of the estyle to that represented by
  * @r, @g, @b and @a.
  */
-void estyle_set_color(Estyle * es, int r, int g, int b, int a)
+void estyle_set_color(Evas_Object *obj, int r, int g, int b, int a)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle * es;
+
+	es = evas_object_smart_data_get(obj);
 
 	es->color = _estyle_color_instance(r, g, b, a);
 	evas_object_color_set(es->bit, r, g, b, a);
@@ -231,11 +257,15 @@
  * estyle_set_color_db - set the color of an estyle based on color name
  * @es: the estyle to change the color
  */
-void estyle_set_color_db(Estyle *es, char *name)
+void estyle_set_color_db(Evas_Object *obj, char *name)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	CHECK_PARAM_POINTER("obj", obj);
 	CHECK_PARAM_POINTER("name", name);
 
+	es = evas_object_smart_data_get(obj);
+
 	es->color = _estyle_color_instance_db(name);
 	evas_object_color_set(es->bit, es->color->r, es->color->g,
 			es->color->b, es->color->a);
@@ -249,9 +279,13 @@
  *
  * Returns the name the style or NULL if no style specified.
  */
-char *estyle_get_style(Estyle *es)
+char *estyle_get_style(Evas_Object *obj)
 {
-	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+	Estyle *es;
+
+	CHECK_PARAM_POINTER_RETURN("obj", obj, NULL);
+
+	es = evas_object_smart_data_get(obj);
 
 	if (!es->style)
 		return NULL;
@@ -266,15 +300,18 @@
  *
  * Returns no value. The style of @es is changed to @name.
  */
-void estyle_set_style(Estyle *es, char *name)
+void estyle_set_style(Evas_Object *obj, char *name)
 {
 	int layer;
 	const char *text;
 	Evas_Object *clip;
+	Estyle *es;
 
-	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER("obj", obj);
 	CHECK_PARAM_POINTER("name", name);
 
+	es = evas_object_smart_data_get(obj);
+
 	/*
 	 * Set the style for this particular es.
 	 */
@@ -293,7 +330,7 @@
 	_estyle_style_draw(es, (char *)text);
 
 	layer = evas_object_layer_get(es->bit);
-	estyle_set_layer(es, layer);
+	estyle_set_layer(obj, layer);
 
 	_estyle_style_move(es);
 
@@ -314,13 +351,16 @@
  * Returns a pointer to a copy of the text in the estyle @es on success, NULL
  * on failure.
  */
-char *estyle_get_text(Estyle * es)
+char *estyle_get_text(Evas_Object *obj)
 {
 	int scount, i;
 	const char *text;
 	char *temp = NULL;
+	Estyle * es;
 
-	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+	CHECK_PARAM_POINTER_RETURN("obj", obj, NULL);
+
+	es = evas_object_smart_data_get(obj);
 
 	text = evas_object_text_text_get(es->bit);
 	if (text) {
@@ -345,12 +385,15 @@
  * Returns no value. Changes the text in @es to @text and updates the display
  * if visible.
  */
-void estyle_set_text(Estyle *es, char *text)
+void estyle_set_text(Evas_Object *obj, char *text)
 {
 	int i, scount;
 	char *temp;
+	Estyle *es;
 
-	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER("obj", obj);
+
+	es = evas_object_smart_data_get(obj);
 
 	/*
 	 * Wheee!! what fun, to get the sizing right when spaces end the
@@ -414,11 +457,12 @@
  * Returns no value. Changes the layer of @es to @layer along with all of
  * it's style bits.
  */
-void estyle_set_layer(Estyle *es, int layer)
+void estyle_set_layer(Evas_Object *obj, int layer)
 {
+	Estyle *es;
 	int index = 0;
 
-	CHECK_PARAM_POINTER("es", es);
+	es = evas_object_smart_data_get(obj);
 
 	evas_object_layer_set(es->bit, layer - 1);
 
@@ -441,11 +485,14 @@
  *
  * Returns a pointer to a copy of the current font of the estyle @es.
  */
-char *estyle_get_font(Estyle * es)
+char *estyle_get_font(Evas_Object *obj)
 {
 	char *font;
 	double size;
-	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+	Estyle * es;
+
+	CHECK_PARAM_POINTER_RETURN("obj", obj, NULL);
+	es = evas_object_smart_data_get(obj);
 	evas_object_text_font_get(es->bit, &font, &size);
 	return font;
 }
@@ -456,11 +503,14 @@
  *
  * Returns the font size (an int) or FALSE if an error occurs.
  */  
-int estyle_get_font_size(Estyle *es)
+int estyle_get_font_size(Evas_Object *obj)
 {
 	char *font;
 	double size;
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+	Estyle *es;
+
+	CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
+	es = evas_object_smart_data_get(obj);
 	evas_object_text_font_get(es->bit, &font, &size);
 	return (int)size;
 }
@@ -472,11 +522,15 @@
  *
  * Returns no value. Changes the font for the specified estyle to @name.
  */
-void estyle_set_font(Estyle *es, char *font, int size)
+void estyle_set_font(Evas_Object *obj, char *font, int size)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	CHECK_PARAM_POINTER("obj", obj);
 	CHECK_PARAM_POINTER("font", font);
 
+	es = evas_object_smart_data_get(obj);
+
 	evas_object_text_font_set(es->bit, font, size);
 	if (es->style)
 		_estyle_style_set_font(es, font, size);
@@ -504,20 +558,37 @@
  *
  * Returns no value. Sets the clip box of the estyle to @clip.
  */
-void estyle_set_clip(Estyle *es, Evas_Object *clip)
+void estyle_set_clip(Evas_Object *obj, Evas_Object *clip)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle *es;
+
+	es = evas_object_smart_data_get(obj);
 
-	if (clip)
-		evas_object_clip_set(es->bit, clip);
-	else
-		evas_object_clip_unset(es->bit);
+	evas_object_clip_set(es->bit, clip);
 
 	if (es->style)
 		_estyle_style_set_clip(es, clip);
 }
 
 /**
+ * estyle_unset_clip - unset the clip box for the estyle
+ * @es: the estyle to unset the clip box
+ *
+ * Returns no value. Unsets the clip box of the estyle.
+ */
+void estyle_unset_clip(Evas_Object *obj)
+{
+	Estyle *es;
+
+	es = evas_object_smart_data_get(obj);
+
+	evas_object_clip_unset(es->bit);
+
+	if (es->style)
+		_estyle_style_set_clip(es, NULL);
+}
+
+/**
  * estyle_merge - merge two estyles into a single estyle
  * @es1: the destination estyle that will contain the final text
  * @es2: the estyle that will be freed, but it's text will be added to @es1
@@ -525,12 +596,17 @@
  * Returns TRUE if the bits are able to be merged, otherwise FALSE. Appends the
  * text in @es2 to the text in @es1 and destroys @es2.
  */
-int estyle_merge(Estyle *es1, Estyle *es2)
+int estyle_merge(Evas_Object *obj1, Evas_Object *obj2)
 {
+	Estyle *es1;
+	Estyle *es2;
 	char *new_text, *text1, *text2;
 
-	CHECK_PARAM_POINTER_RETURN("es1", es1, FALSE);
-	CHECK_PARAM_POINTER_RETURN("es2", es2, FALSE);
+	CHECK_PARAM_POINTER_RETURN("obj1", obj1, FALSE);
+	CHECK_PARAM_POINTER_RETURN("obj2", obj2, FALSE);
+
+	es1 = evas_object_smart_data_get(obj1);
+	es2 = evas_object_smart_data_get(obj2);
 
 	if (!BIT_MERGEABLE(es1, es2))
 		return FALSE;
@@ -554,11 +630,11 @@
 	strcpy(new_text, text1);
 	strcat(new_text, text2);
 
-	estyle_set_text(es1, new_text);
+	estyle_set_text(obj1, new_text);
 
 	FREE(new_text);
 
-	estyle_free(es2);
+	evas_object_del(obj2);
 
 	return TRUE;
 }
@@ -571,14 +647,17 @@
  * Returns the newly created estyle on success, NULL on failure. The old
  * estyle is updated to reflect the changes.
  */
-Estyle *estyle_split(Estyle *es, unsigned int index)
+Evas_Object *estyle_split(Evas_Object *obj, unsigned int index)
 {
+	Estyle *es;
 	char temp;
 	char *content;
-	Estyle *new_es;
+	Evas_Object *new_es;
 	int r, g, b, a;
 
-	CHECK_PARAM_POINTER_RETURN("es", es, NULL);
+	CHECK_PARAM_POINTER_RETURN("obj", obj, NULL);
+
+	es = evas_object_smart_data_get(obj);
 
 	/*
 	 * Don't bother to split if it will result in an empty string.
@@ -589,7 +668,7 @@
 	/*
 	 * Retrieve the contents of the estyle to be split.
 	 */
-	content = estyle_get_text(es);
+	content = estyle_get_text(obj);
 	if (!content)
 		return NULL;
 
@@ -608,7 +687,7 @@
 	 */
 	temp = content[index];
 	content[index] = '\0';
-	estyle_set_text(es, content);
+	estyle_set_text(obj, content);
 
 	/*
 	 * Now place the content from index onwards into a new estyle.
@@ -620,14 +699,14 @@
 	/*
 	 * Give this new estyle the same settings as the previous estyle.
 	 */
-	estyle_set_clip(new_es, estyle_get_clip(es));
-	estyle_set_font(new_es, estyle_get_font(es),
-			estyle_get_font_size(es));
+	evas_object_clip_set(new_es, estyle_get_clip(es));
+	estyle_set_font(new_es, estyle_get_font(obj),
+			estyle_get_font_size(obj));
 
 	/*
 	 * Set the new color for the estyle.
 	 */
-	estyle_get_color(es, &r, &g, &b, &a);
+	estyle_get_color(obj, &r, &g, &b, &a);
 	estyle_set_color(new_es, r, g, b, a);
 
 	/*
@@ -649,9 +728,13 @@
  *
  * Returns the length of the text in the estyle @es.
  */
-inline int estyle_length(Estyle * es)
+inline int estyle_length(Evas_Object *obj)
 {
-	CHECK_PARAM_POINTER_RETURN("es", es, FALSE);
+	Estyle * es;
+
+	CHECK_PARAM_POINTER_RETURN("obj", obj, FALSE);
+
+	es = evas_object_smart_data_get(obj);
 
 	return es->length;
 }
@@ -693,26 +776,26 @@
  * Returns no value. The dimensions of the found character are stored in
  * @char_x, @char_y, @char_w, and @char_h.
  */
-void estyle_text_at(Estyle * es, int index, int *char_x, int *char_y,
-		    int *char_w, int *char_h)
+void estyle_text_at(Evas_Object *obj, int index, double *x, double *y,
+		    double *w, double *h)
 {
-	double xx, yy, ww, hh;
+	Estyle * es;
 
-	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER("obj", obj);
 
-	evas_object_text_char_pos_get(es->bit, index,  &xx, &yy, &ww, &hh);
+	es = evas_object_smart_data_get(obj);
 
-	if (char_x)
-		*char_x = D2I_ROUND(xx) + es->x;
-	if (char_y)
-		*char_y = D2I_ROUND(yy) + es->y;
-	if (char_w)
-		*char_w = D2I_ROUND(ww) + (es->style ? 
-			es->style->info->left_push
+	evas_object_text_char_pos_get(es->bit, index,  x, y, w, h);
+
+	if (x)
+		*x += es->x;
+	if (y)
+		*y += es->y;
+	if (w)
+		*w += (es->style ?  es->style->info->left_push
 			+ es->style->info->right_push : 0);
-        if (char_h)
-		*char_h = D2I_ROUND(hh) + (es->style ? 
-			es->style->info->top_push
+        if (h)
+		*h += (es->style ?  es->style->info->top_push
 			+ es->style->info->bottom_push : 0);
 }
 
@@ -730,28 +813,28 @@
  * dimensions of the found character are stored in @char_x, @char_y, @char_w,
  * and @char_h.
  */
-int estyle_text_at_position(Estyle * es, int x, int y, int *char_x,
-			    int *char_y, int *char_w, int *char_h)
+int estyle_text_at_position(Evas_Object *obj, double x, double y, double *xx,
+			    double *yy, double *ww, double *hh)
 {
 	int ret;
-	double xx = 0, yy = 0, ww = 0, hh = 0;
+	Estyle * es;
+
+	CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
 
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+	es = evas_object_smart_data_get(obj);
 
-	ret = evas_object_text_char_coords_get(es->bit, (double)(x - es->x),
-			(double)(y - es->y), &xx, &yy, &ww, &hh);
+	ret = evas_object_text_char_coords_get(es->bit, x - es->x,
+			y - es->y, xx, yy, ww, hh);
 
-	if (char_x)
-		*char_x = D2I_ROUND(xx) + es->x;
-	if (char_y)
-		*char_y = D2I_ROUND(yy) + es->y;
-	if (char_w)
-		*char_w = D2I_ROUND(ww) + (es->style ? 
-			es->style->info->left_push
+	if (xx)
+		*xx += es->x;
+	if (yy)
+		*yy += es->y;
+	if (ww)
+		*ww += (es->style ?  es->style->info->left_push
 			+ es->style->info->right_push : 0);
-	if (char_h)
-		*char_h = D2I_ROUND(hh) + (es->style ? 
-			es->style->info->top_push
+	if (hh)
+		*hh += (es->style ?  es->style->info->top_push
 			+ es->style->info->bottom_push : 0);
 
 	return ret;
@@ -763,9 +846,13 @@
  *
  * Returns 0 if the estyle does not have fixed geometry, > 0 otherwise.
  */
-inline int estyle_fixed(Estyle * es)
+inline int estyle_fixed(Evas_Object *obj)
 {
-	CHECK_PARAM_POINTER_RETURN("es", es, 0);
+	Estyle * es;
+
+	CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
+
+	es = evas_object_smart_data_get(obj);
 
 	return es->flags & ESTYLE_BIT_FIXED;
 }
@@ -781,9 +868,14 @@
  * Returns no value. Fixes the reported geometry of @es to @x, @y, @w, and @h
  * respectively.
  */
-void estyle_fix_geometry(Estyle * es, int x, int y, int w, int h)
+void estyle_fix_geometry(Evas_Object *obj, double x, double y,
+		double w, double h)
 {
-	CHECK_PARAM_POINTER("es", es);
+	Estyle * es;
+
+	CHECK_PARAM_POINTER("obj", obj);
+
+	es = evas_object_smart_data_get(obj);
 
 	es->flags |= ESTYLE_BIT_FIXED;
 	es->x = x;
@@ -799,17 +891,15 @@
  * Returns no value. Removes the fixed property of the estyle and updates its
  * geometry to the actual geometry of the contents.
  */
-void estyle_unfix_geometry(Estyle * es)
+void estyle_unfix_geometry(Evas_Object *obj)
 {
-	double x, y, w, h;
+	Estyle * es;
 
-	CHECK_PARAM_POINTER("es", es);
+	CHECK_PARAM_POINTER("obj", obj);
+
+	es = evas_object_smart_data_get(obj);
 
-	evas_object_geometry_get(es->bit, &x, &y, &w, &h);
-	es->x = D2I_ROUND(x);
-	es->y = D2I_ROUND(y);
-	es->w = D2I_ROUND(w);
-	es->h = D2I_ROUND(h);
+	evas_object_geometry_get(es->bit, &es->x, &es->y, &es->w, &es->h);
 }
 
 /*
@@ -856,23 +946,22 @@
  * Returns no value. Adds a callback to @es that will be triggered when event
  * @callback occurs, function @func will be called with argument @data.
  */
-void estyle_callback_add(Estyle * es, Evas_Callback_Type callback,
-			 void (*func) (void *_data, Estyle * _es, 
-				       void *event_info), void *data)
+void estyle_callback_add(Evas_Object *obj, Evas_Callback_Type callback,
+			       Estyle_Callback_Function func, void * data)
 {
+	Estyle * es;
 	Estyle_Callback *cb;
 	Evas_List *l;
 
-	if (!es)
-		return;
-	if (!es->evas)
-		return;
+	CHECK_PARAM_POINTER("obj", obj);
+
+	es = evas_object_smart_data_get(obj);
 
 	/*
 	 * Allocate the new estyle callback
 	 */
 	cb = malloc(sizeof(Estyle_Callback));
-	cb->estyle = es;
+	cb->obj = obj;
 	cb->type = callback;
 	cb->data = data;
 	cb->callback = func;
@@ -904,7 +993,7 @@
 				  void *event_info)
 {
 	Estyle_Callback *cb = _data;
-	cb->callback(cb->data, cb->estyle, event_info);
+	cb->callback(cb->data, cb->obj, event_info);
 }
 
 /*
@@ -914,15 +1003,15 @@
  *
  * Returns no value.
  */
-void estyle_callback_del(Estyle * es, Evas_Callback_Type callback,
+void estyle_callback_del(Evas_Object *obj, Evas_Callback_Type callback,
 		Estyle_Callback_Function func)
 {
 	Evas_List *l;
+	Estyle * es;
 
-	if (!es)
-		return;
-	if (!es->evas)
-		return;
+	CHECK_PARAM_POINTER("obj", obj);
+
+	es = evas_object_smart_data_get(obj);
 
 	for (l = es->callbacks; l; l = l->next) {
 		Estyle_Callback *cb;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- estyle_style.c	14 Jan 2003 18:50:56 -0000	1.11
+++ estyle_style.c	5 Aug 2003 16:42:44 -0000	1.12
@@ -194,6 +194,7 @@
 	while ((layer = _estyle_heap_item(info->layers, i))) {
 		ob = __estyle_style_layer_draw(layer, es, text);
 		((Estyle_Style *) es->style)->bits = evas_list_append( ((Estyle_Style *)es->style)->bits, ob );
+		evas_object_smart_member_add(es->smart_obj, ob);
 		i++;
 	}
 
@@ -698,6 +699,7 @@
 	int layers;
 	char key[1024];
 	Estyle_Style_Layer *layer;
+	float x_offset, y_offset;
 
 	if (!info->style_db)
 		return;
@@ -735,10 +737,12 @@
 		e_db_int_get(info->style_db, key, &layer->size_change);
 
 		sprintf(key, "/layers/%d/x_offset", i);
-		e_db_int_get(info->style_db, key, &layer->x_offset);
+		e_db_float_get(info->style_db, key, &x_offset);
+		layer->x_offset = x_offset;
 
 		sprintf(key, "/layers/%d/y_offset", i);
-		e_db_int_get(info->style_db, key, &layer->y_offset);
+		e_db_float_get(info->style_db, key, &y_offset);
+		layer->y_offset = y_offset;
 
 		sprintf(key, "/layers/%d/relative_color", i);
 		e_db_int_get(info->style_db, key, &layer->relative_color);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- estyle_style.h	14 Jan 2003 18:51:01 -0000	1.7
+++ estyle_style.h	5 Aug 2003 16:42:44 -0000	1.8
@@ -9,7 +9,7 @@
 typedef struct _estyle_style_layer Estyle_Style_Layer;
 struct _estyle_style_layer {
 	int stack;
-	int x_offset, y_offset;
+	double x_offset, y_offset;
 	int size_change;
 
 	int a, r, g, b;
@@ -25,7 +25,7 @@
 	char *name;
 	E_DB_File *style_db;
 	Estyle_Heap *layers;
-	int left_push, right_push, top_push, bottom_push;
+	double left_push, right_push, top_push, bottom_push;
 
 	int references;
 };

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/data/styles


Modified Files:
	bold.style.db outline.style.db raised.style.db shadow.style.db 


Log Message:
API breakage. Converted estyle to be an evas smart object.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/data/styles/bold.style.db,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
Binary files /tmp/cvsNSSytO and /tmp/cvs0VImIs differ
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/data/styles/outline.style.db,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
Binary files /tmp/cvsAyRDzP and /tmp/cvsYFGVSu differ
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/data/styles/raised.style.db,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
Binary files /tmp/cvsu00eGQ and /tmp/cvsCwUK7w differ
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/data/styles/shadow.style.db,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
Binary files /tmp/cvsogAPIR and /tmp/cvsaGTadz differ

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle_private.h estyle.c 


Log Message:
Allow for using fixed size estyles. This is used by etox to track obstacles.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Estyle_private.h	5 Aug 2003 16:42:44 -0000	1.12
+++ Estyle_private.h	8 Aug 2003 05:01:03 -0000	1.13
@@ -101,6 +101,7 @@
 void estyle_show(Evas_Object *obj);
 void estyle_hide(Evas_Object *obj);
 void estyle_move(Evas_Object *obj, double x, double y);
+void estyle_resize(Evas_Object *obj, double w, double h);
 void estyle_set_layer(Evas_Object *obj, int layer);
 void estyle_set_color(Evas_Object *obj, int r, int g, int b, int a);
 void estyle_set_clip(Evas_Object *obj, Evas_Object *clip);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- estyle.c	5 Aug 2003 16:42:44 -0000	1.26
+++ estyle.c	8 Aug 2003 05:01:04 -0000	1.27
@@ -37,7 +37,7 @@
 		estyle_smart = evas_smart_new("estyle_smart", NULL,
 				estyle_free, estyle_set_layer, NULL,
 				NULL, NULL, NULL,
-				estyle_move, NULL, estyle_show,
+				estyle_move, estyle_resize, estyle_show,
 				estyle_hide, estyle_set_color, estyle_set_clip,
 				estyle_unset_clip, NULL);
 		_estyle_color_init();
@@ -174,6 +174,31 @@
 }
 
 /**
+ * estyle_resize - resize a fixed estyle into the correct position
+ * @es: the estyle to be moved
+ * @x: the new x coordinate for the estyle
+ * @y: the new y coordinate for the estyle
+ *
+ * Returns no value. Moves the requested estyle into the requested position.
+ */
+void estyle_resize(Evas_Object *obj, double w, double h)
+{
+	Estyle *es;
+
+	es = evas_object_smart_data_get(obj);
+
+	if (!(es->flags & ESTYLE_BIT_FIXED))
+		return;
+
+	if (es->w == w && es->h == h)
+		return;
+
+	es->w = w;
+	es->h = h;
+	evas_object_resize(obj, w, h);
+}
+
+/**
  * estyle_get_color - get the color of the estyle
  * @es: the estyle to get the color
  * @r: the pointer to the int to store the red value of the estyle
@@ -878,10 +903,8 @@
 	es = evas_object_smart_data_get(obj);
 
 	es->flags |= ESTYLE_BIT_FIXED;
-	es->x = x;
-	es->y = y;
-	es->w = w;
-	es->h = h;
+	evas_object_move(obj, x, y);
+	evas_object_resize(obj, w, h);
 }
 
 /**
@@ -934,6 +957,8 @@
 		es->h = D2I_ROUND(h) + (es->style ? es->style->info->top_push
 			+ es->style->info->bottom_push : 0);
 	}
+
+	evas_object_resize(es->smart_obj, es->w, es->h);
 }
 
 /**

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h estyle.c estyle_style.c 
	estyle_style.h 


Log Message:
Update estyle to use the new Evas_Coord type.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Estyle.h	8 Sep 2003 02:20:35 -0000	1.16
+++ Estyle.h	18 Oct 2003 16:22:46 -0000	1.17
@@ -39,17 +39,18 @@
  * Geometry querying
  */
 inline int estyle_length(Evas_Object *obj);
-void estyle_text_at(Evas_Object *obj, int index, double *char_x,
-		    double *char_y, double *char_w, double *char_h);
-int estyle_text_at_position(Evas_Object *obj, double x, double y,
-		double *char_x, double *char_y, double *char_w, double *char_h);
+void estyle_text_at(Evas_Object *obj, int index, Evas_Coord *char_x,
+		    Evas_Coord *char_y, Evas_Coord *char_w, Evas_Coord *char_h);
+int estyle_text_at_position(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+			    Evas_Coord *char_x, Evas_Coord *char_y,
+			    Evas_Coord *char_w, Evas_Coord *char_h);
 
 /*
  * Fixing the reported geometry to set values.
  */
 inline int estyle_fixed(Evas_Object *obj);
-void estyle_fix_geometry(Evas_Object *obj, double x, double y, double w,
-		double h);
+void estyle_fix_geometry(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+			 Evas_Coord w, Evas_Coord h);
 void estyle_unfix_geometry(Evas_Object *obj);
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Estyle_private.h	8 Sep 2003 02:20:35 -0000	1.14
+++ Estyle_private.h	18 Oct 2003 16:22:46 -0000	1.15
@@ -48,7 +48,7 @@
 	 * case of a tab character, the width of the bit does not match the
 	 * width of the actual character printed.
 	 */
-	double x, y, w, h;
+	Evas_Coord x, y, w, h;
 
 	/*
 	 * The flags field is used to indicate that the bit is not to be moved
@@ -106,8 +106,8 @@
 void estyle_free(Evas_Object *obj);
 void estyle_show(Evas_Object *obj);
 void estyle_hide(Evas_Object *obj);
-void estyle_move(Evas_Object *obj, double x, double y);
-void estyle_resize(Evas_Object *obj, double w, double h);
+void estyle_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+void estyle_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
 void estyle_set_layer(Evas_Object *obj, int layer);
 void estyle_set_color(Evas_Object *obj, int r, int g, int b, int a);
 void estyle_set_clip(Evas_Object *obj, Evas_Object *clip);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- estyle.c	8 Sep 2003 02:20:35 -0000	1.29
+++ estyle.c	18 Oct 2003 16:22:46 -0000	1.30
@@ -159,7 +159,7 @@
  *
  * Returns no value. Moves the requested estyle into the requested position.
  */
-void estyle_move(Evas_Object *obj, double x, double y)
+void estyle_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
 	Estyle *es;
 
@@ -186,7 +186,7 @@
  *
  * Returns no value. Moves the requested estyle into the requested position.
  */
-void estyle_resize(Evas_Object *obj, double w, double h)
+void estyle_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 {
 	Estyle *es;
 
@@ -523,7 +523,7 @@
 char *estyle_get_font(Evas_Object *obj)
 {
 	char *font;
-	double size;
+	Evas_Font_Size size;
 	Estyle * es;
 
 	CHECK_PARAM_POINTER_RETURN("obj", obj, NULL);
@@ -541,7 +541,7 @@
 int estyle_get_font_size(Evas_Object *obj)
 {
 	char *font;
-	double size;
+	Evas_Font_Size size;
 	Estyle *es;
 
 	CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
@@ -811,8 +811,8 @@
  * Returns no value. The dimensions of the found character are stored in
  * @char_x, @char_y, @char_w, and @char_h.
  */
-void estyle_text_at(Evas_Object *obj, int index, double *x, double *y,
-		    double *w, double *h)
+void estyle_text_at(Evas_Object *obj, int index, Evas_Coord *x, Evas_Coord *y,
+		    Evas_Coord *w, Evas_Coord *h)
 {
 	Estyle * es;
 
@@ -848,8 +848,9 @@
  * dimensions of the found character are stored in @char_x, @char_y, @char_w,
  * and @char_h.
  */
-int estyle_text_at_position(Evas_Object *obj, double x, double y, double *xx,
-			    double *yy, double *ww, double *hh)
+int estyle_text_at_position(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+			    Evas_Coord *xx, Evas_Coord *yy,
+			    Evas_Coord *ww, Evas_Coord *hh)
 {
 	int ret;
 	Estyle * es;
@@ -903,8 +904,8 @@
  * Returns no value. Fixes the reported geometry of @es to @x, @y, @w, and @h
  * respectively.
  */
-void estyle_fix_geometry(Evas_Object *obj, double x, double y,
-		double w, double h)
+void estyle_fix_geometry(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+			 Evas_Coord w, Evas_Coord h)
 {
 	Estyle * es;
 
@@ -942,9 +943,9 @@
 {
 	if (es->style)
 		evas_object_move(es->bit,
-			(double)(es->x + (es->style ?
+			(Evas_Coord)(es->x + (es->style ?
 				es->style->info->left_push : 0)),
-			(double)(es->y + (es->style ?
+			(Evas_Coord)(es->y + (es->style ?
 				es->style->info->top_push : 0)));
 }
 
@@ -953,7 +954,7 @@
  */
 void __estyle_update_dimensions(Estyle *es)
 {
-	double x, y, w, h;
+	Evas_Coord x, y, w, h;
 	
 	/*
 	 * If the estyle doesn't have fixed dimensions then set it to the
@@ -1084,7 +1085,7 @@
 {
 	Estyle * es;
 
-	CHECK_PARAM_POINTER("obj", obj);
+	CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
 
 	es = evas_object_smart_data_get(obj);
 	
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- estyle_style.c	5 Aug 2003 16:42:44 -0000	1.12
+++ estyle_style.c	18 Oct 2003 16:22:46 -0000	1.13
@@ -330,9 +330,9 @@
 		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(ob = ptr_list->data) != NULL) {
 		
-		evas_object_move(ob, (double)(es->x + layer->x_offset +
+		evas_object_move(ob, (Evas_Coord)(es->x + layer->x_offset +
 					info->left_push),
-					(double)(es->y + layer->y_offset +
+					(Evas_Coord)(es->y + layer->y_offset +
 					info->right_push));
 
 		ptr_list = ptr_list->next;
@@ -607,7 +607,7 @@
 {
 	int r, g, b, a;
 	char *font;
-	double size;
+	Evas_Font_Size size;
 	Evas_Object *ret;
 
 	/*
@@ -618,9 +618,9 @@
 	evas_object_text_font_set(ret, font, size + layer->size_change);
 	evas_object_text_text_set(ret, text); 
 
-	evas_object_move(ret, (double)(es->x + layer->x_offset +
+	evas_object_move(ret, (Evas_Coord)(es->x + layer->x_offset +
 				 es->style->info->left_push),
-			(double)(es->y + layer->y_offset +
+			(Evas_Coord)(es->y + layer->y_offset +
 				 es->style->info->top_push));
 
 	/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- estyle_style.h	5 Aug 2003 16:42:44 -0000	1.8
+++ estyle_style.h	18 Oct 2003 16:22:46 -0000	1.9
@@ -9,7 +9,7 @@
 typedef struct _estyle_style_layer Estyle_Style_Layer;
 struct _estyle_style_layer {
 	int stack;
-	double x_offset, y_offset;
+	Evas_Coord x_offset, y_offset;
 	int size_change;
 
 	int a, r, g, b;
@@ -25,7 +25,7 @@
 	char *name;
 	E_DB_File *style_db;
 	Estyle_Heap *layers;
-	double left_push, right_push, top_push, bottom_push;
+	Evas_Coord left_push, right_push, top_push, bottom_push;
 
 	int references;
 };

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Update estyle to use the new Evas_Coord type.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- estyle_test_simple.c	5 Aug 2003 16:42:44 -0000	1.12
+++ estyle_test_simple.c	18 Oct 2003 16:22:46 -0000	1.13
@@ -87,7 +87,7 @@
 static int ecore_mouse_down(void *data, int type, void * ev)
 {
 	int index;
-	double x, y, w, h;
+	Evas_Coord x, y, w, h;
 
 	Ecore_X_Event_Mouse_Button_Down *eemd =
 	    (Ecore_X_Event_Mouse_Button_Down *) ev;
@@ -201,7 +201,7 @@
 int main(int argc, char *argv[])
 {
 	int i, w, h;
-	double curs_x, curs_y, curs_w, curs_h;
+	Evas_Coord curs_x, curs_y, curs_w, curs_h;
 	Evas_Object *clip_rect;
 	Evas_Object *img_test;
 	Evas_Object *bg, *et_bg, *obst;

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Check the input when setting the text.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- estyle.c	18 Oct 2003 16:22:46 -0000	1.30
+++ estyle.c	21 Dec 2003 23:09:42 -0000	1.31
@@ -424,6 +424,8 @@
 	CHECK_PARAM_POINTER("obj", obj);
 
 	es = evas_object_smart_data_get(obj);
+	if (!text)
+		text = strdup("");
 
 	/*
 	 * Wheee!! what fun, to get the sizing right when spaces end the

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/data/fonts


Added Files:
	Vera.ttf 


Log Message:
Add the Vera font to estyle.

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c 


Log Message:
Allow NULL style name.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- estyle.c	21 Dec 2003 23:09:42 -0000	1.31
+++ estyle.c	27 Jan 2004 17:01:28 -0000	1.32
@@ -338,7 +338,6 @@
 	Estyle *es;
 
 	CHECK_PARAM_POINTER("obj", obj);
-	CHECK_PARAM_POINTER("name", name);
 
 	es = evas_object_smart_data_get(obj);
 
@@ -348,7 +347,7 @@
 	if (es->style)
 		_estyle_style_release(es->style, es->evas);
 
-	if ((es->style = _estyle_style_instance(name)) == NULL)
+	if (!name || (es->style = _estyle_style_instance(name)) == NULL)
 		return;
 
 	text = evas_object_text_text_get(es->bit);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c estyle_style.c estyle_style.h 


Log Message:
Added a soft shadow style to match edje more closely.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- estyle.c	28 Jan 2004 05:06:30 -0000	1.33
+++ estyle.c	28 Feb 2004 06:22:39 -0000	1.34
@@ -247,6 +247,8 @@
 {
 	Estyle * es;
 
+	CHECK_PARAM_POINTER("obj", obj);
+
 	es = evas_object_smart_data_get(obj);
 
 	es->color = _estyle_color_instance(r, g, b, a);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- estyle_style.c	28 Jan 2004 05:06:30 -0000	1.14
+++ estyle_style.c	28 Feb 2004 06:22:39 -0000	1.15
@@ -381,9 +381,9 @@
 	while (ptr_list &&
 		(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
 		(sob = ptr_list->data) != NULL) {
+			int r, g, b, a;
 
 		if (layer->relative_color) {
-			int r, g, b, a;
 
 			r = SET_REL_COLOR(es->color->r, layer->r);
 			g = SET_REL_COLOR(es->color->g, layer->g);
@@ -643,6 +643,9 @@
 		a = layer->a;
 	}
 
+	if (layer->blend_alpha)
+		a = (layer->blend_alpha * (a + 1)) / 256;
+
 	evas_object_color_set(ret, r, g, b, a);
 
 	return ret;
@@ -747,6 +750,9 @@
 		sprintf(key, "/layers/%d/relative_color", i);
 		e_db_int_get(info->style_db, key, &layer->relative_color);
 
+		sprintf(key, "/layers/%d/blend_alpha", i);
+		e_db_int_get(info->style_db, key, &layer->blend_alpha);
+
 		sprintf(key, "/layers/%d/color/a", i);
 		e_db_int_get(info->style_db, key, &layer->a);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- estyle_style.h	18 Oct 2003 16:22:46 -0000	1.9
+++ estyle_style.h	28 Feb 2004 06:22:39 -0000	1.10
@@ -14,6 +14,7 @@
 
 	int a, r, g, b;
 	int relative_color;
+	int blend_alpha;
 };
 
 /*

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/data/styles


Added Files:
	soft_shadow.style.db 


Log Message:
Added a soft shadow style to match edje more closely.

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	estyle_test_simple.c 


Log Message:
Avoid a possible unitialized variable.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- estyle_test_simple.c	18 Oct 2003 16:22:46 -0000	1.13
+++ estyle_test_simple.c	11 Mar 2004 00:18:51 -0000	1.14
@@ -289,7 +289,7 @@
 	/*
 	 * Create an estyle.
 	 */
-	e = estyle_new(evas, string1, "raised");
+	e = estyle_new(evas, string1, "soft_shadow");
 	evas_object_move(e, 100, 100);
 	evas_object_color_set(e, 128, 255, 255, 255);
 	evas_object_clip_set(e, clip_rect);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle_style.c 


Log Message:
Avoid a possible unitialized variable.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- estyle_style.c	28 Feb 2004 06:22:39 -0000	1.15
+++ estyle_style.c	11 Mar 2004 00:18:51 -0000	1.16
@@ -729,9 +729,8 @@
 	 * Read in each layer
 	 */
 	for (i = 0; i < layers; i++) {
-		layer =
-		    (Estyle_Style_Layer *)
-		    malloc(sizeof(Estyle_Style_Layer));
+		layer = (Estyle_Style_Layer *)calloc(sizeof(Estyle_Style_Layer),
+						     1);
 
 		sprintf(key, "/layers/%d/stack", i);
 		e_db_int_get(info->style_db, key, &layer->stack);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/test


Modified Files:
	Makefile.am estyle_test_simple.c 


Log Message:
Move the ewd dependant code to the ecore equivalents.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am	14 Jan 2003 18:51:02 -0000	1.5
+++ Makefile.am	24 Mar 2004 04:53:51 -0000	1.6
@@ -2,11 +2,11 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 CFLAGS			=	-g -W -Wall -Wno-implicit
-INCLUDES		=	-I$(top_srcdir)/src @evas_cflags@ @ewd_cflags@ @ecore_cflags@ @edb_cflags@
+INCLUDES		=	-I$(top_srcdir)/src @evas_cflags@ @ecore_cflags@ @edb_cflags@
 
 bin_PROGRAMS			=	estyle_test_simple
 
 estyle_test_simple_DEPENDENCIES	=	$(top_builddir)/src/libestyle.la
 estyle_test_simple_SOURCES	=	estyle_test_simple.c
 estyle_test_simple_LDFLAGS	=	-static
-estyle_test_simple_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
+estyle_test_simple_LDADD		=	$(top_builddir)/src/libestyle.la @evas_libs@ @ecore_libs@ @edb_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- estyle_test_simple.c	11 Mar 2004 00:18:51 -0000	1.14
+++ estyle_test_simple.c	24 Mar 2004 04:53:52 -0000	1.15
@@ -92,6 +92,9 @@
 	Ecore_X_Event_Mouse_Button_Down *eemd =
 	    (Ecore_X_Event_Mouse_Button_Down *) ev;
 
+	evas_object_geometry_get(e, &x, &y, &w, &h);
+	printf("Estyle geometry: %g, %g, %g x %g\n", x, y, w, h);
+
 	if (eemd->button == 1) {
 		if (last == string1) {
 			estyle_set_style(e, "raised");

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle


Modified Files:
	Makefile.am configure.in estyle-config.in 


Log Message:
Move the ewd dependant code to the ecore equivalents.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am	26 Jan 2002 15:09:04 -0000	1.2
+++ Makefile.am	24 Mar 2004 04:53:49 -0000	1.3
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src test doc
+SUBDIRS = src test
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 		   config.h.in config.sub configure install-sh \
@@ -26,12 +26,3 @@
 m4datadir = $(datadir)/aclocal
 m4data_DATA = estyle.m4
 
-
-docs:
-	                $(MAKE) -C $(top_srcdir)/doc docs
-
-if HAVE_JADE
-html-docs:
-	                $(MAKE) -C $(top_srcdir)/doc html-docs
-endif
-			
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in	15 Jan 2004 01:24:50 -0000	1.7
+++ configure.in	24 Mar 2004 04:53:49 -0000	1.8
@@ -114,41 +114,6 @@
   fi
 ])  
 
-EWD_CONFIG="ewd-config"
-AC_ARG_WITH(ewd,
-[  --with-ewd-config=FILE   ewd-config script to use (eg /usr/bin/ewd-config)],
-[
-   EWD_CONFIG=$withval
-   AC_CHECK_PROG(EWD_CONFIG_IN_PATH, $EWD_CONFIG, yes, no)
-   if test $EWD_CONFIG_IN_PATH = no; then
-      echo "ERROR:"
-      echo "The ewd-config development script you specified:"
-      echo "$EWD_CONFIG"
-      echo "was not found.  Please check the path and make sure "
-      echo "the script exists and is executable."
-      AC_MSG_ERROR([Fatal Error: no ewd-config detected.])
-      exit;
-   fi
-],
-[
-  AC_CHECK_PROG(EWD_CONFIG_IN_PATH, $EWD_CONFIG, yes, no)
-  if test $EWD_CONFIG_IN_PATH = no; then
-    echo "ERROR:"
-    echo "The ewd-config development script was not found in your execute"
-    echo "path. This may mean one of several things"
-    echo "1. You may not have installed the ewd-devel (or ewd-dev)"
-    echo "   packages."
-    echo "2. You may have ewd installed somewhere not covered by your path."
-    echo ""
-    echo "If this is the case make sure you have the packages installed, AND"
-    echo "that the ewd-config script is in your execute path (see your"
-    echo "shell's manual page on setting the \$PATH environment variable), OR"
-    echo "alternatively, specify the script to use with --with-ewd-config."
-    AC_MSG_ERROR([Fatal Error: no ewd-config detected.])
-    exit;
-  fi
-])  
-
 IMLIB2_CONFIG="imlib2-config"
 AC_ARG_WITH(imlib2,
 [  --with-imlib2-config=FILE   imlib2-config script to use (eg /usr/bin/imlib2-config)],
@@ -199,36 +164,13 @@
 evas_cflags=`evas-config --cflags`
 evas_libs=`evas-config --libs`
 
-AC_SUBST(ewd_cflags)
-AC_SUBST(ewd_libs)
-ewd_cflags=`ewd-config --cflags`
-ewd_libs=`ewd-config --libs`
-
 AC_SUBST(imlib2_cflags)
 AC_SUBST(imlib2_libs)
 imlib2_cflags=`imlib2-config --cflags`
 imlib2_libs=`imlib2-config --libs`
 
-dnl Checking for Perl:
-AC_PATH_PROG(PERL,perl,0)
-AC_SUBST(PERL)
-
-dnl Look for jade for sgml translations.
-AC_ARG_WITH(dbsheets,
-       [  --with-dbsheets=DIR     use DIR to specify your DocBook stylesheets
-       installation path.],
-              DB_STYLESHEETS="$withval",
-	      DB_STYLESHEETS="/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh")
-	      AC_SUBST(DB_STYLESHEETS)
-	      AC_PATH_PROG(JADE, jade)
-	      AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d
-	      "$DB_STYLESHEETS")
-
 AC_OUTPUT([
 Makefile
-doc/kernel-doc
-doc/html-customizations.dsl
-doc/Makefile
 estyle-config
 src/Makefile
 test/Makefile
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/estyle-config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle-config.in	26 Jan 2002 07:37:08 -0000	1.1.1.1
+++ estyle-config.in	24 Mar 2004 04:53:49 -0000	1.2
@@ -42,11 +42,11 @@
       if test @includedir@ != /usr/include ; then
         includes=-I@...@
       fi
-      echo $includes @evas_cflags@ @ewd_cflags@ -I$prefix/include/estyle
+      echo $includes @evas_cflags@ -I$prefix/include/estyle
       ;;
     --libs)
       libdirs=-L@...@
-      echo $libdirs -lestyle @evas_libs@ @ewd_libs@ -lm
+      echo $libdirs -lestyle @evas_libs@ -lm
       ;;
     *)
       echo "${usage}" 1>&2

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	Estyle.h Estyle_private.h Makefile.am estyle_color.c 
	estyle_heap.c estyle_heap.h estyle_style.c 


Log Message:
Move the ewd dependant code to the ecore equivalents.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Estyle.h	18 Oct 2003 16:22:46 -0000	1.17
+++ Estyle.h	24 Mar 2004 04:53:51 -0000	1.18
@@ -1,7 +1,6 @@
 #ifndef _ESTYLE_H
 #define _ESTYLE_H
 
-#include <Ewd.h>
 #include <Edb.h>
 #include <Evas.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Estyle_private.h	18 Oct 2003 16:22:46 -0000	1.15
+++ Estyle_private.h	24 Mar 2004 04:53:51 -0000	1.16
@@ -1,6 +1,7 @@
 #ifndef _ESTYLE_PRIVATE_H
 #define _ESTYLE_PRIVATE_H
 
+#include <Ecore.h>
 #include "Estyle.h"
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am	2 Apr 2002 01:30:53 -0000	1.3
+++ Makefile.am	24 Mar 2004 04:53:51 -0000	1.4
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = @evas_cflags@ @ewd_cflags@
+INCLUDES = @evas_cflags@
 
 lib_LTLIBRARIES = libestyle.la
 
@@ -17,6 +17,6 @@
 estyle_heap.c
 
 
-libestyle_la_LIBADD       = @evas_libs@ @ewd_libs@
+libestyle_la_LIBADD       = @evas_libs@
 libestyle_la_DEPENDENCIES = $(top_builddir)/estyle-config.h
 libestyle_la_LDFLAGS      = -version-info 0:1:0
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_color.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- estyle_color.c	14 Jan 2003 18:50:52 -0000	1.7
+++ estyle_color.c	24 Mar 2004 04:53:51 -0000	1.8
@@ -1,7 +1,7 @@
 #include "estyle-config.h"
 #include "Estyle_private.h"
 
-static Ewd_Hash *color_table = NULL;
+static Ecore_Hash *color_table = NULL;
 static E_DB_File *sys_colors = NULL;
 static E_DB_File *user_colors = NULL;
 
@@ -24,14 +24,14 @@
 	 * Check the hash table for a previous malloc of the color
 	 */
 	value = ESTYLE_HASH_COLOR(r, g, b, a);
-	ret = (Estyle_Color *) ewd_hash_get(color_table, (void *) value);
+	ret = (Estyle_Color *) ecore_hash_get(color_table, (void *) value);
 	if (!ret) {
 		ret = (Estyle_Color *) malloc(sizeof(Estyle_Color));
 		ret->r = r;
 		ret->g = g;
 		ret->b = b;
 		ret->a = a;
-		ewd_hash_set(color_table, (void *) value, ret);
+		ecore_hash_set(color_table, (void *) value, ret);
 	}
 
 	return ret;
@@ -88,14 +88,14 @@
 	/*
 	 * Check for a previous allocation for this color.
 	 */
-	found = (Estyle_Color *) ewd_hash_get(color_table, (void *) value);
+	found = (Estyle_Color *) ecore_hash_get(color_table, (void *) value);
 	if (!found) {
 		found = (Estyle_Color *) malloc(sizeof(Estyle_Color));
 		found->r = r;
 		found->g = g;
 		found->b = b;
 		found->a = a;
-		ewd_hash_set(color_table, (void *) value, found);
+		ecore_hash_set(color_table, (void *) value, found);
 	}
 
 	return found;
@@ -120,5 +120,5 @@
 		sys_colors = e_db_open_read(user_path);
 	}
 
-	color_table = ewd_hash_new(NULL, NULL);
+	color_table = ecore_hash_new(NULL, NULL);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_heap.c	19 May 2002 07:19:42 -0000	1.4
+++ estyle_heap.c	24 Mar 2004 04:53:51 -0000	1.5
@@ -11,7 +11,7 @@
  * Returns a pointer to the newly allocated binary heap on success, NULL on
  * failure.
  */
-Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size)
+Estyle_Heap *_estyle_heap_new(Ecore_Compare_Cb compare, int size)
 {
 	Estyle_Heap *heap = NULL;
 
@@ -36,14 +36,14 @@
  *
  * Returns TRUE on success, FALSE on failure
  */
-int _estyle_heap_init(Estyle_Heap * heap, Ewd_Compare_Cb compare, int size)
+int _estyle_heap_init(Estyle_Heap * heap, Ecore_Compare_Cb compare, int size)
 {
 	heap->space = size;
 	if (!compare)
-		heap->compare = ewd_direct_compare;
+		heap->compare = ecore_direct_compare;
 	else
 		heap->compare = compare;
-	heap->order = EWD_SHEAP_MIN;
+	heap->order = ECORE_SHEAP_MIN;
 
 	heap->data = (void **) malloc(heap->space * sizeof(void *));
 	if (!heap->data)
@@ -109,7 +109,7 @@
 	 * data. The loop is placed inside the if statement to reduce the
 	 * number of branching decisions that must be predicted.
 	 */
-	if (heap->order == EWD_SHEAP_MIN) {
+	if (heap->order == ECORE_SHEAP_MIN) {
 		while ((position > 0) && heap->compare(heap->data[parent],
 						       heap->
 						       data[position]) >
@@ -237,10 +237,10 @@
  * Returns TRUE on success, FALSE on failure. The comparison function is
  * changed to @compare and the heap is heapified by the new comparison.
  */
-int _estyle_heap_set_compare(Estyle_Heap * heap, Ewd_Compare_Cb compare)
+int _estyle_heap_set_compare(Estyle_Heap * heap, Ecore_Compare_Cb compare)
 {
 	if (!compare)
-		heap->compare = ewd_direct_compare;
+		heap->compare = ecore_direct_compare;
 	else
 		heap->compare = compare;
 
@@ -329,7 +329,7 @@
 	int left = LEFT(i);
 	int right = RIGHT(i);
 
-	if (heap->order == EWD_SHEAP_MIN) {
+	if (heap->order == ECORE_SHEAP_MIN) {
 		if (left <= heap->size
 		    && heap->compare(heap->data[left - 1],
 				     heap->data[i - 1]) < 0)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_heap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- estyle_heap.h	19 May 2002 07:19:42 -0000	1.4
+++ estyle_heap.h	24 Mar 2004 04:53:51 -0000	1.5
@@ -20,12 +20,12 @@
 
 	char order, sorted;
 
-	Ewd_Compare_Cb compare;
+	Ecore_Compare_Cb compare;
 };
 
-Estyle_Heap *_estyle_heap_new(Ewd_Compare_Cb compare, int size);
+Estyle_Heap *_estyle_heap_new(Ecore_Compare_Cb compare, int size);
 void _estyle_heap_destroy(Estyle_Heap * heap);
-int _estyle_heap_init(Estyle_Heap * heap, Ewd_Compare_Cb compare,
+int _estyle_heap_init(Estyle_Heap * heap, Ecore_Compare_Cb compare,
 		      int size);
 int _estyle_heap_insert(Estyle_Heap * heap, void *data);
 void *_estyle_heap_extract(Estyle_Heap * heap);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- estyle_style.c	11 Mar 2004 00:18:51 -0000	1.16
+++ estyle_style.c	24 Mar 2004 04:53:51 -0000	1.17
@@ -3,7 +3,7 @@
 
 #define SET_REL_COLOR(a, b) ((a + b) > 255 ? 255 : ((a + b) < 0 ? 0 : a + b))
 
-static Ewd_Hash *styles = NULL;
+static Ecore_Hash *styles = NULL;
 static int style_path = 0;
 
 static void __estyle_style_read(Estyle_Style_Info * info);
@@ -145,9 +145,9 @@
 void _estyle_style_add_path(char *path)
 {
 	if (!style_path)
-		style_path = ewd_path_group_new("/estyle/styles");
+		style_path = ecore_path_group_new("/estyle/styles");
 
-	ewd_path_group_add(style_path, path);
+	ecore_path_group_add(style_path, path);
 }
 
 /**
@@ -162,7 +162,7 @@
 	if (!style_path)
 		return;
 
-	ewd_path_group_remove(style_path, path);
+	ecore_path_group_remove(style_path, path);
 }
 
 /*
@@ -544,12 +544,12 @@
 	Estyle_Style_Info *found;
 
 	if (!styles)
-		styles = ewd_hash_new(ewd_str_hash, ewd_str_compare);
+		styles = ecore_hash_new(ecore_str_hash, ecore_str_compare);
 
 	/*
 	 * Look for a previous instance of the info in the hash table.
 	 */
-	found = ewd_hash_get(styles, name);
+	found = ecore_hash_get(styles, name);
 	if (!found) {
 
 		/*
@@ -564,9 +564,9 @@
 		/*
 		 * Load the information for this style info
 		 */
-		found->name = ewd_string_instance(name);
+		found->name = ecore_string_instance(name);
 		__estyle_style_info_load(found);
-		ewd_hash_set(styles, name, found);
+		ecore_hash_set(styles, name, found);
 	}
 
 	found->references++;
@@ -588,10 +588,10 @@
 	 */
 	if (info->references < 1) {
 
-		ewd_hash_remove(styles, info->name);
+		ecore_hash_remove(styles, info->name);
 		if (info->layers)
 			_estyle_heap_destroy(info->layers);
-		ewd_string_release(info->name);
+		ecore_string_release(info->name);
 
 		FREE(info);
 	}
@@ -667,7 +667,7 @@
 	 * paths.
 	 */
 	if (style_path && *info->name != '/')
-		real_path = ewd_path_group_find(style_path, file_name);
+		real_path = ecore_path_group_find(style_path, file_name);
 	else
 		real_path = strdup(file_name);

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/estyle

Dir     : e17/libs/estyle/src


Modified Files:
	estyle.c estyle_style.c 


Log Message:
Pass events by default.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- estyle.c	28 Feb 2004 06:22:39 -0000	1.34
+++ estyle.c	2 May 2004 19:43:06 -0000	1.35
@@ -57,6 +57,7 @@
 	 * Create the Evas_Object and set the default font and font size.
 	 */
 	es->bit = evas_object_text_add(es->evas);
+	evas_object_pass_events_set(es->bit, TRUE);
 	evas_object_text_font_set(es->bit, DEFAULT_FONT, DEFAULT_SIZE);
 
 	obj = evas_object_smart_add(evas, estyle_smart);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- estyle_style.c	24 Mar 2004 04:53:51 -0000	1.17
+++ estyle_style.c	2 May 2004 19:43:07 -0000	1.18
@@ -615,6 +615,7 @@
 	 */
 	evas_object_text_font_get(es->bit, &font, &size);
 	ret = evas_object_text_add(es->evas);
+	evas_object_pass_events_set(ret, TRUE);
 	evas_object_text_font_set(ret, font, size + layer->size_change);
 	evas_object_text_text_set(ret, text);