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
|