From 56f3a68a0180976d3fb7a4a6bcde152c6073edbe Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 10 Jul 2019 14:48:39 +0300 Subject: [PATCH] libweston: Migrate functions that operate on 'weston_compositor' Signed-off-by: Marius Vlad --- include/libweston/libweston.h | 97 -------------------------------- libweston/input.c | 1 + libweston/libweston-internal.h | 98 +++++++++++++++++++++++++++++++++ libweston/linux-dmabuf.c | 1 + libweston/touch-calibration.c | 1 + remoting/remoting-plugin.c | 1 + tests/surface-screenshot-test.c | 1 + 7 files changed, 103 insertions(+), 97 deletions(-) diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h index 748386d4..6d49bb81 100644 --- a/include/libweston/libweston.h +++ b/include/libweston/libweston.h @@ -1761,15 +1761,6 @@ notify_touch_frame(struct weston_touch_device *device); void notify_touch_cancel(struct weston_touch_device *device); -void -weston_compositor_set_touch_mode_normal(struct weston_compositor *compositor); - -void -weston_compositor_set_touch_mode_calib(struct weston_compositor *compositor); - -void -touch_calibrator_mode_changed(struct weston_compositor *compositor); - void notify_touch_calibrator(struct weston_touch_device *device, const struct timespec *time, int32_t slot, @@ -1812,11 +1803,6 @@ weston_plane_init(struct weston_plane *plane, void weston_plane_release(struct weston_plane *plane); -void -weston_compositor_stack_plane(struct weston_compositor *ec, - struct weston_plane *plane, - struct weston_plane *above); - /* An invalid flag in presented_flags to catch logic errors. */ #define WP_PRESENTATION_FEEDBACK_INVALID (1U << 31) @@ -1835,8 +1821,6 @@ weston_compositor_damage_all(struct weston_compositor *compositor); void weston_compositor_wake(struct weston_compositor *compositor); void -weston_compositor_offscreen(struct weston_compositor *compositor); -void weston_compositor_sleep(struct weston_compositor *compositor); struct weston_view * weston_compositor_pick_view(struct weston_compositor *compositor, @@ -1895,56 +1879,11 @@ weston_compositor_add_axis_binding(struct weston_compositor *compositor, enum weston_keyboard_modifier modifier, weston_axis_binding_handler_t binding, void *data); -struct weston_binding * -weston_compositor_add_debug_binding(struct weston_compositor *compositor, - uint32_t key, - weston_key_binding_handler_t binding, - void *data); -void -weston_binding_destroy(struct weston_binding *binding); void weston_install_debug_key_binding(struct weston_compositor *compositor, uint32_t mod); -void -weston_binding_list_destroy_all(struct wl_list *list); - -void -weston_compositor_run_key_binding(struct weston_compositor *compositor, - struct weston_keyboard *keyboard, - const struct timespec *time, - uint32_t key, - enum wl_keyboard_key_state state); - -void -weston_compositor_run_modifier_binding(struct weston_compositor *compositor, - struct weston_keyboard *keyboard, - enum weston_keyboard_modifier modifier, - enum wl_keyboard_key_state state); -void -weston_compositor_run_button_binding(struct weston_compositor *compositor, - struct weston_pointer *pointer, - const struct timespec *time, - uint32_t button, - enum wl_pointer_button_state value); -void -weston_compositor_run_touch_binding(struct weston_compositor *compositor, - struct weston_touch *touch, - const struct timespec *time, - int touch_type); -int -weston_compositor_run_axis_binding(struct weston_compositor *compositor, - struct weston_pointer *pointer, - const struct timespec *time, - struct weston_pointer_axis_event *event); -int -weston_compositor_run_debug_binding(struct weston_compositor *compositor, - struct weston_keyboard *keyboard, - const struct timespec *time, - uint32_t key, - enum wl_keyboard_key_state state); - void weston_compositor_set_default_pointer_grab(struct weston_compositor *compositor, const struct weston_pointer_grab_interface *interface); @@ -2042,9 +1981,6 @@ weston_buffer_from_resource(struct wl_resource *resource); void weston_compositor_get_time(struct timespec *time); -char * -weston_compositor_print_scene_graph(struct weston_compositor *ec); - void weston_compositor_destroy(struct weston_compositor *ec); struct weston_compositor * @@ -2068,23 +2004,6 @@ void weston_compositor_exit(struct weston_compositor *ec); void * weston_compositor_get_user_data(struct weston_compositor *compositor); -int -weston_compositor_set_presentation_clock(struct weston_compositor *compositor, - clockid_t clk_id); -int -weston_compositor_set_presentation_clock_software( - struct weston_compositor *compositor); -void -weston_compositor_read_presentation_clock( - const struct weston_compositor *compositor, - struct timespec *ts); - -bool -weston_compositor_import_dmabuf(struct weston_compositor *compositor, - struct linux_dmabuf_buffer *buffer); - -void -weston_compositor_shutdown(struct weston_compositor *ec); void weston_compositor_exit_with_code(struct weston_compositor *compositor, int exit_code); @@ -2136,8 +2055,6 @@ weston_seat_release(struct weston_seat *seat); int weston_compositor_set_xkb_rule_names(struct weston_compositor *ec, struct xkb_rule_names *names); -void -weston_compositor_xkb_destroy(struct weston_compositor *ec); /* String literal of spaces, the same width as the timestamp. */ #define STAMP_SPACE " " @@ -2230,12 +2147,6 @@ weston_output_mode_switch_to_temporary(struct weston_output *output, int weston_output_mode_switch_to_native(struct weston_output *output); -int -noop_renderer_init(struct weston_compositor *ec); - -int -weston_input_init(struct weston_compositor *compositor); - int weston_backend_init(struct weston_compositor *c, struct weston_backend_config *config_base); @@ -2300,10 +2211,6 @@ weston_head_init(struct weston_head *head, const char *name); void weston_head_release(struct weston_head *head); -void -weston_compositor_add_head(struct weston_compositor *compositor, - struct weston_head *head); - void weston_head_set_monitor_strings(struct weston_head *head, const char *make, @@ -2407,10 +2314,6 @@ weston_output_init(struct weston_output *output, struct weston_compositor *compositor, const char *name); -void -weston_compositor_add_pending_output(struct weston_output *output, - struct weston_compositor *compositor); - int weston_output_enable(struct weston_output *output); diff --git a/libweston/input.c b/libweston/input.c index 99c39f7c..7d35ecf4 100644 --- a/libweston/input.c +++ b/libweston/input.c @@ -43,6 +43,7 @@ #include "shared/os-compatibility.h" #include "shared/timespec-util.h" #include +#include "libweston-internal.h" #include "relative-pointer-unstable-v1-server-protocol.h" #include "pointer-constraints-unstable-v1-server-protocol.h" #include "input-timestamps-unstable-v1-server-protocol.h" diff --git a/libweston/libweston-internal.h b/libweston/libweston-internal.h index b4a9737b..a4689cfd 100644 --- a/libweston/libweston-internal.h +++ b/libweston/libweston-internal.h @@ -58,4 +58,102 @@ void weston_buffer_release_reference(struct weston_buffer_release_reference *ref, struct weston_buffer_release *buf_release); +/* weston_bindings */ +void +weston_binding_destroy(struct weston_binding *binding); + +void +weston_binding_list_destroy_all(struct wl_list *list); + +/* weston_compositor */ + +void +touch_calibrator_mode_changed(struct weston_compositor *compositor); + +int +noop_renderer_init(struct weston_compositor *ec); + +void +weston_compositor_add_head(struct weston_compositor *compositor, + struct weston_head *head); +void +weston_compositor_add_pending_output(struct weston_output *output, + struct weston_compositor *compositor); +struct weston_binding * +weston_compositor_add_debug_binding(struct weston_compositor *compositor, + uint32_t key, + weston_key_binding_handler_t binding, + void *data); +bool +weston_compositor_import_dmabuf(struct weston_compositor *compositor, + struct linux_dmabuf_buffer *buffer); +void +weston_compositor_offscreen(struct weston_compositor *compositor); + +char * +weston_compositor_print_scene_graph(struct weston_compositor *ec); + +void +weston_compositor_read_presentation_clock( + const struct weston_compositor *compositor, + struct timespec *ts); + +int +weston_compositor_run_axis_binding(struct weston_compositor *compositor, + struct weston_pointer *pointer, + const struct timespec *time, + struct weston_pointer_axis_event *event); +void +weston_compositor_run_button_binding(struct weston_compositor *compositor, + struct weston_pointer *pointer, + const struct timespec *time, + uint32_t button, + enum wl_pointer_button_state value); +int +weston_compositor_run_debug_binding(struct weston_compositor *compositor, + struct weston_keyboard *keyboard, + const struct timespec *time, + uint32_t key, + enum wl_keyboard_key_state state); +void +weston_compositor_run_key_binding(struct weston_compositor *compositor, + struct weston_keyboard *keyboard, + const struct timespec *time, + uint32_t key, + enum wl_keyboard_key_state state); +void +weston_compositor_run_modifier_binding(struct weston_compositor *compositor, + struct weston_keyboard *keyboard, + enum weston_keyboard_modifier modifier, + enum wl_keyboard_key_state state); +void +weston_compositor_run_touch_binding(struct weston_compositor *compositor, + struct weston_touch *touch, + const struct timespec *time, + int touch_type); +void +weston_compositor_stack_plane(struct weston_compositor *ec, + struct weston_plane *plane, + struct weston_plane *above); +void +weston_compositor_set_touch_mode_normal(struct weston_compositor *compositor); + +void +weston_compositor_set_touch_mode_calib(struct weston_compositor *compositor); + +int +weston_compositor_set_presentation_clock(struct weston_compositor *compositor, + clockid_t clk_id); +int +weston_compositor_set_presentation_clock_software( + struct weston_compositor *compositor); +void +weston_compositor_shutdown(struct weston_compositor *ec); + +void +weston_compositor_xkb_destroy(struct weston_compositor *ec); + +int +weston_input_init(struct weston_compositor *compositor); + #endif diff --git a/libweston/linux-dmabuf.c b/libweston/linux-dmabuf.c index 5f7515b5..d63f109b 100644 --- a/libweston/linux-dmabuf.c +++ b/libweston/linux-dmabuf.c @@ -33,6 +33,7 @@ #include #include "linux-dmabuf.h" #include "linux-dmabuf-unstable-v1-server-protocol.h" +#include "libweston-internal.h" static void linux_dmabuf_buffer_destroy(struct linux_dmabuf_buffer *buffer) diff --git a/libweston/touch-calibration.c b/libweston/touch-calibration.c index b346d90c..187c8987 100644 --- a/libweston/touch-calibration.c +++ b/libweston/touch-calibration.c @@ -34,6 +34,7 @@ #include #include "shared/timespec-util.h" #include +#include "libweston-internal.h" #include "weston-touch-calibration-server-protocol.h" diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c index 753f206c..e21845fe 100644 --- a/remoting/remoting-plugin.c +++ b/remoting/remoting-plugin.c @@ -47,6 +47,7 @@ #include #include "shared/helpers.h" #include "shared/timespec-util.h" +#include "libweston-internal.h" #define MAX_RETRY_COUNT 3 diff --git a/tests/surface-screenshot-test.c b/tests/surface-screenshot-test.c index 3c6aa06c..d2647e62 100644 --- a/tests/surface-screenshot-test.c +++ b/tests/surface-screenshot-test.c @@ -36,6 +36,7 @@ #include #include "compositor/weston.h" #include "file-util.h" +#include "libweston-internal.h" static char * encode_PAM_comment_line(const char *comment)