Rename compositor.h to libweston/libweston.h

The main idea is to make libweston users use the form

 #include <libweston/libweston.h>

instead of the plain

 #include <compositor.h>

which is prone to name conflicts. This is reflected both in the installed
files, and the internal header search paths so that Weston would use the exact
same form as an external project using libweston would.

The public headers are moved under a new top-level directory include/ to make
them clearly stand out as special (public API).

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>

compositor/cms-colord.c

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <colord.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston.h"
 #include "cms-helper.h"
 #include "shared/helpers.h"

compositor/cms-helper.c

@@ -34,7 +34,7 @@
 #include <lcms2.h>
 #endif
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "cms-helper.h"
 
 #ifdef HAVE_LCMS

compositor/cms-helper.h

@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 /* General overview on how to be a CMS plugin:
  *

compositor/cms-static.c

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "cms-helper.h"
 #include "shared/helpers.h"
 #include "weston.h"

compositor/main.c

@@ -47,7 +47,7 @@
 #include <linux/limits.h>
 
 #include "weston.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "../shared/os-compatibility.h"
 #include "../shared/helpers.h"
 #include "../shared/string-helpers.h"

compositor/screen-share.c

@@ -40,7 +40,7 @@
 
 #include <wayland-client.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston.h"
 #include "shared/helpers.h"
 #include "shared/os-compatibility.h"

compositor/systemd-notify.c

@@ -33,7 +33,7 @@
 #include "shared/helpers.h"
 #include "shared/string-helpers.h"
 #include "shared/zalloc.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston.h"
 
 struct systemd_notifier {

compositor/text-backend.c

@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston.h"
 #include "text-input-unstable-v1-server-protocol.h"
 #include "input-method-unstable-v1-server-protocol.h"

compositor/weston-screenshooter.c

@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <linux/input.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston.h"
 #include "weston-screenshooter-server-protocol.h"
 #include "shared/helpers.h"

compositor/weston.h

@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include <compositor.h>
+#include <libweston/libweston.h>
 
 void
 screenshooter_create(struct weston_compositor *ec);

compositor/xwayland.c

@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <sys/socket.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "xwayland/xwayland-api.h"
 #include "shared/helpers.h"

desktop-shell/shell.h

@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <time.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "xwayland/xwayland-api.h"
 
 #include "weston-desktop-shell-server-protocol.h"

fullscreen-shell/fullscreen-shell.c

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "fullscreen-shell-unstable-v1-server-protocol.h"
 #include "shared/helpers.h"

include/libweston/meson.build

@@ -1,4 +1,5 @@
 install_headers(
+	'libweston.h',
 	'timeline-object.h',
 	subdir: dir_include_libweston_install
 )

ivi-shell/ivi-layout-export.h

@@ -59,7 +59,7 @@ extern "C" {
 #include <limits.h>
 
 #include "stdbool.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "plugin-registry.h"
 
 #define IVI_SUCCEEDED (0)

ivi-shell/ivi-layout-private.h

@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "ivi-layout-export.h"
 #include "libweston-desktop/libweston-desktop.h"
 

ivi-shell/ivi-layout.c

@@ -62,7 +62,7 @@
 #include <stdint.h>
 
 #include "compositor/weston.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "ivi-shell.h"
 #include "ivi-layout-export.h"
 #include "ivi-layout-private.h"

ivi-shell/ivi-shell.h

@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "libweston-desktop/libweston-desktop.h"
 
 struct ivi_shell

libweston-desktop/client.c

@@ -25,7 +25,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 
 #include "libweston-desktop.h"

libweston-desktop/internal.h

@@ -24,7 +24,7 @@
 #ifndef WESTON_DESKTOP_INTERNAL_H
 #define WESTON_DESKTOP_INTERNAL_H
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 struct weston_desktop_seat;
 struct weston_desktop_client;

libweston-desktop/libweston-desktop.c

@@ -28,7 +28,7 @@
 #include <wayland-server.h>
 #include <assert.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 #include "helpers.h"
 

libweston-desktop/libweston-desktop.h

@@ -24,7 +24,7 @@
 #ifndef WESTON_DESKTOP_H
 #define WESTON_DESKTOP_H
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include <pixman.h>
 #include <stdbool.h>
 

libweston-desktop/seat.c

@@ -30,7 +30,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 
 #include "libweston-desktop.h"

libweston-desktop/surface.c

@@ -28,7 +28,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 
 #include "libweston-desktop.h"

libweston-desktop/wl-shell.c

@@ -30,7 +30,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 
 #include "libweston-desktop.h"

libweston-desktop/xdg-shell-v6.c

@@ -31,7 +31,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 #include "xdg-shell-unstable-v6-server-protocol.h"
 

libweston-desktop/xdg-shell.c

@@ -31,7 +31,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 #include "xdg-shell-server-protocol.h"
 

libweston-desktop/xwayland.c

@@ -30,7 +30,7 @@
 
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "zalloc.h"
 
 #include "libweston-desktop.h"

libweston/animation.c

@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"
 

libweston/bindings.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <linux/input.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"
 

libweston/clipboard.c

@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <sys/uio.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "shared/helpers.h"
 
 struct clipboard_source {

libweston/compositor-drm.c

@@ -50,7 +50,7 @@
 #include <gbm.h>
 #include <libudev.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor-drm.h"
 #include "weston-debug.h"
 #include "shared/helpers.h"

libweston/compositor-drm.h

@@ -28,7 +28,7 @@
 #ifndef WESTON_COMPOSITOR_DRM_H
 #define WESTON_COMPOSITOR_DRM_H
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "plugin-registry.h"
 
 #ifdef  __cplusplus

libweston/compositor-fbdev.c

@@ -45,7 +45,7 @@
 #include <libudev.h>
 
 #include "shared/helpers.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor-fbdev.h"
 #include "launcher-util.h"
 #include "pixman-renderer.h"

libweston/compositor-fbdev.h

@@ -32,7 +32,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #define WESTON_FBDEV_BACKEND_CONFIG_VERSION 2
 

libweston/compositor-headless.c

@@ -33,7 +33,7 @@
 #include <sys/time.h>
 #include <stdbool.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor-headless.h"
 #include "shared/helpers.h"
 #include "linux-explicit-synchronization.h"

libweston/compositor-headless.h

@@ -32,7 +32,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #define WESTON_HEADLESS_BACKEND_CONFIG_VERSION 2
 

libweston/compositor-rdp.c

@@ -98,7 +98,7 @@
 
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor-rdp.h"
 #include "pixman-renderer.h"
 

libweston/compositor-rdp.h

@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "plugin-registry.h"
 
 #define WESTON_RDP_OUTPUT_API_NAME "weston_rdp_output_api_v1"

libweston/compositor-wayland.c

@@ -44,7 +44,7 @@
 #include <wayland-egl.h>
 #endif
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor-wayland.h"
 #include "gl-renderer.h"
 #include "weston-egl-ext.h"

libweston/compositor-wayland.h

@@ -26,7 +26,7 @@
 #ifndef WESTON_COMPOSITOR_WAYLAND_H
 #define WESTON_COMPOSITOR_WAYLAND_H
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #ifdef  __cplusplus
 extern "C" {

libweston/compositor-x11.c

@@ -50,7 +50,7 @@
 
 #include <xkbcommon/xkbcommon.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor-x11.h"
 #include "shared/config-parser.h"
 #include "shared/helpers.h"

libweston/compositor-x11.h

@@ -32,7 +32,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #define WESTON_X11_BACKEND_CONFIG_VERSION 2
 

libweston/compositor.c

@@ -55,7 +55,7 @@
 
 #include "timeline.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston-debug.h"
 #include "linux-dmabuf.h"
 #include "viewporter-server-protocol.h"

libweston/data-device.c

@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"
 

libweston/dbus.c

@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "dbus.h"
 
 /*

libweston/dbus.h

@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <wayland-server.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #ifdef HAVE_DBUS
 

libweston/gl-renderer.h

@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #ifdef ENABLE_EGL
 

libweston/input.c

@@ -41,7 +41,7 @@
 #include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/timespec-util.h"
-#include "compositor.h"
+#include <libweston/libweston.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"

libweston/launcher-direct.c

@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #include <errno.h>
 #include <fcntl.h>

libweston/launcher-impl.h

@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 struct weston_launcher;
 

libweston/launcher-logind.c

@@ -38,7 +38,7 @@
 #include <systemd/sd-login.h>
 #include <unistd.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "dbus.h"
 #include "launcher-impl.h"
 

libweston/launcher-util.c

@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #include "launcher-util.h"
 #include "launcher-impl.h"

libweston/launcher-util.h

@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 struct weston_launcher;
 

libweston/launcher-weston-launch.c

@@ -44,7 +44,7 @@
 #include <linux/kd.h>
 #include <linux/major.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "weston-launch.h"
 #include "launcher-impl.h"
 

libweston/libinput-device.c

@@ -38,7 +38,7 @@
 #include <assert.h>
 #include <libinput.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "libinput-device.h"
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"

libweston/libinput-device.h

@@ -33,7 +33,7 @@
 #include <libinput.h>
 #include <stdbool.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 enum evdev_device_seat_capability {
 	EVDEV_SEAT_POINTER = (1 << 0),

libweston/libinput-seat.c

@@ -34,7 +34,7 @@
 #include <libinput.h>
 #include <libudev.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "launcher-util.h"
 #include "libinput-seat.h"
 #include "libinput-device.h"

libweston/libinput-seat.h

@@ -31,7 +31,7 @@
 
 #include <libudev.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 struct libinput_device;
 

libweston/linux-dmabuf.c

@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "linux-dmabuf.h"
 #include "linux-dmabuf-unstable-v1-server-protocol.h"
 

libweston/linux-explicit-synchronization.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <inttypes.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "linux-explicit-synchronization.h"
 #include "linux-explicit-synchronization-unstable-v1-server-protocol.h"
 #include "linux-sync-file.h"

libweston/log.c

@@ -34,7 +34,7 @@
 
 #include <wayland-util.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 static int
 default_log_handler(const char *fmt, va_list ap);

libweston/meson.build

@@ -57,7 +57,6 @@ srcs_libweston = [
 ]
 
 install_headers(
-	'compositor.h',
 	'plugin-registry.h',
 	'windowed-output-api.h',
 	'../shared/config-parser.h',

libweston/noop-renderer.c

@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 static int
 noop_renderer_read_pixels(struct weston_output *output,

libweston/pixman-renderer.h

@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 int
 pixman_renderer_init(struct weston_compositor *ec);

libweston/plugin-registry.c

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "plugin-registry.h"
 
 struct weston_plugin_api {

libweston/screenshooter.c

@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <sys/uio.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"
 

libweston/spring-tool.c

@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "shared/timespec-util.h"
 
 WL_EXPORT void

libweston/timeline.c

@@ -33,7 +33,7 @@
 #include <assert.h>
 
 #include "timeline.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "file-util.h"
 
 struct timeline_log {

libweston/touch-calibration.c

@@ -33,7 +33,7 @@
 #include "shared/string-helpers.h"
 #include "shared/zalloc.h"
 #include "shared/timespec-util.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #include "weston-touch-calibration-server-protocol.h"
 

libweston/vaapi-recorder.c

@@ -45,7 +45,7 @@
 #include <va/va_enc_h264.h>
 #include <va/va_vpp.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "vaapi-recorder.h"
 
 #define NAL_REF_IDC_NONE        0

libweston/weston-debug.c

@@ -28,7 +28,7 @@
 
 #include "weston-debug.h"
 #include "helpers.h"
-#include "compositor.h"
+#include <libweston/libweston.h>
 
 #include "weston-debug-server-protocol.h"
 

libweston/zoom.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "text-cursor-position-server-protocol.h"
 #include "shared/helpers.h"
 

remoting/remoting-plugin.h

@@ -28,7 +28,7 @@
 #ifndef REMOTING_PLUGIN_H
 #define REMOTING_PLUGIN_H
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "plugin-registry.h"
 
 #define WESTON_REMOTING_API_NAME	"weston_remoting_api_v1"

tests/ivi-layout-internal-test.c

@@ -32,7 +32,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "ivi-shell/ivi-layout-export.h"
 #include "ivi-shell/ivi-layout-private.h"

tests/ivi-layout-test-plugin.c

@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <limits.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "weston-test-server-protocol.h"
 #include "ivi-test.h"

tests/plugin-registry-test.c

@@ -27,7 +27,7 @@
 
 #include <assert.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "plugin-registry.h"
 

tests/surface-global-test.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 
 static void

tests/surface-screenshot-test.c

@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <linux/input.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "file-util.h"
 

tests/surface-test.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 
 static void

tests/weston-test.c

@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "weston-test-server-protocol.h"
 

xwayland/dnd.c

@@ -37,7 +37,7 @@
 #include <signal.h>
 #include <X11/Xcursor/Xcursor.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "xwayland.h"
 
 #include "cairo-util.h"

xwayland/window-manager.c

@@ -41,7 +41,7 @@
 #include <X11/Xcursor/Xcursor.h>
 #include <linux/input.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "xwayland.h"
 #include "xwayland-internal-interface.h"
 

xwayland/xwayland.h

@@ -30,7 +30,7 @@
 #include <xcb/composite.h>
 #include <cairo/cairo-xcb.h>
 
-#include "compositor.h"
+#include <libweston/libweston.h>
 #include "compositor/weston.h"
 #include "xwayland-api.h"
 #include "weston-debug.h"