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

Use only output if no output_name

Browse source 
If we don’t have an output_name, but we have only one output, just use
that. This makes things easier to handle so that plug-and-play just
works. For multiple output setups, we fail, showing the old log
message.
This commit is contained in:
Matthew Bauer 2020-08-24 19:08:36 -05:00
parent 0d85c1652e
commit b423558ea5
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
seat.c
View file

@ -128,12 +128,22 @@ update_capabilities(struct cg_seat *seat)
static void static void
map_input_device_to_output(struct cg_seat *seat, struct wlr_input_device *device) map_input_device_to_output(struct cg_seat *seat, struct wlr_input_device *device)
{ {
struct cg_output *output;
if (!device->output_name) { if (!device->output_name) {
wlr_log(WLR_INFO, "Input device %s cannot be mapped to an output device\n", device->name); if (wl_list_length(&seat->server->outputs) == 1) {
return; wl_list_for_each (output, &seat->server->outputs, link) {
wlr_log(WLR_DEBUG, "Input device %s does not have an output name, defaulting to '%s'.\n", device->name,
output->wlr_output);
wlr_cursor_map_input_to_output(seat->cursor, device, output->wlr_output);
}
return;
} else {
wlr_log(WLR_INFO, "Input device %s cannot be mapped to an output device\n", device->name);
return;
}
} }
struct cg_output *output;
wl_list_for_each (output, &seat->server->outputs, link) { wl_list_for_each (output, &seat->server->outputs, link) {
if (strcmp(device->output_name, output->wlr_output->name) == 0) { if (strcmp(device->output_name, output->wlr_output->name) == 0) {
wlr_log(WLR_INFO, "Mapping input device %s to output device %s\n", device->name, wlr_log(WLR_INFO, "Mapping input device %s to output device %s\n", device->name,