Attachment 101908 Details for Bug 79609 – proposed patch

[patch] proposed patch

0001-xwayland-Initialize-device-when-reprobing.patch (text/plain), 1.96 KB, created by Boyan Ding on 2014-06-28 08:56:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boyan Ding

Created: 2014-06-28 08:56:16 UTC

Size: 1.96 KB

patch

obsolete

>From cb819cb7c3fe4257d8718719fe18280a5c821e77 Mon Sep 17 00:00:00 2001
>From: Boyan Ding <stu_dby@126.com>
>Date: Sat, 28 Jun 2014 16:33:58 +0800
>Subject: [PATCH] xwayland: Initialize device when reprobing
>
>Actions like VT switches can somehow make weston reprobe input devices,
>and cause xwayland create new devices, which, unlike the initial ones,
>goes uninitialized. This will make xwayland crash when it uses the new
>devices. This patch activates and enables the devices that are not CVP
>or CVK after they are created thus eliminates the problem.
>
>Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=79609
>Signed-off-by: Boyan Ding <stu_dby@126.com>
>---
> hw/xwayland/xwayland-input.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
>index 990cb82..710109e 100644
>--- a/hw/xwayland/xwayland-input.c
>+++ b/hw/xwayland/xwayland-input.c
>@@ -498,6 +498,10 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
>         xwl_seat_set_cursor(xwl_seat);
>         xwl_seat->pointer =
>             add_device(xwl_seat, "xwayland-pointer", xwl_pointer_proc);
>+        if (xwl_seat->pointer != inputInfo.pointer) {
>+            ActivateDevice(xwl_seat->pointer, TRUE);
>+            EnableDevice(xwl_seat->pointer, TRUE);
>+        }
>     }
>     else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && xwl_seat->pointer) {
>         wl_pointer_release(xwl_seat->wl_pointer);
>@@ -511,6 +515,10 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
>                                  &keyboard_listener, xwl_seat);
>         xwl_seat->keyboard =
>             add_device(xwl_seat, "xwayland-keyboard", xwl_keyboard_proc);
>+        if (xwl_seat->keyboard != inputInfo.keyboard) {
>+            ActivateDevice(xwl_seat->keyboard, TRUE);
>+            EnableDevice(xwl_seat->keyboard, TRUE);
>+        }
>     }
>     else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && xwl_seat->keyboard) {
>         wl_keyboard_release(xwl_seat->wl_keyboard);
>-- 
>2.0.1
>

Actions: View | Splinter Review

Attachments on bug 79609: 100374 | 101836 | 101838 | 101839 | 101908 | 101968

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.