summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2005-01-12 16:03:09 +0000
committerCarsten Haitzler <raster@rasterman.com>2005-01-12 16:03:09 +0000
commite88c2ac1a6718d0fb3243f452effa93ccbecadd8 (patch)
treecaed97e40b1a8efc5c5dd8880454b1a3f8b92760
parent1491d5428c4c9315e726e3cd14986f42c351be1d (diff)
fix up include system so u canhave one struct directly reference another (put
typedefs in separate section and include twice... SVN revision: 12928
-rw-r--r--TODO5
-rw-r--r--src/bin/Makefile.am1
-rw-r--r--src/bin/e.h95
-rw-r--r--src/bin/e_apps.h8
-rw-r--r--src/bin/e_atoms.h5
-rw-r--r--src/bin/e_border.c2
-rw-r--r--src/bin/e_border.h39
-rw-r--r--src/bin/e_box.h4
-rw-r--r--src/bin/e_canvas.h3
-rw-r--r--src/bin/e_config.h71
-rw-r--r--src/bin/e_container.h8
-rw-r--r--src/bin/e_desk.h9
-rw-r--r--src/bin/e_error.h8
-rw-r--r--src/bin/e_file.h7
-rw-r--r--src/bin/e_focus.h3
-rw-r--r--src/bin/e_hints.h3
-rw-r--r--src/bin/e_icon.h3
-rw-r--r--src/bin/e_iconify.h4
-rw-r--r--src/bin/e_includes.h29
-rw-r--r--src/bin/e_init.h3
-rw-r--r--src/bin/e_int_menus.h3
-rw-r--r--src/bin/e_ipc.h8
-rw-r--r--src/bin/e_main.c8
-rw-r--r--src/bin/e_manager.h8
-rw-r--r--src/bin/e_menu.h25
-rw-r--r--src/bin/e_module.h8
-rw-r--r--src/bin/e_object.c7
-rw-r--r--src/bin/e_object.h22
-rw-r--r--src/bin/e_path.h10
-rw-r--r--src/bin/e_place.h3
-rw-r--r--src/bin/e_pointer.h3
-rw-r--r--src/bin/e_resist.h3
-rw-r--r--src/bin/e_startup.h8
-rw-r--r--src/bin/e_user.h3
-rw-r--r--src/bin/e_utils.h3
-rw-r--r--src/bin/e_zone.c7
-rw-r--r--src/bin/e_zone.h11
-rw-r--r--src/lib/E.h15
-rw-r--r--src/lib/e_main.c1
-rw-r--r--src/lib/e_private.h8
40 files changed, 272 insertions, 202 deletions
diff --git a/TODO b/TODO
index f950d7e..2bd9b68 100644
--- a/TODO
+++ b/TODO
@@ -29,14 +29,13 @@ Current freeze issues are:
29 29
30ISSUES: 30ISSUES:
31 31
32* left mouse menu segv's at times
33* pager module doesnt shut down properly (disable and create window - segv) 32* pager module doesnt shut down properly (disable and create window - segv)
34* pager module doesnt handle window deletes 33* pager module doesnt handle window deletes
35* pager module causes window resizes to be slower than normal 34* pager module causes window resizes to be slower than normal
36* virtual desktops need fixign to work with zones properly 35* virtual desktops need fixing to work with zones properly
37* all modules need to respect zones 36* all modules need to respect zones
38* container resize needs to re-evalute zone geometry 37* container resize needs to re-evalute zone geometry
39* zone geometyr change needs to propagate to modules 38* zone geometry change needs to propagate to modules
40* need desktop module geometry managing system (central) 39* need desktop module geometry managing system (central)
41* dropshadow is not optimal and has extreme edge bugs 40* dropshadow is not optimal and has extreme edge bugs
42* e_apps polling/updates is broken 41* e_apps polling/updates is broken
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 264e120..3ad4423 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -10,6 +10,7 @@ bin_PROGRAMS = enlightenment enlightenment_remote enlightenment_eapp
10 10
11ENLIGHTENMENTHEADERS = \ 11ENLIGHTENMENTHEADERS = \
12e.h \ 12e.h \
13e_includes.h \
13e_file.h \ 14e_file.h \
14e_user.h \ 15e_user.h \
15e_manager.h \ 16e_manager.h \
diff --git a/src/bin/e.h b/src/bin/e.h
index 373ff00..b257177 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -43,41 +43,40 @@
43# endif 43# endif
44#endif 44#endif
45 45
46#include "e_object.h"
47#include "e_file.h"
48#include "e_user.h"
49#include "e_manager.h"
50#include "e_path.h"
51#include "e_ipc.h"
52#include "e_error.h"
53#include "e_container.h"
54#include "e_zone.h"
55#include "e_desk.h"
56#include "e_border.h"
57#include "e_pointer.h"
58#include "e_config.h"
59#include "e_menu.h"
60#include "e_icon.h"
61#include "e_box.h"
62#include "e_init.h"
63#include "e_int_menus.h"
64#include "e_module.h"
65#include "e_apps.h"
66#include "e_atoms.h"
67#include "e_utils.h"
68#include "e_canvas.h"
69#include "e_focus.h"
70#include "e_place.h"
71#include "e_resist.h"
72#include "e_startup.h"
73#include "e_iconify.h"
74#include "e_hints.h"
75
76typedef struct _E_Before_Idler E_Before_Idler; 46typedef struct _E_Before_Idler E_Before_Idler;
47typedef struct _E_Rect E_Rect;
48
49/* convenience macro to compress code and avoid typos */
50#define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; }
51#define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
52#define E_SPANS_COMMON(x1, w1, x2, w2) (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
53#define E_REALLOC(p, s, n) p = realloc(p, sizeof(s) * n)
54#define E_NEW(s, n) calloc(n, sizeof(s))
55#define E_NEW_BIG(s, n) malloc(n * sizeof(s))
56#define E_FREE(p) { if (p) {free(p); p = NULL;} }
57
58#define E_TYPEDEFS 1
59#include "e_includes.h"
60#undef E_TYPEDEFS
61#include "e_includes.h"
77 62
78EAPI E_Before_Idler *e_main_idler_before_add(int (*func) (void *data), void *data, int once); 63EAPI E_Before_Idler *e_main_idler_before_add(int (*func) (void *data), void *data, int once);
79EAPI void e_main_idler_before_del(E_Before_Idler *eb); 64EAPI void e_main_idler_before_del(E_Before_Idler *eb);
80 65
66
67struct _E_Before_Idler
68{
69 int (*func) (void *data);
70 void *data;
71 unsigned char once : 1;
72 unsigned char delete_me : 1;
73};
74
75struct _E_Rect
76{
77 int x, y, w, h;
78};
79
81extern EAPI E_Path *path_data; 80extern EAPI E_Path *path_data;
82extern EAPI E_Path *path_images; 81extern EAPI E_Path *path_images;
83extern EAPI E_Path *path_fonts; 82extern EAPI E_Path *path_fonts;
@@ -86,40 +85,4 @@ extern EAPI E_Path *path_icons;
86extern EAPI E_Path *path_init; 85extern EAPI E_Path *path_init;
87extern EAPI int restart; 86extern EAPI int restart;
88 87
89/* convenience macro to compress code and avoid typos */
90#define E_FN_DEL(_fn, _h) \
91if (_h) \
92{ \
93 _fn(_h); \
94 _h = NULL; \
95}
96
97#define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
98(((x) < ((xx) + (ww))) && \
99((y) < ((yy) + (hh))) && \
100(((x) + (w)) > (xx)) && \
101(((y) + (h)) > (yy)))
102
103#define E_SPANS_COMMON(x1, w1, x2, w2) \
104(!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
105
106#define E_REALLOC(p, s, n) \
107 p = realloc(p, sizeof(s) * n)
108
109#define E_NEW(s, n) \
110 calloc(n, sizeof(s))
111
112#define E_NEW_BIG(s, n) \
113 malloc(n * sizeof(s))
114
115#define E_FREE(p) \
116 { if (p) {free(p); p = NULL;} }
117
118typedef struct _E_Rect E_Rect;
119
120struct _E_Rect
121{
122 int x, y, w, h;
123};
124
125#endif 88#endif
diff --git a/src/bin/e_apps.h b/src/bin/e_apps.h
index 12f2b8b..9a809b3 100644
--- a/src/bin/e_apps.h
+++ b/src/bin/e_apps.h
@@ -1,5 +1,4 @@
1#ifndef E_APPS_H 1#ifdef E_TYPEDEFS
2#define E_APPS_H
3 2
4typedef enum _E_App_Change 3typedef enum _E_App_Change
5{ 4{
@@ -14,6 +13,10 @@ typedef enum _E_App_Change
14 13
15typedef struct _E_App E_App; 14typedef struct _E_App E_App;
16 15
16#else
17#ifndef E_APPS_H
18#define E_APPS_H
19
17struct _E_App 20struct _E_App
18{ 21{
19 E_Object e_obj_inherit; 22 E_Object e_obj_inherit;
@@ -59,3 +62,4 @@ EAPI void e_app_change_callback_del(void (*func) (void *data, E_App *a, E_App_
59EAPI E_App *e_app_window_name_class_find(char *name, char *class); 62EAPI E_App *e_app_window_name_class_find(char *name, char *class);
60 63
61#endif 64#endif
65#endif
diff --git a/src/bin/e_atoms.h b/src/bin/e_atoms.h
index f7ee4ee..20b4648 100644
--- a/src/bin/e_atoms.h
+++ b/src/bin/e_atoms.h
@@ -1,9 +1,10 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_ATOMS_H 3#ifndef E_ATOMS_H
2#define E_ATOMS_H 4#define E_ATOMS_H
3 5
4/* atom globals */
5
6EAPI int e_atoms_init(void); 6EAPI int e_atoms_init(void);
7EAPI int e_atoms_shutdown(void); 7EAPI int e_atoms_shutdown(void);
8 8
9#endif 9#endif
10#endif
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 95d889b..f824d8a 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2606,7 +2606,7 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
2606 2606
2607 m = e_menu_new(); 2607 m = e_menu_new();
2608 e_object_data_set(E_OBJECT(m), bd); 2608 e_object_data_set(E_OBJECT(m), bd);
2609 bd->border_menu = E_OBJECT(m); 2609 bd->border_menu = m;
2610 e_menu_post_deactivate_callback_set(m, _e_border_cb_border_menu_end, NULL); 2610 e_menu_post_deactivate_callback_set(m, _e_border_cb_border_menu_end, NULL);
2611 2611
2612 mi = e_menu_item_new(m); 2612 mi = e_menu_item_new(m);
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index e433c3f..5a1bbd8 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -1,25 +1,33 @@
1#ifndef E_BORDER_H 1#ifdef E_TYPEDEFS
2#define E_BORDER_H
3 2
4typedef struct _E_Border E_Border; 3typedef enum _E_Direction
5
6enum _E_Direction
7{ 4{
8 E_DIRECTION_UP, 5 E_DIRECTION_UP,
9 E_DIRECTION_DOWN, 6 E_DIRECTION_DOWN,
10 E_DIRECTION_LEFT, 7 E_DIRECTION_LEFT,
11 E_DIRECTION_RIGHT 8 E_DIRECTION_RIGHT
12}; 9} E_Direction;
13typedef enum _E_Direction E_Direction;
14 10
15enum _E_Transition 11typedef enum _E_Transition
16{ 12{
17 E_TRANSITION_LINEAR, 13 E_TRANSITION_LINEAR,
18 E_TRANSITION_SINUSOIDAL, 14 E_TRANSITION_SINUSOIDAL,
19 E_TRANSITION_ACCELERATE, 15 E_TRANSITION_ACCELERATE,
20 E_TRANSITION_DECELERATE 16 E_TRANSITION_DECELERATE
21}; 17} E_Transition;
22typedef enum _E_Transition E_Transition; 18
19typedef struct _E_Border E_Border;
20typedef struct _E_Event_Border_Resize E_Event_Border_Resize;
21typedef struct _E_Event_Border_Move E_Event_Border_Move;
22typedef struct _E_Event_Border_Add E_Event_Border_Add;
23typedef struct _E_Event_Border_Remove E_Event_Border_Remove;
24typedef struct _E_Event_Border_Show E_Event_Border_Show;
25typedef struct _E_Event_Border_Hide E_Event_Border_Hide;
26typedef struct _E_Event_Border_Desk_Set E_Event_Border_Desk_Set;
27
28#else
29#ifndef E_BORDER_H
30#define E_BORDER_H
23 31
24struct _E_Border 32struct _E_Border
25{ 33{
@@ -169,7 +177,7 @@ struct _E_Border
169 } shade; 177 } shade;
170 178
171 Evas_List *stick_desks; 179 Evas_List *stick_desks;
172 E_Object *border_menu; 180 E_Menu *border_menu;
173 181
174 struct { 182 struct {
175 unsigned int visible : 1; 183 unsigned int visible : 1;
@@ -184,14 +192,6 @@ struct _E_Border
184 } changes; 192 } changes;
185}; 193};
186 194
187typedef struct _E_Event_Border_Resize E_Event_Border_Resize;
188typedef struct _E_Event_Border_Move E_Event_Border_Move;
189typedef struct _E_Event_Border_Add E_Event_Border_Add;
190typedef struct _E_Event_Border_Remove E_Event_Border_Remove;
191typedef struct _E_Event_Border_Show E_Event_Border_Show;
192typedef struct _E_Event_Border_Hide E_Event_Border_Hide;
193typedef struct _E_Event_Border_Desk_Set E_Event_Border_Desk_Set;
194
195struct _E_Event_Border_Resize 195struct _E_Event_Border_Resize
196{ 196{
197 E_Border *border; 197 E_Border *border;
@@ -271,3 +271,4 @@ extern EAPI int E_EVENT_BORDER_REMOVE;
271extern EAPI int E_EVENT_BORDER_DESK_SET; 271extern EAPI int E_EVENT_BORDER_DESK_SET;
272 272
273#endif 273#endif
274#endif
diff --git a/src/bin/e_box.h b/src/bin/e_box.h
index 366c554..16c9a08 100644
--- a/src/bin/e_box.h
+++ b/src/bin/e_box.h
@@ -1,8 +1,9 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_BOX_H 3#ifndef E_BOX_H
2#define E_BOX_H 4#define E_BOX_H
3 5
4EAPI Evas_Object *e_box_add (Evas *evas); 6EAPI Evas_Object *e_box_add (Evas *evas);
5
6EAPI int e_box_freeze (Evas_Object *obj); 7EAPI int e_box_freeze (Evas_Object *obj);
7EAPI int e_box_thaw (Evas_Object *obj); 8EAPI int e_box_thaw (Evas_Object *obj);
8EAPI void e_box_orientation_set (Evas_Object *obj, int horizontal); 9EAPI void e_box_orientation_set (Evas_Object *obj, int horizontal);
@@ -23,3 +24,4 @@ EAPI void e_box_align_get (Evas_Object *obj, double *ax, double
23EAPI void e_box_align_set (Evas_Object *obj, double ax, double ay); 24EAPI void e_box_align_set (Evas_Object *obj, double ax, double ay);
24 25
25#endif 26#endif
27#endif
diff --git a/src/bin/e_canvas.h b/src/bin/e_canvas.h
index 7c80b95..c6681c2 100644
--- a/src/bin/e_canvas.h
+++ b/src/bin/e_canvas.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_CANVAS_H 3#ifndef E_CANVAS_H
2#define E_CANVAS_H 4#define E_CANVAS_H
3 5
@@ -8,3 +10,4 @@ EAPI void e_canvas_cache_flush(void);
8EAPI void e_canvas_cache_reload(void); 10EAPI void e_canvas_cache_reload(void);
9 11
10#endif 12#endif
13#endif
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index b3ce120..beab700 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -1,10 +1,40 @@
1#ifndef E_CONFIG_H 1#ifdef E_TYPEDEFS
2#define E_CONFIG_H 2
3#define E_CONFIG_DD_NEW(str, typ) \
4 eet_data_descriptor_new(str, sizeof(typ), \
5 (void *(*) (void *))evas_list_next, \
6 (void *(*) (void *, void *))evas_list_append, \
7 (void *(*) (void *))evas_list_data, \
8 (void *(*) (void *))evas_list_free, \
9 (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))evas_hash_foreach, \
10 (void *(*) (void *, const char *, void *))evas_hash_add, \
11 (void (*) (void *))evas_hash_free)
12#define E_CONFIG_DD_FREE(eed) if (eed) { eet_data_descriptor_free((eed)); (eed) = NULL; }
13#define E_CONFIG_VAL(edd, type, member, dtype) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
14#define E_CONFIG_SUB(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_SUB(edd, type, #member, member, eddtype)
15#define E_CONFIG_LIST(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
16
17#define CHAR EET_T_CHAR
18#define SHORT EET_T_SHORT
19#define INT EET_T_INT
20#define LL EET_T_LONG_LONG
21#define FLOAT EET_T_FLOAT
22#define DOUBLE EET_T_DOUBLE
23#define UCHAR EET_T_UCHAR
24#define USHORT EET_T_USHORT
25#define UINT EET_T_UINT
26#define ULL EET_T_ULONG_LONG
27#define STR EET_T_STRING
28
29#define E_CONFIG_LIMIT(v, min, max) {if (v > max) v = max; else if (v < min) v = min;}
3 30
4typedef struct _E_Config E_Config; 31typedef struct _E_Config E_Config;
5typedef struct _E_Config_Module E_Config_Module; 32typedef struct _E_Config_Module E_Config_Module;
33typedef Eet_Data_Descriptor E_Config_DD;
6 34
7typedef Eet_Data_Descriptor E_Config_DD; 35#else
36#ifndef E_CONFIG_H
37#define E_CONFIG_H
8 38
9struct _E_Config 39struct _E_Config
10{ 40{
@@ -29,40 +59,6 @@ struct _E_Config_Module
29 unsigned char enabled; 59 unsigned char enabled;
30}; 60};
31 61
32#define E_CONFIG_DD_NEW(str, typ) \
33 eet_data_descriptor_new(str, sizeof(typ), \
34 (void *(*) (void *))evas_list_next, \
35 (void *(*) (void *, void *))evas_list_append, \
36 (void *(*) (void *))evas_list_data, \
37 (void *(*) (void *))evas_list_free, \
38 (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))evas_hash_foreach, \
39 (void *(*) (void *, const char *, void *))evas_hash_add, \
40 (void (*) (void *))evas_hash_free)
41#define E_CONFIG_DD_FREE(eed) \
42 if (eed) { eet_data_descriptor_free((eed)); (eed) = NULL; }
43
44#define E_CONFIG_VAL(edd, type, member, dtype) \
45 EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
46#define E_CONFIG_SUB(edd, type, member, eddtype) \
47 EET_DATA_DESCRIPTOR_ADD_SUB(edd, type, #member, member, eddtype)
48#define E_CONFIG_LIST(edd, type, member, eddtype) \
49 EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
50
51#define CHAR EET_T_CHAR
52#define SHORT EET_T_SHORT
53#define INT EET_T_INT
54#define LL EET_T_LONG_LONG
55#define FLOAT EET_T_FLOAT
56#define DOUBLE EET_T_DOUBLE
57#define UCHAR EET_T_UCHAR
58#define USHORT EET_T_USHORT
59#define UINT EET_T_UINT
60#define ULL EET_T_ULONG_LONG
61#define STR EET_T_STRING
62
63#define E_CONFIG_LIMIT(v, min, max) \
64{if (v > max) v = max; else if (v < min) v = min;}
65
66EAPI int e_config_init(void); 62EAPI int e_config_init(void);
67EAPI int e_config_shutdown(void); 63EAPI int e_config_shutdown(void);
68 64
@@ -75,3 +71,4 @@ EAPI void e_config_save_queue(void);
75extern EAPI E_Config *e_config; 71extern EAPI E_Config *e_config;
76 72
77#endif 73#endif
74#endif
diff --git a/src/bin/e_container.h b/src/bin/e_container.h
index dd9d2a6..2ba508f 100644
--- a/src/bin/e_container.h
+++ b/src/bin/e_container.h
@@ -1,5 +1,4 @@
1#ifndef E_CONTAINER_H 1#ifdef E_TYPEDEFS
2#define E_CONTAINER_H
3 2
4typedef enum _E_Container_Shape_Change 3typedef enum _E_Container_Shape_Change
5{ 4{
@@ -17,6 +16,10 @@ typedef struct _E_Container_Shape E_Container_Shape;
17typedef struct _E_Container_Shape_Callback E_Container_Shape_Callback; 16typedef struct _E_Container_Shape_Callback E_Container_Shape_Callback;
18typedef struct _E_Event_Container_Resize E_Event_Container_Resize; 17typedef struct _E_Event_Container_Resize E_Event_Container_Resize;
19 18
19#else
20#ifndef E_CONTAINER_H
21#define E_CONTAINER_H
22
20struct _E_Container 23struct _E_Container
21{ 24{
22 E_Object e_obj_inherit; 25 E_Object e_obj_inherit;
@@ -91,3 +94,4 @@ EAPI Evas_List *e_container_shape_rects_get(E_Container_Shape *es);
91extern EAPI int E_EVENT_CONTAINER_RESIZE; 94extern EAPI int E_EVENT_CONTAINER_RESIZE;
92 95
93#endif 96#endif
97#endif
diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 3d8ac42..69bdfc1 100644
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -1,8 +1,11 @@
1#ifndef E_DESK_H 1#ifdef E_TYPEDEFS
2#define E_DESK_H
3 2
4typedef struct _E_Desk E_Desk; 3typedef struct _E_Desk E_Desk;
5 4
5#else
6#ifndef E_DESK_H
7#define E_DESK_H
8
6struct _E_Desk 9struct _E_Desk
7{ 10{
8 E_Object e_obj_inherit; 11 E_Object e_obj_inherit;
@@ -32,4 +35,4 @@ EAPI void e_desk_col_add(E_Zone *zone);
32EAPI void e_desk_col_remove(E_Zone *zone); 35EAPI void e_desk_col_remove(E_Zone *zone);
33 36
34#endif 37#endif
35 38#endif
diff --git a/src/bin/e_error.h b/src/bin/e_error.h
index 8e47280..161753d 100644
--- a/src/bin/e_error.h
+++ b/src/bin/e_error.h
@@ -1,5 +1,4 @@
1#ifndef E_ERROR_H 1#ifdef E_TYPEDEFS
2#define E_ERROR_H
3 2
4#define print0(x, args...) x ,print1(## args) 3#define print0(x, args...) x ,print1(## args)
5#define e_error_message_show(args...) \ 4#define e_error_message_show(args...) \
@@ -18,6 +17,10 @@
18 e_error_dialog_show_internal(title, __tmpbuf); \ 17 e_error_dialog_show_internal(title, __tmpbuf); \
19} 18}
20 19
20#else
21#ifndef E_ERROR_H
22#define E_ERROR_H
23
21EAPI void e_error_message_show_internal(char *txt); 24EAPI void e_error_message_show_internal(char *txt);
22EAPI void e_error_dialog_show_internal(char *title, char *txt); 25EAPI void e_error_dialog_show_internal(char *title, char *txt);
23 26
@@ -25,3 +28,4 @@ EAPI void e_error_gui_set(int on);
25EAPI void e_error_message_manager_show(E_Manager *man, char *title, char *txt); 28EAPI void e_error_message_manager_show(E_Manager *man, char *title, char *txt);
26 29
27#endif 30#endif
31#endif
diff --git a/src/bin/e_file.h b/src/bin/e_file.h
index c7b67bb..3520c2a 100644
--- a/src/bin/e_file.h
+++ b/src/bin/e_file.h
@@ -1,10 +1,8 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_FILE_H 3#ifndef E_FILE_H
2#define E_FILE_H 4#define E_FILE_H
3 5
4#include <sys/time.h>
5#include <sys/stat.h>
6#include <Evas.h>
7
8EAPI time_t e_file_mod_time(char *file); 6EAPI time_t e_file_mod_time(char *file);
9EAPI int e_file_exists(char *file); 7EAPI int e_file_exists(char *file);
10EAPI int e_file_is_dir(char *file); 8EAPI int e_file_is_dir(char *file);
@@ -20,3 +18,4 @@ EAPI char *e_file_readlink(char *link);
20EAPI Evas_List *e_file_ls(char *dir); 18EAPI Evas_List *e_file_ls(char *dir);
21 19
22#endif 20#endif
21#endif
diff --git a/src/bin/e_focus.h b/src/bin/e_focus.h
index bada70d..29ffcbb 100644
--- a/src/bin/e_focus.h
+++ b/src/bin/e_focus.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_FOCUS_H 3#ifndef E_FOCUS_H
2#define E_FOCUS_H 4#define E_FOCUS_H
3 5
@@ -6,3 +8,4 @@ EAPI int e_focus_shutdown(void);
6EAPI void e_focus_idler_before(void); 8EAPI void e_focus_idler_before(void);
7 9
8#endif 10#endif
11#endif
diff --git a/src/bin/e_hints.h b/src/bin/e_hints.h
index 1196a4a..bb74aec 100644
--- a/src/bin/e_hints.h
+++ b/src/bin/e_hints.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_HINTS_H 3#ifndef E_HINTS_H
2#define E_HINTS_H 4#define E_HINTS_H
3 5
@@ -12,3 +14,4 @@ EAPI void e_hints_window_name_get(Ecore_X_Window win);
12EAPI void e_hints_window_icon_name_get(Ecore_X_Window win); 14EAPI void e_hints_window_icon_name_get(Ecore_X_Window win);
13 15
14#endif 16#endif
17#endif
diff --git a/src/bin/e_icon.h b/src/bin/e_icon.h
index 3430794..bb62c21 100644
--- a/src/bin/e_icon.h
+++ b/src/bin/e_icon.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_ICON_H 3#ifndef E_ICON_H
2#define E_ICON_H 4#define E_ICON_H
3 5
@@ -11,3 +13,4 @@ EAPI int e_icon_fill_inside_get (Evas_Object *obj);
11EAPI void e_icon_fill_inside_set (Evas_Object *obj, int fill_inside); 13EAPI void e_icon_fill_inside_set (Evas_Object *obj, int fill_inside);
12 14
13#endif 15#endif
16#endif
diff --git a/src/bin/e_iconify.h b/src/bin/e_iconify.h
index 5f0664f..b5509e7 100644
--- a/src/bin/e_iconify.h
+++ b/src/bin/e_iconify.h
@@ -1,12 +1,14 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_ICONIFY_H 3#ifndef E_ICONIFY_H
2#define E_ICONIFY_H 4#define E_ICONIFY_H
3 5
4EAPI int e_iconify_init(void); 6EAPI int e_iconify_init(void);
5EAPI int e_iconify_shutdown(void); 7EAPI int e_iconify_shutdown(void);
6
7EAPI Evas_List *e_iconify_clients_list_get(void); 8EAPI Evas_List *e_iconify_clients_list_get(void);
8EAPI int e_iconify_border_iconfied(E_Border *bd); 9EAPI int e_iconify_border_iconfied(E_Border *bd);
9EAPI void e_iconify_border_add(E_Border *bd); 10EAPI void e_iconify_border_add(E_Border *bd);
10EAPI void e_iconify_border_remove(E_Border *bd); 11EAPI void e_iconify_border_remove(E_Border *bd);
11 12
12#endif 13#endif
14#endif
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
new file mode 100644
index 0000000..f238bd2
--- /dev/null
+++ b/src/bin/e_includes.h
@@ -0,0 +1,29 @@
1#include "e_object.h"
2#include "e_file.h"
3#include "e_user.h"
4#include "e_manager.h"
5#include "e_path.h"
6#include "e_ipc.h"
7#include "e_error.h"
8#include "e_container.h"
9#include "e_zone.h"
10#include "e_desk.h"
11#include "e_border.h"
12#include "e_pointer.h"
13#include "e_config.h"
14#include "e_menu.h"
15#include "e_icon.h"
16#include "e_box.h"
17#include "e_init.h"
18#include "e_int_menus.h"
19#include "e_module.h"
20#include "e_apps.h"
21#include "e_atoms.h"
22#include "e_utils.h"
23#include "e_canvas.h"
24#include "e_focus.h"
25#include "e_place.h"
26#include "e_resist.h"
27#include "e_startup.h"
28#include "e_iconify.h"
29#include "e_hints.h"
diff --git a/src/bin/e_init.h b/src/bin/e_init.h
index 856536d..1dc9eb7 100644
--- a/src/bin/e_init.h
+++ b/src/bin/e_init.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_INIT_H 3#ifndef E_INIT_H
2#define E_INIT_H 4#define E_INIT_H
3 5
@@ -11,3 +13,4 @@ EAPI void e_init_status_set(const char *str);
11EAPI Ecore_X_Window e_init_window_get(void); 13EAPI Ecore_X_Window e_init_window_get(void);
12 14
13#endif 15#endif
16#endif
diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h
index 8311e14..6b71c00 100644
--- a/src/bin/e_int_menus.h
+++ b/src/bin/e_int_menus.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_INT_MENUS_H 3#ifndef E_INT_MENUS_H
2#define E_INT_MENUS_H 4#define E_INT_MENUS_H
3 5
@@ -8,3 +10,4 @@ EAPI E_Menu *e_int_menus_apps_new(char *dir);
8EAPI E_Menu *e_int_menus_favorite_apps_new(void); 10EAPI E_Menu *e_int_menus_favorite_apps_new(void);
9 11
10#endif 12#endif
13#endif
diff --git a/src/bin/e_ipc.h b/src/bin/e_ipc.h
index 0e4fbd5..5174568 100644
--- a/src/bin/e_ipc.h
+++ b/src/bin/e_ipc.h
@@ -1,5 +1,4 @@
1#ifndef E_IPC_H 1#ifdef E_TYPEDEFS
2#define E_IPC_H
3 2
4typedef enum _E_Ipc_Domain { 3typedef enum _E_Ipc_Domain {
5 E_IPC_DOMAIN_NONE, 4 E_IPC_DOMAIN_NONE,
@@ -24,7 +23,12 @@ typedef enum _E_Ipc_Op {
24 E_IPC_OP_LAST 23 E_IPC_OP_LAST
25} E_Ipc_Op; 24} E_Ipc_Op;
26 25
26#else
27#ifndef E_IPC_H
28#define E_IPC_H
29
27EAPI int e_ipc_init(void); 30EAPI int e_ipc_init(void);
28EAPI void e_ipc_shutdown(void); 31EAPI void e_ipc_shutdown(void);
29 32
30#endif 33#endif
34#endif
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index fee96d0..7874053 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -3,14 +3,6 @@
3 */ 3 */
4#include "e.h" 4#include "e.h"
5 5
6struct _E_Before_Idler
7{
8 int (*func) (void *data);
9 void *data;
10 unsigned char once : 1;
11 unsigned char delete_me : 1;
12};
13
14/* local subsystem functions */ 6/* local subsystem functions */
15static void _e_main_shutdown_push(int (*func)(void)); 7static void _e_main_shutdown_push(int (*func)(void));
16static void _e_main_shutdown(int errorcode); 8static void _e_main_shutdown(int errorcode);
diff --git a/src/bin/e_manager.h b/src/bin/e_manager.h
index 20599ea..f0b3857 100644
--- a/src/bin/e_manager.h
+++ b/src/bin/e_manager.h
@@ -1,8 +1,11 @@
1#ifndef E_MANAGER_H 1#ifdef E_TYPEDEFS
2#define E_MANAGER_H
3 2
4typedef struct _E_Manager E_Manager; 3typedef struct _E_Manager E_Manager;
5 4
5#else
6#ifndef E_MANAGER_H
7#define E_MANAGER_H
8
6struct _E_Manager 9struct _E_Manager
7{ 10{
8 E_Object e_obj_inherit; 11 E_Object e_obj_inherit;
@@ -29,3 +32,4 @@ EAPI void e_manager_raise(E_Manager *man);
29EAPI void e_manager_lower(E_Manager *man); 32EAPI void e_manager_lower(E_Manager *man);
30 33
31#endif 34#endif
35#endif
diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h
index 3e8b5c5..fe9f4e9 100644
--- a/src/bin/e_menu.h
+++ b/src/bin/e_menu.h
@@ -1,9 +1,20 @@
1#ifndef E_MENU_H 1#ifdef E_TYPEDEFS
2#define E_MENU_H 2
3#define E_MENU_POP_DIRECTION_NONE 0
4#define E_MENU_POP_DIRECTION_LEFT 1
5#define E_MENU_POP_DIRECTION_RIGHT 2
6#define E_MENU_POP_DIRECTION_UP 3
7#define E_MENU_POP_DIRECTION_DOWN 4
8#define E_MENU_POP_DIRECTION_AUTO 5
9#define E_MENU_POP_DIRECTION_LAST 6
3 10
4typedef struct _E_Menu E_Menu; 11typedef struct _E_Menu E_Menu;
5typedef struct _E_Menu_Item E_Menu_Item; 12typedef struct _E_Menu_Item E_Menu_Item;
6 13
14#else
15#ifndef E_MENU_H
16#define E_MENU_H
17
7struct _E_Menu 18struct _E_Menu
8{ 19{
9 E_Object e_obj_inherit; 20 E_Object e_obj_inherit;
@@ -96,14 +107,6 @@ struct _E_Menu_Item
96 unsigned char active : 1; 107 unsigned char active : 1;
97}; 108};
98 109
99#define E_MENU_POP_DIRECTION_NONE 0
100#define E_MENU_POP_DIRECTION_LEFT 1
101#define E_MENU_POP_DIRECTION_RIGHT 2
102#define E_MENU_POP_DIRECTION_UP 3
103#define E_MENU_POP_DIRECTION_DOWN 4
104#define E_MENU_POP_DIRECTION_AUTO 5
105#define E_MENU_POP_DIRECTION_LAST 6
106
107EAPI int e_menu_init(void); 110EAPI int e_menu_init(void);
108EAPI int e_menu_shutdown(void); 111EAPI int e_menu_shutdown(void);
109 112
@@ -140,4 +143,6 @@ EAPI void e_menu_item_active_set(E_Menu_Item *mi, int active);
140EAPI void e_menu_idler_before(void); 143EAPI void e_menu_idler_before(void);
141 144
142EAPI Ecore_X_Window e_menu_grab_window_get(void); 145EAPI Ecore_X_Window e_menu_grab_window_get(void);
146
147#endif
143#endif 148#endif
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index e23ffbc..3b2bf0a 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -1,11 +1,14 @@
1#ifndef E_MODULE_H 1#ifdef E_TYPEDEFS
2#define E_MODULE_H
3 2
4#define E_MODULE_API_VERSION 1 3#define E_MODULE_API_VERSION 1
5 4
6typedef struct _E_Module E_Module; 5typedef struct _E_Module E_Module;
7typedef struct _E_Module_Api E_Module_Api; 6typedef struct _E_Module_Api E_Module_Api;
8 7
8#else
9#ifndef E_MODULE_H
10#define E_MODULE_H
11
9struct _E_Module 12struct _E_Module
10{ 13{
11 E_Object e_obj_inherit; 14 E_Object e_obj_inherit;
@@ -59,3 +62,4 @@ EAPI Evas_List *e_module_list(void);
59EAPI E_Menu *e_module_menu_new(void); 62EAPI E_Menu *e_module_menu_new(void);
60 63
61#endif 64#endif
65#endif
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index 67a827b..eb70ff2 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -65,6 +65,13 @@ e_object_del_func_set(E_Object *obj, E_Object_Cleanup_Func del_func)
65} 65}
66 66
67void 67void
68e_object_type_set(E_Object *obj, int type)
69{
70 E_OBJECT_CHECK(obj);
71 obj->type = type;
72}
73
74void
68e_object_free(E_Object *obj) 75e_object_free(E_Object *obj)
69{ 76{
70 E_OBJECT_CHECK(obj); 77 E_OBJECT_CHECK(obj);
diff --git a/src/bin/e_object.h b/src/bin/e_object.h
index 2a67ac0..5dabbc4 100644
--- a/src/bin/e_object.h
+++ b/src/bin/e_object.h
@@ -1,6 +1,4 @@
1#ifndef E_OBJECT_H 1#ifdef E_TYPEDEFS
2#define E_OBJECT_H
3
4/* Object safety/debugging checks */ 2/* Object safety/debugging checks */
5/* */ 3/* */
6/* OBJECT_PARANOIA_CHECK is paranoid and checkes pointers and traps segv's */ 4/* OBJECT_PARANOIA_CHECK is paranoid and checkes pointers and traps segv's */
@@ -28,15 +26,18 @@
28#define E_OBJECT_DEL_SET(x, del_func) e_object_del_func_set(E_OBJECT(x), E_OBJECT_CLEANUP_FUNC(del_func)) 26#define E_OBJECT_DEL_SET(x, del_func) e_object_del_func_set(E_OBJECT(x), E_OBJECT_CLEANUP_FUNC(del_func))
29 27
30#ifdef OBJECT_PARANOIA_CHECK 28#ifdef OBJECT_PARANOIA_CHECK
31# define E_OBJECT_CHECK(x) {if (e_object_error(E_OBJECT(x))) return;} 29# define E_OBJECT_CHECK(x) {if (e_object_error(E_OBJECT(x))) return;}
32# define E_OBJECT_CHECK_RETURN(x, ret) {if (e_object_error(E_OBJECT(x))) return ret;} 30# define E_OBJECT_CHECK_RETURN(x, ret) {if (e_object_error(E_OBJECT(x))) return ret;}
31# define E_OBJECT_IF_NOT_TYPE(x, type) if (E_OBJECT(x)->type != (type))
33#else 32#else
34# ifdef OBJECT_CHECK 33# ifdef OBJECT_CHECK
35# define E_OBJECT_CHECK(x) {if ((!E_OBJECT(x)) || (E_OBJECT(x)->magic != E_OBJECT_MAGIC)) return;} 34# define E_OBJECT_CHECK(x) {if ((!E_OBJECT(x)) || (E_OBJECT(x)->magic != E_OBJECT_MAGIC)) return;}
36# define E_OBJECT_CHECK_RETURN(x, ret) {if ((!E_OBJECT(x)) || (E_OBJECT(x)->magic != E_OBJECT_MAGIC)) return ret;} 35# define E_OBJECT_CHECK_RETURN(x, ret) {if ((!E_OBJECT(x)) || (E_OBJECT(x)->magic != E_OBJECT_MAGIC)) return ret;}
36# define E_OBJECT_IF_NOT_TYPE(x, type) if (E_OBJECT(x)->type != (type))
37# else 37# else
38# define E_OBJECT_CHECK(x) 38# define E_OBJECT_CHECK(x)
39# define E_OBJECT_CHECK_RETURN(x, ret) 39# define E_OBJECT_CHECK_RETURN(x, ret)
40# define E_OBJECT_IF_NOT_TYPE(x, type)
40# endif 41# endif
41#endif 42#endif
42 43
@@ -44,9 +45,14 @@ typedef void (*E_Object_Cleanup_Func) (void *obj);
44 45
45typedef struct _E_Object E_Object; 46typedef struct _E_Object E_Object;
46 47
48#else
49#ifndef E_OBJECT_H
50#define E_OBJECT_H
51
47struct _E_Object 52struct _E_Object
48{ 53{
49 int magic; 54 int magic;
55 int type;
50 int references; 56 int references;
51 E_Object_Cleanup_Func del_func; 57 E_Object_Cleanup_Func del_func;
52 E_Object_Cleanup_Func cleanup_func; 58 E_Object_Cleanup_Func cleanup_func;
@@ -60,6 +66,7 @@ EAPI void *e_object_alloc (int size, E_Object_Cleanup_Func cleanup
60EAPI void e_object_del (E_Object *obj); 66EAPI void e_object_del (E_Object *obj);
61EAPI int e_object_del_get (E_Object *obj); 67EAPI int e_object_del_get (E_Object *obj);
62EAPI void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func); 68EAPI void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func);
69EAPI void e_object_type_set (E_Object *obj, int type);
63EAPI void e_object_free (E_Object *obj); 70EAPI void e_object_free (E_Object *obj);
64EAPI int e_object_ref (E_Object *obj); 71EAPI int e_object_ref (E_Object *obj);
65EAPI int e_object_unref (E_Object *obj); 72EAPI int e_object_unref (E_Object *obj);
@@ -71,3 +78,4 @@ EAPI void e_object_free_attach_func_set(E_Object *obj, void (*func) (void *obj)
71EAPI void e_object_del_attach_func_set (E_Object *obj, void (*func) (void *obj)); 78EAPI void e_object_del_attach_func_set (E_Object *obj, void (*func) (void *obj));
72 79
73#endif 80#endif
81#endif
diff --git a/src/bin/e_path.h b/src/bin/e_path.h
index e932757..686104a 100644
--- a/src/bin/e_path.h
+++ b/src/bin/e_path.h
@@ -1,8 +1,11 @@
1#ifndef E_PATH_H 1#ifdef E_TYPEDEFS
2#define E_PATH_H
3 2
4typedef struct _E_Path E_Path; 3typedef struct _E_Path E_Path;
5 4
5#else
6#ifndef E_PATH_H
7#define E_PATH_H
8
6struct _E_Path 9struct _E_Path
7{ 10{
8 E_Object e_obj_inherit; 11 E_Object e_obj_inherit;
@@ -17,6 +20,7 @@ EAPI void e_path_path_append(E_Path *ep, const char *path);
17EAPI void e_path_path_prepend(E_Path *ep, const char *path); 20EAPI void e_path_path_prepend(E_Path *ep, const char *path);
18EAPI void e_path_path_remove(E_Path *ep, const char *path); 21EAPI void e_path_path_remove(E_Path *ep, const char *path);
19EAPI char *e_path_find(E_Path *ep, const char *file); /* for conveience this doesnt return a malloc'd string. it's a static buffer, so a new call will replace this buffer, but thsi means there is no need to free the return */ 22EAPI char *e_path_find(E_Path *ep, const char *file); /* for conveience this doesnt return a malloc'd string. it's a static buffer, so a new call will replace this buffer, but thsi means there is no need to free the return */
20
21EAPI void e_path_evas_append(E_Path *ep, Evas *evas); 23EAPI void e_path_evas_append(E_Path *ep, Evas *evas);
24
25#endif
22#endif 26#endif
diff --git a/src/bin/e_place.h b/src/bin/e_place.h
index e76399a..63693a3 100644
--- a/src/bin/e_place.h
+++ b/src/bin/e_place.h
@@ -1,6 +1,9 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_PLACE_H 3#ifndef E_PLACE_H
2#define E_PLACE_H 4#define E_PLACE_H
3 5
4EAPI int e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w, int h, int *rx, int *ry); 6EAPI int e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
5 7
6#endif 8#endif
9#endif
diff --git a/src/bin/e_pointer.h b/src/bin/e_pointer.h
index 89bfb4d..0e962e1 100644
--- a/src/bin/e_pointer.h
+++ b/src/bin/e_pointer.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_POINTER_H 3#ifndef E_POINTER_H
2#define E_POINTER_H 4#define E_POINTER_H
3 5
@@ -5,3 +7,4 @@ EAPI void e_pointer_container_set(E_Container *con);
5EAPI void e_pointer_ecore_evas_set(Ecore_Evas *ee); 7EAPI void e_pointer_ecore_evas_set(Ecore_Evas *ee);
6 8
7#endif 9#endif
10#endif
diff --git a/src/bin/e_resist.h b/src/bin/e_resist.h
index 7add63c..ee78adc 100644
--- a/src/bin/e_resist.h
+++ b/src/bin/e_resist.h
@@ -1,6 +1,9 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_RESIST_H 3#ifndef E_RESIST_H
2#define E_RESIST_H 4#define E_RESIST_H
3 5
4EAPI int e_resist_container_position(E_Container *con, Evas_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry); 6EAPI int e_resist_container_position(E_Container *con, Evas_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry);
5 7
6#endif 8#endif
9#endif
diff --git a/src/bin/e_startup.h b/src/bin/e_startup.h
index 1c44d9c..5abf51b 100644
--- a/src/bin/e_startup.h
+++ b/src/bin/e_startup.h
@@ -1,5 +1,4 @@
1#ifndef E_STARTUP_H 1#ifdef E_TYPEDEFS
2#define E_STARTUP_H
3 2
4typedef enum _E_Startup_Mode 3typedef enum _E_Startup_Mode
5{ 4{
@@ -7,6 +6,11 @@ typedef enum _E_Startup_Mode
7 E_STARTUP_RESTART 6 E_STARTUP_RESTART
8} E_Startup_Mode; 7} E_Startup_Mode;
9 8
9#else
10#ifndef E_STARTUP_H
11#define E_STARTUP_H
12
10EAPI void e_startup(E_Startup_Mode mode); 13EAPI void e_startup(E_Startup_Mode mode);
11 14
12#endif 15#endif
16#endif
diff --git a/src/bin/e_user.h b/src/bin/e_user.h
index 478c3c6..82dfd54 100644
--- a/src/bin/e_user.h
+++ b/src/bin/e_user.h
@@ -1,6 +1,9 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_USER_H 3#ifndef E_USER_H
2#define E_USER_H 4#define E_USER_H
3 5
4EAPI char *e_user_homedir_get(void); 6EAPI char *e_user_homedir_get(void);
5 7
6#endif 8#endif
9#endif
diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index 7c70c48..b984273 100644
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -1,3 +1,5 @@
1#ifdef E_TYPEDEFS
2#else
1#ifndef E_UTILS_H 3#ifndef E_UTILS_H
2#define E_UTILS_H 4#define E_UTILS_H
3 5
@@ -6,3 +8,4 @@ EAPI void e_util_container_fake_mouse_up_all_later(E_Container *con);
6EAPI void e_util_wakeup(void); 8EAPI void e_util_wakeup(void);
7 9
8#endif 10#endif
11#endif
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 2e108ed..ffd518c 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -280,7 +280,7 @@ _e_zone_cb_bg_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_i
280void 280void
281e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count) 281e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count)
282{ 282{
283 E_Object **new_desks; /* match the bug in e_zone.h */ 283 E_Desk **new_desks;
284 E_Desk *desk, *new_desk; 284 E_Desk *desk, *new_desk;
285 int x, y, xx, yy, moved; 285 int x, y, xx, yy, moved;
286 Evas_List *client; 286 Evas_List *client;
@@ -302,7 +302,7 @@ e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count)
302 desk = (E_Desk *) zone->desks[x + (y * zone->desk_x_count)]; 302 desk = (E_Desk *) zone->desks[x + (y * zone->desk_x_count)];
303 else 303 else
304 desk = e_desk_new(zone, x, y); 304 desk = e_desk_new(zone, x, y);
305 new_desks[x + (y * xx)] = (E_Object *) desk; 305 new_desks[x + (y * xx)] = desk;
306 } 306 }
307 307
308 /* catch windoes that have fallen off the end if we got smaller */ 308 /* catch windoes that have fallen off the end if we got smaller */
@@ -351,8 +351,7 @@ e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count)
351 } 351 }
352 } 352 }
353 353
354 if (zone->desks) 354 if (zone->desks) free(zone->desks);
355 free(zone->desks);
356 zone->desks = new_desks; 355 zone->desks = new_desks;
357 356
358 zone->desk_x_count = xx; 357 zone->desk_x_count = xx;
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 9df2d35..ffd97b8 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -1,8 +1,11 @@
1#ifndef E_ZONE_H 1#ifdef E_TYPEDEFS
2#define E_ZONE_H
3 2
4typedef struct _E_Zone E_Zone; 3typedef struct _E_Zone E_Zone;
5 4
5#else
6#ifndef E_ZONE_H
7#define E_ZONE_H
8
6struct _E_Zone 9struct _E_Zone
7{ 10{
8 E_Object e_obj_inherit; 11 E_Object e_obj_inherit;
@@ -17,7 +20,7 @@ struct _E_Zone
17 20
18 int desk_x_count, desk_y_count; 21 int desk_x_count, desk_y_count;
19 int desk_x_current, desk_y_current; 22 int desk_x_current, desk_y_current;
20 E_Object **desks; /* FIXME: why can this not be E_Desk? */ 23 E_Desk **desks;
21 Evas_List *clients; 24 Evas_List *clients;
22 25
23}; 26};
@@ -35,4 +38,4 @@ EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count);
35EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count); 38EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count);
36 39
37#endif 40#endif
38 41#endif
diff --git a/src/lib/E.h b/src/lib/E.h
index b758ade..9f1b056 100644
--- a/src/lib/E.h
+++ b/src/lib/E.h
@@ -1,7 +1,6 @@
1#ifndef _E_H 1#ifndef _E_H
2#define _E_H 2#define _E_H
3 3
4
5#ifdef EAPI 4#ifdef EAPI
6#undef EAPI 5#undef EAPI
7#endif 6#endif
@@ -19,9 +18,6 @@
19# endif 18# endif
20#endif 19#endif
21 20
22extern EAPI int E_RESPONSE_MODULE_LIST;
23extern EAPI int E_RESPONSE_BACKGROUND_GET;
24
25typedef struct _E_Response_Module_List E_Response_Module_List; 21typedef struct _E_Response_Module_List E_Response_Module_List;
26typedef struct _E_Response_Background_Get E_Response_Background_Get; 22typedef struct _E_Response_Background_Get E_Response_Background_Get;
27 23
@@ -36,23 +32,20 @@ struct _E_Response_Background_Get
36 char *data; 32 char *data;
37}; 33};
38 34
35extern EAPI int E_RESPONSE_MODULE_LIST;
36extern EAPI int E_RESPONSE_BACKGROUND_GET;
39 37
40#ifdef __cplusplus 38#ifdef __cplusplus
41extern "C" { 39extern "C" {
42#endif 40#endif
43 41
44 /* edje_main.c */
45 EAPI int e_init (const char *display); 42 EAPI int e_init (const char *display);
46 EAPI int e_shutdown (void); 43 EAPI int e_shutdown (void);
47 44 EAPI void e_module_enabled_set (const char *module, int enable);
48 EAPI void e_module_enabled_set (const char *module, 45 EAPI void e_module_loaded_set (const char *module, int load);
49 int enable);
50 EAPI void e_module_loaded_set (const char *module,
51 int load);
52 EAPI void e_module_list (void); 46 EAPI void e_module_list (void);
53 EAPI void e_background_set (const char *bgfile); 47 EAPI void e_background_set (const char *bgfile);
54 EAPI void e_background_get (void); 48 EAPI void e_background_get (void);
55
56 49
57#ifdef __cplusplus 50#ifdef __cplusplus
58} 51}
diff --git a/src/lib/e_main.c b/src/lib/e_main.c
index e871a75..2e75824 100644
--- a/src/lib/e_main.c
+++ b/src/lib/e_main.c
@@ -19,7 +19,6 @@
19 19
20#include "E.h" 20#include "E.h"
21#include "e_private.h" 21#include "e_private.h"
22
23#include <Ecore.h> 22#include <Ecore.h>
24#include <Ecore_Ipc.h> 23#include <Ecore_Ipc.h>
25 24
diff --git a/src/lib/e_private.h b/src/lib/e_private.h
index a48d444..9bd58ac 100644
--- a/src/lib/e_private.h
+++ b/src/lib/e_private.h
@@ -1,11 +1,13 @@
1#ifndef _EDJE_PRIVATE_H 1#ifndef _E_PRIVATE_H
2#define _EDJE_PRIVATE_H 2#define _E_PRIVATE_H
3 3
4#ifdef HAVE_CONFIG_H 4#ifdef HAVE_CONFIG_H
5#include <config.h> 5#include <config.h>
6#endif 6#endif
7 7
8#define E_TYPEDEFS 1
9#include "e_ipc.h"
10#undef E_TYPEDEFS
8#include "e_ipc.h" 11#include "e_ipc.h"
9
10 12
11#endif 13#endif