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

Wrap XGetWindowAttributes().

This commit is contained in:
Kim Woelders 2013-11-23 17:08:12 +01:00
parent 6435db730a
commit 3d86eb55fa
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eobj.c
View File

@ -316,7 +316,7 @@ EobjRegister(Window xwin, int type)
if (eo)
return eo;
if (!XGetWindowAttributes(disp, xwin, &attr))
if (!EXGetWindowAttributes(xwin, &attr))
return NULL;
if (type == EOBJ_TYPE_EXT && !attr.override_redirect)

2
src/ewins.c
View File

@ -2240,7 +2240,7 @@ EwinsManage(void)
if (EobjListStackFind(xwin))
continue;
if (!XGetWindowAttributes(disp, xwin, &attr))
if (!EXGetWindowAttributes(xwin, &attr))
continue;
if (attr.map_state == IsUnmapped)

2
src/icccm.c
View File

@ -353,7 +353,7 @@ ICCCM_Cmap(EWin * ewin)
{
for (i = 0; i < num; i++)
{
if (XGetWindowAttributes(disp, wlist[i], &xwa))
if (EXGetWindowAttributes(wlist[i], &xwa))
{
if (xwa.colormap != dcmap)
{

12
src/x.c
View File

@ -709,7 +709,7 @@ ERegisterWindow(Window xwin, XWindowAttributes * pxwa)
if (!pxwa)
{
pxwa = &xwa;
if (!XGetWindowAttributes(disp, xwin, pxwa))
if (!EXGetWindowAttributes(xwin, pxwa))
goto done;
}
@ -835,6 +835,12 @@ EMapRaised(Win win)
XMapRaised(disp, win->xwin);
}
int
EXGetWindowAttributes(Window xwin, XWindowAttributes * pxwa)
{
return XGetWindowAttributes(disp, xwin, pxwa);
}
int
EXGetGeometry(Drawable draw, Window * root_return, int *x, int *y,
int *w, int *h, int *bw, int *depth)
@ -1097,7 +1103,7 @@ ESelectInputChange(Win win, unsigned int set, unsigned int clear)
#else
XWindowAttributes xwa;
XGetWindowAttributes(disp, win->xwin, &xwa);
EXGetWindowAttributes(win->xwin, &xwa);
xwa.your_event_mask |= set;
xwa.your_event_mask &= ~clear;
XSelectInput(disp, win->xwin, xwa.your_event_mask);
@ -1949,7 +1955,7 @@ EWindowGetPixmap(const Win win)
{
XWindowAttributes xwa;
if (XGetWindowAttributes(disp, win->xwin, &xwa) == 0 ||
if (EXGetWindowAttributes(win->xwin, &xwa) == 0 ||
xwa.map_state == IsUnmapped)
return None;

1
src/xwin.h
View File

@ -248,6 +248,7 @@ unsigned int EAllocColor(Colormap cmap, unsigned int argb);
do { a = _A16(c); r = _R16(c); g = _G16(c); b = _B16(c); } while (0)
Window EXWindowGetParent(Window xwin);
int EXGetWindowAttributes(Window w, XWindowAttributes * pxwa);
int EXGetGeometry(Window xwin, Window * root_return,
int *x, int *y, int *w, int *h, int *bw,
int *depth);