Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
aclass.c buttons.c desktops.c eobj.h ewins.c finders.c fx.c
hiwin.c icccm.c iclass.c icons.c ipc.c pager.c
Log Message:
Window handling function api rename/rewrap continued.
===================================================================
RCS file: /cvs/e/e16/e/src/aclass.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- aclass.c 12 Apr 2006 07:30:26 -0000 1.30
+++ aclass.c 18 Apr 2006 16:26:51 -0000 1.31
@@ -1042,7 +1042,7 @@
break;
case LeaveNotify:
/* If frame window, quit if pointer is still inside */
- if (ewin && ev->xcrossing.window == EoGetWin(ewin) &&
+ if (ewin && ev->xcrossing.window == EoGetXwin(ewin) &&
(ev->xcrossing.x >= 0 && ev->xcrossing.x < EoGetW(ewin) &&
ev->xcrossing.y >= 0 && ev->xcrossing.y < EoGetH(ewin)))
return 0;
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- buttons.c 16 Apr 2006 22:59:26 -0000 1.87
+++ buttons.c 18 Apr 2006 16:26:51 -0000 1.88
@@ -416,7 +416,7 @@
return !b->internal && b->default_show;
}
-#if 1 /* Unused */
+#if 0 /* Unused */
int
ButtonEmbedWindow(Button * b, Window WindowToEmbed)
{
@@ -1147,8 +1147,9 @@
IpcPrintf("Win d s l x y w h name\n");
ECORE_LIST_FOR_EACH(button_list, b)
IpcPrintf("%#lx %2d %2d %2d %5d+%5d %5dx%5d %s\n",
- EoGetWin(b), EoGetDeskNum(b), EoIsSticky(b), EoGetLayer(b),
- EoGetX(b), EoGetY(b), EoGetW(b), EoGetH(b), EoGetName(b));
+ EoGetXwin(b), EoGetDeskNum(b), EoIsSticky(b),
+ EoGetLayer(b), EoGetX(b), EoGetY(b), EoGetW(b), EoGetH(b),
+ EoGetName(b));
}
else if (!strncmp(cmd, "move", 2))
{
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -3 -r1.236 -r1.237
--- desktops.c 17 Apr 2006 09:23:58 -0000 1.236
+++ desktops.c 18 Apr 2006 16:26:51 -0000 1.237
@@ -491,7 +491,7 @@
{
if (!dsk)
return VRoot.win;
- return EobjGetWin(dsk->bg.o);
+ return EobjGetXwin(dsk->bg.o);
}
Pixmap
@@ -518,7 +518,7 @@
if (EventDebug(EDBUG_TYPE_DESKS))
Eprintf
("DeskBackgroundConfigure %d v=%d %#lx/%#lx: ext=%d pmap=%#lx/%#lx
pixel=%#lx/%#lx\n",
- dsk->num, dsk->viewable, EoGetWin(dsk), EobjGetWin(dsk->bg.o),
+ dsk->num, dsk->viewable, EoGetXwin(dsk), EobjGetXwin(dsk->bg.o),
BackgroundIsNone(dsk->bg.bg), pmap, dsk->bg.pmap_set, pixel,
dsk->bg.pixel);
@@ -626,7 +626,7 @@
pixel = 0;
if (pmap == None)
- BackgroundRealize(bg, EoGetWin(dsk), EoGetW(dsk), EoGetH(dsk),
+ BackgroundRealize(bg, EoGetXwin(dsk), EoGetW(dsk), EoGetH(dsk),
1, &pmap, &pixel);
if (pmap != None)
BackgroundPixmapSet(bg, pmap);
@@ -1398,7 +1398,7 @@
eo->stacked = 1;
if (EventDebug(EDBUG_TYPE_STACKING))
- Eprintf("DeskRestackSimple %#lx %s\n", EobjGetWin(eo), EobjGetName(eo));
+ Eprintf("DeskRestackSimple %#lx %s\n", EobjGetXwin(eo), EobjGetName(eo));
lst = EobjListStackGetForDesk(&num, dsk);
if (num < 2)
@@ -1413,18 +1413,18 @@
if (i < num - 1)
{
xwc.stack_mode = Above;
- xwc.sibling = EobjGetWin(lst[i + 1]);
+ xwc.sibling = EobjGetXwin(lst[i + 1]);
}
else
{
xwc.stack_mode = Below;
- xwc.sibling = EobjGetWin(lst[i - 1]);
+ xwc.sibling = EobjGetXwin(lst[i - 1]);
}
value_mask = CWSibling | CWStackMode;
if (EventDebug(EDBUG_TYPE_STACKING))
- Eprintf("DeskRestackSimple %#10lx %s %#10lx\n", EobjGetWin(eo),
+ Eprintf("DeskRestackSimple %#10lx %s %#10lx\n", EobjGetXwin(eo),
(xwc.stack_mode == Above) ? "Above" : "Below", xwc.sibling);
- XConfigureWindow(disp, EobjGetWin(eo), value_mask, &xwc);
+ XConfigureWindow(disp, EobjGetXwin(eo), value_mask, &xwc);
}
#define _APPEND_TO_WIN_LIST(win) \
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- eobj.h 6 Apr 2006 21:20:16 -0000 1.25
+++ eobj.h 18 Apr 2006 16:26:51 -0000 1.26
@@ -64,6 +64,7 @@
#define EOBJ_TYPE_ROOT_BG 7
#define EobjGetWin(eo) ((eo)->win)
+#define EobjGetXwin(eo) ((eo)->win)
#define EobjGetDesk(eo) ((eo)->desk)
#define EobjGetName(eo) ((eo)->name)
#define EobjGetType(eo) ((eo)->type)
@@ -73,37 +74,38 @@
#define EobjGetH(eo) ((eo)->h)
#define EoObj(eo) (&((eo)->o))
-#define EoGetWin(eo) ((eo)->o.win)
-#define EoGetName(eo) ((eo)->o.name)
-#define EoGetType(eo) ((eo)->o.type)
-#define EoGetX(eo) ((eo)->o.x)
-#define EoGetY(eo) ((eo)->o.y)
-#define EoGetW(eo) ((eo)->o.w)
-#define EoGetH(eo) ((eo)->o.h)
-#define EoIsGone(eo) ((eo)->o.gone)
-#define EoIsSticky(eo) ((eo)->o.sticky)
-#define EoIsFloating(eo) ((eo)->o.floating)
-#define EoIsShown(eo) ((eo)->o.shown)
-#define EoGetDesk(eo) ((eo)->o.desk)
-#define EoGetDeskNum(eo) ((eo)->o.desk->num)
-#define EoGetLayer(eo) ((eo)->o.layer)
+#define EoGetWin(eo) EobjGetWin(EoObj(eo))
+#define EoGetXwin(eo) EobjGetXwin(EoObj(eo))
+#define EoGetDesk(eo) EobjGetDesk(EoObj(eo))
+#define EoGetName(eo) EobjGetName(EoObj(eo))
+#define EoGetType(eo) EobjGetType(EoObj(eo))
+#define EoGetX(eo) EobjGetX(EoObj(eo))
+#define EoGetY(eo) EobjGetY(EoObj(eo))
+#define EoGetW(eo) EobjGetW(EoObj(eo))
+#define EoGetH(eo) EobjGetH(EoObj(eo))
+#define EoIsGone(eo) (EoObj(eo)->gone)
+#define EoIsSticky(eo) (EoObj(eo)->sticky)
+#define EoIsFloating(eo) (EoObj(eo)->floating)
+#define EoIsShown(eo) (EoObj(eo)->shown)
+#define EoGetDeskNum(eo) (EoGetDesk(eo)->num)
+#define EoGetLayer(eo) (EoObj(eo)->layer)
#define EoGetPixmap(eo) EobjGetPixmap(EoObj(eo))
-#define EoSetName(eo, _x) (eo)->o.name = (_x)
-#define EoSetGone(eo) (eo)->o.gone = 1
-#define EoSetSticky(eo, _x) (eo)->o.sticky = ((_x)?1:0)
+#define EoSetName(eo, _x) EoObj(eo)->name = (_x)
+#define EoSetGone(eo) EoObj(eo)->gone = 1
+#define EoSetSticky(eo, _x) EoObj(eo)->sticky = ((_x)?1:0)
#define EoSetFloating(eo, _f) EobjSetFloating(EoObj(eo), (_f))
-#define EoSetDesk(eo, _x) (eo)->o.desk = (_x)
+#define EoSetDesk(eo, _x) EoObj(eo)->desk = (_x)
#define EoSetLayer(eo, _l) EobjSetLayer(EoObj(eo), (_l))
#define EoChangeOpacity(eo, _o) EobjChangeOpacity(EoObj(eo), _o)
-#define EoSetFade(eo, _x) ((eo)->o.fade = (_x))
-#define EoSetNoRedirect(eo, _x) (eo)->o.noredir = (_x)
-#define EoSetShadow(eo, _x) (eo)->o.shadow = (_x)
+#define EoSetFade(eo, _x) EoObj(eo)->fade = (_x)
+#define EoSetNoRedirect(eo, _x) EoObj(eo)->noredir = (_x)
+#define EoSetShadow(eo, _x) EoObj(eo)->shadow = (_x)
#if USE_COMPOSITE
-#define EoSetOpacity(eo, _o) (eo)->o.opacity = (_o)
-#define EoGetOpacity(eo) ((eo)->o.opacity)
-#define EoGetShadow(eo) ((eo)->o.shadow)
-#define EoGetNoRedirect(eo) ((eo)->o.noredir)
+#define EoSetOpacity(eo, _o) EoObj(eo)->opacity = (_o)
+#define EoGetOpacity(eo) (EoObj(eo)->opacity)
+#define EoGetShadow(eo) (EoObj(eo)->shadow)
+#define EoGetNoRedirect(eo) (EoObj(eo)->noredir)
#else
#define EoSetOpacity(eo, _o)
#endif
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -3 -r1.153 -r1.154
--- ewins.c 16 Apr 2006 13:27:37 -0000 1.153
+++ ewins.c 18 Apr 2006 16:26:51 -0000 1.154
@@ -159,7 +159,7 @@
EwinGetHints(EWin * ewin)
{
if (EventDebug(EDBUG_TYPE_EWINS))
- Eprintf("EwinGetHints %#lx\n", _EwinGetClientWin(ewin));
+ Eprintf("EwinGetHints %#lx\n", _EwinGetClientXwin(ewin));
ICCCM_GetTitle(ewin, 0);
if (EwinIsInternal(ewin))
@@ -236,7 +236,7 @@
if (EventDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinManage %#lx frame=%#lx cont=%#lx st=%d\n",
- _EwinGetClientXwin(ewin), EoGetWin(ewin),
+ _EwinGetClientXwin(ewin), EoGetXwin(ewin),
_EwinGetContainerXwin(ewin), ewin->state.state);
EventCallbackRegister(EoGetWin(ewin), 0, EwinHandleEventsToplevel, ewin);
@@ -249,7 +249,7 @@
if (!EwinIsInternal(ewin))
{
XShapeSelectInput(disp, _EwinGetClientXwin(ewin), ShapeNotifyMask);
- ESetWindowBorderWidth(_EwinGetClientXwin(ewin), 0);
+ ESetWindowBorderWidth(_EwinGetClientWin(ewin), 0);
ewin->client.bw = 0;
}
@@ -642,7 +642,7 @@
if (EventDebug(EX_EVENT_SHAPE_NOTIFY))
Eprintf("EwinPropagateShapes %#lx frame=%#lx shaped=%d\n",
- _EwinGetClientXwin(ewin), EoGetWin(ewin), ewin->state.shaped);
+ _EwinGetClientXwin(ewin), EoGetXwin(ewin), ewin->state.shaped);
EoShapeUpdate(ewin, 1);
ewin->update.shape = 0;
@@ -1030,7 +1030,7 @@
EGrabServer();
- ESelectInput(_EwinGetClientXwin(ewin), NoEventMask);
+ ESelectInput(_EwinGetClientWin(ewin), NoEventMask);
XShapeSelectInput(disp, _EwinGetClientXwin(ewin), NoEventMask);
/* Park the client window on the root */
@@ -1218,7 +1218,7 @@
{
ewin2 = EwinFindByClient(winrel);
if (ewin2)
- winrel = EoGetWin(ewin2);
+ winrel = EoGetXwin(ewin2);
xwc.sibling = winrel;
xwc.stack_mode = ev->xconfigurerequest.detail;
if (Mode.mode == MODE_NONE)
===================================================================
RCS file: /cvs/e/e16/e/src/finders.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- finders.c 18 Feb 2006 08:30:08 -0000 1.47
+++ finders.c 18 Apr 2006 16:26:51 -0000 1.48
@@ -49,7 +49,7 @@
ewins = EwinListGetAll(&num);
for (i = 0; i < num; i++)
{
- if (win == EoGetWin(ewins[i]))
+ if (win == EoGetXwin(ewins[i]))
return ewins[i];
}
return NULL;
===================================================================
RCS file: /cvs/e/e16/e/src/fx.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- fx.c 17 Apr 2006 21:55:34 -0000 1.64
+++ fx.c 18 Apr 2006 16:26:51 -0000 1.65
@@ -109,7 +109,7 @@
}
if (fx_ripple_count == 0)
- XCopyArea(disp, EoGetWin(DesksGetCurrent()), fx_ripple_above, gc, 0,
+ XCopyArea(disp, EoGetXwin(DesksGetCurrent()), fx_ripple_above, gc, 0,
VRoot.h - (fx_ripple_waterh * 3), VRoot.w, fx_ripple_waterh * 2,
0, 0);
@@ -554,7 +554,7 @@
/* On the zero, grab the desktop again. */
if (fx_wave_count == 0)
{
- XCopyArea(disp, EoGetWin(DesksGetCurrent()), fx_wave_above, gc, 0,
+ XCopyArea(disp, EoGetXwin(DesksGetCurrent()), fx_wave_above, gc, 0,
VRoot.h - (FX_WAVE_WATERH * 3), VRoot.w, FX_WAVE_WATERH * 2,
0, 0);
}
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- hiwin.c 17 Apr 2006 21:55:34 -0000 1.11
+++ hiwin.c 18 Apr 2006 16:26:51 -0000 1.12
@@ -68,7 +68,7 @@
}
else if (phi->zoom > 2 && EwinIsOnScreen(ewin))
{
- phi->im = EImageGrabDrawable(EoGetWin(ewin), None, 0, 0,
+ phi->im = EImageGrabDrawable(EoGetXwin(ewin), None, 0, 0,
EoGetW(ewin), EoGetH(ewin), 0);
}
else
@@ -89,7 +89,7 @@
static void
HiwinRenderImageDraw(Hiwin * phi)
{
- HiwinRenderImageDrawX(phi, EoGetWin(phi));
+ HiwinRenderImageDrawX(phi, EoGetXwin(phi));
}
static void
@@ -124,7 +124,7 @@
phi->im = EImageGrabDrawable(pmap, None, 0, 0,
EoGetW(ewin), EoGetH(ewin), 0);
ESetWindowBackgroundPixmap(EoGetWin(phi), None);
- HiwinRenderImageDrawX(phi, EoGetWin(phi));
+ HiwinRenderImageDrawX(phi, EoGetXwin(phi));
EImageDecache(phi->im);
phi->im = NULL;
}
@@ -161,7 +161,7 @@
static void
HiwinRenderPixmapInit(Hiwin * phi)
{
- phi->gc = EXCreateGC(EoGetWin(phi), 0, NULL);
+ phi->gc = EXCreateGC(EoGetXwin(phi), 0, NULL);
}
static void
@@ -176,7 +176,7 @@
static void
HiwinRenderPixmapDraw(Hiwin * phi)
{
- HiwinRenderPixmapDrawX(phi, EoGetWin(phi));
+ HiwinRenderPixmapDrawX(phi, EoGetXwin(phi));
EClearWindow(EoGetWin(phi));
}
===================================================================
RCS file: /cvs/e/e16/e/src/icccm.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- icccm.c 19 Mar 2006 15:33:38 -0000 1.120
+++ icccm.c 18 Apr 2006 16:26:51 -0000 1.121
@@ -302,7 +302,7 @@
ev.xconfigure.width = ewin->client.w;
ev.xconfigure.height = ewin->client.h;
ev.xconfigure.border_width = 0;
- ev.xconfigure.above = EoGetWin(ewin);
+ ev.xconfigure.above = EoGetXwin(ewin);
ev.xconfigure.override_redirect = False;
XSendEvent(disp, _EwinGetClientXwin(ewin), False, StructureNotifyMask, &ev);
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- iclass.c 17 Apr 2006 21:55:34 -0000 1.95
+++ iclass.c 18 Apr 2006 16:26:51 -0000 1.96
@@ -888,7 +888,7 @@
}
else
{
- cr = EoGetWin(DesksGetCurrent());
+ cr = EoGetXwin(DesksGetCurrent());
}
XTranslateCoordinates(disp, win, cr, 0, 0, &xx, &yy, &dummy);
#if 0
===================================================================
RCS file: /cvs/e/e16/e/src/icons.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- icons.c 29 Mar 2006 19:13:17 -0000 1.10
+++ icons.c 18 Apr 2006 16:26:51 -0000 1.11
@@ -117,7 +117,7 @@
}
else
{
- draw = EoGetWin(ewin);
+ draw = EoGetXwin(ewin);
im = EImageGrabDrawableScaled(draw, None, 0, 0, ww, hh, w, h,
!EServerIsGrabbed(), 1);
}
===================================================================
RCS file: /cvs/e/e16/e/src/ipc.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -3 -r1.261 -r1.262
--- ipc.c 16 Apr 2006 13:27:37 -0000 1.261
+++ ipc.c 18 Apr 2006 16:26:51 -0000 1.262
@@ -983,7 +983,7 @@
_EwinGetClientXwin(ewin),
ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h,
_EwinGetContainerXwin(ewin),
- EoGetWin(ewin),
+ EoGetXwin(ewin),
EoGetX(ewin), EoGetY(ewin), EoGetW(ewin), EoGetH(ewin),
#if USE_COMPOSITE
EoGetPixmap(ewin),
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- pager.c 17 Apr 2006 21:55:34 -0000 1.205
+++ pager.c 18 Apr 2006 16:26:51 -0000 1.206
@@ -283,7 +283,7 @@
{
draw = EoGetPixmap(ewin);
if (draw == None && EwinIsOnScreen(ewin))
- draw = EoGetWin(ewin);
+ draw = EoGetXwin(ewin);
}
use_iclass = draw == None;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
