commit d6da09e9353ca64990daaa70b5226dba730977a0
author Daniel Stone <daniel@fooishbar.org> Fri Jun 22 13:21:29 2012 +0100
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jun 22 11:52:05 2012 -0400
tree aed527e279be4c08c03a7019f90d2f4562bc84f4
parent 9c7df91b19d79432e2a6f1ab62a436b805c16fa3

Split notify_keyboard_focus into in/out variants

Since the two functions had nothing in common but the local variables.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

src/compositor-wayland.c

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index cde7658..5b6a8f4 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -640,7 +640,9 @@
 	struct wayland_input *input = data;
 	struct wayland_compositor *c = input->compositor;
 
-	notify_keyboard_focus(&c->base.seat->seat, keys);
+	/* XXX: Need to wait for modifier event and send with state then. */
+	notify_keyboard_focus_in(&c->base.seat->seat, keys,
+				 STATE_UPDATE_AUTOMATIC);
 }
 
 static void
@@ -652,7 +654,7 @@
 	struct wayland_input *input = data;
 	struct wayland_compositor *c = input->compositor;
 
-	notify_keyboard_focus(&c->base.seat->seat, NULL);
+	notify_keyboard_focus_out(&c->base.seat->seat);
 }
 
 static void