evdev: Discard events from a touchscreen paired with an unplugged output
Commit 17bccaed intended to make the events coming from a touchscreen
paired with an unplugged output to be discarded, while an unpaired one
would just choose a different output. However, the logic was inverted
causing the opposite to happen.
Later in commit 161c6c56, the default behavior was changed to map an
output to a default output if the one specified via udev is not
present. This change is reverted by this patch.
v2: undo the change from commit 161c6c56.
v3: deal with libinput too.
diff --git a/src/evdev.c b/src/evdev.c
index bc8e5ef..9d97c87 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -602,7 +602,7 @@
struct weston_compositor *c = device->seat->compositor;
struct weston_output *output;
- if (device->output_name) {
+ if (!device->output_name) {
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);
diff --git a/src/libinput-device.c b/src/libinput-device.c
index a67c119..753583a 100644
--- a/src/libinput-device.c
+++ b/src/libinput-device.c
@@ -264,7 +264,7 @@
struct weston_compositor *c = device->seat->compositor;
struct weston_output *output;
- if (device->output_name) {
+ if (!device->output_name) {
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);
diff --git a/src/libinput-seat.c b/src/libinput-seat.c
index acb29d7..e92834f 100644
--- a/src/libinput-seat.c
+++ b/src/libinput-seat.c
@@ -84,9 +84,7 @@
wl_list_for_each(output, &c->output_list, link)
if (strcmp(output->name, device->output_name) == 0)
evdev_device_set_output(device, output);
- }
-
- if (device->output == NULL) {
+ } else if (device->output == NULL) {
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);
diff --git a/src/udev-seat.c b/src/udev-seat.c
index cd2f6a9..c846898 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -125,9 +125,7 @@
wl_list_for_each(output, &c->output_list, link)
if (strcmp(output->name, device->output_name) == 0)
evdev_device_set_output(device, output);
- }
-
- if (device->output == NULL) {
+ } else if (device->output == NULL) {
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);