Treat subcodes as tuples in the (infrequently used) extension list. Minor documentation points.

mikeggrant · mikeggrant · commit 6a795403ab5a · 2013-04-29T22:53:11.000Z
diff --git a/Xlib/display.py b/Xlib/display.py
@@ -97,6 +97,11 @@ def __init__(self, display = None):
         self.class_extension_dicts = {}
         self.display_extension_methods = {}
 
+        # a dict that maps the event name to the code
+        # or, when it's an event with a subcode, to a tuple of (event,subcode)
+        # note this wraps the dict so you address it as
+        # extension_event.EXTENSION_EVENT_NAME rather than
+        # extension_event["EXTENSION_EVENT_NAME"]
         self.extension_event = rq.DictWrapper({})
 
         exts = self.list_extensions()
@@ -325,7 +330,9 @@ def extension_add_subevent(self, code, subcode, evt, name = None):
         if name is None:
             name = evt.__name__
 
-        setattr(self.extension_event, name, code)
+        # store subcodes as a tuple of (event code, subcode) in the
+        # extension dict maintained in the display object
+        setattr(self.extension_event, name, (code,subcode))
 
     def add_extension_error(self, code, err):
         """add_extension_error(code, err)
diff --git a/Xlib/ext/randr.py b/Xlib/ext/randr.py
@@ -26,6 +26,9 @@
 Version 1.2 of the protocol is documented at:
 http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt
 
+Version 1.3.1 here:
+http://www.x.org/releases/X11R7.5/doc/randrproto/randrproto.txt
+
 """
 
 
diff --git a/examples/xrandr.py b/examples/xrandr.py
@@ -152,23 +152,29 @@ def loop(self):
                 print 'Screen change'
                 print self.pp.pprint(e._data)
 
-            # CRTC information has changed
-            elif e.__class__.__name__ == randr.CrtcChangeNotify.__name__:
-                print 'CRTC change'
-                #e = randr.CrtcChangeNotify(display=display.display, binarydata = e._binary)
-                print self.pp.pprint(e._data)
-
-            # Output information has changed
-            elif e.__class__.__name__ == randr.OutputChangeNotify.__name__:
-                print 'Output change'
-                #e = randr.OutputChangeNotify(display=display.display, binarydata = e._binary)
-                print self.pp.pprint(e._data)
-
-            # Output property information has changed
-            elif e.__class__.__name__ == randr.OutputPropertyNotify.__name__:
-                print 'Output property change'
-                #e = randr.OutputPropertyNotify(display=display.display, binarydata = e._binary)
-                print self.pp.pprint(e._data)
+            # check if we're getting one of the RandR event types with subcodes
+            elif e.type == self.d.extension_event.CrtcChangeNotify[0]:
+                # yes, check the subcodes
+
+                # CRTC information has changed
+                if (e.type, e.sub_code) == self.d.extension_event.CrtcChangeNotify:
+                    print 'CRTC change'
+                    #e = randr.CrtcChangeNotify(display=display.display, binarydata = e._binary)
+                    print self.pp.pprint(e._data)
+
+                # Output information has changed
+                elif (e.type, e.sub_code) == self.d.extension_event.OutputChangeNotify:
+                    print 'Output change'
+                    #e = randr.OutputChangeNotify(display=display.display, binarydata = e._binary)
+                    print self.pp.pprint(e._data)
+
+                # Output property information has changed
+                elif (e.type, e.sub_code) == self.d.extension_event.OutputPropertyNotify:
+                    print 'Output property change'
+                    #e = randr.OutputPropertyNotify(display=display.display, binarydata = e._binary)
+                    print self.pp.pprint(e._data)
+                else:
+                    print "Unrecognised subcode", e.sub_code
 
             # Somebody wants to tell us something
             elif e.type == X.ClientMessage:
