From 90d68d7ea0f25b579f91f26ca3c27c9536a3a44d Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 21 Nov 2016 00:37:17 -0800 Subject: [PATCH] Remove some now-unused functions from xcb.[ch] (#2574) xcb_draw_line is unused since commit d7f9700ba41db61788a7b0f22350cdd9d008a907 xcb_draw_rect is unused since commit a79d33fc7fd41ab6e9b853f5356eeec64aa66ef5 xcb_raise_window is unused since commit 7208d010489ba9ebd79b20aa830ae7fb176f05dc xcb_warp_pointer is unused since commit 755c618cd41815c72d30fd0d3c4770557e952df2 --- include/xcb.h | 28 ---------------------------- src/xcb.c | 43 ------------------------------------------- 2 files changed, 71 deletions(-) diff --git a/include/xcb.h b/include/xcb.h index 94f2945d..92be7b89 100644 --- a/include/xcb.h +++ b/include/xcb.h @@ -69,22 +69,6 @@ extern unsigned int xcb_numlock_mask; xcb_window_t create_window(xcb_connection_t *conn, Rect r, uint16_t depth, xcb_visualid_t visual, uint16_t window_class, enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values); -/** - * 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); - -/** - * 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); - /** * Generates a configure_notify_event with absolute coordinates (relative to * the X root window, not to the client’s frame) for the given client. @@ -98,12 +82,6 @@ void fake_absolute_configure_notify(Con *con); */ void send_take_focus(xcb_window_t window, xcb_timestamp_t timestamp); -/** - * Raises the given window (typically client->frame) above all other windows - * - */ -void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window); - /** * Configures the given window to have the size/position specified by given rect * @@ -122,12 +100,6 @@ xcb_atom_t xcb_get_preferred_window_type(xcb_get_property_reply_t *reply); */ bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom); -/** - * Moves the mouse pointer into the middle of rect. - * - */ -void xcb_warp_pointer_rect(xcb_connection_t *conn, Rect *rect); - /** * Set the cursor of the root window to the given cursor id. * This function should only be used if xcursor_supported == false. diff --git a/src/xcb.c b/src/xcb.c index 900840a2..726d1e89 100644 --- a/src/xcb.c +++ b/src/xcb.c @@ -62,28 +62,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. @@ -127,15 +105,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 * @@ -201,18 +170,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. -- 2.39.5