sawfish r4208 - trunk/src

[jkozicki svn gnome org]

Author: jkozicki
Date: Thu Jan 17 00:30:08 2008
New Revision: 4208
URL: http://svn.gnome.org/viewvc/sawfish?rev=4208&view=rev

Log:
apply patch by Thadeu Lima de Souza Cascardo

This is a patch for Debian bug #406559, and possibly #403100, too. It seems these are ultimately caused by Xlib "helpfully" converting 32 bit messages from the server to the client's native long type, which is bad for sawfish since rep does distinguish these.

A longer description can be found in the patch's author's message in http://bugs.debian.org/406559



Modified:
   trunk/src/events.c

Modified: trunk/src/events.c
==============================================================================
--- trunk/src/events.c	(original)
+++ trunk/src/events.c	Thu Jan 17 00:30:08 2008
@@ -21,6 +21,7 @@
 
 #include "sawmill.h"
 #include <limits.h>
+#include <stdint.h>
 #include <string.h>
 #include <time.h>
 #include <X11/extensions/shape.h>
@@ -641,7 +642,10 @@
     case 32:
 	data = Fmake_vector (rep_MAKE_INT(5), Qnil);
 	for (i = 0; i < 5; i++)
-	    rep_VECTI(data,i) = rep_make_long_uint (ev->xclient.data.l[i]);
+	{
+	     unsigned long l = (uint32_t) ev->xclient.data.l[i];
+	     rep_VECTI(data,i) = rep_make_long_uint (l);
+	}
 	break;
 
     default: