diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h index 1775b590..7f977cbb 100644 --- a/include/libweston/libweston.h +++ b/include/libweston/libweston.h @@ -2077,35 +2077,6 @@ weston_keyboard_send_keymap(struct weston_keyboard *kbd, int weston_compositor_load_xwayland(struct weston_compositor *compositor); -void -weston_head_init(struct weston_head *head, const char *name); - -void -weston_head_release(struct weston_head *head); - -void -weston_head_set_monitor_strings(struct weston_head *head, - const char *make, - const char *model, - const char *serialno); - -void -weston_head_set_non_desktop(struct weston_head *head, bool non_desktop); - -void -weston_head_set_physical_size(struct weston_head *head, - int32_t mm_width, int32_t mm_height); - -void -weston_head_set_subpixel(struct weston_head *head, - enum wl_output_subpixel sp); - -void -weston_head_set_connection_status(struct weston_head *head, bool connected); - -void -weston_head_set_internal(struct weston_head *head); - bool weston_head_is_connected(struct weston_head *head); diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h index 403ae2d2..cbda0a5f 100644 --- a/libweston/backend-drm/drm-internal.h +++ b/libweston/backend-drm/drm-internal.h @@ -55,6 +55,7 @@ #include #include "shared/helpers.h" #include "libinput-seat.h" +#include "backend.h" #include "libweston-internal.h" #ifndef DRM_CLIENT_CAP_ASPECT_RATIO diff --git a/libweston/backend.h b/libweston/backend.h new file mode 100644 index 00000000..79cdbb21 --- /dev/null +++ b/libweston/backend.h @@ -0,0 +1,61 @@ +/* + * Copyright © 2008-2011 Kristian Høgsberg + * Copyright © 2017, 2018 General Electric Company + * Copyright © 2012, 2017-2019 Collabora, Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef LIBWESTON_BACKEND_INTERNAL_H +#define LIBWESTON_BACKEND_INTERNAL_H + +/* weston_head */ + +void +weston_head_init(struct weston_head *head, const char *name); + +void +weston_head_release(struct weston_head *head); + +void +weston_head_set_connection_status(struct weston_head *head, bool connected); + +void +weston_head_set_internal(struct weston_head *head); + +void +weston_head_set_monitor_strings(struct weston_head *head, + const char *make, + const char *model, + const char *serialno); +void +weston_head_set_non_desktop(struct weston_head *head, bool non_desktop); + +void +weston_head_set_physical_size(struct weston_head *head, + int32_t mm_width, int32_t mm_height); + +void +weston_head_set_subpixel(struct weston_head *head, + enum wl_output_subpixel sp); + +#endif diff --git a/libweston/pixman-renderer.h b/libweston/pixman-renderer.h index 07571a1d..f53ae2a3 100644 --- a/libweston/pixman-renderer.h +++ b/libweston/pixman-renderer.h @@ -26,6 +26,7 @@ #include "config.h" #include +#include "backend.h" #include "libweston-internal.h" int diff --git a/libweston/renderer-gl/gl-renderer.h b/libweston/renderer-gl/gl-renderer.h index 7067c8f5..b1d6abbe 100644 --- a/libweston/renderer-gl/gl-renderer.h +++ b/libweston/renderer-gl/gl-renderer.h @@ -28,6 +28,7 @@ #include #include +#include "backend.h" #include "libweston-internal.h" #ifdef ENABLE_EGL diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c index e21845fe..c05977eb 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 "backend.h" #include "libweston-internal.h" #define MAX_RETRY_COUNT 3