From 0bf3f5ac2c1d359b142385913ae0db75878b2dc8 Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 10 Jul 2019 17:32:42 +0300
Subject: [PATCH] libweston: Migrate functions that operate on 'weston_seat'

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---
 include/libweston/libweston.h  | 30 ------------------------
 libweston/libinput-seat.c      |  1 +
 libweston/libweston-internal.h | 43 ++++++++++++++++++++++++++++++++++
 tests/weston-test.c            |  1 +
 4 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h
index 6bad5f98..b3ca6b0b 100644
--- a/include/libweston/libweston.h
+++ b/include/libweston/libweston.h
@@ -721,9 +721,6 @@ weston_touch_device_destroy(struct weston_touch_device *device);
 bool
 weston_touch_device_can_calibrate(struct weston_touch_device *device);
 
-void
-wl_data_device_set_keyboard_focus(struct weston_seat *seat);
-
 int
 wl_data_device_manager_init(struct wl_display *display);
 
@@ -731,8 +728,6 @@ wl_data_device_manager_init(struct wl_display *display);
 void
 weston_seat_set_selection(struct weston_seat *seat,
 			  struct weston_data_source *source, uint32_t serial);
-void
-weston_seat_send_selection(struct weston_seat *seat, struct wl_client *client);
 
 int
 weston_pointer_start_drag(struct weston_pointer *pointer,
@@ -2023,28 +2018,6 @@ weston_output_transform_coordinate(struct weston_output *output,
 				   double device_x, double device_y,
 				   double *x, double *y);
 
-void
-weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec,
-		 const char *seat_name);
-void
-weston_seat_init_pointer(struct weston_seat *seat);
-void
-weston_seat_release_pointer(struct weston_seat *seat);
-int
-weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap);
-void
-weston_seat_release_keyboard(struct weston_seat *seat);
-void
-weston_seat_init_touch(struct weston_seat *seat);
-void
-weston_seat_release_touch(struct weston_seat *seat);
-void
-weston_seat_repick(struct weston_seat *seat);
-void
-weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap);
-
-void
-weston_seat_release(struct weston_seat *seat);
 int
 weston_compositor_set_xkb_rule_names(struct weston_compositor *ec,
 				     struct xkb_rule_names *names);
@@ -2082,9 +2055,6 @@ weston_recorder_start(struct weston_output *output, const char *filename);
 void
 weston_recorder_stop(struct weston_recorder *recorder);
 
-struct clipboard *
-clipboard_create(struct weston_seat *seat);
-
 struct weston_view_animation;
 typedef	void (*weston_view_animation_done_func_t)(struct weston_view_animation *animation, void *data);
 
diff --git a/libweston/libinput-seat.c b/libweston/libinput-seat.c
index 9d3887bc..d47a0323 100644
--- a/libweston/libinput-seat.c
+++ b/libweston/libinput-seat.c
@@ -35,6 +35,7 @@
 #include <libudev.h>
 
 #include <libweston/libweston.h>
+#include "libweston-internal.h"
 #include "launcher-util.h"
 #include "libinput-seat.h"
 #include "libinput-device.h"
diff --git a/libweston/libweston-internal.h b/libweston/libweston-internal.h
index c62646b7..a37f585d 100644
--- a/libweston/libweston-internal.h
+++ b/libweston/libweston-internal.h
@@ -164,4 +164,47 @@ weston_plane_init(struct weston_plane *plane,
 			int32_t x, int32_t y);
 void
 weston_plane_release(struct weston_plane *plane);
+
+/* weston_seat */
+
+struct clipboard *
+clipboard_create(struct weston_seat *seat);
+
+void
+weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec,
+		 const char *seat_name);
+
+void
+weston_seat_repick(struct weston_seat *seat);
+
+void
+weston_seat_release(struct weston_seat *seat);
+
+void
+weston_seat_send_selection(struct weston_seat *seat, struct wl_client *client);
+
+void
+weston_seat_init_pointer(struct weston_seat *seat);
+
+int
+weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap);
+
+void
+weston_seat_init_touch(struct weston_seat *seat);
+
+void
+weston_seat_release_keyboard(struct weston_seat *seat);
+
+void
+weston_seat_release_pointer(struct weston_seat *seat);
+
+void
+weston_seat_release_touch(struct weston_seat *seat);
+
+void
+weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap);
+
+void
+wl_data_device_set_keyboard_focus(struct weston_seat *seat);
+
 #endif
diff --git a/tests/weston-test.c b/tests/weston-test.c
index eea73fb3..d0ab6f76 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 
 #include <libweston/libweston.h>
+#include "libweston-internal.h"
 #include "compositor/weston.h"
 #include "weston-test-server-protocol.h"