Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src
Modified Files:
Etox.h Makefile.am etox.c etox_context.c etox_line.c
etox_obstacle.c etox_selection.c
Log Message:
Estyle is now part of Etox. Update yer proggies!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/Etox.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- Etox.h 16 Mar 2004 04:54:46 -0000 1.47
+++ Etox.h 6 May 2004 05:17:52 -0000 1.48
@@ -3,7 +3,7 @@
#include <Edb.h>
#include <Evas.h>
-#include <Estyle.h>
+#include "style/Etox_Style.h"
/*
* Simple alignment bitfield
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 24 Mar 2004 05:19:03 -0000 1.18
+++ Makefile.am 6 May 2004 05:17:52 -0000 1.19
@@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
+SUBDIRS = style
+
INCLUDES = @evas_cflags@
lib_LTLIBRARIES = libetox.la
@@ -18,6 +20,7 @@
etox_selection.c
-libetox_la_LIBADD = @evas_libs@ @ewd_libs@
-libetox_la_DEPENDENCIES = $(top_builddir)/config.h
-libetox_la_LDFLAGS = -version-info 0:2:0
+libetox_la_LIBADD = style/libetox_style.la @evas_libs@
+libetox_la_DEPENDENCIES = $(top_builddir)/config.h style/libetox_style.la
+libetox_la_LDFLAGS = -version-info 0:9:0
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- etox.c 16 Mar 2004 17:27:27 -0000 1.72
+++ etox.c 6 May 2004 05:17:52 -0000 1.73
@@ -890,7 +890,7 @@
evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
if (xc >= tx && xc <= tx + tw)
break;
- sum += estyle_length(bit);
+ sum += etox_style_length(bit);
}
/*
@@ -918,7 +918,7 @@
/*
* Now get the actual geometry from the bit
*/
- sum += estyle_text_at_position(bit, xc, yc, x, y, w, h);
+ sum += etox_style_text_at_position(bit, xc, yc, x, y, w, h);
}
return sum;
@@ -1089,13 +1089,13 @@
/*
* Make a bit for the preceding text
*/
- bit = estyle_new(et->evas, text, et->context->style);
+ bit = etox_style_new(et->evas, text, et->context->style);
evas_object_smart_member_add(bit, et->smart_obj);
evas_object_clip_set(bit, et->clip);
evas_object_color_set(bit, et->context->r,
et->context->g, et->context->b,
et->context->a);
- estyle_set_font(bit, et->context->font,
+ etox_style_set_font(bit, et->context->font,
et->context->font_size);
etox_line_append(line, bit);
evas_object_show(bit);
@@ -1108,13 +1108,13 @@
* Make a bit for the tab character
*/
*text = '\0';
- bit = estyle_new(et->evas, walk, et->context->style);
+ bit = etox_style_new(et->evas, walk, et->context->style);
evas_object_smart_member_add(bit, et->smart_obj);
evas_object_color_set(bit, et->context->r,
et->context->g, et->context->b,
et->context->a);
evas_object_clip_set(bit, et->clip);
- estyle_set_font(bit, et->context->font,
+ etox_style_set_font(bit, et->context->font,
et->context->font_size);
etox_line_append(line, bit);
evas_object_show(bit);
@@ -1135,13 +1135,13 @@
/*
* Create a bit for the text preceding \n
*/
- bit = estyle_new(et->evas, text, et->context->style);
+ bit = etox_style_new(et->evas, text, et->context->style);
evas_object_smart_member_add(bit, et->smart_obj);
evas_object_color_set(bit, et->context->r,
et->context->g, et->context->b,
et->context->a);
evas_object_clip_set(bit, et->clip);
- estyle_set_font(bit, et->context->font,
+ etox_style_set_font(bit, et->context->font,
et->context->font_size);
etox_line_append(line, bit);
evas_object_show(bit);
@@ -1174,12 +1174,12 @@
* Add any remaining text after the last line break or tab.
*/
if (*text) {
- bit = estyle_new(et->evas, text, et->context->style);
+ bit = etox_style_new(et->evas, text, et->context->style);
evas_object_smart_member_add(bit, et->smart_obj);
evas_object_color_set(bit, et->context->r, et->context->g,
et->context->b, et->context->a);
evas_object_clip_set(bit, et->clip);
- estyle_set_font(bit, et->context->font, et->context->font_size);
+ etox_style_set_font(bit, et->context->font, et->context->font_size);
etox_line_append(line, bit);
evas_object_show(bit);
} else if (line->bits == NULL) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_context.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etox_context.c 16 Mar 2004 17:27:27 -0000 1.20
+++ etox_context.c 6 May 2004 05:17:52 -0000 1.21
@@ -245,7 +245,7 @@
{
CHECK_PARAM_POINTER("context", context);
- estyle_lookup_color_db(name, &context->r, &context->g,
+ etox_style_lookup_color_db(name, &context->r, &context->g,
&context->b, &context->a);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_line.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- etox_line.c 16 Mar 2004 14:28:55 -0000 1.34
+++ etox_line.c 6 May 2004 05:17:52 -0000 1.35
@@ -117,7 +117,7 @@
line->w += w;
if (h > line->h)
line->h = h;
- line->length += estyle_length(bit);
+ line->length += etox_style_length(bit);
etox_selections_update(bit, line);
}
@@ -146,7 +146,7 @@
line->w += w;
if (h > line->h)
line->h = h;
- line->length += estyle_length(bit);
+ line->length += etox_style_length(bit);
etox_selections_update(bit, line);
}
@@ -167,7 +167,7 @@
CHECK_PARAM_POINTER("bit", bit);
line->bits = evas_list_remove(line->bits, bit);
- line->length -= estyle_length(bit);
+ line->length -= etox_style_length(bit);
evas_object_geometry_get(bit, NULL, NULL, &w, NULL);
line->w -= w;
@@ -220,7 +220,7 @@
for (l = line->bits; l; l = l->next) {
bit = l->data;
evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
- if (!estyle_fixed(bit)) {
+ if (!etox_style_fixed(bit)) {
if (line->h < th)
line->h = th;
@@ -273,7 +273,7 @@
* Attempt to merge the bits if possible, remove the second
* one if successful.
*/
- if (estyle_merge(last_bit, bit)) {
+ if (etox_style_merge(last_bit, bit)) {
line->bits = evas_list_remove(line->bits, bit);
l = evas_list_find_list(line->bits, last_bit);
l = l->next;
@@ -375,12 +375,12 @@
for (l = line->bits; l; l = l->next) {
es = l->data;
- sum += estyle_length(es);
+ sum += etox_style_length(es);
- if (estyle_get_type(es) == ETOX_BIT_TYPE_WRAP_MARKER)
+ if (etox_style_get_type(es) == ETOX_BIT_TYPE_WRAP_MARKER)
continue;
- temp = estyle_get_text(es);
+ temp = etox_style_get_text(es);
strcat(buf, temp);
free(temp);
}
@@ -416,14 +416,14 @@
/* get the index of the character on the edge */
if (bit)
- index = estyle_text_at_position(bit, et->x + et->w, y + (h / 2),
+ index = etox_style_text_at_position(bit, et->x + et->w, y + (h / 2),
NULL, NULL, NULL, NULL);
/* Adjust the index to find the actual character we want to wrap. */
if (index > 0) {
char *tmp;
- tmp = estyle_get_text(bit);
+ tmp = etox_style_get_text(bit);
/* Back up to some whitespace when necessary */
if (et->flags & ETOX_BREAK_WORDS) {
@@ -445,16 +445,16 @@
ll = ll->next;
/* create a marker bit. */
- marker = estyle_new(et->evas, et->context->marker.text,
+ marker = etox_style_new(et->evas, et->context->marker.text,
et->context->marker.style);
- estyle_set_type(marker, ETOX_BIT_TYPE_WRAP_MARKER);
+ etox_style_set_type(marker, ETOX_BIT_TYPE_WRAP_MARKER);
evas_object_smart_member_add(marker, et->smart_obj);
evas_object_color_set(marker, et->context->marker.r,
et->context->marker.g,
et->context->marker.b,
et->context->marker.a);
evas_object_clip_set(marker, et->clip);
- estyle_set_font(marker, et->context->font,
+ etox_style_set_font(marker, et->context->font,
et->context->font_size);
evas_object_show(marker);
if (et->context->marker.placement == ETOX_MARKER_BEGINNING)
@@ -489,7 +489,7 @@
* If the bit starts on the boundary, simply move it to the next line.
*/
if (index > 0) {
- if (index < estyle_length(bit)) {
+ if (index < etox_style_length(bit)) {
split = etox_split_bit(line, bit, index);
}
ll = ll->next;
@@ -537,7 +537,7 @@
ll = ll->next;
- if (estyle_get_type(marker) ==
+ if (etox_style_get_type(marker) ==
ETOX_BIT_TYPE_WRAP_MARKER) {
line->bits = evas_list_remove(line->bits, marker);
}
@@ -588,14 +588,14 @@
l = line->bits;
while (l) {
bit = l->data;
- len += estyle_length(bit);
+ len += etox_style_length(bit);
if (*i < len)
break;
l = l->next;
}
if (l)
- *i -= (len - estyle_length(bit));
+ *i -= (len - etox_style_length(bit));
return bit;
}
@@ -607,7 +607,7 @@
Evas_List *l;
for (l = line->bits; l; l = l->next) {
- printf("\tBit %d: %s\n", i, estyle_get_text(l->data));
+ printf("\tBit %d: %s\n", i, etox_style_get_text(l->data));
i++;
}
}
@@ -642,7 +642,7 @@
int length;
bit = l->data;
- length = estyle_length(bit);
+ length = etox_style_length(bit);
if ( sum + length < index)
break;
@@ -666,7 +666,7 @@
}
/* get the geometry from the bit */
- estyle_text_at(bit, index - sum, x, y, w, h);
+ etox_style_text_at(bit, index - sum, x, y, w, h);
}
void
@@ -692,7 +692,7 @@
if (!l->prev && line->flags & ETOX_LINE_WRAPPED)
{
/* go past any obstacles */
- while (estyle_fixed(bit))
+ while (etox_style_fixed(bit))
{
/* if there are only obstacles on the line (can this happen?) */
if (!l->next)
@@ -701,17 +701,17 @@
l = l->next;
bit = l->data;
}
- estyle_set_text(bit, context->marker.text);
- estyle_set_style(bit, context->marker.style);
+ etox_style_set_text(bit, context->marker.text);
+ etox_style_set_style(bit, context->marker.style);
evas_object_color_set(bit, context->marker.r, context->marker.g,
context->marker.b, context->marker.a);
}
else
{
- estyle_set_style(bit, context->style);
+ etox_style_set_style(bit, context->style);
evas_object_color_set(bit, context->r, context->g, context->b,
context->a);
- estyle_set_font(bit, context->font, context->font_size);
+ etox_style_set_font(bit, context->font, context->font_size);
}
if (l == le)
break;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_obstacle.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etox_obstacle.c 18 Oct 2003 16:43:37 -0000 1.19
+++ etox_obstacle.c 6 May 2004 05:17:52 -0000 1.20
@@ -24,10 +24,10 @@
obst = (Etox_Obstacle *) calloc(1, sizeof(Etox_Obstacle));
if (obst) {
obst->et = et;
- obst->bit = estyle_new(et->evas, "", NULL);
- estyle_set_type(obst->bit, ETOX_BIT_TYPE_OBSTACLE);
+ obst->bit = etox_style_new(et->evas, "", NULL);
+ etox_style_set_type(obst->bit, ETOX_BIT_TYPE_OBSTACLE);
evas_object_smart_member_add(obst->bit, et->smart_obj);
- estyle_fix_geometry(obst->bit, x, y, w, h);
+ etox_style_fix_geometry(obst->bit, x, y, w, h);
}
return obst;
@@ -142,14 +142,14 @@
/*
* Find the index into the line of the obstacle.
*/
- i = estyle_text_at_position(bit, x, line->y + (line->h / 2), NULL, NULL,
+ i = etox_style_text_at_position(bit, x, line->y + (line->h / 2), NULL, NULL,
NULL, NULL);
/*
* Check if we can append it after this bit, possibly after splitting.
*/
if (i > 0) {
- if (i < estyle_length(bit)) {
+ if (i < etox_style_length(bit)) {
etox_split_bit(line, bit, i);
}
line->bits = evas_list_append_relative(line->bits, obst->bit,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_selection.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etox_selection.c 18 Oct 2003 16:43:37 -0000 1.14
+++ etox_selection.c 6 May 2004 05:17:52 -0000 1.15
@@ -44,8 +44,8 @@
* Split the leading bit, only need to inform selections that end with
* this bit.
*/
- if (index && index < estyle_length(bit)) {
- point = estyle_split(bit, index);
+ if (index && index < etox_style_length(bit)) {
+ point = etox_style_split(bit, index);
evas_object_smart_member_add(point, line->et->smart_obj);
line->bits = evas_list_append_relative(line->bits, point, bit);
@@ -182,8 +182,8 @@
if (!eb)
goto out;
- i1 = estyle_text_at_position(sb, sx, sy, NULL, NULL, NULL, NULL);
- i2 = estyle_text_at_position(eb, sx, sy, NULL, NULL, NULL, NULL);
+ i1 = etox_style_text_at_position(sb, sx, sy, NULL, NULL, NULL, NULL);
+ i2 = etox_style_text_at_position(eb, sx, sy, NULL, NULL, NULL, NULL);
selected = etox_selection_new(et, sl, el, sb, eb, i1, i2);
-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
