Fixed Crosswalk Bug XWALK-2800

Crosswalk does not support multiple inputs and hence need to disable
the creation of multiple seats.

Change-Id: Ib6157ce8c734be07b407e08d10b42a3e33e99abb
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index d558f7d..4c0e2d6 100644 (file)
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -119,7 +119,6 @@ struct drm_compositor {
        uint32_t prev_state;
 
        clockid_t clock;
-       struct udev_input input;
        char *main_seat;
 
        uint32_t cursor_width;
@@ -2769,7 +2768,11 @@ static int
 create_seats(struct drm_compositor *ec, int connector,
                struct udev_device *drm_device)
 {
+#if HAVE_MULTISEAT
        struct udev_seat *seat = udev_seat_get_named(&ec->base, ec->main_seat);
+#else
+       struct udev_seat *seat = udev_seat_get_named(&ec->base, "default");
+#endif
        if (seat && udev_input_init(&seat->input, &ec->base,
            ec->udev, ec->main_seat) < 0) {
                weston_log("failed to create input devices\n");

diff --git a/src/compositor.c b/src/compositor.c
index 5547ab2..4b8e0c1 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3192,9 +3192,9 @@ bind_output(struct wl_client *client,
 
        resource = wl_resource_create(client, &wl_output_interface,
 #if HAVE_MULTISEAT
-                                     MIN(version, 2),
-#else
                                      MIN(version, 3),
+#else
+                                     MIN(version, 2),
 #endif
                                      id);
        if (resource == NULL) {