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.
dev
Ander Conselvan de Oliveira 11 years ago committed by Kristian Høgsberg
parent f957dfb1de
commit 6c975faaa9
  1. 2
      src/evdev.c
  2. 2
      src/libinput-device.c
  3. 4
      src/libinput-seat.c
  4. 4
      src/udev-seat.c

@ -602,7 +602,7 @@ notify_output_destroy(struct wl_listener *listener, void *data)
struct weston_compositor *c = device->seat->compositor; struct weston_compositor *c = device->seat->compositor;
struct weston_output *output; struct weston_output *output;
if (device->output_name) { if (!device->output_name) {
output = container_of(c->output_list.next, output = container_of(c->output_list.next,
struct weston_output, link); struct weston_output, link);
evdev_device_set_output(device, output); evdev_device_set_output(device, output);

@ -264,7 +264,7 @@ notify_output_destroy(struct wl_listener *listener, void *data)
struct weston_compositor *c = device->seat->compositor; struct weston_compositor *c = device->seat->compositor;
struct weston_output *output; struct weston_output *output;
if (device->output_name) { if (!device->output_name) {
output = container_of(c->output_list.next, output = container_of(c->output_list.next,
struct weston_output, link); struct weston_output, link);
evdev_device_set_output(device, output); evdev_device_set_output(device, output);

@ -84,9 +84,7 @@ device_added(struct udev_input *input, struct libinput_device *libinput_device)
wl_list_for_each(output, &c->output_list, link) wl_list_for_each(output, &c->output_list, link)
if (strcmp(output->name, device->output_name) == 0) if (strcmp(output->name, device->output_name) == 0)
evdev_device_set_output(device, output); evdev_device_set_output(device, output);
} } else if (device->output == NULL) {
if (device->output == NULL) {
output = container_of(c->output_list.next, output = container_of(c->output_list.next,
struct weston_output, link); struct weston_output, link);
evdev_device_set_output(device, output); evdev_device_set_output(device, output);

@ -125,9 +125,7 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
wl_list_for_each(output, &c->output_list, link) wl_list_for_each(output, &c->output_list, link)
if (strcmp(output->name, device->output_name) == 0) if (strcmp(output->name, device->output_name) == 0)
evdev_device_set_output(device, output); evdev_device_set_output(device, output);
} } else if (device->output == NULL) {
if (device->output == NULL) {
output = container_of(c->output_list.next, output = container_of(c->output_list.next,
struct weston_output, link); struct weston_output, link);
evdev_device_set_output(device, output); evdev_device_set_output(device, output);

Loading…
Cancel
Save