Attachment 103842 Details for Bug 81819 – Another patch

[patch] Another patch

fix-capability.patch (text/plain), 1.67 KB, created by Boyan Ding on 2014-08-02 01:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boyan Ding

Created: 2014-08-02 01:57:43 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
>index cc5f7df..14af717 100644
>--- a/hw/xwayland/xwayland-input.c
>+++ b/hw/xwayland/xwayland-input.c
>@@ -496,13 +496,13 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
>         wl_pointer_add_listener(xwl_seat->wl_pointer,
>                                 &pointer_listener, xwl_seat);
> 
>-        if (xwl_seat->pointer)
>-            EnableDevice(xwl_seat->pointer, TRUE);
>-        else {
>+        if (xwl_seat->pointer == NULL) {
>             xwl_seat_set_cursor(xwl_seat);
>             xwl_seat->pointer =
>                 add_device(xwl_seat, "xwayland-pointer", xwl_pointer_proc);
>+            ActivateDevice(xwl_seat->prointer, TRUE);
>         }
>+        EnableDevice(xwl_seat->pointer, TRUE);
>     } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && xwl_seat->wl_pointer) {
>         wl_pointer_release(xwl_seat->wl_pointer);
>         xwl_seat->wl_pointer = NULL;
>@@ -516,12 +516,12 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
>         wl_keyboard_add_listener(xwl_seat->wl_keyboard,
>                                  &keyboard_listener, xwl_seat);
> 
>-        if (xwl_seat->keyboard)
>-            EnableDevice(xwl_seat->keyboard, TRUE);
>-        else {
>+        if (xwl_seat->keyboard == NULL) {
>             xwl_seat->keyboard =
>                 add_device(xwl_seat, "xwayland-keyboard", xwl_keyboard_proc);
>+            ActivateDevice(xwl_seat->keyboard, TRUE);
>         }
>+        EnableDevice(xwl_seat->keyboard, TRUE);
>     } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && xwl_seat->wl_keyboard) {
>         wl_keyboard_release(xwl_seat->wl_keyboard);
>         xwl_seat->wl_keyboard = NULL;

Actions: View | Splinter Review

Attachments on bug 81819: 103567 | 103842

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.