diff options
| author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2014-04-24 15:11:15 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-04-25 14:55:28 -0700 |
| commit | 6c975faaa9310c7b9f0e723540ec64d3c2343c87 (patch) | |
| tree | 247e3a4b1eadd8bc2824094c7e039ff886377372 /src/evdev.c | |
| parent | f957dfb1de37e563d3aa2a1bbe3d1e3497c76de5 (diff) | |
| download | weston-6c975faaa9310c7b9f0e723540ec64d3c2343c87.tar.gz | |
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.
Diffstat (limited to 'src/evdev.c')
| -rw-r--r-- | src/evdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c index bc8e5efe..9d97c87c 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -602,7 +602,7 @@ notify_output_destroy(struct wl_listener *listener, void *data) 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); |