summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorcpk <cpk>2001-11-02 17:07:52 +0000
committercpk <cpk@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2001-11-02 17:07:52 +0000
commit02379472ae1b4c15b2704505e1056da458719c28 (patch)
tree0144ab4ec0d3c75818568952103be74c9e071a0d /src/Makefile.am
parent59eda55bb749d28daa39245b16a952752a1ba4da (diff)
Alright, I spent some time now reading e17's code. Here's what
I've changed, this is big, so read this carefully :) * I've added debugging macros for messages and function call tracing. Usage: D("Creating item %i %i %i\n", x, y, z); Define DEBUG to use the D macro. D_ENTER; D_RETURN; D_RETURN_(x); These are for call tracing. Use D_RETURN_(x) when returning something from a function. Define DEBUG_NEST to use this. * added iconbar header file to Makefile.am * added proper new()/cleanup() calls for E_Delayed_Action; * I've completely rewritten the object and observer handling. Bye bye macros, this was nasty. It'll be hard enough to avoid leaks with usecounting in C. We now basically have the same system as gtk. There's a clear separation of observer and object code now. An E_Object by itself has nothing to do with observing or being observed, therefore, there are now E_Observers and E_Observees that are derived from E_Object. IMPORTANT: The cleanup system now reflects the reference count system, therefore, all ..._free() calls are now static, because the destructor should never be called explicitly, but implicitly through e_object_unref(). The object handling now is as follows: - The cleanup functions clean up everything that is contained in a struct, but NOT the struct itself. Instead of the final free() call, they call the destructor of the base class. The calls will walk up the hierarchy and clean up what's contained in every struct, and the final e_object_cleanup() will free the structure itself. E_Delayed_Action is a good example. - The only calls that influence the reference count are e_object_ref() and e_object_unref(). If you need to do things before an object gets destroyed, you can query the use count using e_object_get_usecount() and check if it's equal to 1. So this: OBJ_UNREF(b); OBJ_IF_FREE(b) { ecore_window_reparent(e->win, 0, 0, 0); e_icccm_release(e->win); OBJ_FREE(b); } now is this: if (e_object_get_usecount(E_OBJECT(b)) == 1) { ecore_window_reparent(e->win, 0, 0, 0); e_icccm_release(e->win); } e_object_unref(E_OBJECT(b)); object.h and observer.h are completely commented, it shouldn't be too hard to understand. This'll need to be documented in the manual anyway. * E_Objects are now used in lots of places where void* were used as pointers to objects before, especially in the actions code. This is obviously better, as it will generate compiler warnings when people want to pass things to functions that expect E_Objects. This could probably be more restrictive. * Added typedefs for the function prototypes in E_Action_Impl. Those fat signatures were just painful to read in the function declarations/implementations. * I've also tried to give parameters more useful names. Calling an object "o" is a lot of fun when you want to grep for it. * Included is also Graham's latest menu.c patch. Sorry for the delay, Graham. * I've added checks to the menu code that make sure that menus don't pop up when they're empty (which resulted in a little useless rectangle). I guess that's it for now. Sorry if I broke anything, but this was necessary imho. SVN revision: 5605
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 408ab11db..dd35496e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,14 @@
2 2
3DISTCLEANFILES = e_ferite_gen_* 3DISTCLEANFILES = e_ferite_gen_*
4 4
5## Enable -DDEBUG for debugging messages, -DDEBUG_NEST
6## for call tracing. Caution -- this will produce a *lot*
7## of output!
8DEBUGFLAGS = -g -DDEBUG -DDEBUG_NEST
9
5INCLUDES = \ 10INCLUDES = \
6 -I$(top_srcdir)/intl \ 11 -I$(top_srcdir)/intl \
7 @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ferite_cflags@ 12 @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ferite_cflags@ $(DEBUGFLAGS)
8 13
9bin_PROGRAMS = enlightenment 14bin_PROGRAMS = enlightenment
10 15
@@ -24,6 +29,7 @@ enlightenment_SOURCES = \
24 border.h border.c \ 29 border.h border.c \
25 config.h config.c \ 30 config.h config.c \
26 cursors.c cursors.h \ 31 cursors.c cursors.h \
32 debug.c debug.h \
27 delayed.h delayed.c \ 33 delayed.h delayed.c \
28 desktops.h desktops.c \ 34 desktops.h desktops.c \
29 embed.c embed.h \ 35 embed.c embed.h \
@@ -33,6 +39,7 @@ enlightenment_SOURCES = \
33 $(ferite_c) \ 39 $(ferite_c) \
34 guides.h guides.c \ 40 guides.h guides.c \
35 icccm.h icccm.c \ 41 icccm.h icccm.c \
42 iconbar.h iconbar.c\
36 icons.c \ 43 icons.c \
37 ipc.h ipc.c \ 44 ipc.h ipc.c \
38 keys.h keys.c \ 45 keys.h keys.c \
@@ -40,6 +47,8 @@ enlightenment_SOURCES = \
40 match.c match.h \ 47 match.c match.h \
41 menu.h menu.c \ 48 menu.h menu.c \
42 menubuild.h menubuild.c \ 49 menubuild.h menubuild.c \
50 object.h object.c \
51 observer.h observer.c\
43 pack.c \ 52 pack.c \
44 place.c place.h \ 53 place.c place.h \
45 resist.h resist.c \ 54 resist.h resist.c \
@@ -48,7 +57,6 @@ enlightenment_SOURCES = \
48 text.h text.c \ 57 text.h text.c \
49 util.h util.c \ 58 util.h util.c \
50 view.h view.c \ 59 view.h view.c \
51 e.h \ 60 e.h
52 iconbar.c
53 61
54enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ferite_libs@ -lm -lc $(INTLLIBS) 62enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ferite_libs@ -lm -lc $(INTLLIBS)