[Xcb-commit] 3 commits - configure.ac event icccm

[Arnaud Fontaine]

 configure.ac      |    2 +-
 event/event.c     |    1 +
 event/xcb_event.h |    2 --
 icccm/icccm.c     |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 48a8d85065701ac76facf17542e2458945aebc3c
Author: Arnaud Fontaine <arnau at debian.org>
Date:   Wed Jul 15 16:26:56 2009 +0100

    event: fix compiler warning due to missing include for memset

diff --git a/event/event.c b/event/event.c
index 1332a33..7faac1c 100644
--- a/event/event.c
+++ b/event/event.c
@@ -28,6 +28,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "xcb_event.h"
 #include "../xcb-util-common.h"
commit 857ea75bb9df7a3b335c06e9b90dd54230b14bb1
Author: Arnaud Fontaine <arnau at debian.org>
Date:   Wed Jul 15 16:23:41 2009 +0100

    event: update to libxcb 1.4
    
    Remove useless macros to get error information because libxcb 1.4 now
    provides additional fields (major_opcode, minor_opcode and
    resource_id) like Xlib.

diff --git a/configure.ac b/configure.ac
index 714b617..61811a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_SUBST(xcbincludedir)
 pkgconfigdir='${libdir}/pkgconfig'
 AC_SUBST(pkgconfigdir)
 
-PKG_CHECK_MODULES(XCB, xcb >= 1.2)
+PKG_CHECK_MODULES(XCB, xcb >= 1.4)
 
 ######
 # Check version of xcb-proto that xcb was compiled against
diff --git a/event/xcb_event.h b/event/xcb_event.h
index 05b9cac..9bd286b 100644
--- a/event/xcb_event.h
+++ b/event/xcb_event.h
@@ -55,8 +55,6 @@ extern "C" {
 #define XCB_EVENT_RESPONSE_TYPE_MASK (0x7f)
 #define XCB_EVENT_RESPONSE_TYPE(e)   (e->response_type &  XCB_EVENT_RESPONSE_TYPE_MASK)
 #define XCB_EVENT_SENT(e)            (e->response_type & ~XCB_EVENT_RESPONSE_TYPE_MASK)
-#define XCB_EVENT_ERROR_TYPE(e) (*((uint8_t *) e + 1))
-#define XCB_EVENT_REQUEST_TYPE(e) (*((uint8_t *) e + 10))
 
 typedef int (*xcb_generic_event_handler_t)(void *data, xcb_connection_t *c, xcb_generic_event_t *event);
 typedef int (*xcb_generic_error_handler_t)(void *data, xcb_connection_t *c, xcb_generic_error_t *error);
commit 12b991f6b76f981c7f92f30413a4aea9c125b8e4
Author: Julien Danjou <julien at danjou.info>
Date:   Thu Jun 25 16:48:00 2009 +0200

    icccm: fix atoms_len with new libxcb
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/icccm/icccm.c b/icccm/icccm.c
index 9d13334..7cc341a 100644
--- a/icccm/icccm.c
+++ b/icccm/icccm.c
@@ -708,7 +708,7 @@ xcb_get_wm_protocols_reply(xcb_connection_t *c,
   }
 
   protocols->_reply = reply;
-  protocols->atoms_len = xcb_get_property_value_length(protocols->_reply);
+  protocols->atoms_len = xcb_get_property_value_length(protocols->_reply) /  (reply->format / 8);
   protocols->atoms = (xcb_atom_t *) xcb_get_property_value(protocols->_reply);
 
   return 1;