mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-09 08:21:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: Refactor cursor events

Browse source 
Makes relative and absolute events go through the same system.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2021-10-17 21:40:36 +00:00
parent 455a1c4d2c
commit 4e05eb70ed
1 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/cursor.c
View file

@ -142,16 +142,30 @@ input_inhibit_blocks_surface(struct seat *seat, struct wl_resource *resource)
} }
static void static void
process_cursor_motion(struct server *server, uint32_t time) process_cursor_motion(struct seat *seat, uint32_t time_msec,
struct wlr_input_device *device, double dx, double dy,
double dx_unaccel, double dy_unaccel)
{ {
struct server *server = seat->server;
/*
* The cursor doesn't move unless we tell it to. The cursor
* automatically handles constraining the motion to the output layout,
* as well as any special configuration applied for the specific input
* device which generated the event. You can pass NULL for the device
* if you want to move the cursor around without any input.
*/
wlr_cursor_move(seat->cursor, device, dx, dy);
static bool cursor_name_set_by_server; static bool cursor_name_set_by_server;
/* If the mode is non-passthrough, delegate to those functions. */ /* If the mode is non-passthrough, delegate to those functions. */
if (server->input_mode == LAB_INPUT_STATE_MOVE) { if (server->input_mode == LAB_INPUT_STATE_MOVE) {
process_cursor_move(server, time); process_cursor_move(server, time_msec);
return; return;
} else if (server->input_mode == LAB_INPUT_STATE_RESIZE) { } else if (server->input_mode == LAB_INPUT_STATE_RESIZE) {
process_cursor_resize(server, time); process_cursor_resize(server, time_msec);
return; return;
} else if (server->input_mode == LAB_INPUT_STATE_MENU) { } else if (server->input_mode == LAB_INPUT_STATE_MENU) {
menu_set_selected(server->rootmenu, menu_set_selected(server->rootmenu,
@ -216,7 +230,7 @@ process_cursor_motion(struct server *server, uint32_t time)
* The enter event contains coordinates, so we only need * The enter event contains coordinates, so we only need
* to notify on motion if the focus did not change. * to notify on motion if the focus did not change.
*/ */
wlr_seat_pointer_notify_motion(wlr_seat, time, sx, sy); wlr_seat_pointer_notify_motion(wlr_seat, time_msec, sx, sy);
} }
} else { } else {
/* /*
@ -246,16 +260,8 @@ cursor_motion(struct wl_listener *listener, void *data)
struct seat *seat = wl_container_of(listener, seat, cursor_motion); struct seat *seat = wl_container_of(listener, seat, cursor_motion);
struct wlr_event_pointer_motion *event = data; struct wlr_event_pointer_motion *event = data;
/* process_cursor_motion(seat, event->time_msec, event->device,
* The cursor doesn't move unless we tell it to. The cursor event->delta_x, event->delta_y, event->unaccel_dx, event->unaccel_dy);
* automatically handles constraining the motion to the output layout,
* as well as any special configuration applied for the specific input
* device which generated the event. You can pass NULL for the device
* if you want to move the cursor around without any input.
*/
wlr_cursor_move(seat->cursor, event->device, event->delta_x,
event->delta_y);
process_cursor_motion(seat->server, event->time_msec);
} }
void void
@ -284,8 +290,16 @@ cursor_motion_absolute(struct wl_listener *listener, void *data)
struct seat *seat = wl_container_of( struct seat *seat = wl_container_of(
listener, seat, cursor_motion_absolute); listener, seat, cursor_motion_absolute);
struct wlr_event_pointer_motion_absolute *event = data; struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(seat->cursor, event->device, event->x, event->y);
process_cursor_motion(seat->server, event->time_msec); double lx, ly;
wlr_cursor_absolute_to_layout_coords(seat->cursor, event->device,
event->x, event->y, &lx, &ly);
double dx = lx - seat->cursor->x;
double dy = ly - seat->cursor->y;
process_cursor_motion(seat, event->time_msec, event->device,
dx, dy, dx, dy);
} }
static void static void