Attachment 79579 Details for Bug 64506 – Only abort weston startup if seat incomplete

[patch] Only abort weston startup if seat incomplete

0001-udev-seat-Fail-seat-setup-only-if-the-seat-is-incomp.patch (text/plain), 1.56 KB, created by Rob Bradford on 2013-05-20 16:59:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Bradford

Created: 2013-05-20 16:59:15 UTC

Size: 1.56 KB

patch

obsolete

>From 7b63f95edf543423a3f284929cca6d5965cd9cf6 Mon Sep 17 00:00:00 2001
>From: Rob Bradford <rob@linux.intel.com>
>Date: Mon, 20 May 2013 17:17:52 +0100
>Subject: [PATCH] udev-seat: Fail seat setup only if the seat is incomplete
>
>Rather than failing seat setup if we fail to open the input device
>instead fail the seat setup if we don't have "complete seat" with both
>keyboard and pointer or a touchscreen.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=64506
>---
> src/udev-seat.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/src/udev-seat.c b/src/udev-seat.c
>index 7e62429..3dd3438 100644
>--- a/src/udev-seat.c
>+++ b/src/udev-seat.c
>@@ -58,7 +58,7 @@ device_added(struct udev_device *udev_device, struct udev_seat *master)
> 	fd = weston_launcher_open(c, devnode, O_RDWR | O_NONBLOCK);
> 	if (fd < 0) {
> 		weston_log("opening input device '%s' failed.\n", devnode);
>-		return -1;
>+		return 0;
> 	}
> 
> 	device = evdev_device_create(&master->base, devnode, fd);
>@@ -69,7 +69,7 @@ device_added(struct udev_device *udev_device, struct udev_seat *master)
> 	} else if (device == NULL) {
> 		close(fd);
> 		weston_log("failed to create input device '%s'.\n", devnode);
>-		return -1;
>+		return 0;
> 	}
> 
> 	calibration_values =
>@@ -142,6 +142,12 @@ udev_seat_add_devices(struct udev_seat *seat, struct udev *udev)
> 			"udev device property ID_SEAT)\n");
> 	}
> 
>+	if (!(seat->base.touch || (seat->base.keyboard && seat->base.pointer))) {
>+		weston_log ("seat not complete: no touchscreen or "
>+			    "no keyboard and pointer found.\n");
>+		return -1;
>+	}
>+
> 	return 0;
> }
> 
>-- 
>1.8.1.4
>

Actions: View | Splinter Review

Attachments on bug 64506: 79208 | 79209 | 79577 | 79579 | 79580

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.