commit 2bf876282fa640f8f3f33bab2c9fd1df1cafa1c4
author Kristian Høgsberg <krh@bitplanet.net> Tue May 07 23:17:41 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Tue May 07 23:40:26 2013 -0400
tree 31ea0ac0c8c92923a1283a20a046aa82afc11e8f
parent aad8099c2f9970264779e43148ec2da8e4152d4c

input: Eliminate weston_seat::has_pointer/keyboard/touch

We can just look at weston_seat::pointer/keyboard/touch now.

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index f129288..4021e7d 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -900,7 +900,7 @@
 
 	drop_focus_state(shell, from, surface);
 	wl_list_for_each(seat, &shell->compositor->seat_list, link)
-		if (seat->has_keyboard &&
+		if (seat->keyboard &&
 		    seat->keyboard->focus == &surface->surface)
 			weston_keyboard_set_focus(seat->keyboard, NULL);
 
@@ -3127,7 +3127,7 @@
 	 * TODO: Do something clever for touch too?
 	 */
 	wl_list_for_each(seat, &compositor->seat_list, link) {
-		if (seat->has_pointer) {
+		if (seat->pointer) {
 			ix = wl_fixed_to_int(seat->pointer->x);
 			iy = wl_fixed_to_int(seat->pointer->y);
 			break;