e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Window handling function api rename/rewrap continued. 

SVN revision: 22200
This commit is contained in:
Kim Woelders 2006-04-18 16:26:51 +00:00
parent 0218e123c2
commit 1978ce5aa5
13 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aclass.c
View File

@ -1042,7 +1042,7 @@ ActionclassEvent(ActionClass * ac, XEvent * ev, EWin * ewin)
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;

7
src/buttons.c
View File

@ -416,7 +416,7 @@ ButtonDoShowDefault(const Button * b)
return !b->internal && b->default_show;
}
#if 1 /* Unused */
#if 0 /* Unused */
int
ButtonEmbedWindow(Button * b, Window WindowToEmbed)
{
@ -1147,8 +1147,9 @@ ButtonsIpc(const char *params, Client * c __UNUSED__)
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))
{

16
src/desktops.c
View File

@ -491,7 +491,7 @@ DeskGetBackgroundWin(const Desk * dsk)
{
if (!dsk)
return VRoot.win;
return EobjGetWin(dsk->bg.o);
return EobjGetXwin(dsk->bg.o);
}
Pixmap
@ -518,7 +518,7 @@ DeskBackgroundConfigure(Desk * dsk)
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 @@ DeskBackgroundRefresh(Desk * dsk, int why)
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 @@ DeskRestackSimple(Desk * dsk)
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 @@ DeskRestackSimple(Desk * dsk)
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) \

52
src/eobj.h
View File

@ -64,6 +64,7 @@ struct _eobj
#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 @@ struct _eobj
#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

12
src/ewins.c
View File

@ -159,7 +159,7 @@ static void
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 @@ EwinManage(EWin * ewin)
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 @@ EwinManage(EWin * ewin)
if (!EwinIsInternal(ewin))
{
XShapeSelectInput(disp, _EwinGetClientXwin(ewin), ShapeNotifyMask);
ESetWindowBorderWidth(_EwinGetClientXwin(ewin), 0);
ESetWindowBorderWidth(_EwinGetClientWin(ewin), 0);
ewin->client.bw = 0;
}
@ -642,7 +642,7 @@ EwinPropagateShapes(EWin * ewin)
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 @@ EwinWithdraw(EWin * ewin)
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 @@ EwinEventConfigureRequest(EWin * ewin, XEvent * ev)
{
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)

2
src/finders.c
View File

@ -49,7 +49,7 @@ EwinFindByFrame(Window win)
ewins = EwinListGetAll(&num);
for (i = 0; i < num; i++)
{
if (win == EoGetWin(ewins[i]))
if (win == EoGetXwin(ewins[i]))
return ewins[i];
}
return NULL;

4
src/fx.c
View File

@ -109,7 +109,7 @@ FX_ripple_timeout(int val __UNUSED__, void *data __UNUSED__)
}
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 @@ FX_Wave_timeout(int val __UNUSED__, void *data __UNUSED__)
/* 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);
}

10
src/hiwin.c
View File

@ -68,7 +68,7 @@ HiwinRenderImageInit(Hiwin * phi)
}
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 @@ HiwinRenderImageDrawX(Hiwin * phi, Drawable draw)
static void
HiwinRenderImageDraw(Hiwin * phi)
{
HiwinRenderImageDrawX(phi, EoGetWin(phi));
HiwinRenderImageDrawX(phi, EoGetXwin(phi));
}
static void
@ -124,7 +124,7 @@ HiwinRenderImageUpdate(Hiwin * phi)
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 const HiwinRender HiwinRenderIclass = {
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 @@ HiwinRenderPixmapDrawX(Hiwin * phi, Drawable draw)
static void
HiwinRenderPixmapDraw(Hiwin * phi)
{
HiwinRenderPixmapDrawX(phi, EoGetWin(phi));
HiwinRenderPixmapDrawX(phi, EoGetXwin(phi));
EClearWindow(EoGetWin(phi));
}

2
src/icccm.c
View File

@ -302,7 +302,7 @@ ICCCM_Configure(EWin * ewin)
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);

2
src/iclass.c
View File

@ -888,7 +888,7 @@ pt_get_bg_image(Window win, int w, int h, int use_root)
}
else
{
cr = EoGetWin(DesksGetCurrent());
cr = EoGetXwin(DesksGetCurrent());
}
XTranslateCoordinates(disp, win, cr, 0, 0, &xx, &yy, &dummy);
#if 0

2
src/icons.c
View File

@ -117,7 +117,7 @@ IB_SnapEWin(EWin * ewin, int size)
}
else
{
draw = EoGetWin(ewin);
draw = EoGetXwin(ewin);
im = EImageGrabDrawableScaled(draw, None, 0, 0, ww, hh, w, h,
!EServerIsGrabbed(), 1);
}

2
src/ipc.c
View File

@ -983,7 +983,7 @@ EwinShowInfo(const EWin * ewin)
_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),

2
src/pager.c
View File

@ -283,7 +283,7 @@ PagerEwinUpdateMini(Pager * p, EWin * ewin)
{
draw = EoGetPixmap(ewin);
if (draw == None && EwinIsOnScreen(ewin))
draw = EoGetWin(ewin);
draw = EoGetXwin(ewin);
}
use_iclass = draw == None;