Changeset 216

Timestamp:

05/28/2008 04:35:12 PM (7 months ago)

Author:

petli

Message:

Stability fixes: handle destroyed windows better in some Client methods; don't crash in CompositionProxy? for GLX-infested visuals

Location:

trunk/plwm

Files:

• composite.py (modified) (5 diffs)
• wmanager.py (modified) (4 diffs)

trunk/plwm/composite.py

@@ -1 @@
-# $Id: __init__.py,v 1.10 2005/07/10 00:12:19 petli Exp $
-#
 # composite.py - interface plcm to produce visual effects
 #
@@ -35 +33 @@
 import struct
 
-from Xlib import X, Xatom
+from Xlib import X, Xatom, error
 import Xlib.protocol.event
 from Xlib.ext.composite import RedirectManual
@@ -145 +143 @@
         # Is client already composition enabled?
         if client in self.comp_clients:
+            return
+
+        # Is composition disabled due to strange visuals?
+        if client.window._composition_disabled:
+            wmanager.debug('composite', 'composition disabled for client %s', client)
             return
 
@@ -287 +290 @@
         a = window.get_attributes()
 
+        # Never trust an X server.  The visual and depth as returned
+        # by the methods just called can result in a BadMatch, despite
+        # the reasonable assumption that if the client could create a
+        # window with those specs, then we can also do it.
+
+        # The reason for this sad state of affairs is OpenGL: a GLX
+        # visual that have 24 bits of colour info _and_ 8 bits of
+        # alpha info appears to a non-GL application (e.g. plwm) to
+        # have depth 24, but you can't create windows of that depth on
+        # it.  An example of an application that does this is
+        # OpenOffice 2.0, which is how I found it.
+
+        # In this case, just create a window on the default visual for
+        # the proxy and disable composition for this client (as plcm
+        # require that the proxy and the client windows use the same
+        # visual).
+
+        self._composition_disabled = 0
+
+        ec = error.CatchError(error.BadMatch)
         self._proxy = screen.root.create_window(
             g.x, g.y, g.width, g.height, g.border_width, g.depth,
-            a.win_class, a.visual)
-
+            a.win_class, a.visual, onerror = ec)
+
+        # Check if the mismatch was triggered
+        self._wm.display.sync()
+
+        if ec.get_error():
+            wmanager.debug('composite', 'strange visual, disabling composition for %s', window)
+            
+            self._composition_disabled = 1
+            self._proxy = screen.root.create_window(
+                g.x, g.y, g.width, g.height, g.border_width, X.CopyFromParent)
+            
+            
         # The proxy window must have the SubstructureRedirectMask set, so
         # we still get MapRequest, ConfigureRequest etc for the client window.
@@ -307 +341 @@
         self.get_geometry = self._proxy.get_geometry
         self.circulate = self._proxy.circulate
+        self.reparent = self._proxy.reparent
 
         self._screen.add_proxy_window(self._proxy, window)

trunk/plwm/wmanager.py

@@ -288 +288 @@
         if self.withdrawn:
             return None
-        r = self.window.query_pointer()
+
+        # Handle destroyed windows gracefully, registering the error
+        # so the window is withdrawn from managing.
+
+        try:
+            r = self.window.query_pointer()
+        except error.BadWindow, e:
+            self.wm.events.put_event(e)
+            return None
+
         if r.same_screen:
             return r.win_x, r.win_y
@@ -521 +530 @@
         # mapped, and mostly affect initial state anyway.
 
-        # Besides, Netscape does weird things with its requesters: it
-        # changes WM_PROTOCOLS just before they are destroyed, giving
-        # us a BadWindow traceback if we try to follow that property.
-        # Hohum.
-
         if event.atom == Xatom.WM_NORMAL_HINTS:
-            self.sizehints = self.window.get_wm_normal_hints()
+
+            # Handle destroyed windows gracefully, registering the error
+            # so the window is withdrawn from managing.
+
+            try:
+                self.sizehints = self.window.get_wm_normal_hints()
+            except error.BadWindow, e:
+                self.wm.events.put_event(e)
 
     def handle_destroy_notify(self, event):
@@ -820 +831 @@
         if self.withdrawn:
             return None
-        return self.window.get_wm_name()
+
+        # Handle destroyed windows gracefully, registering the error
+        # so the window is withdrawn from managing.
+        try:
+            return self.window.get_wm_name()
+        except error.BadWindow, e:
+            self.wm.events.put_event(e)
+            return None
 
 
@@ -839 +857 @@
             return Xutil.WithdrawnState
 
-        r = self.window.get_wm_state()
+        try:
+            r = self.window.get_wm_state()
+        except error.BadWindow, e:
+            self.wm.events.put_event(e)
+            return None
+
         if r:
             return r.state