diff options
| author | Daniel Martin <consume.noise@gmail.com> | 2013-06-08 11:20:38 +0200 |
|---|---|---|
| committer | Peter Harris <pharris@opentext.com> | 2013-07-12 15:54:14 -0400 |
| commit | 56a82005ac388fcb7a4d1c82e07c7e72eaf69a32 (patch) | |
| tree | 13cb5e7d760ff97b7a38d583462b706acda54de2 | |
| parent | e6a246e50e62cbcba33d0e1d2371e69e6e089383 (diff) | |
Add support for X Generic Extension events
With these patches, we are able to mark an XGE event as such and
generate the correct header for it.
XGE events can be found in the X Input Extension v2++.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
| -rw-r--r-- | doc/xml-xcb.txt | 8 | ||||
| -rw-r--r-- | src/xcb.xsd | 1 | ||||
| -rw-r--r-- | xcbgen/xtypes.py | 26 |
3 files changed, 29 insertions, 6 deletions
diff --git a/doc/xml-xcb.txt b/doc/xml-xcb.txt index cf6d14e..7311911 100644 --- a/doc/xml-xcb.txt +++ b/doc/xml-xcb.txt @@ -128,7 +128,8 @@ Top-Level Elements requests of the same type may be combined into a single request without affecting the semantics of the requests. -<event name="identifier" number="integer" [no-sequence-number="true"]> +<event name="identifier" number="integer" + [[no-sequence-number="true"] | [xge="true"]]> structure contents </event> @@ -142,6 +143,11 @@ Top-Level Elements include a sequence number. This is a special-case for the KeymapNotify event in the core protocol, and should not be used in any other event. + If the optional xge attribute is true, the event is an X Generic Event and + will be treated as such. + + The no-sequence-number and xge attribute can not be combined. + <error name="identifier" number="integer"> structure contents </error> diff --git a/src/xcb.xsd b/src/xcb.xsd index 4ef269e..819495b 100644 --- a/src/xcb.xsd +++ b/src/xcb.xsd @@ -324,6 +324,7 @@ authorization from the authors. </xsd:sequence> <xsd:attribute name="no-sequence-number" type="xsd:boolean" use="optional" /> + <xsd:attribute name="xge" type="xsd:boolean" use="optional" /> </xsd:extension> </xsd:complexContent> </xsd:complexType> diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py index 5469cd9..a4614d9 100644 --- a/xcbgen/xtypes.py +++ b/xcbgen/xtypes.py @@ -602,25 +602,41 @@ class Event(ComplexType): self.has_seq = not bool(elt.get('no-sequence-number')) + self.is_ge_event = bool(elt.get('xge')) + self.doc = None for item in list(elt): if item.tag == 'doc': self.doc = Doc(name, item) - + def add_opcode(self, opcode, name, main): self.opcodes[name] = opcode if main: self.name = name def resolve(self, module): + def add_event_header(): + self.fields.append(Field(tcard8, tcard8.name, 'response_type', False, True, True)) + if self.has_seq: + self.fields.append(_placeholder_byte) + self.fields.append(Field(tcard16, tcard16.name, 'sequence', False, True, True)) + + def add_ge_event_header(): + self.fields.append(Field(tcard8, tcard8.name, 'response_type', False, True, True)) + self.fields.append(Field(tcard8, tcard8.name, 'extension', False, True, True)) + self.fields.append(Field(tcard16, tcard16.name, 'sequence', False, True, True)) + self.fields.append(Field(tcard32, tcard32.name, 'length', False, True, True)) + self.fields.append(Field(tcard16, tcard16.name, 'event_type', False, True, True)) + if self.resolved: return # Add the automatic protocol fields - self.fields.append(Field(tcard8, tcard8.name, 'response_type', False, True, True)) - if self.has_seq: - self.fields.append(_placeholder_byte) - self.fields.append(Field(tcard16, tcard16.name, 'sequence', False, True, True)) + if self.is_ge_event: + add_ge_event_header() + else: + add_event_header() + ComplexType.resolve(self, module) out = __main__.output['event'] |