xserver: Branch 'xwayland-1.12' - 2 commits

[Kristian Høgsberg]

 hw/xfree86/xwayland/xwayland-input.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 36af05e5afd7c9b8fd625aceeb0ef92147e72a2f
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Sat Jun 2 21:01:54 2012 -0400

    xwayland: Stub out keymap handler so we don't crash

diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index 12bc4f9..517ad30 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -389,6 +389,15 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard, uint32_t serial,
 }
 
 static void
+keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
+		       uint32_t format, int fd, uint32_t size)
+{
+    /* FIXME: Handle keymap */
+
+    close(fd);
+}
+
+static void
 keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
 		      uint32_t serial,
 		      struct wl_surface *surface, struct wl_array *keys)
@@ -426,6 +435,7 @@ keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
 }
 
 static const struct wl_keyboard_listener keyboard_listener = {
+	keyboard_handle_keymap,
 	keyboard_handle_enter,
 	keyboard_handle_leave,
 	keyboard_handle_key,
commit b338250ca09fb9f2acae82dfae04772cf8efc539
Author: Tiago Vignatti <tiago.vignatti at intel.com>
Date:   Fri Jun 1 15:51:53 2012 +0300

    xwayland: track axis type conversion
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>

diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index 734e2c1..12bc4f9 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -341,14 +341,15 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
 
 static void
 pointer_handle_axis(void *data, struct wl_pointer *pointer,
-		    uint32_t time, uint32_t axis, int32_t value)
+		    uint32_t time, uint32_t axis, wl_fixed_t value)
 {
     struct xwl_seat *xwl_seat = data;
     int index;
+    int val = wl_fixed_to_int(value);
 
-    if (value == 1)
+    if (val == 1)
         index = 4;
-    else if (value == -1)
+    else if (val == -1)
         index = 5;
 
     xf86PostButtonEvent(xwl_seat->pointer, TRUE, index, 1, 0, 0);