fixes for subcode events (xrandr being the main driver) - needs some more testing, but seems ok. Patch by anYc from Freednode.

mikeggrant · mikeggrant · commit bc47436aa48d · 2013-04-27T21:11:55.000Z
diff --git a/Xlib/display.py b/Xlib/display.py
@@ -287,7 +287,7 @@ def extension_add_event(self, code, evt, name = None):
         the event class.  EVT will be cloned, and the attribute _code
         of the new event class will be set to CODE.
 
-        If NAME is ommitted, it will be set to the name of EVT.  This
+        If NAME is omitted, it will be set to the name of EVT.  This
         name is used to insert an entry in the DictWrapper
         extension_event.
         """
@@ -303,6 +303,29 @@ def extension_add_event(self, code, evt, name = None):
 
         setattr(self.extension_event, name, code)
 
+    def extension_add_subevent(self, code, subcode, evt, name = None):
+        """extension_add_subevent(code, evt, [name])
+
+        Add an extension subevent.  CODE is the numeric code, subcode
+        is the sub-ID of this event that shares the code ID with other
+        sub-events and EVT is the event class.  EVT will be cloned, and
+        the attribute _code of the new event class will be set to CODE.
+
+        If NAME is omitted, it will be set to the name of EVT.  This
+        name is used to insert an entry in the DictWrapper
+        extension_event.
+        """
+
+        newevt = new.classobj(evt.__name__, evt.__bases__,
+                              evt.__dict__.copy())
+        newevt._code = code
+
+        self.display.add_extension_event(code, newevt, subcode)
+
+        if name is None:
+            name = evt.__name__
+
+        setattr(self.extension_event, name, code)
 
     def add_extension_error(self, code, err):
         """add_extension_error(code, err)
diff --git a/Xlib/ext/randr.py b/Xlib/ext/randr.py
@@ -1182,9 +1182,9 @@ def init(disp, info):
     disp.extension_add_method('display', 'xrandr_set_panning', set_panning)
 
     disp.extension_add_event(info.first_event, ScreenChangeNotify)
-    disp.extension_add_event(info.first_event + 1, CrtcChangeNotify)
-    disp.extension_add_event(info.first_event + 2, OutputChangeNotify)
-    disp.extension_add_event(info.first_event + 3, OutputPropertyNotify)
+    disp.extension_add_subevent(info.first_event + 1, 0, CrtcChangeNotify)
+    disp.extension_add_subevent(info.first_event + 1, 1, OutputChangeNotify)
+    disp.extension_add_subevent(info.first_event + 1, 2, OutputPropertyNotify)
 
     #disp.extension_add_error(BadRROutput, BadRROutputError)
     #disp.extension_add_error(BadRRCrtc, BadRRCrtcError)
diff --git a/Xlib/protocol/display.py b/Xlib/protocol/display.py
@@ -279,8 +279,14 @@ def set_extension_major(self, extname, major):
     def get_extension_major(self, extname):
         return self.extension_major_opcodes[extname]
 
-    def add_extension_event(self, code, evt):
-        self.event_classes[code] = evt
+    def add_extension_event(self, code, evt, subcode=None):
+       if subcode == None:
+           self.event_classes[code] = evt
+       else:
+           if not code in self.event_classes:
+               self.event_classes[code] = {subcode: evt}
+           else:
+               self.event_classes[code][subcode] = evt
 
     def add_extension_error(self, code, err):
         self.error_classes[code] = err
@@ -749,6 +755,9 @@ def parse_event_response(self, etype):
         # Skip bit 8 at lookup, that is set if this event came from an
         # SendEvent
         estruct = self.event_classes.get(etype & 0x7f, event.AnyEvent)
+        if type(estruct) == dict:
+            # this etype refers to a set of sub-events with individual subcodes
+            estruct = estruct[ord(self.data_recv[1])]
 
         e = estruct(display = self, binarydata = self.data_recv[:32])
 
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -817,6 +817,9 @@ def parse_binary_value(self, data, display, length, format):
         import event
 
         estruct = display.event_classes.get(ord(data[0]) & 0x7f, event.AnyEvent)
+        if type(estruct) == dict:
+            # this etype refers to a set of sub-events with individual subcodes
+            estruct = estruct[ord(data[1])]
 
         return estruct(display = display, binarydata = data[:32]), buffer(data, 32)
 
@@ -1367,7 +1370,7 @@ class TextElements16(TextElements8):
 
 
 
-class GetAttrData:
+class GetAttrData(object):
     def __getattr__(self, attr):
         try:
             if self._data:
diff --git a/examples/xrandr.py b/examples/xrandr.py
@@ -148,23 +148,26 @@ def loop(self):
                 sys.exit(0)
 
             # Screen information has changed
-            elif e.type == self.d.extension_event.ScreenChangeNotify:
+            elif e.__class__.__name__ == randr.ScreenChangeNotify.__name__:
                 print 'Screen change'
                 print self.pp.pprint(e._data)
 
             # CRTC information has changed
-            elif e.type == self.d.extension_event.CrtcChangeNotify:
+            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.type == self.d.extension_event.OutputChangeNotify:
+            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.type == self.d.extension_event.OutputPropertyNotify:
+            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)
 
             # Somebody wants to tell us something
