debian/patches/102_ignore-bad-match.diff

   1 Wed Jul 23 17:54:17 BST 2008  Tuomo Valkonen <tuomov@iki.fi>
   2   * More BadMatch ignore
   3 diff -rN -u old-ion-3plus/ioncore/rootwin.c new-ion-3plus/ioncore/rootwin.c
   4 --- old-ion-3plus/ioncore/rootwin.c     2008-07-24 21:28:52.000000000 +0100
   5 +++ new-ion-3plus/ioncore/rootwin.c     2008-07-24 21:28:52.000000000 +0100
   6 @@ -59,9 +59,13 @@
   7
   8      /* Just ignore bad window and similar errors; makes the rest of
   9       * the code simpler.
  10 +     *
  11 +     * Apparently XGetWindowProperty can return BadMatch on a race
  12 +     * condition where the server is already reusing the XID for a
  13 +     * non-window drawable, so let's just ignore BadMatch entirely...
  14       */
  15      if((ev->error_code==BadWindow ||
  16 -        (ev->error_code==BadMatch && ev->request_code==X_SetInputFocus) ||
  17 +        (ev->error_code==BadMatch /*&& ev->request_code==X_SetInputFocus*/) ||
  18          (ev->error_code==BadDrawable && ev->request_code==X_GetGeometry)) &&
  19         ignore_badwindow)
  20          return 0;
  21