Enlightenment CVS committal
Author : gilbertt
Project : misc
Module : geist
Modified Files:
Makefile.am geist.h geist_document.c geist_document.h
geist_document_xml.c geist_fill.c geist_fill.h geist_image.c
geist_image.h geist_imlib.c geist_imlib.h geist_interface.c
geist_layer.c geist_layer.h geist_line.c geist_line.h
geist_object.c geist_object.h geist_poly.c geist_poly.h
geist_rect.c geist_rect.h geist_text.c geist_text.h
geist_utils.c geist_utils.h main.c structs.h
Removed Files:
geist_list.c geist_list.h geist_style.c geist_style.h
Log Message:
Sun Nov 12 16:05:00 2000 Tom Gilbert <gilbertt@...>
* geist now requires giblib.
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Makefile.am 2000/10/27 01:15:23 1.17
+++ Makefile.am 2000/11/12 16:07:28 1.18
@@ -4,7 +4,7 @@
INCLUDES = \
-I. -I$(top_srcdir) \
-@...@ -DPREFIX=\""$(prefix)"\" @XML_CFLAGS@ @IMLIB_CFLAGS@
+@GTK_CFLAGS@ -DPREFIX=\""$(prefix)"\" @XML_CFLAGS@ @GIBLIB_CFLAGS@
bin_PROGRAMS = geist
@@ -19,7 +19,6 @@
debug.h \
geist.h \
geist_layer.c geist_layer.h \
- geist_list.c geist_list.h \
geist_object.h geist_object.c \
structs.h \
geist_image.c geist_image.h \
@@ -28,7 +27,6 @@
geist_line.c geist_line.h \
geist_poly.c geist_poly.h \
geist_imlib.c geist_imlib.h \
- geist_style.c geist_style.h \
geist_document.c geist_document.h \
geist_document_gtk.c geist_document_gtk.h \
geist_fill.c geist_fill.h \
@@ -38,4 +36,4 @@
geist_utils.c geist_utils.h \
imlib.c
-geist_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ @XML_LIBS@
+geist_LDADD = @GTK_LIBS@ @GIBLIB_LIBS@ @XML_LIBS@
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- geist.h 2000/10/12 20:46:47 1.31
+++ geist.h 2000/11/12 16:07:28 1.32
@@ -47,13 +47,13 @@
#include <stdarg.h>
#include <signal.h>
#include <sys/wait.h>
-#include <Imlib2.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <math.h>
+#include <giblib/giblib.h>
#include "config.h"
#include "debug.h"
@@ -112,6 +112,6 @@
extern GtkWidget *mainwin;
extern geist_document *current_doc;
-extern geist_list *doc_list;
+extern gib_list *doc_list;
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_document.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- geist_document.c 2000/10/21 17:16:58 1.39
+++ geist_document.c 2000/11/12 16:07:28 1.40
@@ -46,7 +46,7 @@
d->name = estrdup("New document");
geist_document_add_layer(d);
- doc_list = geist_list_add_end(doc_list, d);
+ doc_list = gib_list_add_end(doc_list, d);
D_RETURN(3, d);
}
@@ -54,7 +54,7 @@
void
geist_document_free(geist_document * document)
{
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
@@ -62,17 +62,17 @@
{
if (GEIST_DOCUMENT(l->data) == document)
{
- doc_list = geist_list_unlink(doc_list, l);
+ doc_list = gib_list_unlink(doc_list, l);
}
}
for (l = document->layers; l; l = l->next)
geist_layer_free((geist_layer *) l->data);
- geist_list_free(document->layers);
+ gib_list_free(document->layers);
if (document->im)
- geist_imlib_free_image(document->im);
+ gib_imlib_free_image(document->im);
if (document->pmap)
XFreePixmap(disp, document->pmap);
@@ -84,11 +84,11 @@
void
geist_document_render(geist_document * document)
{
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
- geist_imlib_image_fill_rectangle(document->im, 0, 0, document->w,
+ gib_imlib_image_fill_rectangle(document->im, 0, 0, document->w,
document->h, 255, 255, 255, 255);
geist_fill_render(document->bg_fill, document->im, 0, 0, document->w,
@@ -100,10 +100,10 @@
D_RETURN_(3);
}
-geist_list *
+gib_list *
geist_document_get_selected_list(geist_document * doc)
{
- geist_list *l, *ll, *ret = NULL;
+ gib_list *l, *ll, *ret = NULL;
geist_object *obj;
D_ENTER(3);
@@ -117,7 +117,7 @@
if (geist_object_get_state(obj, SELECTED))
{
D(5, ("selected object found\n"));
- ret = geist_list_add_end(ret, obj);
+ ret = gib_list_add_end(ret, obj);
}
}
}
@@ -127,12 +127,12 @@
void
geist_document_unselect_all(geist_document * doc)
{
- geist_list *sl, *l;
+ gib_list *sl, *l;
D_ENTER(3);
sl = geist_document_get_selected_list(doc);
- D(3, ("selected items count: %d\n", geist_list_length(sl)));
+ D(3, ("selected items count: %d\n", gib_list_length(sl)));
if (sl)
{
geist_object *obj;
@@ -146,7 +146,7 @@
geist_object_dirty(obj);
}
}
- geist_list_free(sl);
+ gib_list_free(sl);
}
D_RETURN_(3);
@@ -155,26 +155,26 @@
void
geist_document_render_selection(geist_document * doc)
{
- geist_list *sl, *l;
+ gib_list *sl, *l;
int sel_count;
D_ENTER(3);
sl = geist_document_get_selected_list(doc);
- D(3, ("selected items count: %d\n", geist_list_length(sl)));
+ D(3, ("selected items count: %d\n", gib_list_length(sl)));
if (sl)
{
geist_object *obj;
- sel_count = geist_list_length(sl);
+ sel_count = gib_list_length(sl);
for (l = sl; l; l = l->next)
{
obj = GEIST_OBJECT(l->data);
obj->render_selected(obj, doc->im, (sel_count > 1) ? TRUE : FALSE);
}
- geist_list_free(sl);
+ gib_list_free(sl);
}
D_RETURN_(3);
@@ -184,19 +184,19 @@
geist_document_render_selection_partial(geist_document * doc, int x, int y,
int w, int h)
{
- geist_list *sl, *l;
+ gib_list *sl, *l;
int sel_count;
D_ENTER(3);
sl = geist_document_get_selected_list(doc);
- D(3, ("selected items count: %d\n", geist_list_length(sl)));
+ D(3, ("selected items count: %d\n", gib_list_length(sl)));
if (sl)
{
geist_object *obj;
- sel_count = geist_list_length(sl);
+ sel_count = gib_list_length(sl);
for (l = sl; l; l = l->next)
{
@@ -209,7 +209,7 @@
(sel_count > 1) ? TRUE : FALSE);
}
}
- geist_list_free(sl);
+ gib_list_free(sl);
}
D_RETURN_(3);
@@ -220,7 +220,7 @@
geist_document_render_pmap(geist_document * doc)
{
D_ENTER(3);
- geist_imlib_render_image_on_drawable(doc->pmap, doc->im, 0, 0, 1, 1, 0);
+ gib_imlib_render_image_on_drawable(doc->pmap, doc->im, 0, 0, 1, 1, 0);
D_RETURN_(3);
}
@@ -228,12 +228,12 @@
geist_document_render_partial(geist_document * document, int x, int y, int w,
int h)
{
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
D(4, ("Doc render partial, %d,%d %dx%d\n", x, y, w, h));
- geist_imlib_image_fill_rectangle(document->im, x, y, w, h, 255, 255, 255,
+ gib_imlib_image_fill_rectangle(document->im, x, y, w, h, 255, 255, 255,
255);
geist_fill_render(document->bg_fill, document->im, x, y, w, h);
@@ -251,7 +251,7 @@
int h)
{
D_ENTER(3);
- geist_imlib_render_image_part_on_drawable_at_size(doc->pmap, doc->im, x, y,
+ gib_imlib_render_image_part_on_drawable_at_size(doc->pmap, doc->im, x, y,
w, h, x, y, w, h, 1, 1,
0);
D_RETURN_(3);
@@ -261,11 +261,11 @@
void
geist_document_add_object(geist_document * doc, geist_object * obj)
{
- geist_list *top;
+ gib_list *top;
D_ENTER(3);
- top = geist_list_last(doc->layers);
+ top = gib_list_last(doc->layers);
geist_layer_add_object(((geist_layer *) top->data), obj);
if (GEIST_OBJECT_DOC(obj) == current_doc)
geist_object_add_to_object_list(obj);
@@ -277,7 +277,7 @@
void
geist_document_reset_object_list(geist_document * d)
{
- geist_list *l, *ll;
+ gib_list *l, *ll;
D_ENTER(3);
@@ -311,7 +311,7 @@
layer = geist_layer_new();
layer->doc = doc;
- doc->layers = geist_list_add_end(doc->layers, layer);
+ doc->layers = gib_list_add_end(doc->layers, layer);
D_RETURN_(3);
}
@@ -319,7 +319,7 @@
geist_object *
geist_document_find_clicked_object(geist_document * doc, int x, int y)
{
- geist_list *l;
+ gib_list *l;
geist_object *ret = NULL;
D_ENTER(3);
@@ -388,7 +388,7 @@
void
geist_document_dirty_selection(geist_document * doc)
{
- geist_list *l, *list;
+ gib_list *l, *list;
D_ENTER(3);
@@ -397,7 +397,7 @@
for (l = list; l; l = l->next)
geist_object_dirty_selection(GEIST_OBJECT(l->data));
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -447,7 +447,7 @@
/* render all but the selection */
geist_document_render_full(doc, 0);
- geist_imlib_save_image(doc->im, filename);
+ gib_imlib_save_image(doc->im, filename);
D_RETURN(3, 1);
}
@@ -470,7 +470,7 @@
XFreePixmap(disp, doc->pmap);
doc->pmap = XCreatePixmap(disp, root, w, h, depth);
if (doc->im)
- geist_imlib_free_image(doc->im);
+ gib_imlib_free_image(doc->im);
doc->im = imlib_create_image(w, h);
/* TODO move objects back into document if they are moved off it */
geist_document_resize_gtk(doc, w, h);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_document.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- geist_document.h 2000/10/21 17:16:58 1.25
+++ geist_document.h 2000/11/12 16:07:28 1.26
@@ -27,10 +27,8 @@
#define GEIST_DOCUMENT_H
#include "geist.h"
-#include "geist_list.h"
#include "geist_object.h"
#include "geist_layer.h"
-#include "geist_imlib.h"
#include "geist_document_gtk.h"
#include "geist_fill.h"
@@ -40,7 +38,7 @@
{
char *name;
char *filename;
- geist_list *layers;
+ gib_list *layers;
geist_fill *bg_fill;
int w;
int h;
@@ -74,7 +72,7 @@
void geist_document_render_pmap_partial(geist_document * doc, int x, int y,
int w, int h);
void geist_document_render_selection(geist_document * doc);
-geist_list *geist_document_get_selected_list(geist_document * doc);
+gib_list *geist_document_get_selected_list(geist_document * doc);
void geist_document_unselect_all(geist_document * doc);
void geist_document_render_selection_partial(geist_document * doc, int x,
int y, int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_document_xml.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- geist_document_xml.c 2000/10/27 00:15:11 1.18
+++ geist_document_xml.c 2000/11/12 16:07:28 1.19
@@ -40,7 +40,7 @@
xmlNodePtr cur,
geist_layer * parent);
-static geist_list *geist_object_list_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
+static gib_list *geist_object_list_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
xmlNodePtr cur,
geist_layer * parent);
@@ -48,7 +48,7 @@
xmlNodePtr cur,
geist_document * parent);
-static geist_list *geist_layer_list_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
+static gib_list *geist_layer_list_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
xmlNodePtr cur,
geist_document * parent);
@@ -58,14 +58,14 @@
char *filename);
static geist_object *geist_parse_poly_xml(xmlDocPtr doc, xmlNsPtr ns,
xmlNodePtr cur);
-static geist_list *geist_parse_point_list_xml(xmlDocPtr doc, xmlNsPtr ns,
+static gib_list *geist_parse_point_list_xml(xmlDocPtr doc, xmlNsPtr ns,
xmlNodePtr cur);
static geist_point *geist_point_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
xmlNodePtr cur);
-static geist_style *geist_style_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
+static gib_style *gib_style_parse_xml(xmlDocPtr doc, xmlNsPtr ns,
xmlNodePtr cur);
-static geist_list *
-geist_style_bits_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur);
+static gib_list *
+gib_style_bits_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur);
static void geist_save_layer_xml(geist_layer * layer, xmlNodePtr parent,
@@ -94,7 +94,7 @@
static void geist_save_style_xml(geist_text * txt, xmlNodePtr parent,
xmlNsPtr ns);
-static void geist_save_style_bit_xml(geist_style_bit * b, xmlNodePtr parent,
+static void geist_save_style_bit_xml(gib_style_bit * b, xmlNodePtr parent,
xmlNsPtr ns);
/* Utility functions */
@@ -187,7 +187,7 @@
int w, h;
char *name = NULL;
geist_fill *fill = NULL;
- geist_list *layers = NULL;
+ gib_list *layers = NULL;
D_ENTER(3);
@@ -216,7 +216,7 @@
if (ret->bg_fill)
geist_fill_free(ret->bg_fill);
ret->bg_fill = fill;
- geist_list_free(ret->layers);
+ gib_list_free(ret->layers);
ret->layers = layers;
D_RETURN(3, ret);
@@ -240,11 +240,11 @@
D_RETURN(3, ret);
}
-static geist_list *
+static gib_list *
geist_layer_list_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur,
geist_document * parent)
{
- geist_list *ret = NULL;
+ gib_list *ret = NULL;
geist_layer *layer = NULL;
D_ENTER(3);
@@ -256,7 +256,7 @@
{
layer = geist_layer_parse_xml(doc, ns, cur, parent);
if (layer)
- ret = geist_list_add_end(ret, layer);
+ ret = gib_list_add_end(ret, layer);
else
weprintf("invalid layer found\n");
}
@@ -296,11 +296,11 @@
D_RETURN(3, ret);
}
-static geist_list *
+static gib_list *
geist_object_list_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur,
geist_layer * parent)
{
- geist_list *ret = NULL;
+ gib_list *ret = NULL;
geist_object *obj;
D_ENTER(3);
@@ -313,7 +313,7 @@
{
obj = geist_object_parse_xml(doc, ns, cur, parent);
if (obj)
- ret = geist_list_add_end(ret, obj);
+ ret = gib_list_add_end(ret, obj);
else
weprintf("invalid object found");
}
@@ -471,7 +471,7 @@
{
geist_object *ret;
int filled, closed, r, g, b, a;
- geist_list *points = NULL;
+ gib_list *points = NULL;
geist_poly *poly;
D_ENTER(3);
@@ -488,7 +488,7 @@
{
if ((!strcmp(cur->name, "Points")) && (cur->ns == ns))
points =
- geist_list_add_end(points,
+ gib_list_add_end(points,
geist_parse_point_list_xml(doc, ns, cur));
cur = cur->next;
}
@@ -501,10 +501,10 @@
D_RETURN(3, ret);
}
-static geist_list *
+static gib_list *
geist_parse_point_list_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
{
- geist_list *ret = NULL;
+ gib_list *ret = NULL;
geist_point *point = NULL;
D_ENTER(3);
@@ -516,7 +516,7 @@
{
point = geist_point_parse_xml(doc, ns, cur);
if (point)
- ret = geist_list_add_end(ret, point);
+ ret = gib_list_add_end(ret, point);
else
weprintf("invalid point found\n");
}
@@ -548,7 +548,7 @@
char *text = NULL;
int wordwrap = 0;
int justification = 0;
- geist_style *style = NULL;
+ gib_style *style = NULL;
int r,g,b,a;
D_ENTER(3);
@@ -576,7 +576,7 @@
xmlFree(temp);
}
else if ((!strcmp(cur->name, "Style")) && (cur->ns == ns))
- style = geist_style_parse_xml(doc, ns, cur);
+ style = gib_style_parse_xml(doc, ns, cur);
cur = cur->next;
}
@@ -596,12 +596,12 @@
D_RETURN(3, ret);
}
-static geist_style *
-geist_style_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
+static gib_style *
+gib_style_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
{
- geist_style *ret = NULL;
+ gib_style *ret = NULL;
char *name = NULL;
- geist_list *bits = NULL;
+ gib_list *bits = NULL;
D_ENTER(3);
@@ -610,24 +610,24 @@
{
if ((!strcmp(cur->name, "Bits")) && (cur->ns == ns))
{
- bits = geist_style_bits_parse_xml(doc, ns, cur);
+ bits = gib_style_bits_parse_xml(doc, ns, cur);
}
else if ((!strcmp(cur->name, "Name")) && (cur->ns == ns))
name = xmlNodeGetContent(cur->children);
cur = cur->next;
}
- ret = geist_style_new(name);
+ ret = gib_style_new(name);
xmlFree(name);
ret->bits = bits;
D_RETURN(3, ret);
}
-static geist_list *
-geist_style_bits_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
+static gib_list *
+gib_style_bits_parse_xml(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
{
- geist_list *ret = NULL;
+ gib_list *ret = NULL;
D_ENTER(3);
@@ -644,7 +644,7 @@
r = geist_xml_read_int(cur, "R", 255);
g = geist_xml_read_int(cur, "G", 255);
b = geist_xml_read_int(cur, "B", 255);
- ret = geist_list_add_end(ret, geist_style_bit_new(x_off, y_off, r,g,b,a));
+ ret = gib_list_add_end(ret, gib_style_bit_new(x_off, y_off, r,g,b,a));
}
cur = cur->next;
}
@@ -704,7 +704,7 @@
xmlDocPtr doc;
xmlNodePtr tree, subtree;
xmlNsPtr ns;
- geist_list *kids;
+ gib_list *kids;
D_ENTER(3);
@@ -749,7 +749,7 @@
{
/* recursive */
xmlNodePtr newlayer, subtree = NULL;
- geist_list *kids;
+ gib_list *kids;
D_ENTER(3);
@@ -865,7 +865,7 @@
geist_save_style_xml(geist_text * txt, xmlNodePtr parent, xmlNsPtr ns)
{
xmlNodePtr subtree;
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
subtree = xmlNewChild(parent, ns, "Style", NULL);
@@ -883,7 +883,7 @@
}
static void
-geist_save_style_bit_xml(geist_style_bit * b, xmlNodePtr parent, xmlNsPtr ns)
+geist_save_style_bit_xml(gib_style_bit * b, xmlNodePtr parent, xmlNsPtr ns)
{
xmlNodePtr subtree;
@@ -903,7 +903,7 @@
static void
geist_save_poly_xml(geist_poly * poly, xmlNodePtr parent, xmlNsPtr ns)
{
- geist_list *kids;
+ gib_list *kids;
xmlNodePtr subtree;
D_ENTER(3);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_fill.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- geist_fill.c 2000/09/24 15:51:55 1.2
+++ geist_fill.c 2000/11/12 16:07:28 1.3
@@ -71,7 +71,7 @@
{
D_ENTER(3);
- geist_imlib_image_fill_rectangle(dest, x, y, w, h, fill->r, fill->g, fill->b,
+ gib_imlib_image_fill_rectangle(dest, x, y, w, h, fill->r, fill->g, fill->b,
fill->a);
D_RETURN_(3);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_fill.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- geist_fill.h 2000/09/24 15:51:55 1.2
+++ geist_fill.h 2000/11/12 16:07:28 1.3
@@ -30,7 +30,6 @@
#include "geist.h"
#include "geist_object.h"
#include "geist_document.h"
-#include "geist_list.h"
#define GEIST_FILL(O) ((geist_fill *)O)
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_image.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- geist_image.c 2000/10/21 16:19:12 1.50
+++ geist_image.c 2000/11/12 16:07:28 1.51
@@ -24,7 +24,7 @@
*/
#include "geist.h"
-#include "geist_imlib.h"
+#include "gib_imlib.h"
#include "geist_image.h"
static gboolean img_load_cancel_cb(GtkWidget * widget, gpointer data);
@@ -135,7 +135,7 @@
if (img->filename)
efree(img->filename);
if (img->im)
- geist_imlib_free_image(img->im);
+ gib_imlib_free_image(img->im);
efree(img);
@@ -158,15 +158,15 @@
/*
- dw = geist_imlib_image_get_width(dest);
- dh = geist_imlib_image_get_height(dest);
- sw = geist_imlib_image_get_width(im->im);
- sh = geist_imlib_image_get_height(im->im);
+ dw = gib_imlib_image_get_width(dest);
+ dh = gib_imlib_image_get_height(dest);
+ sw = gib_imlib_image_get_width(im->im);
+ sh = gib_imlib_image_get_height(im->im);
D(3, ("Rendering image %p with filename %s\n", obj, im->filename));
- geist_imlib_blend_image_onto_image(dest, im->im, 0, 0, 0, sw, sh, obj->x,
+ gib_imlib_blend_image_onto_image(dest, im->im, 0, 0, 0, sw, sh, obj->x,
obj->y, sw, sh, 1,
- geist_imlib_image_has_alpha(im->im),
+ gib_imlib_image_has_alpha(im->im),
obj->alias);
*/
@@ -210,9 +210,9 @@
dh));
D(3, ("Rendering partial image %s\n", im->filename));
- geist_imlib_blend_image_onto_image(dest, im->im, 0, sx, sy, sw, sh, dx, dy,
+ gib_imlib_blend_image_onto_image(dest, im->im, 0, sx, sy, sw, sh, dx, dy,
dw, dh, 1,
- geist_imlib_image_has_alpha(im->im),
+ gib_imlib_image_has_alpha(im->im),
obj->alias);
D_RETURN_(5);
@@ -228,7 +228,7 @@
D_ENTER(5);
if (img->im)
- geist_imlib_free_image(img->im);
+ gib_imlib_free_image(img->im);
ret = geist_imlib_load_image(&img->im, filename);
@@ -237,9 +237,9 @@
obj = (geist_object *) img;
if (img->orig_im)
- geist_imlib_free_image(img->orig_im);
- obj->w = obj->rendered_w = geist_imlib_image_get_width(img->im);
- obj->h = obj->rendered_h = geist_imlib_image_get_height(img->im);
+ gib_imlib_free_image(img->orig_im);
+ obj->w = obj->rendered_w = gib_imlib_image_get_width(img->im);
+ obj->h = obj->rendered_h = gib_imlib_image_get_height(img->im);
}
D_RETURN(5, ret);
@@ -309,7 +309,7 @@
refresh_image_mods_cb(GtkWidget * widget, gpointer * type)
{
int p[4], i;
- geist_list *list, *l;
+ gib_list *list, *l;
geist_object *obj = NULL;
D_ENTER(3);
@@ -333,7 +333,7 @@
geist_object_dirty(GEIST_OBJECT(obj));
}
}
- geist_list_free(list);
+ gib_list_free(list);
geist_document_render_updates(GEIST_OBJECT_DOC(obj),1);
D_RETURN_(3);
}
@@ -397,8 +397,8 @@
gboolean refresh_aa_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *l = NULL;
- geist_list *list = NULL;
+ gib_list *l = NULL;
+ gib_list *list = NULL;
D_ENTER(3);
@@ -413,7 +413,7 @@
geist_object_update_positioning(obj);
geist_object_dirty(obj);
}
- geist_list_free(list);
+ gib_list_free(list);
geist_document_render_updates(GEIST_OBJECT_DOC(obj),1);
}
D_RETURN(3, TRUE);
@@ -554,17 +554,17 @@
img = GEIST_IMAGE(obj);
- w = geist_imlib_image_get_width(img->im);
- h = geist_imlib_image_get_height(img->im);
+ w = gib_imlib_image_get_width(img->im);
+ h = gib_imlib_image_get_height(img->im);
if ((obj->rendered_w != w) || (obj->rendered_h != h)
|| (obj->alias != obj->last.alias) || (img->orig_im
&&
- ((geist_imlib_image_get_width
+ ((gib_imlib_image_get_width
(img->orig_im) !=
obj->rendered_w)
||
- (geist_imlib_image_get_height
+ (gib_imlib_image_get_height
(img->orig_im) !=
obj->rendered_h))
&&
@@ -579,17 +579,17 @@
/* need to resize */
if (!img->orig_im)
{
- img->orig_im = geist_imlib_clone_image(img->im);
+ img->orig_im = gib_imlib_clone_image(img->im);
}
else
{
- w = geist_imlib_image_get_width(img->orig_im);
- h = geist_imlib_image_get_height(img->orig_im);
+ w = gib_imlib_image_get_width(img->orig_im);
+ h = gib_imlib_image_get_height(img->orig_im);
}
has_resized = 1;
- geist_imlib_free_image_and_decache(img->im);
+ gib_imlib_free_image_and_decache(img->im);
img->im =
- geist_imlib_create_cropped_scaled_image(img->orig_im, 0, 0, w, h,
+ gib_imlib_create_cropped_scaled_image(img->orig_im, 0, 0, w, h,
obj->rendered_w,
obj->rendered_h, obj->alias);
}
@@ -615,18 +615,18 @@
{
if (!img->orig_im)
{
- img->orig_im = geist_imlib_clone_image(img->im);
+ img->orig_im = gib_imlib_clone_image(img->im);
}
else
{
- geist_imlib_free_image_and_decache(img->im);
- img->im = geist_imlib_clone_image(img->orig_im);
+ gib_imlib_free_image_and_decache(img->im);
+ img->im = gib_imlib_clone_image(img->orig_im);
}
}
- w = geist_imlib_image_get_width(img->im);
- h = geist_imlib_image_get_height(img->im);
+ w = gib_imlib_image_get_width(img->im);
+ h = gib_imlib_image_get_height(img->im);
- geist_imlib_image_set_has_alpha(img->im, 1);
+ gib_imlib_image_set_has_alpha(img->im, 1);
for (i = 0; i < 256; i++)
{
@@ -658,7 +658,7 @@
hb++;
btab[i] = (DATA8) (hb);
}
- geist_imlib_apply_color_modifier_to_rectangle(img->im, 0, 0, w, h, rtab,
+ gib_imlib_apply_color_modifier_to_rectangle(img->im, 0, 0, w, h, rtab,
gtab, btab, atab);
}
D_RETURN_(3);
@@ -698,13 +698,13 @@
case SIZEMODE_NONE:
if (img->orig_im)
{
- ww = geist_imlib_image_get_width(img->orig_im);
- hh = geist_imlib_image_get_height(img->orig_im);
+ ww = gib_imlib_image_get_width(img->orig_im);
+ hh = gib_imlib_image_get_height(img->orig_im);
}
else
{
- ww = geist_imlib_image_get_width(img->im);
- hh = geist_imlib_image_get_height(img->im);
+ ww = gib_imlib_image_get_width(img->im);
+ hh = gib_imlib_image_get_height(img->im);
}
obj->rendered_w = ww;
obj->rendered_h = hh;
@@ -718,13 +718,13 @@
hhh = obj->h;
if (img->orig_im)
{
- ww = geist_imlib_image_get_width(img->orig_im);
- hh = geist_imlib_image_get_height(img->orig_im);
+ ww = gib_imlib_image_get_width(img->orig_im);
+ hh = gib_imlib_image_get_height(img->orig_im);
}
else
{
- ww = geist_imlib_image_get_width(img->im);
- hh = geist_imlib_image_get_height(img->im);
+ ww = gib_imlib_image_get_width(img->im);
+ hh = gib_imlib_image_get_height(img->im);
}
ratio = ((double) ww / hh) / ((double) www / hhh);
if (ratio > 1.0)
@@ -773,7 +773,7 @@
if (img->image_mods[A] != FULL_OPACITY)
D_RETURN(3, TRUE);
- D_RETURN(3, geist_imlib_image_has_alpha(img->im));
+ D_RETURN(3, gib_imlib_image_has_alpha(img->im));
}
void
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_image.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- geist_image.h 2000/09/24 15:51:55 1.26
+++ geist_image.h 2000/11/12 16:07:28 1.27
@@ -27,6 +27,7 @@
#define GEIST_IMAGE_H
#include "geist.h"
+#include "geist_imlib.h"
#include "geist_object.h"
#define GEIST_IMAGE(O) ((geist_image *) O)
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_imlib.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- geist_imlib.c 2000/10/29 23:57:48 1.24
+++ geist_imlib.c 2000/11/12 16:07:28 1.25
@@ -1,4 +1,4 @@
-/* geist_imlib.c
+/* gib_imlib.c
Copyright (C) 1999,2000 Tom Gilbert.
@@ -24,7 +24,6 @@
*/
#include "geist_imlib.h"
-#include "geist_style.h"
int
geist_imlib_load_image(Imlib_Image * im, char *filename)
@@ -91,465 +90,6 @@
return (1);
}
-int
-geist_imlib_image_get_width(Imlib_Image im)
-{
- imlib_context_set_image(im);
- return imlib_image_get_width();
-}
-
-int
-geist_imlib_image_get_height(Imlib_Image im)
-{
- imlib_context_set_image(im);
- return imlib_image_get_height();
-}
-
-int
-geist_imlib_image_has_alpha(Imlib_Image im)
-{
- imlib_context_set_image(im);
- return imlib_image_has_alpha();
-}
-
-void
-geist_imlib_free_image_and_decache(Imlib_Image im)
-{
- imlib_context_set_image(im);
- imlib_free_image_and_decache();
-}
-
-void
-geist_imlib_free_image(Imlib_Image im)
-{
- imlib_context_set_image(im);
- imlib_free_image();
-}
-
-const char *
-geist_imlib_image_get_filename(Imlib_Image im)
-{
- if (im)
- {
- imlib_context_set_image(im);
- return imlib_image_get_filename();
- }
- else
- return NULL;
-}
-
-void
-geist_imlib_render_image_on_drawable(Drawable d, Imlib_Image im, int x, int y,
- char dither, char blend, char alias)
-{
- imlib_context_set_image(im);
- imlib_context_set_drawable(d);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(0);
- imlib_render_image_on_drawable(x, y);
-}
-
-void
-geist_imlib_render_image_on_drawable_with_rotation(Drawable d, Imlib_Image im,
- int x, int y, double angle,
- char dither, char blend,
- char alias)
-{
- Imlib_Image new_im;
-
- imlib_context_set_image(im);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(angle);
- imlib_context_set_drawable(d);
- new_im = imlib_create_rotated_image(angle);
- imlib_context_set_image(new_im);
- imlib_render_image_on_drawable(x, y);
- imlib_free_image();
-}
-
-void
-geist_imlib_render_image_on_drawable_at_size(Drawable d, Imlib_Image im,
- int x, int y, int w, int h,
- char dither, char blend,
- char alias)
-{
- imlib_context_set_image(im);
- imlib_context_set_drawable(d);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(0);
- imlib_render_image_on_drawable_at_size(x, y, w, h);
-}
-
-void
-geist_imlib_render_image_on_drawable_at_size_with_rotation(Drawable d,
- Imlib_Image im,
- int x, int y,
- int w, int h,
- double angle,
- char dither,
- char blend,
- char alias)
-{
- Imlib_Image new_im;
-
- imlib_context_set_image(im);
- imlib_context_set_drawable(d);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(angle);
- new_im = imlib_create_rotated_image(angle);
- imlib_context_set_image(new_im);
- imlib_render_image_on_drawable_at_size(x, y, w, h);
- imlib_free_image_and_decache();
-}
-
-void
-geist_imlib_render_image_part_on_drawable_at_size(Drawable d, Imlib_Image im,
- int sx, int sy, int sw,
- int sh, int dx, int dy,
- int dw, int dh, char dither,
- char blend, char alias)
-{
- imlib_context_set_image(im);
- imlib_context_set_drawable(d);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(0);
- imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw,
- dh);
-}
-
-void
-geist_imlib_render_image_part_on_drawable_at_size_with_rotation(Drawable d,
- Imlib_Image
- im, int sx,
- int sy,
- int sw,
- int sh,
- int dx,
- int dy,
- int dw,
- int dh,
- double angle,
- char dither,
- char blend,
- char alias)
-{
- Imlib_Image new_im;
-
- imlib_context_set_image(im);
- imlib_context_set_drawable(d);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_angle(angle);
- imlib_context_set_blend(blend);
- new_im = imlib_create_rotated_image(angle);
- imlib_context_set_image(new_im);
- imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw,
- dh);
- imlib_free_image_and_decache();
-}
-
-void
-geist_imlib_image_fill_rectangle(Imlib_Image im, int x, int y, int w, int h,
- int r, int g, int b, int a)
-{
- imlib_context_set_image(im);
- imlib_context_set_color(r, g, b, a);
- imlib_image_fill_rectangle(x, y, w, h);
-}
-
-void
-geist_imlib_image_fill_polygon(Imlib_Image im, ImlibPolygon poly, int r,
- int g, int b, int a, unsigned char alias,
- int cx, int cy, int cw, int ch)
-{
- imlib_context_set_image(im);
- imlib_context_set_color(r, g, b, a);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_cliprect(cx, cy, cw, ch);
- imlib_image_fill_polygon(poly);
- imlib_context_set_cliprect(0, 0, 0, 0);
-}
-
-void
-geist_imlib_image_draw_polygon(Imlib_Image im, ImlibPolygon poly, int r,
- int g, int b, int a, unsigned char closed,
- unsigned char alias, int cx, int cy, int cw,
- int ch)
-{
- imlib_context_set_image(im);
- imlib_context_set_color(r, g, b, a);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_cliprect(cx, cy, cw, ch);
- imlib_image_draw_polygon(poly, closed);
- imlib_context_set_cliprect(0, 0, 0, 0);
-}
-
-
-void
-geist_imlib_image_draw_rectangle(Imlib_Image im, int x, int y, int w, int h,
- int r, int g, int b, int a)
-{
- imlib_context_set_image(im);
- imlib_context_set_color(r, g, b, a);
- imlib_image_draw_rectangle(x, y, w, h);
-}
-
-
-void
-geist_imlib_text_draw(Imlib_Image im, Imlib_Font fn, geist_style * s, int x,
- int y, char *text, Imlib_Text_Direction dir, int r,
- int g, int b, int a)
-{
- imlib_context_set_image(im);
- imlib_context_set_font(fn);
- imlib_context_set_direction(dir);
- if (s)
- {
- int min_x = 0, min_y = 0;
- geist_style_bit *bb;
- geist_list *l;
-
- /* here we shift the draw to accomodate bits with negative offsets,
- * which would be drawn at negative coords otherwise */
- l = s->bits;
- while (l)
- {
- bb = (geist_style_bit *) l->data;
- if (bb)
- {
- if (bb->x_offset < min_x)
- min_x = bb->x_offset;
- if (bb->y_offset < min_y)
- min_y = bb->y_offset;
- }
- l = l->next;
- }
- x -= min_x;
- y -= min_y;
-
- /* Now draw the bits */
- l = s->bits;
- while (l)
- {
- bb = (geist_style_bit *) l->data;
- if (bb)
- {
- if((bb->r + bb->g + bb->b + bb->a) == 0)
- imlib_context_set_color(r,g,b,a);
- else
- imlib_context_set_color(bb->r, bb->g, bb->b, bb->a);
- imlib_text_draw(x +bb->x_offset, y + bb->y_offset, text);
- }
- l = l->next;
- }
- }
- else
- {
- imlib_context_set_color(r, g, b, a);
- imlib_text_draw(x, y, text);
- }
-}
-
-char **
-geist_imlib_list_fonts(int *num)
-{
- return imlib_list_fonts(num);
-}
-
-
-void
-geist_imlib_get_text_size(Imlib_Font fn, char *text, geist_style * s, int *w,
- int *h, Imlib_Text_Direction dir)
-{
-
- imlib_context_set_font(fn);
- imlib_context_set_direction(dir);
- imlib_get_text_size(text, w, h);
- if (s)
- {
- geist_style_bit *b;
- int max_x_off = 0, min_x_off = 0, max_y_off = 0, min_y_off = 0;
- geist_list *l;
-
- l = s->bits;
- while (l)
- {
- b = (geist_style_bit *) l->data;
- if (b)
- {
- if (b->x_offset > max_x_off)
- max_x_off = b->x_offset;
- else if (b->x_offset < min_x_off)
- min_x_off = b->x_offset;
- if (b->y_offset > max_y_off)
- max_y_off = b->y_offset;
- else if (b->y_offset < min_y_off)
- min_y_off = b->y_offset;
- }
- l = l->next;
- }
- if (h)
- {
- *h += max_y_off;
- *h -= min_y_off;
- }
- if (w)
- {
- *w += max_x_off;
- *w -= min_x_off;
- }
- }
-}
-
-Imlib_Image geist_imlib_clone_image(Imlib_Image im)
-{
- imlib_context_set_image(im);
- return imlib_clone_image();
-}
-
-char *
-geist_imlib_image_format(Imlib_Image im)
-{
- imlib_context_set_image(im);
- return imlib_image_format();
-}
-
-void
-geist_imlib_blend_image_onto_image(Imlib_Image dest_image,
- Imlib_Image source_image, char merge_alpha,
- int sx, int sy, int sw, int sh, int dx,
- int dy, int dw, int dh, char dither,
- char blend, char alias)
-{
- imlib_context_set_image(dest_image);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(0);
- imlib_blend_image_onto_image(source_image, merge_alpha, sx, sy, sw, sh, dx,
- dy, dw, dh);
-}
-
-void
-geist_imlib_blend_image_onto_image_with_rotation(Imlib_Image dest_image,
- Imlib_Image source_image,
- char merge_alpha, int sx,
- int sy, int sw, int sh,
- int dx, int dy, int dw,
- int dh, double angle,
- char dither, char blend,
- char alias)
-{
- imlib_context_set_image(dest_image);
- imlib_context_set_anti_alias(alias);
- imlib_context_set_dither(dither);
- imlib_context_set_blend(blend);
- imlib_context_set_angle(angle);
- imlib_blend_image_onto_image_at_angle(source_image, merge_alpha, sx, sy,
- sw, sh, dx, dy, (int) angle,
- (int) angle);
- return;
- dw = 0;
- dh = 0;
-}
-
-Imlib_Image geist_imlib_create_cropped_scaled_image(Imlib_Image im, int sx,
- int sy, int sw, int sh,
- int dw, int dh,
- char alias)
-{
- imlib_context_set_image(im);
- imlib_context_set_anti_alias(alias);
- return imlib_create_cropped_scaled_image(sx, sy, sw, sh, dw, dh);
-}
-
-void
-geist_imlib_apply_color_modifier_to_rectangle(Imlib_Image im, int x, int y,
- int w, int h, DATA8 * rtab,
- DATA8 * gtab, DATA8 * btab,
- DATA8 * atab)
-{
- Imlib_Color_Modifier cm;
-
- imlib_context_set_image(im);
- cm = imlib_create_color_modifier();
- imlib_context_set_color_modifier(cm);
- imlib_set_color_modifier_tables(rtab, gtab, btab, atab);
- imlib_apply_color_modifier_to_rectangle(x, y, w, h);
- imlib_free_color_modifier();
-}
-
-void
-geist_imlib_image_set_has_alpha(Imlib_Image im, int alpha)
-{
- imlib_context_set_image(im);
- imlib_image_set_has_alpha(alpha);
-}
-
-void
-geist_imlib_save_image(Imlib_Image im, char *file)
-{
- char *tmp;
- imlib_context_set_image(im);
- tmp = strrchr(file, '.');
- if (tmp)
- imlib_image_set_format(tmp + 1);
- imlib_save_image(file);
-}
-
-void
-geist_imlib_free_font(Imlib_Font fn)
-{
- imlib_context_set_font(fn);
- imlib_free_font();
-}
-
-void
-geist_imlib_image_draw_line(Imlib_Image im, int x1, int y1, int x2, int y2,
- char make_updates, int r, int g, int b, int a)
-{
- imlib_context_set_image(im);
- imlib_context_set_color(r, g, b, a);
- imlib_image_draw_line(x1, y1, x2, y2, make_updates);
-}
-
-Imlib_Image geist_imlib_create_rotated_image(Imlib_Image im, double angle)
-{
- imlib_context_set_image(im);
- return (imlib_create_rotated_image(angle));
-}
-
-void
-geist_imlib_image_tile(Imlib_Image im)
-{
- imlib_context_set_image(im);
- imlib_image_tile();
-}
-
-void
-geist_imlib_image_blur(Imlib_Image im, int radius)
-{
- imlib_context_set_image(im);
- imlib_image_blur(radius);
-}
-
-void
-geist_imlib_image_sharpen(Imlib_Image im, int radius)
-{
- imlib_context_set_image(im);
- imlib_image_sharpen(radius);
-}
-
DATA8
geist_imlib_image_part_is_transparent(Imlib_Image im, int x, int y)
{
@@ -594,14 +134,4 @@
return 0;
return 1;
-}
-
-void
-geist_imlib_line_clip_and_draw(Imlib_Image dest, int x0, int y0, int x1,
- int y1, int cx, int cy, int cw, int ch, int r,
- int g, int b, int a)
-{
- imlib_context_set_cliprect(cx, cy, cw, ch);
- geist_imlib_image_draw_line(dest, x0, y0, x1, y1, 0, r, g, b, a);
- imlib_context_set_cliprect(0, 0, 0, 0);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_imlib.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- geist_imlib.h 2000/10/19 23:21:52 1.17
+++ geist_imlib.h 2000/11/12 16:07:28 1.18
@@ -42,130 +42,6 @@
}
int geist_imlib_load_image(Imlib_Image * im, char *filename);
-int geist_imlib_image_get_width(Imlib_Image im);
-int geist_imlib_image_get_height(Imlib_Image im);
-int geist_imlib_image_has_alpha(Imlib_Image im);
-const char *geist_imlib_image_get_filename(Imlib_Image im);
-void geist_imlib_free_image_and_decache(Imlib_Image im);
-void geist_imlib_render_image_on_drawable(Drawable d, Imlib_Image im, int x,
- int y, char dither, char blend,
-
- char alias);
-void geist_imlib_render_image_on_drawable_with_rotation(Drawable d,
- Imlib_Image im, int x,
- int y, double angle,
-
- char dither,
- char blend,
- char alias);
-void geist_imlib_render_image_part_on_drawable_at_size(Drawable d,
- Imlib_Image im, int sx,
- int sy, int sw, int sh,
- int dx, int dy, int dw,
- int dh, char dither,
-
- char blend,
- char alias);
-void geist_imlib_render_image_part_on_drawable_at_size_with_rotation(Drawable
- d,
-
- Imlib_Image
- im,
- int sx,
- int sy,
- int sw,
- int sh,
- int dx,
- int dy,
- int dw,
- int dh,
- double
- angle,
- char
- dither,
- char
- blend,
- char
- alias);
-void geist_imlib_image_fill_rectangle(Imlib_Image im, int x, int y, int w,
- int h, int r, int g, int b, int a);
-void geist_imlib_text_draw(Imlib_Image im, Imlib_Font fn, geist_style *s,int x, int y,
- char *text, Imlib_Text_Direction dir, int r, int g,
- int b, int a);
-void geist_imlib_get_text_size(Imlib_Font fn, char *text, geist_style *s, int *w, int *h,
- Imlib_Text_Direction dir);
-Imlib_Image geist_imlib_clone_image(Imlib_Image im);
-char *geist_imlib_image_format(Imlib_Image im);
-char **geist_imlib_list_fonts(int *num);
-void geist_imlib_render_image_on_drawable_at_size(Drawable d, Imlib_Image im,
- int x, int y, int w, int h,
- char dither, char blend,
-
- char alias);
-void geist_imlib_render_image_on_drawable_at_size_with_rotation(Drawable d,
- Imlib_Image
- im, int x,
- int y, int w,
-
- int h,
- double angle,
- char dither,
- char blend,
- char alias);
-void geist_imlib_blend_image_onto_image(Imlib_Image dest_image,
- Imlib_Image source_image,
- char merge_alpha, int sx, int sy,
- int sw, int sh, int dx, int dy,
- int dw, int dh, char dither,
- char blend, char alias);
-void geist_imlib_blend_image_onto_image_with_rotation(Imlib_Image dest_image,
- Imlib_Image
- source_image,
- char merge_alpha,
- int sx, int sy, int sw,
- int sh, int dx, int dy,
- int dw, int dh,
- double angle,
-
- char dither, char blend,
- char alias);
-Imlib_Image geist_imlib_create_cropped_scaled_image(Imlib_Image im, int sx,
- int sy, int sw, int sh,
- int dw, int dh,
-
- char alias);
-void geist_imlib_apply_color_modifier_to_rectangle(Imlib_Image im, int x,
- int y, int w, int h,
- DATA8 * rtab, DATA8 * gtab,
- DATA8 * btab,
-
- DATA8 * atab);
-void geist_imlib_image_set_has_alpha(Imlib_Image im, int alpha);
-void geist_imlib_save_image(Imlib_Image im, char *file);
-void geist_imlib_free_font(Imlib_Font fn);
-void geist_imlib_free_image(Imlib_Image im);
-void geist_imlib_image_draw_line(Imlib_Image im, int x1, int y1, int x2,
- int y2, char make_updates, int r, int g,
- int b, int a);
-void geist_imlib_image_set_has_alpha(Imlib_Image im, int alpha);
-void geist_image_save_image(Imlib_Image im, char *file);
-void geist_imlib_free_font(Imlib_Font fn);
-Imlib_Image geist_imlib_create_rotated_image(Imlib_Image im, double angle);
-void geist_imlib_image_tile(Imlib_Image im);
-void geist_imlib_image_blur(Imlib_Image im, int radius);
-void geist_imlib_image_sharpen(Imlib_Image im, int radius);
-void geist_imlib_image_draw_rectangle(Imlib_Image im, int x, int y, int w,
- int h, int r, int g, int b, int a);
DATA8 geist_imlib_image_part_is_transparent(Imlib_Image im, int x, int y);
-void geist_imlib_line_clip_and_draw(Imlib_Image dest, int x0, int y0, int x1,
- int y1, int cx, int cy, int cw, int ch,
- int r, int g, int b, int a);
-void geist_imlib_image_fill_polygon(Imlib_Image im, ImlibPolygon poly, int r,
- int g, int b, int a, unsigned char alias,
- int cx, int cy, int cw, int ch);
-void geist_imlib_image_draw_polygon(Imlib_Image im, ImlibPolygon poly, int r,
- int g, int b, int a, unsigned char closed,
- unsigned char alias, int cx, int cy,
- int cw, int ch);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_interface.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- geist_interface.c 2000/10/25 22:08:10 1.46
+++ geist_interface.c 2000/11/12 16:07:28 1.47
@@ -134,7 +134,7 @@
geist_update_statusbar(geist_document * doc)
{
geist_object *obj;
- geist_list *list;
+ gib_list *list;
char buff[35];
gint contextid;
@@ -143,7 +143,7 @@
list = geist_document_get_selected_list(doc);
if (list)
{
- if (geist_list_has_more_than_one_item(list))
+ if (gib_list_has_more_than_one_item(list))
{
gtk_statusbar_push(GTK_STATUSBAR(statusbar), contextid,
"[Multiple selection]");
@@ -474,7 +474,7 @@
D_RETURN(5, 1);
if (event->button == 1)
{
- geist_list *l, *list;
+ gib_list *l, *list;
int row;
/* First check for resizes */
@@ -514,7 +514,7 @@
geist_document_render_updates(doc, 1);
D_RETURN(5, 1);
}
- geist_list_free(list);
+ gib_list_free(list);
}
obj = geist_document_find_clicked_object(doc, event->x, event->y);
@@ -606,7 +606,7 @@
gint evbox_buttonrelease_cb(GtkWidget * widget, GdkEventButton * event,
gpointer user_data)
{
- geist_list *list, *l;
+ gib_list *list, *l;
geist_object *obj;
geist_document *doc;
int dragged = 0;
@@ -628,7 +628,7 @@
obj->clicked_x = obj->clicked_y = 0;
geist_object_dirty(obj);
}
- geist_list_free(list);
+ gib_list_free(list);
gtk_object_set_data_full(GTK_OBJECT(widget), "draglist", NULL, NULL);
dragged = 1;
}
@@ -644,7 +644,7 @@
obj->clicked_x = obj->clicked_y = 0;
geist_object_dirty(obj);
}
- geist_list_free(list);
+ gib_list_free(list);
gtk_object_set_data_full(GTK_OBJECT(widget), "resizelist", NULL, NULL);
resized = 1;
}
@@ -652,7 +652,7 @@
{
int x, y, w, h;
int row;
- geist_list *l, *ll;
+ gib_list *l, *ll;
/* this is a bit hackish: we didnt resize or drag, so no object was
* clicked. If there are updates now, they're the boundaries of the
@@ -723,7 +723,7 @@
gint evbox_mousemove_cb(GtkWidget * widget, GdkEventMotion * event,
gpointer user_data)
{
- geist_list *l, *list;
+ gib_list *l, *list;
geist_object *obj;
geist_document *doc;
int x, y;
@@ -801,9 +801,9 @@
}
/*draw selection rect */
- geist_imlib_image_fill_rectangle(doc->im, rect_x, rect_y, w, h, 170,
+ gib_imlib_image_fill_rectangle(doc->im, rect_x, rect_y, w, h, 170,
210, 170, 120);
- geist_imlib_image_draw_rectangle(doc->im, rect_x, rect_y, w, h, 0,
+ gib_imlib_image_draw_rectangle(doc->im, rect_x, rect_y, w, h, 0,
0, 0, 255);
/*render on top of everything else */
@@ -888,7 +888,7 @@
gboolean obj_cpy_cb(GtkWidget * widget, gpointer * data)
{
geist_object *new;
- geist_list *l, *list;
+ gib_list *l, *list;
geist_object *obj;
int row;
@@ -917,7 +917,7 @@
gtk_clist_select_row(GTK_CLIST(obj_list), row, 0);
}
}
- geist_list_free(list);
+ gib_list_free(list);
geist_document_render_updates(current_doc, 1);
}
D_RETURN(3, TRUE);
@@ -926,7 +926,7 @@
gboolean obj_del_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj;
- geist_list *l, *list;
+ gib_list *l, *list;
D_ENTER(3);
if (doc_list)
@@ -948,7 +948,7 @@
geist_document_remove_object(current_doc, obj);
geist_object_free(obj);
}
- geist_list_free(list);
+ gib_list_free(list);
geist_document_render_updates(current_doc, 1);
}
D_RETURN(3, TRUE);
@@ -1144,12 +1144,12 @@
obj_vis_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *l = NULL;
- geist_list *list = NULL;
+ gib_list *l = NULL;
+ gib_list *list = NULL;
D_ENTER(3);
list = geist_document_get_selected_list(current_doc);
- if (geist_list_length(list) > 1)
+ if (gib_list_length(list) > 1)
{
for (l = list; l; l = l->next)
{
@@ -1169,7 +1169,7 @@
geist_object_hide(obj);
}
geist_document_render_updates(GEIST_OBJECT_DOC(obj), 1);
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -1177,11 +1177,11 @@
refresh_name_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *list = NULL;
+ gib_list *list = NULL;
list = geist_document_get_selected_list(current_doc);
D_ENTER(3);
- if (geist_list_length(list) > 1)
+ if (gib_list_length(list) > 1)
printf("Implement me!\n");
else
{
@@ -1190,7 +1190,7 @@
efree(obj->name);
obj->name = estrdup(gtk_entry_get_text(GTK_ENTRY(widget)));
}
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -1198,8 +1198,8 @@
refresh_sizemode_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *l = NULL;
- geist_list *list = NULL;
+ gib_list *l = NULL;
+ gib_list *list = NULL;
list = geist_document_get_selected_list(current_doc);
D_ENTER(3);
@@ -1214,7 +1214,7 @@
geist_object_dirty(obj);
}
geist_document_render_updates(GEIST_OBJECT_DOC(obj), 1);
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -1223,8 +1223,8 @@
refresh_alignment_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *l = NULL;
- geist_list *list = NULL;
+ gib_list *l = NULL;
+ gib_list *list = NULL;
list = geist_document_get_selected_list(current_doc);
D_ENTER(3);
@@ -1239,7 +1239,7 @@
geist_object_dirty(obj);
}
geist_document_render_updates(GEIST_OBJECT_DOC(obj), 1);
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -1248,8 +1248,8 @@
buttons_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *l = NULL;
- geist_list *list = NULL;
+ gib_list *l = NULL;
+ gib_list *list = NULL;
D_ENTER(3);
list = geist_document_get_selected_list(current_doc);
@@ -1290,7 +1290,7 @@
}
geist_update_statusbar(current_doc);
geist_document_render_updates(GEIST_OBJECT_DOC(obj), 1);
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -1298,8 +1298,8 @@
rotation_cb(GtkWidget * widget, gpointer * data)
{
geist_object *obj = NULL;
- geist_list *l = NULL;
- geist_list *list = NULL;
+ gib_list *l = NULL;
+ gib_list *list = NULL;
double angle;
list = geist_document_get_selected_list(current_doc);
@@ -1316,7 +1316,7 @@
}
geist_update_statusbar(current_doc);
geist_document_render_updates(GEIST_OBJECT_DOC(obj), 1);
- geist_list_free(list);
+ gib_list_free(list);
D_RETURN_(3);
}
@@ -1545,9 +1545,9 @@
{
geist_object *obj;
GtkWidget *new_hbox;
- geist_list *list;
+ gib_list *list;
geist_object *obj_first;
- geist_list *l;
+ gib_list *l;
char *align_string = NULL;
char *sizemode_string = NULL;
@@ -1580,7 +1580,7 @@
{
/*update the values in the generic part */
- if (geist_list_has_more_than_one_item(list))
+ if (gib_list_has_more_than_one_item(list))
{
/*grey out the name entry box */
gtk_entry_set_text(GTK_ENTRY(name), "");
@@ -1631,7 +1631,7 @@
gtk_window_set_title(GTK_WINDOW(obj_win), obj->name);
gtk_window_set_title(GTK_WINDOW(obj_props_window), obj->name);
}
- geist_list_free(list);
+ gib_list_free(list);
}
else
geist_clear_obj_props_window();
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_layer.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- geist_layer.c 2000/09/24 15:51:55 1.6
+++ geist_layer.c 2000/11/12 16:07:28 1.7
@@ -45,14 +45,14 @@
void
geist_layer_free(geist_layer * layer)
{
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
for (l = layer->objects; l; l = l->next)
geist_object_free(((geist_object *) l->data));
- geist_list_free(layer->objects);
+ gib_list_free(layer->objects);
efree(layer);
@@ -62,7 +62,7 @@
void
geist_layer_render(geist_layer * layer, Imlib_Image dest)
{
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
@@ -80,7 +80,7 @@
geist_layer_render_partial(geist_layer * layer, Imlib_Image dest, int x,
int y, int w, int h)
{
- geist_list *l;
+ gib_list *l;
geist_object *obj;
int ox, oy, ow, oh;
@@ -115,7 +115,7 @@
if (!obj)
D_RETURN_(3);
- layer->objects = geist_list_add_end(layer->objects, obj);
+ layer->objects = gib_list_add_end(layer->objects, obj);
obj->layer = layer;
D_RETURN_(3);
@@ -124,7 +124,7 @@
geist_object *
geist_layer_find_clicked_object(geist_layer * layer, int x, int y)
{
- geist_list *l;
+ gib_list *l;
geist_object *ret = NULL, *obj;
D_ENTER(4);
@@ -143,7 +143,7 @@
void
geist_layer_raise_object(geist_object * obj)
{
- geist_list *ll;
+ gib_list *ll;
geist_object *ob;
D_ENTER(4);
@@ -154,7 +154,7 @@
if (ob == obj)
{
D(4, ("Found object %p - popping to end of list\n", obj));
- obj->layer->objects = geist_list_pop_to_end(obj->layer->objects, ll);
+ obj->layer->objects = gib_list_pop_to_end(obj->layer->objects, ll);
D_RETURN_(4);
}
}
@@ -165,7 +165,7 @@
unsigned char
geist_layer_remove_object(geist_layer * lay, geist_object * obj)
{
- geist_list *l;
+ gib_list *l;
D_ENTER(3);
@@ -173,7 +173,7 @@
{
if (GEIST_OBJECT(l->data) == obj)
{
- lay->objects = geist_list_unlink(lay->objects, l);
+ lay->objects = gib_list_unlink(lay->objects, l);
obj->layer = NULL;
efree(l);
D_RETURN(3, TRUE);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_layer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- geist_layer.h 2000/09/24 15:51:55 1.3
+++ geist_layer.h 2000/11/12 16:07:28 1.4
@@ -30,14 +30,13 @@
#include "geist.h"
#include "geist_object.h"
#include "geist_document.h"
-#include "geist_list.h"
#include "geist_fill.h"
#define GEIST_LAYER(O) ((geist_layer *)O)
struct __geist_layer
{
- geist_list *objects;
+ gib_list *objects;
geist_document *doc;
int alpha;
int x_offset;
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_line.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- geist_line.c 2000/10/21 16:19:12 1.19
+++ geist_line.c 2000/11/12 16:07:28 1.20
@@ -150,7 +150,7 @@
line = GEIST_LINE(obj);
- geist_imlib_line_clip_and_draw(dest, line->start.x + obj->x,
+ gib_imlib_line_clip_and_draw(dest, line->start.x + obj->x,
line->start.y + obj->y,
line->end.x + obj->x, line->end.y + obj->y,
x, y, w, h, line->r, line->g, line->b,
@@ -441,22 +441,22 @@
if (multiple)
{
- geist_imlib_image_draw_rectangle(dest, clip_x0 - HALF_SEL_WIDTH,
+ gib_imlib_image_draw_rectangle(dest, clip_x0 - HALF_SEL_WIDTH,
clip_y0 - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest, clip_x1 - HALF_SEL_WIDTH,
+ gib_imlib_image_draw_rectangle(dest, clip_x1 - HALF_SEL_WIDTH,
clip_y1 - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
}
else
{
- geist_imlib_image_fill_rectangle(dest, clip_x0 - HALF_SEL_WIDTH,
+ gib_imlib_image_fill_rectangle(dest, clip_x0 - HALF_SEL_WIDTH,
clip_y0 - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest, clip_x1 - HALF_SEL_WIDTH,
+ gib_imlib_image_fill_rectangle(dest, clip_x1 - HALF_SEL_WIDTH,
clip_y1 - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_line.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- geist_line.h 2000/09/24 15:51:55 1.9
+++ geist_line.h 2000/11/12 16:07:28 1.10
@@ -29,7 +29,6 @@
#include "geist.h"
#include "geist_object.h"
#include "geist.h"
-#include "geist_imlib.h"
#include "geist_image.h"
#define GEIST_LINE(O) ((geist_line *) O)
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_object.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- geist_object.c 2000/10/09 15:33:23 1.64
+++ geist_object.c 2000/11/12 16:07:28 1.65
@@ -230,7 +230,7 @@
D_RETURN(3,
(char *)
- geist_imlib_image_get_filename(geist_object_get_rendered_image
+ gib_imlib_image_get_filename(geist_object_get_rendered_image
(obj)));
}
@@ -309,37 +309,37 @@
if (multiple)
{
- geist_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH,
+ gib_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH,
obj->y - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
+ gib_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
obj->y - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH,
+ gib_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH,
obj->y - HALF_SEL_HEIGHT + obj->h,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
+ gib_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
obj->y - HALF_SEL_HEIGHT + obj->h,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest,
+ gib_imlib_image_draw_rectangle(dest,
obj->x - HALF_SEL_WIDTH + (obj->w / 2),
obj->y - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
+ gib_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
obj->y - HALF_SEL_HEIGHT +
(obj->h / 2), 2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH,
+ gib_imlib_image_draw_rectangle(dest, obj->x - HALF_SEL_WIDTH,
obj->y - HALF_SEL_HEIGHT +
(obj->h / 2), 2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_draw_rectangle(dest,
+ gib_imlib_image_draw_rectangle(dest,
obj->x - HALF_SEL_WIDTH + (obj->w / 2),
obj->y - HALF_SEL_HEIGHT + obj->h,
2 * HALF_SEL_WIDTH,
@@ -347,37 +347,37 @@
}
else
{
- geist_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH,
+ gib_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH,
obj->y - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
+ gib_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
obj->y - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH,
+ gib_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH,
obj->y - HALF_SEL_HEIGHT + obj->h,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
+ gib_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
obj->y - HALF_SEL_HEIGHT + obj->h,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest,
+ gib_imlib_image_fill_rectangle(dest,
obj->x - HALF_SEL_WIDTH + (obj->w / 2),
obj->y - HALF_SEL_HEIGHT,
2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
+ gib_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH + obj->w,
obj->y - HALF_SEL_HEIGHT +
(obj->h / 2), 2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH,
+ gib_imlib_image_fill_rectangle(dest, obj->x - HALF_SEL_WIDTH,
obj->y - HALF_SEL_HEIGHT +
(obj->h / 2), 2 * HALF_SEL_WIDTH,
2 * HALF_SEL_HEIGHT, 0, 0, 0, 255);
- geist_imlib_image_fill_rectangle(dest,
+ gib_imlib_image_fill_rectangle(dest,
obj->x - HALF_SEL_WIDTH + (obj->w / 2),
obj->y - HALF_SEL_HEIGHT + obj->h,
2 * HALF_SEL_WIDTH,
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_object.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- geist_object.h 2000/10/09 15:33:23 1.56
+++ geist_object.h 2000/11/12 16:07:28 1.57
@@ -208,7 +208,7 @@
int geist_object_get_sizemode_from_string(char *s);
int geist_object_get_alignment_from_string(char *s);
int geist_object_get_type_from_string(char *s);
-GtkWidget *geist_object_generic_properties(geist_list * list);
+GtkWidget *geist_object_generic_properties(gib_list * list);
void geist_object_debug_print_values(geist_object * obj);
void geist_object_get_rendered_area(geist_object * obj, int *x, int *y,
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_poly.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- geist_poly.c 2000/10/21 16:19:12 1.5
+++ geist_poly.c 2000/11/12 16:07:28 1.6
@@ -73,7 +73,7 @@
}
geist_object *
-geist_poly_new_from_points(geist_list * points, int a, int r, int g, int b)
+geist_poly_new_from_points(gib_list * points, int a, int r, int g, int b)
{
geist_poly *poly;
geist_object *obj;
@@ -158,7 +158,7 @@
if (!poly->poly)
poly->poly = imlib_polygon_new();
imlib_polygon_add_point(poly->poly, x, y);
- poly->points = geist_list_add_end(poly->points, geist_point_new(x, y));
+ poly->points = gib_list_add_end(poly->points, geist_point_new(x, y));
geist_poly_update_bounds(poly);
D_RETURN_(3);
@@ -167,7 +167,7 @@
void
geist_poly_update_imlib_polygon(geist_poly * poly)
{
- geist_list *l;
+ gib_list *l;
geist_point *p;
geist_object *obj;
@@ -207,7 +207,7 @@
D_RETURN_(5);
imlib_polygon_free(poly->poly);
- geist_list_free_and_data(poly->points);
+ gib_list_free_and_data(poly->points);
efree(poly);
D_RETURN_(5);
@@ -228,11 +228,11 @@
geist_poly_update_imlib_polygon(poly);
if (poly->filled)
- geist_imlib_image_fill_polygon(dest, poly->poly, poly->r, poly->g,
+ gib_imlib_image_fill_polygon(dest, poly->poly, poly->r, poly->g,
poly->b, poly->a, obj->alias, 0, 0, 0,
0);
else
- geist_imlib_image_draw_polygon(dest, poly->poly, poly->r, poly->g,
+ gib_imlib_image_draw_polygon(dest, poly->poly, poly->r, poly->g,
poly->b, poly->a, poly->closed,
obj->alias, 0, 0, 0, 0);
@@ -263,11 +263,11 @@
poly->r, poly->g, poly->b, poly->a));
if (poly->filled)
- geist_imlib_image_fill_polygon(dest, poly->poly, poly->r, poly->g,
+ gib_imlib_image_fill_polygon(dest, poly->poly, poly->r, poly->g,
poly->b, poly->a, obj->alias, dx, dy, dw,
dh);
else
- geist_imlib_image_draw_polygon(dest, poly->poly, poly->r, poly->g,
+ gib_imlib_image_draw_polygon(dest, poly->poly, poly->r, poly->g,
poly->b, poly->a, poly->closed,
obj->alias, dx, dy, dw, dh);
@@ -286,7 +286,7 @@
poly = GEIST_POLY(obj);
ret =
- geist_poly_new_from_points(geist_list_dup(poly->points), poly->a,
+ geist_poly_new_from_points(gib_list_dup(poly->points), poly->a,
poly->r, poly->g, poly->b);
ret->rendered_x = obj->rendered_x;
ret->rendered_y = obj->rendered_y;
@@ -338,7 +338,7 @@
void
geist_poly_move_points_relative(geist_poly * poly, int x, int y)
{
- geist_list *l;
+ gib_list *l;
geist_point *p;
D_ENTER(3);
@@ -534,7 +534,7 @@
geist_poly_rotate(geist_object * obj, double angle)
{
geist_poly *poly;
- geist_list *l;
+ gib_list *l;
geist_point *p;
/*the cartesian coordinates relative to the center point */
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_poly.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- geist_poly.h 2000/10/12 20:46:47 1.4
+++ geist_poly.h 2000/11/12 16:07:28 1.5
@@ -29,7 +29,6 @@
#include "geist.h"
#include "geist_object.h"
#include "geist.h"
-#include "geist_imlib.h"
#include "geist_image.h"
#define GEIST_POLY(O) ((geist_poly *) O)
@@ -37,7 +36,7 @@
struct __geist_poly
{
geist_object object;
- geist_list *points;
+ gib_list *points;
ImlibPolygon poly;
int filled;
int closed;
@@ -46,7 +45,7 @@
};
geist_object *geist_poly_new(void);
-geist_object *geist_poly_new_from_points(geist_list *points, int a, int r,
+geist_object *geist_poly_new_from_points(gib_list *points, int a, int r,
int g, int b);
void geist_poly_init(geist_poly * txt);
void geist_poly_free(geist_object * obj);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_rect.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- geist_rect.c 2000/10/21 16:19:12 1.25
+++ geist_rect.c 2000/11/12 16:07:28 1.26
@@ -129,7 +129,7 @@
("rendering %d,%d %dx%d with %d,%d,%d,%d\n", obj->x, obj->y, obj->w,
obj->h, rec->r, rec->g, rec->b, rec->a));
- geist_imlib_image_fill_rectangle(dest, obj->x, obj->y, obj->w, obj->h,
+ gib_imlib_image_fill_rectangle(dest, obj->x, obj->y, obj->w, obj->h,
rec->r, rec->g, rec->b, rec->a);
*/
@@ -159,7 +159,7 @@
("partial rendering %d,%d %dx%d with %d,%d,%d,%d\n", dx, dy, dw, dh,
rec->r, rec->g, rec->b, rec->a));
- geist_imlib_image_fill_rectangle(dest, dx, dy, dw, dh, rec->r, rec->g,
+ gib_imlib_image_fill_rectangle(dest, dx, dy, dw, dh, rec->r, rec->g,
rec->b, rec->a);
D_RETURN_(5);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_rect.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- geist_rect.h 2000/09/24 15:51:55 1.8
+++ geist_rect.h 2000/11/12 16:07:28 1.9
@@ -29,7 +29,6 @@
#include "geist.h"
#include "geist_object.h"
#include "geist.h"
-#include "geist_imlib.h"
#include "geist_image.h"
#define GEIST_RECT(O) ((geist_rect *) O)
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_text.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- geist_text.c 2000/10/27 00:52:38 1.45
+++ geist_text.c 2000/11/12 16:07:28 1.46
@@ -30,7 +30,7 @@
int fontstyler_active = 0;
/* temp copy of the style thats edited*/
-geist_style *working_copy, *temp;
+gib_style *working_copy, *temp;
geist_object *current_obj;
int cur = 0;
@@ -147,10 +147,10 @@
txt->g = g;
txt->b = b;
txt->a = a;
- txt->style = geist_style_new("Default");
+ txt->style = gib_style_new("Default");
txt->style->bits =
- geist_list_add_end(txt->style->bits,
- geist_style_bit_new(0, 0, 0, 0, 0, 0));
+ gib_list_add_end(txt->style->bits,
+ gib_style_bit_new(0, 0, 0, 0, 0, 0));
txt->justification = justification;
txt->wordwrap = wordwrap;
@@ -184,13 +184,13 @@
if (txt->text)
efree(txt->text);
if (txt->fn)
- geist_imlib_free_font(txt->fn);
+ gib_imlib_free_font(txt->fn);
if (txt->im)
- geist_imlib_free_image(txt->im);
+ gib_imlib_free_image(txt->im);
if (txt->lines)
geist_text_free_lines(txt);
if (txt->style)
- geist_style_free(txt->style);
+ gib_style_free(txt->style);
efree(txt);
@@ -211,13 +211,13 @@
if (!im->im)
D_RETURN_(5);
/*
- dw = geist_imlib_image_get_width(dest);
- dh = geist_imlib_image_get_height(dest);
- sw = geist_imlib_image_get_width(im->im);
- sh = geist_imlib_image_get_height(im->im);
+ dw = gib_imlib_image_get_width(dest);
+ dh = gib_imlib_image_get_height(dest);
+ sw = gib_imlib_image_get_width(im->im);
+ sh = gib_imlib_image_get_height(im->im);
D(3, ("Rendering text %p with text %s\n", obj, im->text));
- geist_imlib_blend_image_onto_image(dest, im->im, 0, 0, 0, sw, sh,
+ gib_imlib_blend_image_onto_image(dest, im->im, 0, 0, 0, sw, sh,
obj->x + obj->rendered_x,
obj->y + obj->rendered_y, sw, sh, 1, 1,
obj->alias);
@@ -259,7 +259,7 @@
("Rendering text area:\nsx: %d\tsy: %d\nsw: %d\tsh: %d\ndx: %d\tdy: %d\ndw: %d\tdh: %d\n",
sx, sy, sw, sh, dx, dy, dw, dh));
- geist_imlib_blend_image_onto_image(dest, im->im, 0, sx, sy, sw, sh, dx, dy,
+ gib_imlib_blend_image_onto_image(dest, im->im, 0, sx, sy, sw, sh, dx, dy,
dw, dh, 1, 1, 0);
D_RETURN_(5);
@@ -275,7 +275,7 @@
obj = GEIST_OBJECT(txt);
geist_object_dirty(obj);
if (txt->im)
- geist_imlib_free_image_and_decache(txt->im);
+ gib_imlib_free_image_and_decache(txt->im);
txt->im = NULL;
geist_text_create_image(txt);
if (resize)
@@ -314,7 +314,7 @@
DATA8 atab[256];
Imlib_Image im;
geist_object *obj;
- geist_list *l, *ll, *words;
+ gib_list *l, *ll, *words;
char *p, *pp;
int w = 0, h = 0, ww, hh;
int x = 0, y = 0;
@@ -341,7 +341,7 @@
while (l)
{
p = (char *) l->data;
- geist_imlib_get_text_size(txt->fn, p, txt->style, &ww, &hh,
+ gib_imlib_get_text_size(txt->fn, p, txt->style, &ww, &hh,
IMLIB_TEXT_TO_RIGHT);
if (ww > w)
w = ww;
@@ -363,9 +363,9 @@
}
/* make image transparent (HACK - imlib2 should do this nicely) */
- geist_imlib_image_set_has_alpha(im, 1);
+ gib_imlib_image_set_has_alpha(im, 1);
memset(atab, 0, sizeof(atab));
- geist_imlib_apply_color_modifier_to_rectangle(im, 0, 0, obj->w, obj->h,
+ gib_imlib_apply_color_modifier_to_rectangle(im, 0, 0, obj->w, obj->h,
NULL, NULL, NULL, atab);
/* todo - put offset, margin etc into txt struct */
@@ -373,23 +373,23 @@
while (l)
{
p = (char *) l->data;
- geist_imlib_get_text_size(txt->fn, p, txt->style, &ww, &hh,
+ gib_imlib_get_text_size(txt->fn, p, txt->style, &ww, &hh,
IMLIB_TEXT_TO_RIGHT);
switch (txt->justification)
{
case JUST_LEFT:
x = 0;
- geist_imlib_text_draw(im, txt->fn, txt->style, x, y, p,
+ gib_imlib_text_draw(im, txt->fn, txt->style, x, y, p,
IMLIB_TEXT_TO_RIGHT, txt->r, txt->g, txt->b, txt->a);
break;
case JUST_CENTER:
x = (w - ww) / 2;
- geist_imlib_text_draw(im, txt->fn, txt->style, x, y, p,
+ gib_imlib_text_draw(im, txt->fn, txt->style, x, y, p,
IMLIB_TEXT_TO_RIGHT, txt->r, txt->g, txt->b, txt->a);
break;
case JUST_RIGHT:
x = w - ww;
- geist_imlib_text_draw(im, txt->fn, txt->style, x, y, p,
+ gib_imlib_text_draw(im, txt->fn, txt->style, x, y, p,
IMLIB_TEXT_TO_RIGHT, txt->r, txt->g, txt->b, txt->a);
break;
@@ -400,12 +400,12 @@
int wordcnt, word_spacing, line_w;
int t_width, m_width, space_width, offset = 0;
- wordcnt = geist_list_length(words);
- geist_imlib_get_text_size(txt->fn, p, txt->style, &line_w, NULL,
+ wordcnt = gib_list_length(words);
+ gib_imlib_get_text_size(txt->fn, p, txt->style, &line_w, NULL,
IMLIB_TEXT_TO_RIGHT);
- geist_imlib_get_text_size(txt->fn, "M M", txt->style, &t_width,
+ gib_imlib_get_text_size(txt->fn, "M M", txt->style, &t_width,
NULL, IMLIB_TEXT_TO_RIGHT);
- geist_imlib_get_text_size(txt->fn, "M", txt->style, &m_width,
+ gib_imlib_get_text_size(txt->fn, "M", txt->style, &m_width,
NULL, IMLIB_TEXT_TO_RIGHT);
space_width = t_width - (2 * m_width);
@@ -424,15 +424,15 @@
{
int wordw;
- geist_imlib_text_draw(im, txt->fn, txt->style, x + offset,
+ gib_imlib_text_draw(im, txt->fn, txt->style, x + offset,
y, pp, IMLIB_TEXT_TO_RIGHT, txt->r, txt->g, txt->b, txt->a);
- geist_imlib_get_text_size(txt->fn, pp, txt->style, &wordw,
+ gib_imlib_get_text_size(txt->fn, pp, txt->style, &wordw,
NULL, IMLIB_TEXT_TO_RIGHT);
offset += (wordw + space_width + word_spacing);
}
ll = ll->next;
}
- geist_list_free_and_data(words);
+ gib_list_free_and_data(words);
}
break;
@@ -454,7 +454,7 @@
if (!txt->lines)
return;
- geist_list_free_and_data(txt->lines);
+ gib_list_free_and_data(txt->lines);
txt->lines = NULL;
D_RETURN_(3);
@@ -464,8 +464,8 @@
geist_text_calculate_lines(geist_text * txt)
{
geist_object *obj;
- geist_list *ll, *lines = NULL, *list = NULL, *words;
- geist_list *l = NULL;
+ gib_list *ll, *lines = NULL, *list = NULL, *words;
+ gib_list *l = NULL;
char delim[2] = { '\n', '\0' };
int w, line_width;
int tw, th;
@@ -485,9 +485,9 @@
if (txt->wordwrap && obj->w)
{
- geist_imlib_get_text_size(txt->fn, "M M", txt->style, &t_width, NULL,
+ gib_imlib_get_text_size(txt->fn, "M M", txt->style, &t_width, NULL,
IMLIB_TEXT_TO_RIGHT);
- geist_imlib_get_text_size(txt->fn, "M", txt->style, &m_width, NULL,
+ gib_imlib_get_text_size(txt->fn, "M", txt->style, &m_width, NULL,
IMLIB_TEXT_TO_RIGHT);
space_width = t_width - (2 * m_width);
w = obj->w;
@@ -498,14 +498,14 @@
p = (char *) l->data;
D(1, ("got line %s\n", p));
/* quick check to see if whole line fits okay */
- geist_imlib_get_text_size(txt->fn, p, txt->style, &tw, &th,
+ gib_imlib_get_text_size(txt->fn, p, txt->style, &tw, &th,
IMLIB_TEXT_TO_RIGHT);
if (tw <= w)
- list = geist_list_add_end(list, estrdup(p));
+ list = gib_list_add_end(list, estrdup(p));
else if (strlen(p) == 0)
- list = geist_list_add_end(list, estrdup(""));
+ list = gib_list_add_end(list, estrdup(""));
else if (!strcmp(p, " "))
- list = geist_list_add_end(list, estrdup(" "));
+ list = gib_list_add_end(list, estrdup(" "));
else
{
words = geist_string_split(p, " ");
@@ -518,7 +518,7 @@
if (strcmp(pp, " "))
{
D(1, ("got word %s\n", pp));
- geist_imlib_get_text_size(txt->fn, pp, txt->style, &tw,
+ gib_imlib_get_text_size(txt->fn, pp, txt->style, &tw,
&th, IMLIB_TEXT_TO_RIGHT);
if (line_width == 0)
new_width = tw;
@@ -551,7 +551,7 @@
/* finish this line, start next and add word there */
if (line)
{
- list = geist_list_add_end(list, estrdup(line));
+ list = gib_list_add_end(list, estrdup(line));
D(5, ("line finished, is: %s\n", line));
efree(line);
line = NULL;
@@ -565,18 +565,18 @@
if (line)
{
/* finish last line */
- list = geist_list_add_end(list, estrdup(line));
+ list = gib_list_add_end(list, estrdup(line));
D(5, ("line finished, is: %s\n", line));
efree(line);
line = NULL;
line_width = 0;
}
- geist_list_free_and_data(words);
+ gib_list_free_and_data(words);
}
}
l = l->next;
}
- geist_list_free_and_data(lines);
+ gib_list_free_and_data(lines);
txt->lines = list;
}
else
@@ -616,7 +616,7 @@
ret->alias = obj->alias;
GEIST_TEXT(ret)->justification = txt->justification;
GEIST_TEXT(ret)->wordwrap = txt->wordwrap;
- GEIST_TEXT(ret)->style = geist_style_dup(txt->style);
+ GEIST_TEXT(ret)->style = gib_style_dup(txt->style);
GEIST_TEXT(ret)->r = txt->r;
GEIST_TEXT(ret)->g = txt->g;
GEIST_TEXT(ret)->b = txt->b;
@@ -624,7 +624,7 @@
ret->name =
g_strjoin(" ", "Copy of", obj->name ? obj->name : "Untitled object",
NULL);
- /* GEIST_TEXT(ret)->im = geist_imlib_clone_image(txt->im); */
+ /* GEIST_TEXT(ret)->im = gib_imlib_clone_image(txt->im); */
}
geist_text_update_image(txt, FALSE);
@@ -693,7 +693,7 @@
txt->fontsize = fontsize;
if (txt->fn)
- geist_imlib_free_font(txt->fn);
+ gib_imlib_free_font(txt->fn);
txt->fn = fn;
@@ -803,7 +803,7 @@
if (!ok_data)
printf("ARGH");
- fonts = geist_imlib_list_fonts(&num);
+ fonts = gib_imlib_list_fonts(&num);
if (!fonts)
printf("ARGH!\n");
@@ -1032,7 +1032,7 @@
/*font styler dialog. should be moved to its own file I guess. Till*/
void
-render_style(geist_style * style)
+render_style(gib_style * style)
{
/*we render the text object with the current style, but reset the style
* immidiately afterwards, so the object doesnt really change until OK
@@ -1054,9 +1054,9 @@
}
void
-load_style(geist_style * style)
+load_style(gib_style * style)
{
- geist_list *bit_list, *l;
+ gib_list *bit_list, *l;
int i = 0;
D_ENTER(3);
@@ -1070,7 +1070,7 @@
for (l = bit_list; l; l = l->next)
{
- geist_style_bit *bit = l->data;
+ gib_style_bit *bit = l->data;
gchar *buf[6];
@@ -1147,11 +1147,11 @@
static void
spinner_changed_cb(gpointer data)
{
- geist_style_bit *bit;
+ gib_style_bit *bit;
D_ENTER(3);
- bit = GEIST_STYLE_BIT(gtk_clist_get_row_data(GTK_CLIST(list), cur));
+ bit = GIB_STYLE_BIT(gtk_clist_get_row_data(GTK_CLIST(list), cur));
bit->x_offset = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(e1));
bit->y_offset = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(e2));
@@ -1173,7 +1173,7 @@
{
D_ENTER(3);
- geist_style_free(GEIST_TEXT(current_obj)->style);
+ gib_style_free(GEIST_TEXT(current_obj)->style);
GEIST_TEXT(current_obj)->style = working_copy;
geist_object_dirty(current_obj);
@@ -1192,7 +1192,7 @@
D_ENTER(3);
- geist_style_free(working_copy);
+ gib_style_free(working_copy);
geist_object_dirty(current_obj);
geist_text_update_image(GEIST_TEXT(current_obj), FALSE);
@@ -1207,14 +1207,14 @@
new_cb(GtkWidget * widget, gpointer * data)
{
- geist_list *bit_list;
- geist_style_bit *new_bit;
+ gib_list *bit_list;
+ gib_style_bit *new_bit;
D_ENTER(3);
- new_bit = geist_style_bit_new(0, 0, 255, 255, 255, 255);
+ new_bit = gib_style_bit_new(0, 0, 255, 255, 255, 255);
bit_list = working_copy->bits;
- working_copy->bits = geist_list_add_at_pos(bit_list, cur+1, new_bit);
+ working_copy->bits = gib_list_add_at_pos(bit_list, cur+1, new_bit);
load_style(working_copy);
gtk_clist_select_row(GTK_CLIST(list), cur+1, 0);
@@ -1226,17 +1226,17 @@
delete_cb(GtkWidget * widget, gpointer * data)
{
- geist_list *bit_list, *temp;
+ gib_list *bit_list, *temp;
D_ENTER(3);
bit_list = working_copy->bits;
- temp = geist_list_nth(bit_list, cur);
- working_copy->bits = geist_list_unlink(bit_list, temp);
- geist_style_bit_free(GEIST_STYLE_BIT(temp));
+ temp = gib_list_nth(bit_list, cur);
+ working_copy->bits = gib_list_unlink(bit_list, temp);
+ gib_style_bit_free(GIB_STYLE_BIT(temp));
load_style(working_copy);
- if (cur != geist_list_length(working_copy->bits))
+ if (cur != gib_list_length(working_copy->bits))
gtk_clist_select_row(GTK_CLIST(list), cur, 0);
else
gtk_clist_select_row(GTK_CLIST(list), cur - 1, 0);
@@ -1247,15 +1247,15 @@
void
raise_cb(GtkWidget * widget, gpointer * data)
{
- geist_list *bit_list;
+ gib_list *bit_list;
D_ENTER(3);
bit_list = working_copy->bits;
working_copy->bits =
- geist_list_move_down_by_one(bit_list, geist_list_nth(bit_list, cur));
+ gib_list_move_down_by_one(bit_list, gib_list_nth(bit_list, cur));
load_style(working_copy);
- if (cur + 1 != geist_list_length(working_copy->bits))
+ if (cur + 1 != gib_list_length(working_copy->bits))
gtk_clist_select_row(GTK_CLIST(list), cur + 1, 0);
else
gtk_clist_select_row(GTK_CLIST(list), cur, 0);
@@ -1267,13 +1267,13 @@
void
lower_cb(GtkWidget * widget, gpointer * data)
{
- geist_list *bit_list;
+ gib_list *bit_list;
D_ENTER(3);
bit_list = working_copy->bits;
working_copy->bits =
- geist_list_move_up_by_one(bit_list, geist_list_nth(bit_list, cur));
+ gib_list_move_up_by_one(bit_list, gib_list_nth(bit_list, cur));
load_style(working_copy);
gtk_clist_select_row(GTK_CLIST(list), cur - 1, 0);
@@ -1539,9 +1539,9 @@
D_ENTER(3);
current_obj = obj;
- working_copy = geist_style_dup(GEIST_TEXT(obj)->style);
+ working_copy = gib_style_dup(GEIST_TEXT(obj)->style);
load_style(working_copy);
- gtk_clist_select_row(GTK_CLIST(list), geist_list_length(working_copy->bits)-1, 0);
+ gtk_clist_select_row(GTK_CLIST(list), gib_list_length(working_copy->bits)-1, 0);
D_RETURN_(3);
}
@@ -1550,7 +1550,7 @@
save_style_cb(GtkWidget *widget)
{
GtkWidget *fs;
- geist_style *style;
+ gib_style *style;
char *name;
D_ENTER(3);
@@ -1582,7 +1582,7 @@
static gboolean save_style_ok_cb(GtkWidget * widget, gpointer * data)
{
char *filename;
- geist_style *style;
+ gib_style *style;
D_ENTER(3);
@@ -1593,7 +1593,7 @@
style = gtk_object_get_data(GTK_OBJECT(data), "style");
if (style)
{
- geist_style_save_ascii(style, filename);
+ gib_style_save_ascii(style, filename);
}
gtk_widget_destroy(GTK_WIDGET(data));
@@ -1628,7 +1628,7 @@
static gboolean load_style_ok_cb(GtkWidget * widget, gpointer * data)
{
char *filename;
- geist_style *style;
+ gib_style *style;
D_ENTER(3);
@@ -1636,7 +1636,7 @@
if (!filename)
D_RETURN(3, TRUE);
- style = geist_style_new_from_ascii(filename);
+ style = gib_style_new_from_ascii(filename);
if (!style)
{
weprintf("failed to load style file %s\n", filename);
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_text.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- geist_text.h 2000/10/27 00:15:11 1.22
+++ geist_text.h 2000/11/12 16:07:28 1.23
@@ -29,9 +29,8 @@
#include "geist.h"
#include "geist_object.h"
#include "geist.h"
-#include "geist_imlib.h"
#include "geist_image.h"
-#include "geist_style.h"
+#include "geist_imlib.h"
#define GEIST_TEXT(O) ((geist_text *) O)
@@ -51,12 +50,12 @@
char *fontname;
int fontsize;
char *text;
- geist_list *lines;
+ gib_list *lines;
Imlib_Font fn;
Imlib_Image im;
int wordwrap;
int justification;
- geist_style *style;
+ gib_style *style;
int r,g,b,a;
};
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- geist_utils.c 2000/09/24 15:51:55 1.3
+++ geist_utils.c 2000/11/12 16:07:28 1.4
@@ -24,12 +24,12 @@
*/
#include "geist_utils.h"
-#include "geist_list.h"
+#include "gib_list.h"
-geist_list *
+gib_list *
geist_string_split(const char *string, const char *delimiter)
{
- geist_list *string_list = NULL;
+ gib_list *string_list = NULL;
char *s;
unsigned int n = 1;
@@ -53,7 +53,7 @@
strncpy(new_string, string, len);
new_string[len] = 0;
- string_list = geist_list_add_front(string_list, new_string);
+ string_list = gib_list_add_front(string_list, new_string);
n++;
string = s + delimiter_len;
s = strstr(string, delimiter);
@@ -63,10 +63,10 @@
if (*string)
{
n++;
- string_list = geist_list_add_front(string_list, estrdup((char *)string));
+ string_list = gib_list_add_front(string_list, estrdup((char *)string));
}
- string_list = geist_list_reverse(string_list);
+ string_list = gib_list_reverse(string_list);
D_RETURN(3, string_list);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/geist_utils.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- geist_utils.h 2000/09/24 15:51:55 1.2
+++ geist_utils.h 2000/11/12 16:07:28 1.3
@@ -28,7 +28,7 @@
#include "geist.h"
-geist_list *
+gib_list *
geist_string_split(const char *string, const char *delimiter);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/main.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- main.c 2000/10/27 01:15:23 1.87
+++ main.c 2000/11/12 16:07:28 1.88
@@ -37,7 +37,7 @@
#include "geist_interface.h"
int call_level = 0;
-geist_list *doc_list = NULL;
+gib_list *doc_list = NULL;
int
main(int argc, char *argv[])
===================================================================
RCS file: /cvsroot/enlightenment/misc/geist/src/structs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- structs.h 2000/10/17 12:59:17 1.9
+++ structs.h 2000/11/12 16:07:29 1.10
@@ -26,7 +26,6 @@
#ifndef STRUCTS_H
#define STRUCTS_H
-typedef struct __geist_list geist_list;
typedef struct __geistoptions geistoptions;
typedef struct __geist_image geist_image;
typedef struct __geist_text geist_text;
@@ -38,7 +37,5 @@
typedef struct __geist_line geist_line;
typedef struct __geist_poly geist_poly;
typedef struct __geist_point geist_point;
-typedef struct __geist_style geist_style;
-typedef struct __geist_style_bit geist_style_bit;
#endif
|