Merge branch 'tree' into next

[i3/i3] / src / xcb.c

diff --git a/src/xcb.c b/src/xcb.c
index 545e2c60494b897d7b222e4efbf2769b8e4f7c7c..2c194013b09172d2fc784c11dfc3362569e053fe 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -188,7 +188,7 @@ void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window)
     generated_event->above_sibling = XCB_NONE;
     generated_event->override_redirect = false;
 
-    xcb_send_event(conn, false, window, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)&generated_event);
+    xcb_send_event(conn, false, window, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)generated_event);
     xcb_flush(conn);
 
     free(event);
@@ -219,19 +219,22 @@ void fake_absolute_configure_notify(Con *con) {
  *
  */
 void send_take_focus(xcb_window_t window) {
-    xcb_client_message_event_t ev;
-
-    memset(&ev, 0, sizeof(xcb_client_message_event_t));
+    /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes.
+     * In order to properly initialize these bytes, we allocate 32 bytes even
+     * though we only need less for an xcb_configure_notify_event_t */
+    void *event = scalloc(32);
+    xcb_client_message_event_t *ev = event;
 
-    ev.response_type = XCB_CLIENT_MESSAGE;
-    ev.window = window;
-    ev.type = A_WM_PROTOCOLS;
-    ev.format = 32;
-    ev.data.data32[0] = A_WM_TAKE_FOCUS;
-    ev.data.data32[1] = XCB_CURRENT_TIME;
+    ev->response_type = XCB_CLIENT_MESSAGE;
+    ev->window = window;
+    ev->type = A_WM_PROTOCOLS;
+    ev->format = 32;
+    ev->data.data32[0] = A_WM_TAKE_FOCUS;
+    ev->data.data32[1] = XCB_CURRENT_TIME;
 
     DLOG("Sending WM_TAKE_FOCUS to the client\n");
-    xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)&ev);
+    xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev);
+    free(event);
 }
 
 /*