summaryrefslogtreecommitdiff
path: root/clients/window.h
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-05-16 18:45:18 +0100
committerKristian Høgsberg <krh@bitplanet.net>2012-05-16 15:29:06 -0400
commit37816df64641a9b8bb922e938f902adc2374de2e (patch)
treeca57380d1aeb7c9f13b4bd4cd743e8869d2db1a7 /clients/window.h
parentdc549932b734967b6ea7bb9a9d3467440e105739 (diff)
Convert wl_input_device to wl_seat (and friends)
wl_input_device has been both renamed and split. wl_seat is now a virtual object representing a group of logically related input devices with related focus. It now only generates one event: to let clients know that it has new capabilities. It takes requests which hand back objects for the wl_pointer, wl_keyboard and wl_touch interfaces it exposes which all provide the old input interface, just under different names. This commit tracks these changes in weston and the clients, as well as similar renames (e.g. weston_input_device -> weston_seat). Some other changes were necessary, e.g. renaming the name for the visible mouse sprite from 'pointer' to 'cursor' so as to not conflict. For simplicity, every seat is always exposed with all three interfaces, although this will change as time goes on. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'clients/window.h')
-rw-r--r--clients/window.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/clients/window.h b/clients/window.h
index 2491da5..bcb7d62 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -375,8 +375,8 @@ input_ungrab(struct input *input);
struct widget *
input_get_focus_widget(struct input *input);
-struct wl_input_device *
-input_get_input_device(struct input *input);
+struct wl_seat *
+input_get_seat(struct input *input);
struct wl_data_device *
input_get_data_device(struct input *input);