Changeset 214

Timestamp:

05/05/2008 05:17:45 PM (8 months ago)

Author:

petli

Message:

Withdrawing windows proxied by CompositeProxy? didn't work at all, really. One reason turned out to be a bug which must have been there since the dawn of plwm, but never triggered until now.

Location:

trunk/plwm

Files:

• composite.py (modified) (1 diff)
• wmanager.py (modified) (2 diffs)

trunk/plwm/composite.py

@@ -312 +312 @@
 
     def _proxy_withdraw(self):
+        # Move window back to be an immediate child of root
+        g = self._proxy.get_geometry()
+
+        self._proxy.change_attributes(event_mask = 0)
+
+        self._window.configure(border_width = g.border_width)
+        self._window.reparent(self._screen.root, g.x, g.y)
+
         self._screen.remove_proxy_window(self._proxy)
         self._proxy.destroy()

trunk/plwm/wmanager.py

@@ -1584 +1584 @@
         """
 
+        sys.stderr.write('X protocol error:\n%s\n' % err)
+        
         if isinstance(err, error.BadWindow) or isinstance(err, error.BadDrawable):
-            self.remove_window(err.resource_id, 1)
+            # The error can't be handled immediately, as the error
+            # handler must not call any Xlib methods.  Solve this by
+            # queing up the error object on the event queue and
+            # checking for this in the event handler just below.
+
+            # The event queue doesn't care about us putting an XError
+            # there, it just returns it to us.
+
+            self.events.put_event(err)
 
 
@@ -1600 +1610 @@
 
         # debug('verbose_event', 'handling %s', event)
+
+        # Continuation of the error handling hack: check if this is a
+        # window error and if so remove it
+        if isinstance(event, error.BadWindow) or isinstance(event, error.BadDrawable):
+            self.remove_window(event.resource_id, 1)
+            return
+
 
         grabbed = self.dispatch.handle_event(event)