mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat: support WLR_{WL,X11}_OUTPUTS >= 2

Browse source 
When running nested in X11 or a wlroots compositor with the respective
environment variables WLR_X11_OUTPUTS or WLR_WL_OUTPUTS set to value >= 2,
cursors need to be mapped to the respective outputs.

Closes issue #196

Suggested-by: @Consolatis
Written-by: @johanmalm
This commit is contained in:
Johan Malm 2022-01-06 21:40:10 +00:00
parent 2b82bdcdb7
commit cef9723505
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/seat.c
View file

@ -112,13 +112,33 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
} }
} }
static struct wlr_output *
output_by_name(struct server *server, const char *name)
{
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
if (!strcasecmp(output->wlr_output->name, name)) {
return output->wlr_output;
}
}
return NULL;
}
void void
new_pointer(struct seat *seat, struct input *input) new_pointer(struct seat *seat, struct input *input)
{ {
if (wlr_input_device_is_libinput(input->wlr_input_device)) { struct wlr_input_device *dev = input->wlr_input_device;
configure_libinput(input->wlr_input_device); if (wlr_input_device_is_libinput(dev)) {
configure_libinput(dev);
} }
wlr_cursor_attach_input_device(seat->cursor, input->wlr_input_device); wlr_cursor_attach_input_device(seat->cursor, dev);
/* In support of running with WLR_WL_OUTPUTS set to >=2 */
wlr_log(WLR_INFO, "map pointer to output %s\n", dev->output_name);
struct wlr_output *output =
output_by_name(seat->server, dev->output_name);
wlr_cursor_map_input_to_output(seat->cursor, dev, output);
wlr_cursor_map_input_to_region(seat->cursor, dev, NULL);
} }
void void
@ -227,7 +247,6 @@ seat_init(struct server *server)
&seat->idle_inhibitor_create); &seat->idle_inhibitor_create);
seat->idle_inhibitor_create.notify = new_idle_inhibitor; seat->idle_inhibitor_create.notify = new_idle_inhibitor;
seat->cursor = wlr_cursor_create(); seat->cursor = wlr_cursor_create();
if (!seat->cursor) { if (!seat->cursor) {
wlr_log(WLR_ERROR, "unable to create cursor"); wlr_log(WLR_ERROR, "unable to create cursor");