From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 23 Jul 2008 23:22:59 +0000 (+0000)
Subject: Added workaround for Xorg bug in reporting deleted windows
X-Git-Tag: 20080707-2~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=43f58fb1188973e1407a2f18af22813a5c03bb89;p=ion3.git

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
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 dfa21ca..86fb6be 100644
--- 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