nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Error Handler to fullscreen check

Browse Source
This commit is contained in:
Benedikt Heine 2017-11-21 10:51:30 +01:00
parent aa7a851fdd
commit dd28e62c11
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/x11/screen.c
View File

@ -192,6 +192,24 @@ bool have_fullscreen_window(void)
return window_is_fullscreen(get_focused_window()); return window_is_fullscreen(get_focused_window());
} }
/**
* X11 ErrorHandler to mainly discard BadWindow parameter error
*/
static int XErrorHandlerFullscreen(Display *display, XErrorEvent *e)
{
/* Ignore BadWindow errors. Window may have been gone */
if (e->error_code == BadWindow) {
return 0;
}
char err_buf[BUFSIZ];
XGetErrorText(display, e->error_code, err_buf, BUFSIZ);
fputs(err_buf, stderr);
fputs("\n", stderr);
return 0;
}
/* see screen.h */ /* see screen.h */
bool window_is_fullscreen(Window window) bool window_is_fullscreen(Window window)
{ {
@ -205,6 +223,9 @@ bool window_is_fullscreen(Window window)
return false; return false;
} }
XFlush(xctx.dpy);
XSetErrorHandler(XErrorHandlerFullscreen);
Atom actual_type_return; Atom actual_type_return;
int actual_format_return; int actual_format_return;
unsigned long bytes_after_return; unsigned long bytes_after_return;
@ -224,6 +245,10 @@ bool window_is_fullscreen(Window window)
&bytes_after_return, &bytes_after_return,
&prop_to_return); &prop_to_return);
XFlush(xctx.dpy);
XSync(xctx.dpy, false);
XSetErrorHandler(NULL);
if (result == Success) { if (result == Success) {
for(int i = 0; i < n_items; i++) { for(int i = 0; i < n_items; i++) {
char *atom = XGetAtomName(xctx.dpy, ((Atom*)prop_to_return)[i]); char *atom = XGetAtomName(xctx.dpy, ((Atom*)prop_to_return)[i]);