mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-02 09:01:38 -05:00
Merge pull request #1432 from ForTheReallys/relative-pointers
Relative pointers
This commit is contained in:
commit
610f5bfc77
12 changed files with 888 additions and 0 deletions
|
|
@ -305,11 +305,41 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
|
|||
}
|
||||
}
|
||||
|
||||
static void notify_relative_motion(struct roots_seat *seat, uint64_t time_msec,
|
||||
double dx, double dy, double dx_unaccel, double dy_unaccel) {
|
||||
struct wlr_relative_pointer_manager_v1 *relative_pointer_manager =
|
||||
seat->input->server->desktop->relative_pointer_manager;
|
||||
|
||||
struct wlr_seat_client *client = seat->seat->pointer_state.focused_client;
|
||||
if (client == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
struct wlr_relative_pointer_v1 *pointer;
|
||||
wl_list_for_each(pointer, &relative_pointer_manager->relative_pointers, link) {
|
||||
struct wlr_seat_client *relative_pointer_client =
|
||||
wlr_seat_client_from_pointer_resource(pointer->pointer);
|
||||
|
||||
if (seat->seat == pointer->seat &&
|
||||
client == relative_pointer_client) {
|
||||
wlr_relative_pointer_v1_send_relative_motion(pointer,
|
||||
time_msec, dx, dy, dx_unaccel, dy_unaccel);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void roots_cursor_handle_motion(struct roots_cursor *cursor,
|
||||
struct wlr_event_pointer_motion *event) {
|
||||
double dx = event->delta_x;
|
||||
double dy = event->delta_y;
|
||||
|
||||
double unaccel_dx = event->unaccel_dx;
|
||||
double unaccel_dy = event->unaccel_dy;
|
||||
|
||||
notify_relative_motion(cursor->seat,
|
||||
(uint64_t)event->time_msec * 1000, dx, dy, unaccel_dx, unaccel_dy);
|
||||
|
||||
if (cursor->active_constraint) {
|
||||
struct roots_view *view = cursor->pointer_view->view;
|
||||
assert(view);
|
||||
|
|
@ -349,6 +379,12 @@ void roots_cursor_handle_motion_absolute(struct roots_cursor *cursor,
|
|||
wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, event->x,
|
||||
event->y, &lx, &ly);
|
||||
|
||||
double dx = lx - cursor->cursor->x;
|
||||
double dy = ly - cursor->cursor->y;
|
||||
|
||||
notify_relative_motion(cursor->seat,
|
||||
(uint64_t)event->time_msec * 1000, dx, dy, dx, dy);
|
||||
|
||||
if (cursor->pointer_view) {
|
||||
struct roots_view *view = cursor->pointer_view->view;
|
||||
|
||||
|
|
|
|||
|
|
@ -1081,6 +1081,8 @@ struct roots_desktop *desktop_create(struct roots_server *server,
|
|||
wlr_presentation_create(server->wl_display, server->backend);
|
||||
desktop->foreign_toplevel_manager_v1 =
|
||||
wlr_foreign_toplevel_manager_v1_create(server->wl_display);
|
||||
desktop->relative_pointer_manager =
|
||||
wlr_relative_pointer_manager_v1_create(server->wl_display);
|
||||
|
||||
return desktop;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue