diff --git a/include/drag.h b/include/drag.h index 5d4ca581e..924ff98c6 100644 --- a/include/drag.h +++ b/include/drag.h @@ -51,5 +51,5 @@ typedef enum { * */ drag_result_t drag_pointer(Con *con, const xcb_button_press_event_t *event, - xcb_window_t confine_to, border_t border, int cursor, + xcb_window_t confine_to, int cursor, callback_t callback, const void *extra); diff --git a/src/drag.c b/src/drag.c index af019b255..57d9f9a9b 100644 --- a/src/drag.c +++ b/src/drag.c @@ -138,7 +138,7 @@ static void xcb_drag_prepare_cb(EV_P_ ev_prepare *w, int revents) { * */ drag_result_t drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t confine_to, - border_t border, int cursor, callback_t callback, const void *extra) { + int cursor, callback_t callback, const void *extra) { xcb_cursor_t xcursor = (cursor && xcursor_supported) ? xcursor_get_cursor(cursor) : XCB_NONE; /* Grab the pointer */ diff --git a/src/floating.c b/src/floating.c index b022ee193..6772128ae 100644 --- a/src/floating.c +++ b/src/floating.c @@ -595,7 +595,7 @@ void floating_drag_window(Con *con, const xcb_button_press_event_t *event) { Rect initial_rect = con->rect; /* Drag the window */ - drag_result_t drag_result = drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, XCURSOR_CURSOR_MOVE, drag_window_callback, event); + drag_result_t drag_result = drag_pointer(con, event, XCB_NONE, XCURSOR_CURSOR_MOVE, drag_window_callback, event); if (!con_exists(con)) { DLOG("The container has been closed in the meantime.\n"); @@ -711,7 +711,7 @@ void floating_resize_window(Con *con, const bool proportional, /* get the initial rect in case of revert/cancel */ Rect initial_rect = con->rect; - drag_result_t drag_result = drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, cursor, resize_window_callback, ¶ms); + drag_result_t drag_result = drag_pointer(con, event, XCB_NONE, cursor, resize_window_callback, ¶ms); if (!con_exists(con)) { DLOG("The container has been closed in the meantime.\n"); diff --git a/src/resize.c b/src/resize.c index 5ddee5c1e..a63e337b9 100644 --- a/src/resize.c +++ b/src/resize.c @@ -208,7 +208,7 @@ void resize_graphical_handler(Con *first, Con *second, orientation_t orientation const struct callback_params params = {orientation, output, helpwin, &new_position}; /* `drag_pointer' blocks until the drag is completed. */ - drag_result_t drag_result = drag_pointer(NULL, event, grabwin, BORDER_TOP, 0, resize_callback, ¶ms); + drag_result_t drag_result = drag_pointer(NULL, event, grabwin, 0, resize_callback, ¶ms); xcb_destroy_window(conn, helpwin); xcb_destroy_window(conn, grabwin);