Fixed bug in event decoding

petli · petli · commit 3e1e2c55c542 · 2001-12-14T17:03:10.000Z
diff --git a/Xlib/protocol/ChangeLog b/Xlib/protocol/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-14  Peter Liljenberg  <peter.liljenberg@esdgkonsult.com>
+
+	* display.py (Display.parse_event_response): 
+	* rq.py (Event.__init__): Fixed bug in event type decoding: bit
+	0-6 is the event type, and bit 7 is set if the event was sent by
+	SendEvent. 
+	
+
 2001-01-16    <petli@cendio.se>
 
 	* event.py: Changed some class names so that they correspond
diff --git a/Xlib/protocol/display.py b/Xlib/protocol/display.py
@@ -1,4 +1,4 @@
-# $Id: display.py,v 1.14 2001-12-04 11:41:01 petli Exp $
+# $Id: display.py,v 1.15 2001-12-14 17:03:10 petli Exp $
 #
 # Xlib.protocol.display -- core display communication
 #
@@ -733,9 +733,12 @@ def parse_request_response(self, request):
 	
 
     def parse_event_response(self, etype):
-	estruct = self.event_classes.get(etype, event.AnyEvent)
+	# Skip bit 8 at lookup, that is set if this event came from an
+	# SendEvent
+	estruct = self.event_classes.get(etype & 0x7f, event.AnyEvent)
 
 	e = estruct(display = self, binarydata = self.data_recv[:32])
+	
 	self.data_recv = buffer(self.data_recv, 32)
 
 	# Drop all requests having an error handler,
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -1,4 +1,4 @@
-# $Id: rq.py,v 1.11 2001-02-19 11:16:10 petli Exp $
+# $Id: rq.py,v 1.12 2001-12-14 17:03:10 petli Exp $
 #
 # Xlib.protocol.rq -- structure primitives for request, events and errors
 #
@@ -1383,15 +1383,19 @@ def __repr__(self):
     
 	
 class Event(GetAttrData):
-    def __init__(self, binarydata = None, display = None, **keys):
+    def __init__(self, binarydata = None, display = None,
+		 **keys):
 	if binarydata:
 	    self._binary = binarydata
 	    self._data, data = self._fields.parse_binary(binarydata, display,
 							 rawdict = 1)
+	    # split event type into type and send_event bit
+	    self._data['send_event'] = not not self._data['type'] & 0x80
+	    self._data['type'] = self._data['type'] & 0x7f
 	else:
 	    if self._code:
 		keys['type'] = self._code
-
+	    
 	    keys['sequence_number'] = 0
 	    
 	    self._binary = apply(self._fields.to_binary, (), keys)
diff --git a/examples/draw.py b/examples/draw.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# $Id: draw.py,v 1.4 2000-12-21 12:23:07 petli Exp $
+# $Id: draw.py,v 1.5 2001-12-14 17:03:10 petli Exp $
 #
 # examples/draw.py -- high-level xlib test application.
 #
@@ -61,10 +61,14 @@ def __init__(self, display):
 
 	# Set some WM info
 
+	self.WM_DELETE_WINDOW = self.d.intern_atom('WM_DELETE_WINDOW')
+	self.WM_PROTOCOLS = self.d.intern_atom('WM_PROTOCOLS')
+	
 	self.window.set_wm_name('Xlib example: draw.py')
 	self.window.set_wm_icon_name('draw.py')
 	self.window.set_wm_class('draw', 'XlibExample')
 
+	self.window.set_wm_protocols([self.WM_DELETE_WINDOW])
 	self.window.set_wm_hints(flags = Xutil.StateHint,
 				 initial_state = Xutil.NormalState)
 
@@ -106,6 +110,12 @@ def loop(self):
 	    if e.type == X.MotionNotify and current:
 		current.motion(e)
 
+	    if e.type == X.ClientMessage:
+		if e.client_type == self.WM_PROTOCOLS:
+		    fmt, data = e.data
+		    if fmt == 32 and data[0] == self.WM_DELETE_WINDOW:
+			sys.exit(0)
+	    
 # A drawed objects, consisting of either a single
 # romboid, or two romboids connected by a winding line
 
