Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed XmuClientWindow, was killing Perl with BadWindow #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed XmuClientWindow, was killing Perl with BadWindow #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2446dd
wrap XmuClientWindow's XGetWindowProperty in Tk_CreateErrorHandler
mcast Oct 16, 2014
07a558a
Merge branch 'fix/XmuClientWindow-BadWindow.old' into fix/XmuClientWi…
mcast Oct 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions pTk/mTk/additions/ClientWin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ in this Software without prior written authorization from the X Consortium.

#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include "tkInt.h"

static Window TryChildren();

Expand All @@ -47,17 +48,30 @@ Window XmuClientWindow (dpy, win)
unsigned long nitems, after;
unsigned char *data;
Window inf;
Tk_ErrorHandler handler;

WM_STATE = XInternAtom(dpy, "WM_STATE", True);
if (!WM_STATE)
return win;

/*
* Ignore X errors when reading the property.
* Sometimes (difficult to reproduce) we were called for a
* ClientMessage{window=0x1}.
*/

handler = Tk_CreateErrorHandler(dpy, -1, -1, -1, (Tk_ErrorProc *) NULL, (ClientData) NULL);
XGetWindowProperty(dpy, win, WM_STATE, 0, 0, False, AnyPropertyType,
&type, &format, &nitems, &after, &data);
if (type)
return win;
inf = TryChildren(dpy, win, WM_STATE);
if (!inf)
if (type) {
inf = win;
} else {
inf = TryChildren(dpy, win, WM_STATE);
if (!inf)
inf = win;
}

Tk_DeleteErrorHandler(handler);
return inf;
#endif
}
Expand Down