mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert to new pointer enums 

References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4575
This commit is contained in:
Simon Ser 2024-02-28 17:49:58 +01:00 committed by Simon Zeni
parent 469411d484
commit fca8474e9b
11 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sway/input/cursor.h
View File

@ -114,7 +114,7 @@ void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
void dispatch_cursor_button(struct sway_cursor *cursor,
struct wlr_input_device *device, uint32_t time_msec, uint32_t button,
enum wlr_button_state state);
enum wl_pointer_button_state state);
void dispatch_cursor_axis(struct sway_cursor *cursor,
struct wlr_pointer_axis_event *event);

6
include/sway/input/seat.h
View File

@ -17,7 +17,7 @@ struct sway_seat;
struct sway_seatop_impl {
void (*button)(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state);
enum wl_pointer_button_state state);
void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec);
void (*pointer_axis)(struct sway_seat *seat,
struct wlr_pointer_axis_event *event);
@ -286,13 +286,13 @@ struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
struct sway_workspace *workspace);
void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
uint32_t button, enum wlr_button_state state);
uint32_t button, enum wl_pointer_button_state state);
void seat_consider_warp_to_focus(struct sway_seat *seat);
void seatop_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state);
enum wl_pointer_button_state state);
void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec);

14
sway/commands/seat/cursor.c
View File

@ -84,12 +84,12 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
static struct cmd_results *press_or_release(struct sway_cursor *cursor,
char *action, char *button_str) {
enum wlr_button_state state;
enum wl_pointer_button_state state;
uint32_t button;
if (strcasecmp(action, "press") == 0) {
state = WLR_BUTTON_PRESSED;
state = WL_POINTER_BUTTON_STATE_PRESSED;
} else if (strcasecmp(action, "release") == 0) {
state = WLR_BUTTON_RELEASED;
state = WL_POINTER_BUTTON_STATE_RELEASED;
} else {
return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
}
@ -104,16 +104,16 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor,
} else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
|| button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) {
// Dispatch axis event
enum wlr_axis_orientation orientation =
enum wl_pointer_axis orientation =
(button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN)
? WLR_AXIS_ORIENTATION_VERTICAL
: WLR_AXIS_ORIENTATION_HORIZONTAL;
? WL_POINTER_AXIS_VERTICAL_SCROLL
: WL_POINTER_AXIS_HORIZONTAL_SCROLL;
double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT)
? -1 : 1;
struct wlr_pointer_axis_event event = {
.pointer = NULL,
.time_msec = 0,
.source = WLR_AXIS_SOURCE_WHEEL,
.source = WL_POINTER_AXIS_SOURCE_WHEEL,
.orientation = orientation,
.delta = delta * 15,
.delta_discrete = delta

16
sway/input/cursor.c
View File

@ -356,7 +356,7 @@ static void handle_pointer_motion_absolute(
void dispatch_cursor_button(struct sway_cursor *cursor,
struct wlr_input_device *device, uint32_t time_msec, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
if (time_msec == 0) {
time_msec = get_current_time_msec();
}
@ -368,7 +368,7 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
struct wlr_pointer_button_event *event = data;
if (event->state == WLR_BUTTON_PRESSED) {
if (event->state == WL_POINTER_BUTTON_STATE_PRESSED) {
cursor->pressed_button_count++;
} else {
if (cursor->pressed_button_count > 0) {
@ -430,7 +430,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
if (cursor->pointer_touch_id == cursor->seat->touch_id) {
cursor->pointer_touch_up = true;
dispatch_cursor_button(cursor, &event->touch->base,
event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
}
} else {
seatop_touch_up(seat, event);
@ -448,7 +448,7 @@ static void handle_touch_cancel(struct wl_listener *listener, void *data) {
if (cursor->pointer_touch_id == cursor->seat->touch_id) {
cursor->pointer_touch_up = true;
dispatch_cursor_button(cursor, &event->touch->base,
event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
}
} else {
seatop_touch_cancel(seat, event);
@ -661,7 +661,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
event->state == WLR_TABLET_TOOL_TIP_UP) {
cursor->simulating_pointer_from_tool_tip = false;
dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
BTN_LEFT, WLR_BUTTON_RELEASED);
BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
} else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
// If we started holding the tool tip down on a surface that accepts
@ -673,7 +673,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
} else {
cursor->simulating_pointer_from_tool_tip = true;
dispatch_cursor_button(cursor, &event->tablet->base,
event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED);
event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
}
} else {
@ -776,13 +776,13 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
case WLR_BUTTON_PRESSED:
if (cursor->tool_buttons == 0) {
dispatch_cursor_button(cursor, &event->tablet->base,
event->time_msec, BTN_RIGHT, event->state);
event->time_msec, BTN_RIGHT, WL_POINTER_BUTTON_STATE_PRESSED);
}
break;
case WLR_BUTTON_RELEASED:
if (cursor->tool_buttons <= 1) {
dispatch_cursor_button(cursor, &event->tablet->base,
event->time_msec, BTN_RIGHT, event->state);
event->time_msec, BTN_RIGHT, WL_POINTER_BUTTON_STATE_RELEASED);
}
break;
}

4
sway/input/seat.c
View File

@ -1520,7 +1520,7 @@ struct seat_config *seat_get_config_by_name(const char *name) {
}
void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
uint32_t button, enum wlr_button_state state) {
uint32_t button, enum wl_pointer_button_state state) {
seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
time_msec, button, state);
}
@ -1557,7 +1557,7 @@ void seatop_unref(struct sway_seat *seat, struct sway_container *con) {
void seatop_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
if (seat->seatop_impl->button) {
seat->seatop_impl->button(seat, time_msec, device, button, state);
}

34
sway/input/seatop_default.c
View File

@ -290,7 +290,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
static bool trigger_pointer_button_binding(struct sway_seat *seat,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state, uint32_t modifiers,
enum wl_pointer_button_state state, uint32_t modifiers,
bool on_titlebar, bool on_border, bool on_contents, bool on_workspace) {
// We can reach this for non-pointer devices if we're currently emulating
// pointer input for one. Emulated input should not trigger bindings. The
@ -304,7 +304,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
char *device_identifier = device ? input_device_get_identifier(device)
: strdup("*");
struct sway_binding *binding = NULL;
if (state == WLR_BUTTON_PRESSED) {
if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
state_add_button(e, button);
binding = get_active_mouse_binding(e,
config->current_mode->mouse_bindings, modifiers, false,
@ -329,7 +329,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
struct sway_cursor *cursor = seat->cursor;
// Determine what's under the cursor
@ -362,7 +362,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
// Handle clicking an empty workspace
if (node && node->type == N_WORKSPACE) {
if (state == WLR_BUTTON_PRESSED) {
if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
seat_set_focus(seat, node);
transaction_commit_dirty();
}
@ -377,7 +377,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
seat_set_focus_layer(seat, layer);
transaction_commit_dirty();
}
if (state == WLR_BUTTON_PRESSED) {
if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
seatop_begin_down_on_surface(seat, surface, sx, sy);
}
seat_pointer_notify_button(seat, time_msec, button, state);
@ -386,7 +386,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
// Handle tiling resize via border
if (cont && resize_edge && button == BTN_LEFT &&
state == WLR_BUTTON_PRESSED && !is_floating) {
state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating) {
// If a resize is triggered on a tabbed or stacked container, change
// focus to the tab which already had inactive focus -- otherwise, we'd
// change the active tab when the user probably just wanted to resize.
@ -404,7 +404,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
// Handle tiling resize via mod
bool mod_pressed = modifiers & config->floating_mod;
if (cont && !is_floating_or_child && mod_pressed &&
state == WLR_BUTTON_PRESSED) {
state == WL_POINTER_BUTTON_STATE_PRESSED) {
uint32_t btn_resize = config->floating_mod_inverse ?
BTN_LEFT : BTN_RIGHT;
if (button == btn_resize) {
@ -432,7 +432,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
}
// Handle changing focus when clicking on a container
if (cont && state == WLR_BUTTON_PRESSED) {
if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
// Default case: focus the container that was just clicked.
node = &cont->node;
@ -453,7 +453,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
// Handle beginning floating move
if (cont && is_floating_or_child && !is_fullscreen_or_child &&
state == WLR_BUTTON_PRESSED) {
state == WL_POINTER_BUTTON_STATE_PRESSED) {
uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
if (button == btn_move && (mod_pressed || on_titlebar)) {
seatop_begin_move_floating(seat, container_toplevel_ancestor(cont));
@ -463,7 +463,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
// Handle beginning floating resize
if (cont && is_floating_or_child && !is_fullscreen_or_child &&
state == WLR_BUTTON_PRESSED) {
state == WL_POINTER_BUTTON_STATE_PRESSED) {
// Via border
if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {
seat_set_focus_container(seat, cont);
@ -489,7 +489,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
// Handle moving a tiling container
if (config->tiling_drag && (mod_pressed || on_titlebar) &&
state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating_or_child &&
cont && cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
// If moving a container by its title bar, use a threshold for the drag
if (!mod_pressed && config->tiling_drag_threshold > 0) {
@ -502,14 +502,14 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
}
// Handle mousedown on a container surface
if (surface && cont && state == WLR_BUTTON_PRESSED) {
if (surface && cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
seatop_begin_down(seat, cont, sx, sy);
seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
seat_pointer_notify_button(seat, time_msec, button, WL_POINTER_BUTTON_STATE_PRESSED);
return;
}
// Handle clicking a container surface or decorations
if (cont && state == WLR_BUTTON_PRESSED) {
if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
seat_pointer_notify_button(seat, time_msec, button, state);
return;
}
@ -684,7 +684,7 @@ static void handle_touch_down(struct sway_seat *seat,
pointer_motion(cursor, event->time_msec, &event->touch->base, dx, dy,
dx, dy);
dispatch_cursor_button(cursor, &event->touch->base, event->time_msec,
BTN_LEFT, WLR_BUTTON_PRESSED);
BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
}
}
@ -694,9 +694,9 @@ static void handle_touch_down(struct sway_seat *seat,
static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
switch (event->orientation) {
case WLR_AXIS_ORIENTATION_VERTICAL:
case WL_POINTER_AXIS_VERTICAL_SCROLL:
return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
case WLR_AXIS_ORIENTATION_HORIZONTAL:
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
return event->delta < 0 ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT;
default:
sway_log(SWAY_DEBUG, "Unknown axis orientation");

2
sway/input/seatop_down.c
View File

@ -142,7 +142,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
seat_pointer_notify_button(seat, time_msec, button, state);
if (seat->cursor->pressed_button_count == 0) {

2
sway/input/seatop_move_floating.c
View File

@ -21,7 +21,7 @@ static void finalize_move(struct sway_seat *seat) {
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
if (seat->cursor->pressed_button_count == 0) {
finalize_move(seat);
}

2
sway/input/seatop_move_tiling.c
View File

@ -405,7 +405,7 @@ static void finalize_move(struct sway_seat *seat) {
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
if (seat->cursor->pressed_button_count == 0) {
finalize_move(seat);
}

2
sway/input/seatop_resize_floating.c
View File

@ -20,7 +20,7 @@ struct seatop_resize_floating_event {
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
struct seatop_resize_floating_event *e = seat->seatop_data;
struct sway_container *con = e->con;

2
sway/input/seatop_resize_tiling.c
View File

@ -45,7 +45,7 @@ static struct sway_container *container_get_resize_sibling(
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
enum wlr_button_state state) {
enum wl_pointer_button_state state) {
struct seatop_resize_tiling_event *e = seat->seatop_data;
if (seat->cursor->pressed_button_count == 0) {