mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wistrut. Closes issue #131.

This commit is contained in:
Kris Maglione 2009-10-18 18:07:35 -04:00
parent 3cf4dfd093
commit 7e95268cd3
3 changed files with 9 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/strut/Makefile
View File

@ -11,7 +11,7 @@ PACKAGES += $(X11PACKAGES) xext xrandr xinerama
LIB = $(LIBIXP)
LDFLAGS += -lm -lregexp9 -lbio -lfmt -lutf
CFLAGS += -DVERSION=\"$(VERSION)\" -DIXP_NEEDAPI=86
CFLAGS += -DIXP_NEEDAPI=86
OBJ = main \
event \
ewmh \

6
cmd/strut/event.c
View File

@ -68,7 +68,7 @@ findtime(Display *d, XEvent *e, XPointer v) {
Window *w;
w = (Window*)v;
if(e->type == PropertyNotify && e->xproperty.window == w->w) {
if(e->type == PropertyNotify && e->xproperty.window == w->xid) {
xtime = e->xproperty.time;
return true;
}
@ -84,7 +84,7 @@ xtime_kludge(void) {
w = createwindow(&scr.root, Rect(0, 0, 1, 1), 0, InputOnly, &wa, 0);
XSelectInput(display, w->w, PropertyChangeMask);
XSelectInput(display, w->xid, PropertyChangeMask);
changeprop_long(w, "ATOM", "ATOM", &l, 0);
XIfEvent(display, &e, findtime, (void*)w);
@ -272,7 +272,7 @@ unmapnotify(XEvent *e) {
Window *w;
ev = &e->xunmap;
if((w = findwin(ev->window)) && w->parent && (ev->event == w->parent->w)) {
if((w = findwin(ev->window)) && w->parent && (ev->event == w->parent->xid)) {
if(ev->send_event || w->unmapped-- == 0)
handle(w, unmap, ev);
}

53
cmd/strut/main.c
View File

@ -10,8 +10,6 @@
static const char version[] = "witray-"VERSION", ©2007 Kris Maglione\n";
static int (*xlib_errorhandler) (Display*, XErrorEvent*);
static void
usage(void) {
fatal("usage: %s <window>\n", argv0);
@ -32,47 +30,7 @@ debug(int flag, const char *fmt, ...) {
va_end(ap);
}
/*
* There's no way to check accesses to destroyed windows, thus
* those cases are ignored (especially on UnmapNotifies).
* Other types of errors call Xlib's default error handler, which
* calls exit().
*/
struct {
uchar rcode;
uchar ecode;
} itab[] = {
{ 0, BadWindow },
{ X_SetInputFocus, BadMatch },
{ X_PolyText8, BadDrawable },
{ X_PolyFillRectangle, BadDrawable },
{ X_PolySegment, BadDrawable },
{ X_ConfigureWindow, BadMatch },
{ X_GrabKey, BadAccess },
{ X_GetAtomName, BadAtom },
};
static int
errorhandler(Display *dpy, XErrorEvent *error) {
int i;
USED(dpy);
if(error->request_code == X_QueryTree
&& error->error_code == BadWindow
&& error->resourceid == win.w)
fatal("%W: window does not exist", &win);
for(i = 0; i < nelem(itab); i++)
if((itab[i].rcode == 0 || itab[i].rcode == error->request_code)
&& (itab[i].ecode == 0 || itab[i].ecode == error->error_code))
return 0;
fprint(2, "%s: fatal error: Xrequest code=%d, Xerror code=%d\n",
argv0, error->request_code, error->error_code);
return xlib_errorhandler(display, error); /* calls exit() */
}
ErrorCode ignored_xerrors[] = { {0,} };
static Window
findframe(Window *w) {
@ -81,12 +39,12 @@ findframe(Window *w) {
Window ret = {0, };
uint n;
for(par=w->w; par != scr.root.w; ) {
for(par=w->xid; par != scr.root.xid; ) {
xw = par;
XQueryTree(display, xw, &root, &par, &children, &n);
XFree(children);
}
ret.w = xw;
ret.xid = xw;
ret.parent = &scr.root;
return ret;
}
@ -98,7 +56,7 @@ getwinsize(Window *win) {
XWindow root;
uint border, depth;
XGetGeometry(display, win->w, &root,
XGetGeometry(display, win->xid, &root,
&x, &y, &w, &h,
&border, &depth);
win->r = rectaddpt(Rect(0, 0, w, h),
@ -119,7 +77,7 @@ extern int fmtevent(Fmt*);
}ARGEND;
s = EARGF(usage());
if(!getulong(s, &win.w))
if(!getulong(s, &win.xid))
usage();
if(argc)
@ -128,7 +86,6 @@ extern int fmtevent(Fmt*);
setlocale(LC_CTYPE, "");
initdisplay();
xlib_errorhandler = XSetErrorHandler(errorhandler);
frame = findframe(&win);
getwinsize(&frame);