Added workaround for Xorg bug in reporting deleted windows

closes: #490601

diff --git a/debian/patches/102_ignore-bad-match.diff b/debian/patches/102_ignore-bad-match.diff
new file mode 100644 (file)
index 0000000..4a60cad
--- /dev/null
+++ b/debian/patches/102_ignore-bad-match.diff
@@ -0,0 +1,16 @@
+--- ion3.orig/ioncore/rootwin.c
++++ ion3/ioncore/rootwin.c
+@@ -58,10 +58,11 @@
+     static char msg[128], request[64], num[32];
+     
+     /* Just ignore bad window and similar errors; makes the rest of
+-     * the code simpler.
++     * the code simpler.  Due to a Xorg bug, window lookups may fail
++     * with BadMatch instead of BadWindow.
+      */
+     if((ev->error_code==BadWindow ||
+-        (ev->error_code==BadMatch && ev->request_code==X_SetInputFocus) ||
++        ev->error_code==BadMatch ||
+         (ev->error_code==BadDrawable && ev->request_code==X_GetGeometry)) &&
+        ignore_badwindow)
+         return 0;

diff --git a/debian/patches/series b/debian/patches/series
index dfa21ca2bdaee5728fba2dc60ae1bebe13d50ff9..86fb6be20e44172d37bb85dae2a190b00dc2d8e6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 101_ignore-mising-keys.diff
+102_ignore-bad-match.diff
 201_build-config.diff
 205_ion-lock.diff
 206_use-x-terminal-emulator.diff