Merge branch 'input-device-output' into 'master'

Draft: pointer,touch: store the output instead of its name

See merge request wlroots/wlroots!4167
This commit is contained in:
Kirill Primak 2025-01-11 00:37:12 +00:00
commit 2f49d01779
5 changed files with 6 additions and 5 deletions

View file

@ -469,7 +469,7 @@ void create_pointer(struct wlr_wl_seat *seat, struct wlr_wl_output *output) {
snprintf(name, sizeof(name), "wayland-pointer-%s", seat->name);
wlr_pointer_init(&pointer->wlr_pointer, &wl_pointer_impl, name);
pointer->wlr_pointer.output_name = strdup(output->wlr_output.name);
pointer->wlr_pointer.output = &output->wlr_output;
pointer->seat = seat;
pointer->output = output;

View file

@ -669,7 +669,7 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
wl_list_insert(&x11->outputs, &output->link);
wlr_pointer_init(&output->pointer, &x11_pointer_impl, "x11-pointer");
output->pointer.output_name = strdup(wlr_output->name);
output->pointer.output = wlr_output;
wlr_touch_init(&output->touch, &x11_touch_impl, "x11-touch");
output->touch.output_name = strdup(wlr_output->name);