alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

seat: use default output mapping if there is no input config

Browse source
This commit is contained in:
Ronan Pigott 2020-10-15 15:52:55 -06:00 committed by Simon Ser
parent d6ac30753d
commit 5bcbc0b4a9
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/input/seat.c
View file

@ -660,17 +660,16 @@ static void seat_apply_input_config(struct sway_seat *seat,
struct sway_seat_device *sway_device) { struct sway_seat_device *sway_device) {
struct input_config *ic = struct input_config *ic =
input_device_get_config(sway_device->input_device); input_device_get_config(sway_device->input_device);
if (ic == NULL) {
return;
}
sway_log(SWAY_DEBUG, "Applying input config to %s", sway_log(SWAY_DEBUG, "Applying input config to %s",
sway_device->input_device->identifier); sway_device->input_device->identifier);
const char *mapped_to_output = ic->mapped_to_output; const char *mapped_to_output = ic == NULL ? NULL : ic->mapped_to_output;
struct wlr_box *mapped_to_region = ic->mapped_to_region; struct wlr_box *mapped_to_region = ic == NULL ? NULL : ic->mapped_to_region;
enum input_config_mapped_to mapped_to =
ic == NULL ? MAPPED_TO_DEFAULT : ic->mapped_to;
switch (ic->mapped_to) { switch (mapped_to) {
case MAPPED_TO_DEFAULT: case MAPPED_TO_DEFAULT:
mapped_to_output = sway_device->input_device->wlr_device->output_name; mapped_to_output = sway_device->input_device->wlr_device->output_name;
if (mapped_to_output == NULL) { if (mapped_to_output == NULL) {