Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
buttons.c desktops.c eobj.c eobj.h ewins.c hiwin.c slideout.c
warp.c
Log Message:
Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- buttons.c 26 Sep 2005 17:32:09 -0000 1.77
+++ buttons.c 16 Oct 2005 09:33:49 -0000 1.78
@@ -156,7 +156,7 @@
EoSetSticky(b, sticky);
EoSetDesk(b, DeskGet(desk));
- EobjInit(EoObj(b), EOBJ_TYPE_BUTTON, None, -100, -100, 50, 50, 0, name);
+ EoInit(b, EOBJ_TYPE_BUTTON, None, -100, -100, 50, 50, 0, name);
EoSetLayer(b, ontop);
EoSetShadow(b, 0);
@@ -182,8 +182,7 @@
while (RemoveItemByPtr(b, LIST_TYPE_BUTTON));
- EobjFini(&b->o);
- EDestroyWindow(EoGetWin(b));
+ EoFini(b);
if (b->iclass)
ImageclassDecRefcount(b->iclass);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -3 -r1.185 -r1.186
--- desktops.c 10 Oct 2005 19:40:10 -0000 1.185
+++ desktops.c 16 Oct 2005 09:33:49 -0000 1.186
@@ -427,7 +427,7 @@
win = (desk == 0) ? VRoot.win : None;
Esnprintf(buf, sizeof(buf), "Desk-%d", desk);
- EobjInit(&dsk->o, EOBJ_TYPE_DESK, win, 0, 0, VRoot.w, VRoot.h, 0, buf);
+ EoInit(dsk, EOBJ_TYPE_DESK, win, 0, 0, VRoot.w, VRoot.h, 0, buf);
EventCallbackRegister(EoGetWin(dsk), 0, DeskHandleEvents, dsk);
EoSetShadow(dsk, 0);
if (desk == 0)
@@ -467,8 +467,7 @@
if (dsk->bg)
BackgroundDecRefcount(dsk->bg);
- EobjFini(&dsk->o);
- EDestroyWindow(EoGetWin(dsk));
+ EoFini(dsk);
desks.desk[dsk->num] = NULL;
Efree(dsk);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- eobj.c 4 Oct 2005 22:08:13 -0000 1.53
+++ eobj.c 16 Oct 2005 09:33:49 -0000 1.54
@@ -165,6 +165,11 @@
Eprintf("EobjFini: %#lx %s\n", eo->win, eo->name);
EobjListStackDel(eo);
+ if (!eo->external)
+ {
+ EDestroyWindow(eo->win);
+ eo->gone = 1;
+ }
#if USE_COMPOSITE
if (eo->cmhook)
ECompMgrWinDel(eo);
@@ -219,8 +224,6 @@
void
EobjWindowDestroy(EObj * eo)
{
- EDestroyWindow(eo->win);
- eo->gone = 1;
EobjDestroy(eo);
}
@@ -246,6 +249,7 @@
EobjInit(eo, type, win, attr.x, attr.y, attr.width, attr.height, 0, NULL);
eo->name = ecore_x_icccm_title_get(win);
+ eo->external = 1;
#if 1 /* FIXME - TBD */
if (type == EOBJ_TYPE_EXT)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- eobj.h 1 Oct 2005 20:44:47 -0000 1.14
+++ eobj.h 16 Oct 2005 09:33:49 -0000 1.15
@@ -39,6 +39,7 @@
signed char stacked;
char sticky;
char floating;
+ unsigned external:1;
unsigned shown:1;
unsigned gone:1;
unsigned noredir:1; /* Do not redirect */
@@ -104,6 +105,9 @@
#define EoSetFade(eo, _x)
#endif
+#define EoInit(eo, type, win, x, y, w, h, su, name) \
+ EobjInit(EoObj(eo), type, win, x, y, w,
h, su, name)
+#define EoFini(eo) EobjFini(EoObj(eo));
#define EoSync(eo) EobjSync(EoObj(eo))
#define EoMap(eo, raise) EobjMap(EoObj(eo), raise)
#define EoUnmap(eo) EobjUnmap(EoObj(eo))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- ewins.c 12 Oct 2005 17:20:42 -0000 1.111
+++ ewins.c 16 Oct 2005 09:33:49 -0000 1.112
@@ -132,7 +132,7 @@
ewin->o.stacked = -1; /* Not placed on desk yet */
EoSetDesk(ewin, DesksGetCurrent());
- EobjInit(EoObj(ewin), EOBJ_TYPE_EWIN, frame, -10, -10, -1, -1, 1, NULL);
+ EoInit(ewin, EOBJ_TYPE_EWIN, frame, -10, -10, -1, -1, 1, NULL);
EoSetLayer(ewin, 4);
EoSetShadow(ewin, 1);
EobjListFocusAdd(&ewin->o, 0);
@@ -230,8 +230,7 @@
EwinCleanup(ewin);
EobjListOrderDel(&ewin->o);
EobjListFocusDel(&ewin->o);
- EobjFini(&ewin->o);
- EDestroyWindow(EoGetWin(ewin));
+ EoFini(ewin);
HintsSetClientList();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hiwin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- hiwin.c 26 Sep 2005 17:32:09 -0000 1.5
+++ hiwin.c 16 Oct 2005 09:33:49 -0000 1.6
@@ -248,7 +248,7 @@
if (!phi)
return NULL;
- EobjInit(EoObj(phi), EOBJ_TYPE_MISC, None, 0, 0, 3, 3, 1, "HiWin");
+ EoInit(phi, EOBJ_TYPE_MISC, None, 0, 0, 3, 3, 1, "HiWin");
EoSetShadow(phi, 0);
EoSetFloating(phi, 1);
EoSetLayer(phi, 19);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- slideout.c 9 Oct 2005 18:01:30 -0000 1.45
+++ slideout.c 16 Oct 2005 09:33:49 -0000 1.46
@@ -64,7 +64,7 @@
if (!s)
return NULL;
- EobjInit(EoObj(s), EOBJ_TYPE_MISC, None, -10, -10, 1, 1, 1, name);
+ EoInit(s, EOBJ_TYPE_MISC, None, -10, -10, 1, 1, 1, name);
s->direction = dir;
EoSetFade(s, 0);
ESelectInput(EoGetWin(s), SLIDEOUT_EVENT_MASK);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- warp.c 15 Oct 2005 20:37:25 -0000 1.82
+++ warp.c 16 Oct 2005 09:33:49 -0000 1.83
@@ -76,7 +76,7 @@
if (!fw)
return fw;
- EobjInit(EoObj(fw), EOBJ_TYPE_MISC, None, 0, 0, 1, 1, 1, "Warp");
+ EoInit(fw, EOBJ_TYPE_MISC, None, 0, 0, 1, 1, 1, "Warp");
EoSetFloating(fw, 1);
EoSetLayer(fw, 20);
@@ -99,8 +99,7 @@
WarpFocusWinDestroy(WarpFocusWin * fw)
{
EventCallbackUnregister(EoGetWin(fw), 0, WarpFocusHandleEvent, NULL);
- EobjFini(EoObj(fw));
- EDestroyWindow(EoGetWin(fw));
+ EoFini(fw);
Efree(fw);
}
#endif
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
