diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-07 23:17:41 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-07 23:40:26 -0400 |
| commit | 2bf876282fa640f8f3f33bab2c9fd1df1cafa1c4 (patch) | |
| tree | 31ea0ac0c8c92923a1283a20a046aa82afc11e8f /src/shell.c | |
| parent | aad8099c2f9970264779e43148ec2da8e4152d4c (diff) | |
input: Eliminate weston_seat::has_pointer/keyboard/touch
We can just look at weston_seat::pointer/keyboard/touch now.
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ move_surface_to_workspace(struct desktop_shell *shell, 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 @@ weston_surface_set_initial_position (struct weston_surface *surface, * 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; |