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

Eliminate redundant macro (Xwin). 

SVN revision: 24447
This commit is contained in:
Kim Woelders 2006-08-07 20:47:12 +00:00
parent ca544e09ba
commit 6caf9ed8d4
16 changed files with 77 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/borders.c
View File

@ -562,13 +562,13 @@ EwinBorderSetTo(EWin * ewin, const Border * b)
for (i = b->num_winparts - 1; i >= 0; i--)
{
if (b->part[i].ontop)
wl[j++] = Xwin(ewin->bits[i].win);
wl[j++] = WinGetXwin(ewin->bits[i].win);
}
wl[j++] = Xwin(ewin->win_container);
wl[j++] = WinGetXwin(ewin->win_container);
for (i = b->num_winparts - 1; i >= 0; i--)
{
if (!b->part[i].ontop)
wl[j++] = Xwin(ewin->bits[i].win);
wl[j++] = WinGetXwin(ewin->bits[i].win);
}
XRestackWindows(disp, wl, j);
Efree(wl);
@ -880,7 +880,7 @@ BorderWinpartEventMouseDown(EWinBit * wbit, XEvent * ev)
wbit->state = STATE_CLICKED;
#if DEBUG_BORDER_EVENTS
Eprintf("BorderWinpartEventMouseDown %#lx %d\n", Xwin(wbit->win),
Eprintf("BorderWinpartEventMouseDown %#lx %d\n", WinGetXwin(wbit->win),
wbit->state);
#endif
BorderWinpartChange(ewin, part, 0);
@ -905,14 +905,15 @@ BorderWinpartEventMouseUp(EWinBit * wbit, XEvent * ev)
else
wbit->state = STATE_NORMAL;
#if DEBUG_BORDER_EVENTS
Eprintf("BorderWinpartEventMouseUp %#lx %d\n", Xwin(wbit->win), wbit->state);
Eprintf("BorderWinpartEventMouseUp %#lx %d\n", WinGetXwin(wbit->win),
wbit->state);
#endif
BorderWinpartChange(ewin, part, 0);
/* Beware! Actions may destroy the current border */
wbit->left = 0;
if (Xwin(wbit->win) == Mode.events.last_bpress && !left &&
if (WinGetXwin(wbit->win) == Mode.events.last_bpress && !left &&
ewin->border->part[part].aclass)
ActionclassEvent(ewin->border->part[part].aclass, ev, ewin);
}
@ -924,7 +925,8 @@ BorderWinpartEventEnter(EWinBit * wbit, XEvent * ev)
int part = wbit - ewin->bits;
#if DEBUG_BORDER_EVENTS
Eprintf("BorderWinpartEventEnter %#lx %d\n", Xwin(wbit->win), wbit->state);
Eprintf("BorderWinpartEventEnter %#lx %d\n", WinGetXwin(wbit->win),
wbit->state);
#endif
if (wbit->state == STATE_CLICKED)
wbit->left = 0;
@ -946,7 +948,8 @@ BorderWinpartEventLeave(EWinBit * wbit, XEvent * ev)
int part = wbit - ewin->bits;
#if DEBUG_BORDER_EVENTS
Eprintf("BorderWinpartEventLeave %#lx %d\n", Xwin(wbit->win), wbit->state);
Eprintf("BorderWinpartEventLeave %#lx %d\n", WinGetXwin(wbit->win),
wbit->state);
#endif
if (wbit->state == STATE_CLICKED)
wbit->left = 1;

13
src/comms.c
View File

@ -153,7 +153,7 @@ ClientConfigure(Client * c, const char *str)
static int
ClientMatchWindow(const void *data, const void *match)
{
return Xwin(((const Client *)data)->win) != (Window) match;
return WinGetXwin(((const Client *)data)->win) != (Window) match;
}
static char *
@ -274,9 +274,10 @@ CommsInit(void)
ESelectInput(comms_win, StructureNotifyMask | SubstructureNotifyMask);
EventCallbackRegister(comms_win, 0, ClientHandleEvents, NULL);
Esnprintf(s, sizeof(s), "WINID %8lx", Xwin(comms_win));
Esnprintf(s, sizeof(s), "WINID %8lx", WinGetXwin(comms_win));
XA_ENLIGHTENMENT_COMMS = XInternAtom(disp, "ENLIGHTENMENT_COMMS", False);
ecore_x_window_prop_string_set(Xwin(comms_win), XA_ENLIGHTENMENT_COMMS, s);
ecore_x_window_prop_string_set(WinGetXwin(comms_win), XA_ENLIGHTENMENT_COMMS,
s);
ecore_x_window_prop_string_set(VRoot.xwin, XA_ENLIGHTENMENT_COMMS, s);
XA_ENL_MSG = XInternAtom(disp, "ENL_MSG", False);
@ -301,7 +302,7 @@ CommsDoSend(Window win, const char *s)
ev.xclient.format = 8;
for (i = 0; i < len + 1; i += 12)
{
Esnprintf(ss, sizeof(ss), "%8lx", Xwin(comms_win));
Esnprintf(ss, sizeof(ss), "%8lx", WinGetXwin(comms_win));
for (j = 0; j < 12; j++)
{
ss[8 + j] = s[i + j];
@ -322,7 +323,7 @@ CommsSend(Client * c, const char *s)
return;
c->replied = 1;
CommsDoSend(Xwin(c->win), s);
CommsDoSend(WinGetXwin(c->win), s);
}
void
@ -332,7 +333,7 @@ CommsFlush(Client * c)
return;
if (!c->replied)
CommsDoSend(Xwin(c->win), "");
CommsDoSend(WinGetXwin(c->win), "");
}
/*

2
src/cursors.c
View File

@ -247,7 +247,7 @@ ECursorApply(ECursor * ec, Win win)
{
if (!ec)
return;
XDefineCursor(disp, Xwin(win), ec->cursor);
XDefineCursor(disp, WinGetXwin(win), ec->cursor);
#if 0 /* Not used */
if (win == VRoot.xwin)
ec->inroot = 1;

4
src/dialog.c
View File

@ -2207,7 +2207,7 @@ DItemEventMotion(Win win __UNUSED__, DItem * di, XEvent * ev)
case DITEM_SLIDER:
if (!di->item.slider.in_drag)
break;
if (ev->xmotion.window == Xwin(di->item.slider.knob_win))
if (ev->xmotion.window == WinGetXwin(di->item.slider.knob_win))
{
dx = Mode.events.x - Mode.events.px;
dy = Mode.events.y - Mode.events.py;
@ -2270,7 +2270,7 @@ DItemEventMouseDown(Win win, DItem * di, XEvent * ev)
break;
#endif
if (ev->xbutton.window == Xwin(di->item.slider.knob_win))
if (ev->xbutton.window == WinGetXwin(di->item.slider.knob_win))
{
if (ev->xbutton.button >= 1 && ev->xbutton.button <= 3)
{

2
src/eobj.c
View File

@ -186,7 +186,7 @@ EobjInit(EObj * eo, int type, Win win, int x, int y, int w, int h,
eo->shaped = -1;
if (type == EOBJ_TYPE_EXT)
eo->name = ecore_x_icccm_title_get(Xwin(win));
eo->name = ecore_x_icccm_title_get(WinGetXwin(win));
else if (name)
eo->name = Estrdup(name);
if (!eo->name)

2
src/eobj.h
View File

@ -66,7 +66,7 @@ struct _eobj
#define EOBJ_TYPE_ROOT_BG 7
#define EobjGetWin(eo) ((eo)->win)
#define EobjGetXwin(eo) Xwin((eo)->win)
#define EobjGetXwin(eo) WinGetXwin((eo)->win)
#define EobjGetDesk(eo) ((eo)->desk)
#define EobjGetName(eo) ((eo)->name)
#define EobjGetType(eo) ((eo)->type)

2
src/finders.c
View File

@ -87,7 +87,7 @@ EwinFindByChildren(Window win)
else
{
for (j = 0; j < ewins[i]->border->num_winparts; j++)
if (win == Xwin(ewins[i]->bits[j].win))
if (win == WinGetXwin(ewins[i]->bits[j].win))
{
return ewins[i];
}

2
src/focus.c
View File

@ -617,7 +617,7 @@ FocusHandleClick(EWin * ewin, Win win)
/* Allow click to pass thorugh */
if (EventDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusHandleClick %#lx %#lx\n", Xwin(win),
Eprintf("FocusHandleClick %#lx %#lx\n", WinGetXwin(win),
EwinGetContainerXwin(ewin));
if (win == EwinGetContainerWin(ewin))
{

14
src/fx.c
View File

@ -102,8 +102,8 @@ FX_ripple_timeout(int val __UNUSED__, void *data __UNUSED__)
if (gc1)
EXFreeGC(gc1);
gcv.subwindow_mode = IncludeInferiors;
gc = EXCreateGC(Xwin(fx_ripple_win), GCSubwindowMode, &gcv);
gc1 = EXCreateGC(Xwin(fx_ripple_win), 0L, &gcv);
gc = EXCreateGC(WinGetXwin(fx_ripple_win), GCSubwindowMode, &gcv);
gc1 = EXCreateGC(WinGetXwin(fx_ripple_win), 0L, &gcv);
FX_ripple_info();
}
@ -137,7 +137,7 @@ FX_ripple_timeout(int val __UNUSED__, void *data __UNUSED__)
yy = (fx_ripple_waterh * 2) - yoff;
aa = p * p * 64 + inch;
off = (int)(sin(aa) * 10 * (1 - p));
XCopyArea(disp, fx_ripple_above, Xwin(fx_ripple_win), gc1, 0, yy,
XCopyArea(disp, fx_ripple_above, WinGetXwin(fx_ripple_win), gc1, 0, yy,
VRoot.w, 1, off, VRoot.h - fx_ripple_waterh + y);
}
DoIn("FX_RIPPLE_TIMEOUT", 0.066, FX_ripple_timeout, 0, NULL);
@ -545,8 +545,8 @@ FX_Wave_timeout(int val __UNUSED__, void *data __UNUSED__)
if (gc1)
EXFreeGC(gc1);
gcv.subwindow_mode = IncludeInferiors;
gc = EXCreateGC(Xwin(fx_wave_win), GCSubwindowMode, &gcv);
gc1 = EXCreateGC(Xwin(fx_wave_win), 0L, &gcv);
gc = EXCreateGC(WinGetXwin(fx_wave_win), GCSubwindowMode, &gcv);
gc1 = EXCreateGC(WinGetXwin(fx_wave_win), 0L, &gcv);
FX_Wave_info();
}
@ -580,7 +580,7 @@ FX_Wave_timeout(int val __UNUSED__, void *data __UNUSED__)
/* Copy the area to correct bugs */
if (fx_wave_count == 0)
{
XCopyArea(disp, fx_wave_above, Xwin(fx_wave_win), gc1, 0,
XCopyArea(disp, fx_wave_above, WinGetXwin(fx_wave_win), gc1, 0,
VRoot.h - FX_WAVE_GRABH, VRoot.w, FX_WAVE_DEPTH * 2, 0,
VRoot.h - FX_WAVE_GRABH);
}
@ -620,7 +620,7 @@ FX_Wave_timeout(int val __UNUSED__, void *data __UNUSED__)
sx = (int)(sin(incx2) * FX_WAVE_DEPTH);
/* Display this block */
XCopyArea(disp, fx_wave_above, Xwin(fx_wave_win), gc1, x, yy, /* x, y */
XCopyArea(disp, fx_wave_above, WinGetXwin(fx_wave_win), gc1, x, yy, /* x, y */
FX_WAVE_WATERW, 1, /* w, h */
off + x, VRoot.h - FX_WAVE_WATERH + y + sx /* dx, dy */
);

22
src/grabs.c
View File

@ -28,11 +28,12 @@ GrabKeyboardSet(Win win)
{
int rc;
rc = XGrabKeyboard(disp, Xwin(win), False, GrabModeAsync, GrabModeAsync,
CurrentTime);
rc =
XGrabKeyboard(disp, WinGetXwin(win), False, GrabModeAsync, GrabModeAsync,
CurrentTime);
#if 0
Eprintf("GrabKeyboardSet %#lx %d\n", Xwin(win), rc);
Eprintf("GrabKeyboardSet %#lx %d\n", WinGetXwin(win), rc);
#endif
return rc;
}
@ -54,15 +55,15 @@ int
GrabPointerSet(Win win, unsigned int csr, int confine)
{
int ret = -1;
Window confine_to = (confine) ? Xwin(win) : None;
Window confine_to = (confine) ? WinGetXwin(win) : None;
ret = XGrabPointer(disp, Xwin(win), False,
ret = XGrabPointer(disp, WinGetXwin(win), False,
ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask,
GrabModeAsync, GrabModeAsync, confine_to, ECsrGet(csr),
CurrentTime);
Mode.grabs.pointer_grab_window = Xwin(win);
Mode.grabs.pointer_grab_window = WinGetXwin(win);
Mode.grabs.pointer_grab_active = 1;
if (EventDebug(EDBUG_TYPE_GRABS))
@ -91,14 +92,15 @@ GrabButtonSet(unsigned int button, unsigned int modifiers, Win win,
Bool owner_events = False;
int pointer_mode = GrabModeSync;
int keyboard_mode = GrabModeAsync;
Window confine_to = (confine) ? Xwin(win) : None;
Window confine_to = (confine) ? WinGetXwin(win) : None;
XGrabButton(disp, button, modifiers, Xwin(win), owner_events, event_mask,
pointer_mode, keyboard_mode, confine_to, ECsrGet(csr));
XGrabButton(disp, button, modifiers, WinGetXwin(win), owner_events,
event_mask, pointer_mode, keyboard_mode, confine_to,
ECsrGet(csr));
}
void
GrabButtonRelease(unsigned int button, unsigned int modifiers, Win win)
{
XUngrabButton(disp, button, modifiers, Xwin(win));
XUngrabButton(disp, button, modifiers, WinGetXwin(win));
}

15
src/hints.c
View File

@ -153,9 +153,9 @@ HintsSetActiveWindow(Window win)
void
HintsSetWindowName(Win win, const char *name)
{
ecore_x_icccm_title_set(Xwin(win), name);
ecore_x_icccm_title_set(WinGetXwin(win), name);
EWMH_SetWindowName(Xwin(win), name);
EWMH_SetWindowName(WinGetXwin(win), name);
}
void
@ -166,7 +166,7 @@ HintsSetWindowClass(Win win, const char *name, const char *clss)
xch = XAllocClassHint();
xch->res_name = (char *)name;
xch->res_class = (char *)clss;
XSetClassHint(disp, Xwin(win), xch);
XSetClassHint(disp, WinGetXwin(win), xch);
XFree(xch);
}
@ -287,7 +287,8 @@ HintsGetRootPixmap(Win win)
pm = None;
num =
ecore_x_window_prop_xid_get(Xwin(win), E_XROOTPMAP_ID, XA_PIXMAP, &pm, 1);
ecore_x_window_prop_xid_get(WinGetXwin(win), E_XROOTPMAP_ID, XA_PIXMAP,
&pm, 1);
return pm;
}
@ -298,9 +299,11 @@ HintsSetRootInfo(Win win, Pixmap pmap, unsigned int color)
Ecore_X_Pixmap pm;
pm = pmap;
ecore_x_window_prop_xid_set(Xwin(win), E_XROOTPMAP_ID, XA_PIXMAP, &pm, 1);
ecore_x_window_prop_xid_set(WinGetXwin(win), E_XROOTPMAP_ID, XA_PIXMAP, &pm,
1);
ecore_x_window_prop_card32_set(Xwin(win), E_XROOTCOLOR_PIXEL, &color, 1);
ecore_x_window_prop_card32_set(WinGetXwin(win), E_XROOTCOLOR_PIXEL, &color,
1);
}
typedef union

8
src/iclass.c
View File

@ -925,7 +925,7 @@ ImageclassGetImageBlended(ImageClass * ic, Win win, int w, int h, int active,
flags = pt_type_to_flags(image_type);
if (flags != ICLASS_ATTR_OPAQUE)
{
bg = pt_get_bg_image(Xwin(win), w, h, flags & ICLASS_ATTR_GLASS);
bg = pt_get_bg_image(WinGetXwin(win), w, h, flags & ICLASS_ATTR_GLASS);
if (bg)
{
EImageBlendCM(bg, im, (flags & ICLASS_ATTR_USE_CM) ? icm : NULL);
@ -967,7 +967,7 @@ ImagestateMakePmapMask(ImageState * is, Win win, PmapMask * pmm,
if (flags != ICLASS_ATTR_OPAQUE)
{
ii = pt_get_bg_image(Xwin(win), w, h, flags & ICLASS_ATTR_GLASS);
ii = pt_get_bg_image(WinGetXwin(win), w, h, flags & ICLASS_ATTR_GLASS);
}
else
{
@ -1231,8 +1231,8 @@ ITApply(Win win, ImageClass * ic, ImageState * is, int w, int h,
{
GC gc;
gc = EXCreateGC(Xwin(win), 0, NULL);
ImagestateDrawBevel(is, Xwin(win), gc, w, h);
gc = EXCreateGC(WinGetXwin(win), 0, NULL);
ImagestateDrawBevel(is, WinGetXwin(win), gc, w, h);
EXFreeGC(gc);
}
}

17
src/iconify.c
View File

@ -1754,7 +1754,7 @@ IB_ShowMenu(Iconbox * ib, int x __UNUSED__, int y __UNUSED__)
mi = MenuItemCreate(_("This Iconbox Settings..."), NULL, s, NULL);
MenuAddItem(p_menu, mi);
Esnprintf(s, sizeof(s), "wop %#lx cl", Xwin(ib->win));
Esnprintf(s, sizeof(s), "wop %#lx cl", WinGetXwin(ib->win));
mi = MenuItemCreate(_("Close Iconbox"), NULL, s, NULL);
MenuAddItem(p_menu, mi);
@ -1771,7 +1771,7 @@ IB_ShowMenu(Iconbox * ib, int x __UNUSED__, int y __UNUSED__)
mi = MenuItemCreate(_("Systray Settings..."), NULL, s, NULL);
MenuAddItem(p_menu, mi);
Esnprintf(s, sizeof(s), "wop %#lx cl", Xwin(ib->win));
Esnprintf(s, sizeof(s), "wop %#lx cl", WinGetXwin(ib->win));
mi = MenuItemCreate(_("Close Systray"), NULL, s, NULL);
MenuAddItem(p_menu, mi);
@ -2698,7 +2698,7 @@ IconboxObjSwinFind(Iconbox * ib, Window win)
int i;
for (i = 0; i < ib->num_objs; i++)
if (win == Xwin(ib->objs[i].u.swin->win))
if (win == WinGetXwin(ib->objs[i].u.swin->win))
return i;
return -1;
@ -2817,7 +2817,7 @@ IconboxObjSwinDel(Iconbox * ib, Win win, int gone)
return;
if (EventDebug(EDBUG_TYPE_ICONBOX))
Eprintf("IconboxObjSwinDel %#lx\n", Xwin(win));
Eprintf("IconboxObjSwinDel %#lx\n", WinGetXwin(win));
swin = ib->objs[i].u.swin;
@ -3029,9 +3029,10 @@ SystrayInit(Iconbox * ib, Win win, int screen)
}
systray_sel_win = ECreateEventWindow(VRoot.win, -100, -100, 1, 1);
systray_sel_time = EGetTimestamp();
XSetSelectionOwner(disp, _NET_SYSTEM_TRAY_Sx, Xwin(systray_sel_win),
XSetSelectionOwner(disp, _NET_SYSTEM_TRAY_Sx, WinGetXwin(systray_sel_win),
systray_sel_time);
if (XGetSelectionOwner(disp, _NET_SYSTEM_TRAY_Sx) != Xwin(systray_sel_win))
if (XGetSelectionOwner(disp, _NET_SYSTEM_TRAY_Sx) !=
WinGetXwin(systray_sel_win))
{
DialogOK(_("Systray Error!"), _("Could not activate systray"));
Eprintf("Failed to acquire selection %s\n", buf);
@ -3041,7 +3042,7 @@ SystrayInit(Iconbox * ib, Win win, int screen)
}
if (EventDebug(EDBUG_TYPE_ICONBOX))
Eprintf("Window %#lx is now %s owner, time=%ld\n",
Xwin(systray_sel_win), buf, systray_sel_time);
WinGetXwin(systray_sel_win), buf, systray_sel_time);
ESelectInput(systray_sel_win,
SubstructureRedirectMask | SubstructureNotifyMask);
@ -3053,7 +3054,7 @@ SystrayInit(Iconbox * ib, Win win, int screen)
ecore_x_client_message32_send(VRoot.xwin, E_XA_MANAGER, StructureNotifyMask,
CurrentTime, _NET_SYSTEM_TRAY_Sx,
Xwin(systray_sel_win), 0, 0);
WinGetXwin(systray_sel_win), 0, 0);
}
static void

3
src/menus.c
View File

@ -1578,7 +1578,8 @@ SubmenuShowTimeout(int val __UNUSED__, void *dat)
MenusSetEvents(1);
if (Conf.menus.warp)
EXWarpPointer(Xwin(mi->win), mi->text_w / 2, mi->text_h / 2);
EXWarpPointer(WinGetXwin(mi->win), mi->text_w / 2,
mi->text_h / 2);
}
}

2
src/pager.c
View File

@ -1110,7 +1110,7 @@ PagerHandleMotion(Pager * p, int x, int y)
if (!Conf_pagers.enable)
return;
on_screen = EXQueryPointer(Xwin(p->win), &x, &y, NULL, NULL);
on_screen = EXQueryPointer(WinGetXwin(p->win), &x, &y, NULL, NULL);
if (on_screen && x >= 0 && x < p->w && y >= 0 && y < p->h)
ewin = EwinInPagerAt(p, x, y);

17
src/xwin.h
View File

@ -47,7 +47,6 @@ Time EGetTimestamp(void);
Win ELookupXwin(Window xwin);
#define Xwin(win) WinGetXwin(win)
Window WinGetXwin(const Win win);
int WinGetBorderWidth(const Win win);
int WinGetDepth(const Win win);
@ -106,22 +105,22 @@ int ETranslateCoordinates(Win src_w, Win dst_w,
int EDrawableCheck(Drawable draw, int grab);
#define ESelectInput(win, event_mask) \
XSelectInput(disp, Xwin(win), event_mask)
XSelectInput(disp, WinGetXwin(win), event_mask)
#define EChangeWindowAttributes(win, mask, attr) \
XChangeWindowAttributes(disp, Xwin(win), mask, attr)
XChangeWindowAttributes(disp, WinGetXwin(win), mask, attr)
#define ESetWindowBorderWidth(win, bw) \
XSetWindowBorderWidth(disp, Xwin(win), bw)
XSetWindowBorderWidth(disp, WinGetXwin(win), bw)
#define ERaiseWindow(win) \
XRaiseWindow(disp, Xwin(win))
XRaiseWindow(disp, WinGetXwin(win))
#define ELowerWindow(win) \
XLowerWindow(disp, Xwin(win))
XLowerWindow(disp, WinGetXwin(win))
#define EClearWindow(win) \
XClearWindow(disp, Xwin(win))
XClearWindow(disp, WinGetXwin(win))
#define EClearArea(win, x, y, w, h, exp) \
XClearArea(disp, Xwin(win), x, y, w, h, exp)
XClearArea(disp, WinGetXwin(win), x, y, w, h, exp)
Pixmap ECreatePixmap(Win win, unsigned int width,
unsigned int height, unsigned int depth);
@ -151,7 +150,7 @@ int EXGetGeometry(Window xwin, Window * root_return,
int *x, int *y, int *w, int *h, int *bw,
int *depth);
#define EXGetWindowAttributes(win, xwa) \
XGetWindowAttributes(disp, Xwin(win), xwa)
XGetWindowAttributes(disp, WinGetXwin(win), xwa)
void EXCopyArea(Drawable src, Drawable dst, int sx, int sy,
unsigned int w, unsigned int h, int dx, int dy);