1 From 4534fcab54409b08faf4445ed6780136b58afb63 Mon Sep 17 00:00:00 2001
2 From: Marius Vlad <marius.vlad@collabora.com>
3 Date: Mon, 28 Sep 2020 22:51:00 +0300
4 Subject: [PATCH 1/2] libweston: Migrate weston_seat_init/release to public
7 weston_seat_init/release needed for creating weston plug-ins that want
8 manage seat/input on their own.
10 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
12 include/libweston/libweston.h | 25 +++++++++++++++++++++++++
13 libweston/libweston-internal.h | 31 +++----------------------------
14 2 files changed, 28 insertions(+), 28 deletions(-)
16 diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h
17 index 54ea008..59541f2 100644
18 --- a/include/libweston/libweston.h
19 +++ b/include/libweston/libweston.h
20 @@ -2053,6 +2053,31 @@ void
21 weston_timeline_refresh_subscription_objects(struct weston_compositor *wc,
26 +weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec,
27 + const char *seat_name);
29 +weston_seat_release(struct weston_seat *seat);
32 +weston_seat_init_pointer(struct weston_seat *seat);
35 +weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap);
38 +weston_seat_init_touch(struct weston_seat *seat);
41 +weston_seat_release_keyboard(struct weston_seat *seat);
44 +weston_seat_release_pointer(struct weston_seat *seat);
47 +weston_seat_release_touch(struct weston_seat *seat);
52 diff --git a/libweston/libweston-internal.h b/libweston/libweston-internal.h
53 index 66c38e8..f5c4c2c 100644
54 --- a/libweston/libweston-internal.h
55 +++ b/libweston/libweston-internal.h
56 @@ -168,44 +168,19 @@ weston_plane_init(struct weston_plane *plane,
58 weston_plane_release(struct weston_plane *plane);
63 clipboard_create(struct weston_seat *seat);
66 -weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec,
67 - const char *seat_name);
70 -weston_seat_repick(struct weston_seat *seat);
74 -weston_seat_release(struct weston_seat *seat);
75 +weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap);
78 weston_seat_send_selection(struct weston_seat *seat, struct wl_client *client);
81 -weston_seat_init_pointer(struct weston_seat *seat);
84 -weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap);
87 -weston_seat_init_touch(struct weston_seat *seat);
90 -weston_seat_release_keyboard(struct weston_seat *seat);
93 -weston_seat_release_pointer(struct weston_seat *seat);
96 -weston_seat_release_touch(struct weston_seat *seat);
99 -weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap);
100 +weston_seat_repick(struct weston_seat *seat);
103 wl_data_device_set_keyboard_focus(struct weston_seat *seat);