xserver: Branch 'xwayland-1.12' - 2 commits

[Kristian Høgsberg]

 hw/xfree86/xwayland/xwayland-input.c |   10 ++++++++++
 hw/xfree86/xwayland/xwayland.c       |    4 ----
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 52433472bbf322a416f7291a82b0a5ac7c2c158a
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Jun 1 00:02:25 2012 -0400

    xwayland: Remove selection callback ErrorF()

diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
index e5037fd..0bf8f4e 100644
--- a/hw/xfree86/xwayland/xwayland.c
+++ b/hw/xfree86/xwayland/xwayland.c
@@ -188,10 +188,6 @@ xwayland_selection_callback(CallbackListPtr *callbacks,
 
     switch (info->kind) {
     case SelectionSetOwner:
-	ErrorF("set selection: atom %s (%d), window %d\n",
-	       NameForAtom(selection->selection),
-	       selection->selection, selection->window);
-
 	if (selection->selection == xdnd_atom) {
 	    if (selection->window != None)
 		ErrorF("client %p starts dnd\n", info->client);
commit 190df19ad63665287c5a00da91319177f0c1fd82
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Jun 1 00:01:39 2012 -0400

    xwayland: Add wl_keyboard.modifiers stub

diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index 38a34e0..734e2c1 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -415,10 +415,20 @@ keyboard_handle_leave(void *data, struct wl_keyboard *keyboard,
 	xf86PostKeyboardEvent(xwl_seat->keyboard, *k + 8, 0);
 }
 
+static void
+keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
+			  uint32_t serial, uint32_t mods_depressed,
+			  uint32_t mods_latched, uint32_t mods_locked,
+			  uint32_t group)
+{
+    /* FIXME: Figure this out... */
+}
+
 static const struct wl_keyboard_listener keyboard_listener = {
 	keyboard_handle_enter,
 	keyboard_handle_leave,
 	keyboard_handle_key,
+	keyboard_handle_modifiers,
 };
 
 static void