Merge branch 'tree' into next

[i3/i3] / src / xcb.c

diff --git a/src/xcb.c b/src/xcb.c
index b88b7673346c5c863e5cdf62c6a9a92b40c798f9..2c194013b09172d2fc784c11dfc3362569e053fe 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -62,6 +62,8 @@ i3Font load_font(const char *pattern, bool fallback) {
 
     new.height = reply->font_ascent + reply->font_descent;
 
+    free(reply);
+
     return new;
 }
 
@@ -167,23 +169,29 @@ void xcb_draw_rect(xcb_connection_t *conn, xcb_drawable_t drawable, xcb_gcontext
  *
  */
 void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window) {
-    xcb_configure_notify_event_t generated_event;
-
-    generated_event.event = window;
-    generated_event.window = window;
-    generated_event.response_type = XCB_CONFIGURE_NOTIFY;
-
-    generated_event.x = r.x;
-    generated_event.y = r.y;
-    generated_event.width = r.width;
-    generated_event.height = r.height;
-
-    generated_event.border_width = 0;
-    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);
+    /* 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_configure_notify_event_t *generated_event = event;
+
+    generated_event->event = window;
+    generated_event->window = window;
+    generated_event->response_type = XCB_CONFIGURE_NOTIFY;
+
+    generated_event->x = r.x;
+    generated_event->y = r.y;
+    generated_event->width = r.width;
+    generated_event->height = r.height;
+
+    generated_event->border_width = 0;
+    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_flush(conn);
+
+    free(event);
 }
 
 /*
@@ -211,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));
-
-    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;
+    /* 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;
 
     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);
 }
 
 /*
@@ -246,7 +257,7 @@ void xcb_get_numlock_mask(xcb_connection_t *conn) {
                            XCB_MOD_MASK_5 };
 
     /* Request the modifier map */
-    cookie = xcb_get_modifier_mapping_unchecked(conn);
+    cookie = xcb_get_modifier_mapping(conn);
 
     /* Get the keysymbols */
     keysyms = xcb_key_symbols_alloc(conn);