Merge branch 'release-4.16.1'

[i3/i3] / src / xcb.c

diff --git a/src/xcb.c b/src/xcb.c
index 9d181cfa8c8ba28dbb4b5a35e14aca1c2ec2ce4d..bdfb08bc4d9dd994bc75a7050fa8b06019993eed 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "xcb.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -30,16 +28,21 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims,
         visual = XCB_COPY_FROM_PARENT;
     }
 
-    xcb_create_window(conn,
-                      depth,
-                      result,                                  /* the window id */
-                      root,                                    /* parent == root */
-                      dims.x, dims.y, dims.width, dims.height, /* dimensions */
-                      0,                                       /* border = 0, we draw our own */
-                      window_class,
-                      visual,
-                      mask,
-                      values);
+    xcb_void_cookie_t gc_cookie = xcb_create_window(conn,
+                                                    depth,
+                                                    result,                                  /* the window id */
+                                                    root,                                    /* parent == root */
+                                                    dims.x, dims.y, dims.width, dims.height, /* dimensions */
+                                                    0,                                       /* border = 0, we draw our own */
+                                                    window_class,
+                                                    visual,
+                                                    mask,
+                                                    values);
+
+    xcb_generic_error_t *error = xcb_request_check(conn, gc_cookie);
+    if (error != NULL) {
+        ELOG("Could not create window. Error code: %d.\n", error->error_code);
+    }
 
     /* Set the cursor */
     if (xcursor_supported) {
@@ -64,28 +67,6 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims,
     return result;
 }
 
-/*
- * Draws a line from x,y to to_x,to_y using the given color
- *
- */
-void xcb_draw_line(xcb_connection_t *conn, xcb_drawable_t drawable, xcb_gcontext_t gc,
-                   uint32_t colorpixel, uint32_t x, uint32_t y, uint32_t to_x, uint32_t to_y) {
-    xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){colorpixel});
-    xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, drawable, gc, 2,
-                  (xcb_point_t[]){{x, y}, {to_x, to_y}});
-}
-
-/*
- * Draws a rectangle from x,y with width,height using the given color
- *
- */
-void xcb_draw_rect(xcb_connection_t *conn, xcb_drawable_t drawable, xcb_gcontext_t gc,
-                   uint32_t colorpixel, uint32_t x, uint32_t y, uint32_t width, uint32_t height) {
-    xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){colorpixel});
-    xcb_rectangle_t rect = {x, y, width, height};
-    xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect);
-}
-
 /*
  * Generates a configure_notify_event with absolute coordinates (relative to the X root
  * window, not to the client’s frame) for the given client.
@@ -129,15 +110,6 @@ void send_take_focus(xcb_window_t window, xcb_timestamp_t timestamp) {
     free(event);
 }
 
-/*
- * Raises the given window (typically client->frame) above all other windows
- *
- */
-void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window) {
-    uint32_t values[] = {XCB_STACK_MODE_ABOVE};
-    xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, values);
-}
-
 /*
  * Configures the given window to have the size/position specified by given rect
  *
@@ -203,18 +175,6 @@ bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom) {
     return false;
 }
 
-/**
- * Moves the mouse pointer into the middle of rect.
- *
- */
-void xcb_warp_pointer_rect(xcb_connection_t *conn, Rect *rect) {
-    int mid_x = rect->x + (rect->width / 2);
-    int mid_y = rect->y + (rect->height / 2);
-
-    LOG("warp pointer to: %d %d\n", mid_x, mid_y);
-    xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, mid_x, mid_y);
-}
-
 /*
  * Set the cursor of the root window to the given cursor id.
  * This function should only be used if xcursor_supported == false.
@@ -346,20 +306,12 @@ release_grab:
  * Grab the specified buttons on a window when managing it.
  *
  */
-void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, bool bind_scrollwheel) {
-    uint8_t buttons[3];
-    int num = 0;
-
-    if (bind_scrollwheel) {
-        buttons[num++] = XCB_BUTTON_INDEX_ANY;
-    } else {
-        buttons[num++] = XCB_BUTTON_INDEX_1;
-        buttons[num++] = XCB_BUTTON_INDEX_2;
-        buttons[num++] = XCB_BUTTON_INDEX_3;
-    }
-
-    for (int i = 0; i < num; i++) {
+void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, int *buttons) {
+    int i = 0;
+    while (buttons[i] > 0) {
         xcb_grab_button(conn, false, window, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC,
                         XCB_GRAB_MODE_ASYNC, root, XCB_NONE, buttons[i], XCB_BUTTON_MASK_ANY);
+
+        i++;
     }
 }