From c2e147401048aa53aebd52f1851b1da8c91043a3 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 12 Feb 2018 21:29:23 +0100 Subject: [PATCH] Reformat all #include directives --- backend/backend.c | 16 +++++----- backend/drm/atomic.c | 4 +-- backend/drm/backend.c | 18 ++++++------ backend/drm/drm.c | 24 +++++++-------- backend/drm/legacy.c | 2 +- backend/drm/properties.c | 2 +- backend/drm/renderer.c | 18 +++++------- backend/drm/util.c | 8 ++--- backend/headless/backend.c | 6 ++-- backend/headless/input_device.c | 8 ++--- backend/headless/output.c | 4 +-- backend/libinput/backend.c | 6 ++-- backend/libinput/events.c | 6 ++-- backend/libinput/keyboard.c | 6 ++-- backend/libinput/pointer.c | 6 ++-- backend/libinput/tablet_pad.c | 6 ++-- backend/libinput/tablet_tool.c | 6 ++-- backend/libinput/touch.c | 6 ++-- backend/meson.build | 6 ++-- backend/multi/backend.c | 4 +-- backend/session/direct-freebsd.c | 26 ++++++++-------- backend/session/direct-ipc.c | 10 +++---- backend/session/direct.c | 18 ++++++------ backend/session/logind.c | 12 ++++---- backend/session/session.c | 8 ++--- backend/wayland/backend.c | 14 ++++----- backend/wayland/output.c | 10 +++---- backend/wayland/registry.c | 1 - backend/wayland/wl_seat.c | 8 ++--- backend/x11/backend.c | 26 ++++++++-------- include/backend/drm/drm.h | 10 +++---- include/backend/drm/iface.h | 3 +- include/backend/drm/renderer.h | 6 ++-- include/backend/drm/util.h | 2 +- include/backend/headless.h | 2 +- include/backend/libinput.h | 3 +- include/backend/multi.h | 2 +- include/backend/wayland.h | 10 +++---- include/backend/x11.h | 8 ++--- include/render/gles2.h | 10 +++---- include/rootston/config.h | 7 +++-- include/rootston/cursor.h | 4 +-- include/rootston/desktop.h | 21 ++++++------- include/rootston/input.h | 11 +++---- include/rootston/keyboard.h | 4 +-- include/rootston/output.h | 6 ++-- include/rootston/seat.h | 5 ++-- include/rootston/server.h | 5 ++-- include/rootston/view.h | 4 +-- include/rootston/xcursor.h | 4 +-- include/util/os-compatibility.h | 7 ++--- include/util/signal.h | 4 +-- include/wlr/backend/drm.h | 2 +- include/wlr/backend/libinput.h | 2 +- include/wlr/backend/multi.h | 5 ---- include/wlr/backend/session.h | 4 +-- include/wlr/backend/wayland.h | 2 +- include/wlr/interfaces/wlr_keyboard.h | 2 +- include/wlr/interfaces/wlr_output.h | 2 +- include/wlr/render.h | 2 +- include/wlr/render/egl.h | 6 ++-- include/wlr/render/gles2.h | 2 +- include/wlr/render/interface.h | 2 +- include/wlr/types/wlr_cursor.h | 6 ++-- include/wlr/types/wlr_keyboard.h | 4 +-- include/wlr/types/wlr_list.h | 6 ++-- include/wlr/types/wlr_output.h | 4 +-- include/wlr/types/wlr_output_damage.h | 2 +- include/wlr/types/wlr_output_layout.h | 4 +-- include/wlr/types/wlr_pointer.h | 4 +-- include/wlr/types/wlr_primary_selection.h | 2 +- include/wlr/types/wlr_screenshooter.h | 5 ++-- include/wlr/types/wlr_seat.h | 5 ++-- include/wlr/types/wlr_surface.h | 7 +++-- include/wlr/types/wlr_tablet_pad.h | 4 +-- include/wlr/types/wlr_tablet_tool.h | 4 +-- include/wlr/types/wlr_touch.h | 2 +- include/wlr/types/wlr_xdg_shell_v6.h | 2 +- include/wlr/xwayland.h | 2 +- include/wlr/xwm.h | 6 ++-- meson.build | 36 +++++++++++------------ protocol/meson.build | 4 +-- render/egl.c | 4 +-- render/gles2/renderer.c | 6 ++-- render/gles2/shaders.c | 2 +- render/gles2/texture.c | 8 ++--- render/gles2/util.c | 4 +-- render/matrix.c | 4 +-- render/meson.build | 2 +- render/wlr_renderer.c | 2 +- render/wlr_texture.c | 2 +- rootston/config.c | 10 +++---- rootston/cursor.c | 10 +++---- rootston/desktop.c | 10 +++---- rootston/input.c | 4 +-- rootston/keyboard.c | 8 ++--- rootston/main.c | 2 +- rootston/meson.build | 2 +- rootston/output.c | 14 ++++----- rootston/seat.c | 10 +++---- rootston/wl_shell.c | 4 +-- rootston/xdg_shell_v6.c | 4 +-- rootston/xwayland.c | 4 +-- types/meson.build | 4 +-- types/wlr_box.c | 2 +- types/wlr_compositor.c | 6 ++-- types/wlr_cursor.c | 12 ++++---- types/wlr_data_device.c | 6 ++-- types/wlr_gamma_control.c | 2 +- types/wlr_idle.c | 2 +- types/wlr_input_device.c | 6 ++-- types/wlr_keyboard.c | 4 +-- types/wlr_list.c | 4 +-- types/wlr_output.c | 6 ++-- types/wlr_output_damage.c | 6 ++-- types/wlr_output_layout.c | 12 ++++---- types/wlr_pointer.c | 2 +- types/wlr_primary_selection.c | 6 ++-- types/wlr_region.c | 6 ++-- types/wlr_screenshooter.c | 4 +-- types/wlr_seat.c | 6 ++-- types/wlr_server_decoration.c | 4 +-- types/wlr_surface.c | 8 ++--- types/wlr_tablet_pad.c | 2 +- types/wlr_tablet_tool.c | 2 +- types/wlr_touch.c | 2 +- types/wlr_wl_shell.c | 8 ++--- types/wlr_xdg_shell_v6.c | 4 +-- util/log.c | 2 +- util/os-compatibility.c | 10 +++---- util/region.c | 2 +- xcursor/meson.build | 2 +- xcursor/wlr_xcursor.c | 6 ++-- xcursor/xcursor.c | 4 +-- xwayland/selection.c | 16 +++++----- xwayland/sockets.c | 16 +++++----- xwayland/xwayland.c | 16 +++++----- xwayland/xwm.c | 16 +++++----- 138 files changed, 449 insertions(+), 456 deletions(-) diff --git a/backend/backend.c b/backend/backend.c index aec5781ee..c67be6172 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -1,17 +1,17 @@ -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include #include +#include #include +#include +#include #include #include -#include #include void wlr_backend_init(struct wlr_backend *backend, diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index 526b27315..29b5ccb13 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -1,8 +1,8 @@ -#include #include +#include +#include #include #include -#include #include "backend/drm/drm.h" #include "backend/drm/iface.h" #include "backend/drm/util.h" diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 682e8c85a..47dff2275 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -1,19 +1,19 @@ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include -#include -#include #include +#include #include +#include #include #include -#include "util/signal.h" -#include +#include #include "backend/drm/drm.h" +#include "util/signal.h" static bool wlr_drm_backend_start(struct wlr_backend *backend) { struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend; diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 5189ec909..e60b7e1cd 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1,30 +1,30 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include #include #include #include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include "util/signal.h" -#include -#include #include +#include +#include +#include +#include +#include #include "backend/drm/drm.h" #include "backend/drm/iface.h" #include "backend/drm/util.h" +#include "util/signal.h" bool wlr_drm_check_features(struct wlr_drm_backend *drm) { if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) { diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c index eec8c6423..88a01b89d 100644 --- a/backend/drm/legacy.c +++ b/backend/drm/legacy.c @@ -1,7 +1,7 @@ #include +#include #include #include -#include #include "backend/drm/drm.h" #include "backend/drm/iface.h" #include "backend/drm/util.h" diff --git a/backend/drm/properties.c b/backend/drm/properties.c index 153e845ef..3d35beb5d 100644 --- a/backend/drm/properties.c +++ b/backend/drm/properties.c @@ -2,9 +2,9 @@ #include #include #include +#include #include #include -#include #include "backend/drm/properties.h" /* diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index 80d3bd9a7..f3e570f74 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -1,18 +1,16 @@ +#include +#include +#include +#include #include #include #include - -#include -#include -#include -#include #include - -#include -#include -#include -#include #include +#include +#include +#include +#include #include "backend/drm/drm.h" #include "glapi.h" diff --git a/backend/drm/util.c b/backend/drm/util.c index 37d99aa8c..41ba47d17 100644 --- a/backend/drm/util.c +++ b/backend/drm/util.c @@ -1,10 +1,10 @@ +#include +#include +#include #include #include -#include -#include -#include -#include "backend/drm/util.h" #include +#include "backend/drm/util.h" int32_t calculate_refresh_rate(drmModeModeInfo *mode) { int32_t refresh = (mode->clock * 1000000LL / mode->htotal + diff --git a/backend/headless/backend.c b/backend/headless/backend.c index a79e4af86..663bc13be 100644 --- a/backend/headless/backend.c +++ b/backend/headless/backend.c @@ -1,10 +1,10 @@ +#include "util/signal.h" #include +#include +#include #include #include #include -#include "util/signal.h" -#include -#include #include "backend/headless.h" #include "glapi.h" diff --git a/backend/headless/input_device.c b/backend/headless/input_device.c index 5d7ca34b6..ea335aff6 100644 --- a/backend/headless/input_device.c +++ b/backend/headless/input_device.c @@ -1,13 +1,13 @@ #include #include -#include #include -#include -#include +#include #include +#include +#include #include -#include "util/signal.h" #include "backend/headless.h" +#include "util/signal.h" static void input_device_destroy(struct wlr_input_device *wlr_dev) { struct wlr_headless_input_device *device = diff --git a/backend/headless/output.c b/backend/headless/output.c index 63f0b6b4b..ba4a094e2 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -1,11 +1,11 @@ -#include #include #include #include +#include #include #include -#include "util/signal.h" #include "backend/headless.h" +#include "util/signal.h" static EGLSurface egl_create_surface(struct wlr_egl *egl, unsigned int width, unsigned int height) { diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 1ec730097..71fe0d934 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -1,11 +1,11 @@ -#include #include #include -#include +#include #include +#include #include -#include "util/signal.h" #include "backend/libinput.h" +#include "util/signal.h" static int wlr_libinput_open_restricted(const char *path, int flags, void *_backend) { diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 248b82139..603eed07d 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -1,12 +1,12 @@ -#include #include #include +#include +#include #include #include #include -#include -#include "util/signal.h" #include "backend/libinput.h" +#include "util/signal.h" struct wlr_input_device *get_appropriate_device( enum wlr_input_device_type desired_type, diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c index 065d8ead0..b44bc892b 100644 --- a/backend/libinput/keyboard.c +++ b/backend/libinput/keyboard.c @@ -1,9 +1,9 @@ -#include #include #include +#include #include -#include #include +#include #include #include "backend/libinput.h" @@ -57,7 +57,7 @@ void handle_keyboard_key(struct libinput_event *event, wlr_event.time_msec = usec_to_msec(libinput_event_keyboard_get_time_usec(kbevent)); wlr_event.keycode = libinput_event_keyboard_get_key(kbevent); - enum libinput_key_state state = + enum libinput_key_state state = libinput_event_keyboard_get_key_state(kbevent); switch (state) { case LIBINPUT_KEY_STATE_RELEASED: diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index 560e95b56..8a31d3121 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -1,12 +1,12 @@ -#include #include #include +#include #include -#include #include +#include #include -#include "util/signal.h" #include "backend/libinput.h" +#include "util/signal.h" struct wlr_pointer *wlr_libinput_pointer_create( struct libinput_device *libinput_dev) { diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c index e8ffc6dda..70e4c677b 100644 --- a/backend/libinput/tablet_pad.c +++ b/backend/libinput/tablet_pad.c @@ -1,12 +1,12 @@ -#include #include #include +#include #include -#include #include +#include #include -#include "util/signal.h" #include "backend/libinput.h" +#include "util/signal.h" struct wlr_tablet_pad *wlr_libinput_tablet_pad_create( struct libinput_device *libinput_dev) { diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 0f2ea70a9..4e60367fb 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -1,12 +1,12 @@ -#include #include #include +#include #include -#include #include +#include #include -#include "util/signal.h" #include "backend/libinput.h" +#include "util/signal.h" struct wlr_tablet_tool *wlr_libinput_tablet_tool_create( struct libinput_device *libinput_dev) { diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c index fb2b8e3f5..2b87f9cd4 100644 --- a/backend/libinput/touch.c +++ b/backend/libinput/touch.c @@ -1,12 +1,12 @@ -#include #include #include +#include #include -#include #include +#include #include -#include "util/signal.h" #include "backend/libinput.h" +#include "util/signal.h" struct wlr_touch *wlr_libinput_touch_create( struct libinput_device *libinput_dev) { diff --git a/backend/meson.build b/backend/meson.build index beb3841c5..bac43063c 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -1,7 +1,5 @@ backend_files = files( 'backend.c', - 'session/direct-ipc.c', - 'session/session.c', 'drm/atomic.c', 'drm/backend.c', 'drm/drm.c', @@ -10,8 +8,8 @@ backend_files = files( 'drm/renderer.c', 'drm/util.c', 'headless/backend.c', - 'headless/output.c', 'headless/input_device.c', + 'headless/output.c', 'libinput/backend.c', 'libinput/events.c', 'libinput/keyboard.c', @@ -20,6 +18,8 @@ backend_files = files( 'libinput/tablet_tool.c', 'libinput/touch.c', 'multi/backend.c', + 'session/direct-ipc.c', + 'session/session.c', 'wayland/backend.c', 'wayland/output.c', 'wayland/registry.c', diff --git a/backend/multi/backend.c b/backend/multi/backend.c index 1005e6b71..5cb3fbc59 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -4,9 +4,9 @@ #include #include #include -#include "util/signal.h" -#include "backend/multi.h" #include "backend/drm/drm.h" +#include "backend/multi.h" +#include "util/signal.h" struct subbackend_state { struct wlr_backend *backend; diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c index ceaae2be2..6e23bf1b2 100644 --- a/backend/session/direct-freebsd.c +++ b/backend/session/direct-freebsd.c @@ -1,22 +1,22 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include -#include "util/signal.h" #include "backend/session/direct-ipc.h" +#include "util/signal.h" const struct session_impl session_direct; diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c index e7a169fae..6c69b70a3 100644 --- a/backend/session/direct-ipc.c +++ b/backend/session/direct-ipc.c @@ -4,22 +4,22 @@ #define INPUT_MAJOR 0 #endif #include +#include #include #include #include -#include -#include #include #include #include #include +#include +#include +#include +#include #ifdef __linux__ #include #include #endif -#include -#include -#include #include "backend/session/direct-ipc.h" enum { DRM_MAJOR = 226 }; diff --git a/backend/session/direct.c b/backend/session/direct.c index 1f60ed237..13a26d990 100644 --- a/backend/session/direct.c +++ b/backend/session/direct.c @@ -1,22 +1,22 @@ #define _POSIX_C_SOURCE 200809L #include -#include -#include -#include -#include +#include +#include +#include +#include #include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include #include #include #include -#include "util/signal.h" #include "backend/session/direct-ipc.h" +#include "util/signal.h" enum { DRM_MAJOR = 226 }; diff --git a/backend/session/logind.c b/backend/session/logind.c index b2206e15b..f0ac1e931 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -1,17 +1,17 @@ #define _POSIX_C_SOURCE 200809L #include -#include +#include +#include #include +#include #include #include -#include -#include -#include #include -#include +#include +#include #include -#include #include +#include #include #include "util/signal.h" diff --git a/backend/session/session.c b/backend/session/session.c index ac55a1910..2d5d97767 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -1,18 +1,18 @@ #define _POSIX_C_SOURCE 200809L #include +#include #include #include #include #include #include -#include #include -#include -#include -#include #include #include +#include #include +#include +#include #include "util/signal.h" extern const struct session_impl session_logind; diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 60c8ede91..abb25df55 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -1,18 +1,18 @@ -#include -#include #include -#include #include #include +#include +#include +#include #include +#include +#include +#include #include #include -#include -#include -#include #include -#include "util/signal.h" #include "backend/wayland.h" +#include "util/signal.h" #include "xdg-shell-unstable-v6-client-protocol.h" static int dispatch_events(int fd, uint32_t mask, void *data) { diff --git a/backend/wayland/output.c b/backend/wayland/output.c index fed4c63a7..fc40dea0b 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -1,17 +1,17 @@ -#include #include +#include #include +#include #include #include -#include -#include #include +#include +#include #include -#include #include #include -#include "util/signal.h" #include "backend/wayland.h" +#include "util/signal.h" #include "xdg-shell-unstable-v6-client-protocol.h" int os_create_anonymous_file(off_t size); diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c index 0dec0ec54..4aa39f09a 100644 --- a/backend/wayland/registry.c +++ b/backend/wayland/registry.c @@ -6,7 +6,6 @@ #include "backend/wayland.h" #include "xdg-shell-unstable-v6-client-protocol.h" - static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell, uint32_t serial) { zxdg_shell_v6_pong(shell, serial); diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index f63281064..b1f7cff6d 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -1,17 +1,17 @@ #define _XOPEN_SOURCE 500 #include -#include #include +#include #include #include -#include #include -#include #include +#include +#include #include #include -#include "util/signal.h" #include "backend/wayland.h" +#include "util/signal.h" static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 2715b3664..28a4fcacb 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -1,29 +1,29 @@ #define _POSIX_C_SOURCE 200112L +#include #include #include #include #include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #ifdef __linux__ #include #elif __FreeBSD__ #include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "util/signal.h" #include "backend/x11.h" +#include "util/signal.h" static struct wlr_backend_impl backend_impl; static struct wlr_output_impl output_impl; diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 12530da64..65db04ef3 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -1,19 +1,17 @@ #ifndef BACKEND_DRM_DRM_H #define BACKEND_DRM_DRM_H +#include +#include #include #include #include #include -#include -#include -#include #include - -#include #include +#include #include - +#include #include "iface.h" #include "properties.h" #include "renderer.h" diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index 15cdf1ab9..ef0e7bf85 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -1,10 +1,9 @@ #ifndef BACKEND_DRM_IFACE_H #define BACKEND_DRM_IFACE_H +#include #include #include - -#include #include #include diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h index bf0165bc2..a56a8673a 100644 --- a/include/backend/drm/renderer.h +++ b/include/backend/drm/renderer.h @@ -1,12 +1,10 @@ #ifndef BACKEND_DRM_RENDERER_H #define BACKEND_DRM_RENDERER_H -#include -#include - #include #include - +#include +#include #include struct wlr_drm_backend; diff --git a/include/backend/drm/util.h b/include/backend/drm/util.h index 6818b4dbd..25da858f7 100644 --- a/include/backend/drm/util.h +++ b/include/backend/drm/util.h @@ -2,9 +2,9 @@ #define BACKEND_DRM_UTIL_H #include +#include #include #include -#include // Calculates a more accurate refresh rate (mHz) than what mode itself provides int32_t calculate_refresh_rate(drmModeModeInfo *mode); diff --git a/include/backend/headless.h b/include/backend/headless.h index f9805bccc..e130bae16 100644 --- a/include/backend/headless.h +++ b/include/backend/headless.h @@ -1,8 +1,8 @@ #ifndef BACKEND_HEADLESS_H #define BACKEND_HEADLESS_H -#include #include +#include struct wlr_headless_backend { struct wlr_backend backend; diff --git a/include/backend/libinput.h b/include/backend/libinput.h index 6ec718c64..f828c310e 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -1,10 +1,11 @@ #ifndef BACKEND_LIBINPUT_H #define BACKEND_LIBINPUT_H + #include #include -#include #include #include +#include #include struct wlr_libinput_backend { diff --git a/include/backend/multi.h b/include/backend/multi.h index 3363c6082..c57c48f39 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -1,10 +1,10 @@ #ifndef BACKEND_MULTI_H #define BACKEND_MULTI_H +#include #include #include #include -#include struct wlr_multi_backend { struct wlr_backend backend; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 78a88f29b..16c8e13b0 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -3,13 +3,13 @@ #include #include -#include #include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include struct wlr_wl_backend { struct wlr_backend backend; diff --git a/include/backend/x11.h b/include/backend/x11.h index fee39eacb..c5f258c00 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -1,11 +1,11 @@ -#ifndef WLR_X11_H -#define WLR_X11_H +#ifndef BACKEND_X11_H +#define BACKEND_X11_H #include -#include -#include #include #include +#include +#include struct wlr_x11_backend; diff --git a/include/render/gles2.h b/include/render/gles2.h index 0b7032cc7..797c52931 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -1,13 +1,13 @@ #ifndef RENDER_GLES2_H #define RENDER_GLES2_H -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/rootston/config.h b/include/rootston/config.h index 05f23b75b..9926d9c2b 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -1,7 +1,8 @@ -#ifndef _ROOTSTON_CONFIG_H -#define _ROOTSTON_CONFIG_H -#include +#ifndef ROOTSTON_CONFIG_H +#define ROOTSTON_CONFIG_H + #include +#include #define ROOTS_CONFIG_DEFAULT_SEAT_NAME "seat0" diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h index 90d54c121..a1a466c26 100644 --- a/include/rootston/cursor.h +++ b/include/rootston/cursor.h @@ -1,5 +1,5 @@ -#ifndef _ROOTSTON_CURSOR_H -#define _ROOTSTON_CURSOR_H +#ifndef ROOTSTON_CURSOR_H +#define ROOTSTON_CURSOR_H #include "rootston/seat.h" diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index a21217016..6572b242a 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -1,22 +1,23 @@ -#ifndef _ROOTSTON_DESKTOP_H -#define _ROOTSTON_DESKTOP_H +#ifndef ROOTSTON_DESKTOP_H +#define ROOTSTON_DESKTOP_H + #include #include #include -#include -#include #include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include -#include "rootston/view.h" +#include +#include +#include #include "rootston/config.h" #include "rootston/output.h" +#include "rootston/view.h" struct roots_desktop { struct wl_list views; // roots_view::link diff --git a/include/rootston/input.h b/include/rootston/input.h index d05cbb0aa..4395a0f7e 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -1,13 +1,14 @@ -#ifndef _ROOTSTON_INPUT_H -#define _ROOTSTON_INPUT_H +#ifndef ROOTSTON_INPUT_H +#define ROOTSTON_INPUT_H + #include -#include #include +#include #include -#include "rootston/cursor.h" #include "rootston/config.h" -#include "rootston/view.h" +#include "rootston/cursor.h" #include "rootston/server.h" +#include "rootston/view.h" struct roots_input { struct roots_config *config; diff --git a/include/rootston/keyboard.h b/include/rootston/keyboard.h index 4548f4a7c..0140389aa 100644 --- a/include/rootston/keyboard.h +++ b/include/rootston/keyboard.h @@ -1,5 +1,5 @@ -#ifndef _ROOTSTON_KEYBOARD_H -#define _ROOTSTON_KEYBOARD_H +#ifndef ROOTSTON_KEYBOARD_H +#define ROOTSTON_KEYBOARD_H #include #include "rootston/input.h" diff --git a/include/rootston/output.h b/include/rootston/output.h index 8396e7c5b..9682e4f54 100644 --- a/include/rootston/output.h +++ b/include/rootston/output.h @@ -1,8 +1,8 @@ -#ifndef _ROOTSTON_OUTPUT_H -#define _ROOTSTON_OUTPUT_H +#ifndef ROOTSTON_OUTPUT_H +#define ROOTSTON_OUTPUT_H -#include #include +#include #include #include diff --git a/include/rootston/seat.h b/include/rootston/seat.h index cd8190761..cc0293b52 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -1,5 +1,6 @@ -#ifndef _ROOTSTON_SEAT_H -#define _ROOTSTON_SEAT_H +#ifndef ROOTSTON_SEAT_H +#define ROOTSTON_SEAT_H + #include #include "rootston/input.h" #include "rootston/keyboard.h" diff --git a/include/rootston/server.h b/include/rootston/server.h index 0c26ea923..5f35dd909 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -1,11 +1,12 @@ #ifndef _ROOTSTON_SERVER_H #define _ROOTSTON_SERVER_H + #include -#include #include #include -#include +#include #include +#include #ifdef WLR_HAS_XWAYLAND #include #endif diff --git a/include/rootston/view.h b/include/rootston/view.h index f6968c7ac..b61ac3306 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -1,5 +1,5 @@ -#ifndef _ROOTSTON_VIEW_H -#define _ROOTSTON_VIEW_H +#ifndef ROOTSTON_VIEW_H +#define ROOTSTON_VIEW_H #include #include diff --git a/include/rootston/xcursor.h b/include/rootston/xcursor.h index a7d2b9601..f78489a41 100644 --- a/include/rootston/xcursor.h +++ b/include/rootston/xcursor.h @@ -1,5 +1,5 @@ -#ifndef _ROOTSTON_XCURSOR_H -#define _ROOTSTON_XCURSOR_H +#ifndef ROOTSTON_XCURSOR_H +#define ROOTSTON_XCURSOR_H #include diff --git a/include/util/os-compatibility.h b/include/util/os-compatibility.h index b2ec2db98..2038025e8 100644 --- a/include/util/os-compatibility.h +++ b/include/util/os-compatibility.h @@ -1,12 +1,9 @@ -#ifndef _WLR_UTIL_OS_COMPATIBILITY_H -#define _WLR_UTIL_OS_COMPATIBILITY_H +#ifndef UTIL_OS_COMPATIBILITY_H +#define UTIL_OS_COMPATIBILITY_H int os_fd_set_cloexec(int fd); - int set_cloexec_or_close(int fd); - int create_tmpfile_cloexec(char *tmpname); - int os_create_anonymous_file(off_t size); #endif diff --git a/include/util/signal.h b/include/util/signal.h index e13141d8a..cc6cb525b 100644 --- a/include/util/signal.h +++ b/include/util/signal.h @@ -1,5 +1,5 @@ -#ifndef WLR_UTIL_SIGNAL_H -#define WLR_UTIL_SIGNAL_H +#ifndef UTIL_SIGNAL_H +#define UTIL_SIGNAL_H #include diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 133e4f692..90460647a 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -2,8 +2,8 @@ #define WLR_BACKEND_DRM_H #include -#include #include +#include #include struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h index af8736287..c7cfe8945 100644 --- a/include/wlr/backend/libinput.h +++ b/include/wlr/backend/libinput.h @@ -3,8 +3,8 @@ #include #include -#include #include +#include #include struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display, diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h index d9914efc1..2dee7403e 100644 --- a/include/wlr/backend/multi.h +++ b/include/wlr/backend/multi.h @@ -5,17 +5,12 @@ #include struct wlr_backend *wlr_multi_backend_create(struct wl_display *display); - void wlr_multi_backend_add(struct wlr_backend *multi, struct wlr_backend *backend); - void wlr_multi_backend_remove(struct wlr_backend *multi, struct wlr_backend *backend); - bool wlr_backend_is_multi(struct wlr_backend *backend); - struct wlr_session *wlr_multi_get_session(struct wlr_backend *base); - bool wlr_multi_is_empty(struct wlr_backend *backend); #endif diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h index 3242a13f0..7ff9691f8 100644 --- a/include/wlr/backend/session.h +++ b/include/wlr/backend/session.h @@ -1,10 +1,10 @@ #ifndef WLR_BACKEND_SESSION_H #define WLR_BACKEND_SESSION_H -#include -#include #include +#include #include +#include struct session_impl; diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h index f89a63832..e28ffff5c 100644 --- a/include/wlr/backend/wayland.h +++ b/include/wlr/backend/wayland.h @@ -1,12 +1,12 @@ #ifndef WLR_BACKEND_WAYLAND_H #define WLR_BACKEND_WAYLAND_H +#include #include #include #include #include #include -#include /** * Creates a new wlr_wl_backend. This backend will be created with no outputs; diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h index 570f5721b..6960ea874 100644 --- a/include/wlr/interfaces/wlr_keyboard.h +++ b/include/wlr/interfaces/wlr_keyboard.h @@ -1,8 +1,8 @@ #ifndef WLR_INTERFACES_WLR_KEYBOARD_H #define WLR_INTERFACES_WLR_KEYBOARD_H -#include #include +#include struct wlr_keyboard_impl { void (*destroy)(struct wlr_keyboard *keyboard); diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index a01f8901c..5edd1ae1c 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -2,9 +2,9 @@ #define WLR_INTERFACES_WLR_OUTPUT_H #include +#include #include #include -#include struct wlr_output_impl { void (*enable)(struct wlr_output *output, bool enable); diff --git a/include/wlr/render.h b/include/wlr/render.h index ccc66d36b..3743482be 100644 --- a/include/wlr/render.h +++ b/include/wlr/render.h @@ -1,9 +1,9 @@ #ifndef WLR_RENDER_H #define WLR_RENDER_H -#include #include #include +#include #include #include #include diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index 1facc6b88..97a280165 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -1,10 +1,10 @@ -#ifndef WLR_EGL_H -#define WLR_EGL_H +#ifndef WLR_RENDER_EGL_H +#define WLR_RENDER_EGL_H -#include #include #include #include +#include #include struct wlr_egl { diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h index 25e760d53..a924a0656 100644 --- a/include/wlr/render/gles2.h +++ b/include/wlr/render/gles2.h @@ -1,8 +1,8 @@ #ifndef WLR_RENDER_GLES2_H #define WLR_RENDER_GLES2_H -#include #include +#include struct wlr_egl; struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend); diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index b8e998980..b989e3997 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -1,10 +1,10 @@ #ifndef WLR_RENDER_INTERFACE_H #define WLR_RENDER_INTERFACE_H -#include #include #include #include +#include #include #include #include diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h index e072ca053..da0109727 100644 --- a/include/wlr/types/wlr_cursor.h +++ b/include/wlr/types/wlr_cursor.h @@ -2,10 +2,10 @@ #define WLR_TYPES_WLR_CURSOR_H #include -#include -#include -#include #include +#include +#include +#include struct wlr_cursor_state; diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h index c67cc4c26..ed0427e81 100644 --- a/include/wlr/types/wlr_keyboard.h +++ b/include/wlr/types/wlr_keyboard.h @@ -1,9 +1,9 @@ #ifndef WLR_TYPES_WLR_KEYBOARD_H #define WLR_TYPES_WLR_KEYBOARD_H -#include -#include #include +#include +#include #include #include diff --git a/include/wlr/types/wlr_list.h b/include/wlr/types/wlr_list.h index 78a309956..23bf53b77 100644 --- a/include/wlr/types/wlr_list.h +++ b/include/wlr/types/wlr_list.h @@ -1,8 +1,8 @@ -#ifndef WLR_UTIL_LIST_H -#define WLR_UTIL_LIST_H +#ifndef WLR_TYPES_WLR_LIST_H +#define WLR_TYPES_WLR_LIST_H -#include #include +#include struct wlr_list { size_t capacity; diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 8eed06fe4..5c2ffee03 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -1,11 +1,11 @@ #ifndef WLR_TYPES_WLR_OUTPUT_H #define WLR_TYPES_WLR_OUTPUT_H +#include #include #include -#include -#include #include +#include struct wlr_output_mode { uint32_t flags; // enum wl_output_mode diff --git a/include/wlr/types/wlr_output_damage.h b/include/wlr/types/wlr_output_damage.h index 52cbce785..6682f942a 100644 --- a/include/wlr/types/wlr_output_damage.h +++ b/include/wlr/types/wlr_output_damage.h @@ -1,8 +1,8 @@ #ifndef WLR_TYPES_WLR_OUTPUT_DAMAGE_H #define WLR_TYPES_WLR_OUTPUT_DAMAGE_H -#include #include +#include #include /** diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index 9187b3775..7dd2b16ac 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -1,10 +1,10 @@ #ifndef WLR_TYPES_WLR_OUTPUT_LAYOUT_H #define WLR_TYPES_WLR_OUTPUT_LAYOUT_H +#include +#include #include #include -#include -#include struct wlr_output_layout_state; diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 3a6d21754..e7ac9b46c 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -1,9 +1,9 @@ #ifndef WLR_TYPES_WLR_POINTER_H #define WLR_TYPES_WLR_POINTER_H -#include -#include #include +#include +#include struct wlr_pointer_impl; diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h index da3c096a2..78f23ad67 100644 --- a/include/wlr/types/wlr_primary_selection.h +++ b/include/wlr/types/wlr_primary_selection.h @@ -1,8 +1,8 @@ #ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_H #define WLR_TYPES_WLR_PRIMARY_SELECTION_H -#include #include +#include struct wlr_primary_selection_device_manager { struct wl_global *global; diff --git a/include/wlr/types/wlr_screenshooter.h b/include/wlr/types/wlr_screenshooter.h index cfe7742d5..680d86f07 100644 --- a/include/wlr/types/wlr_screenshooter.h +++ b/include/wlr/types/wlr_screenshooter.h @@ -1,5 +1,6 @@ -#ifndef _WLR_SCREENSHOOTER_H -#define _WLR_SCREENSHOOTER_H +#ifndef WLR_TYPES_WLR_SCREENSHOOTER_H +#define WLR_TYPES_WLR_SCREENSHOOTER_H + #include struct wlr_screenshooter { diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index ffdabd98b..b03cab6ec 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -1,10 +1,11 @@ #ifndef WLR_TYPES_WLR_SEAT_H #define WLR_TYPES_WLR_SEAT_H + #include -#include +#include #include #include -#include +#include /** * Contains state for a single client's bound wl_seat resource and can be used diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 50316abc1..998b5ae5b 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -1,9 +1,10 @@ #ifndef WLR_TYPES_WLR_SURFACE_H #define WLR_TYPES_WLR_SURFACE_H -#include -#include -#include + #include +#include +#include +#include #include #include diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h index 51a65dd16..e70db516f 100644 --- a/include/wlr/types/wlr_tablet_pad.h +++ b/include/wlr/types/wlr_tablet_pad.h @@ -1,9 +1,9 @@ #ifndef WLR_TYPES_WLR_TABLET_PAD_H #define WLR_TYPES_WLR_TABLET_PAD_H -#include -#include #include +#include +#include /* * NOTE: the wlr tablet pad implementation does not currently support tablets diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h index c6984d4db..59e49ef8d 100644 --- a/include/wlr/types/wlr_tablet_tool.h +++ b/include/wlr/types/wlr_tablet_tool.h @@ -1,9 +1,9 @@ #ifndef WLR_TYPES_TABLET_TOOL_H #define WLR_TYPES_TABLET_TOOL_H -#include -#include #include +#include +#include struct wlr_tablet_tool_impl; diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index 2925fd014..8ea293ebb 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -1,8 +1,8 @@ #ifndef WLR_TYPES_WLR_TOUCH_H #define WLR_TYPES_WLR_TOUCH_H -#include #include +#include struct wlr_touch_impl; diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index c7b1a24b4..7dc746ce5 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -1,9 +1,9 @@ #ifndef WLR_TYPES_WLR_XDG_SHELL_V6_H #define WLR_TYPES_WLR_XDG_SHELL_V6_H +#include #include #include -#include struct wlr_xdg_shell_v6 { struct wl_global *wl_global; diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index c0135943f..ad7ceb837 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -1,8 +1,8 @@ #ifndef WLR_XWAYLAND_H #define WLR_XWAYLAND_H -#include #include +#include #include #include #include diff --git a/include/wlr/xwm.h b/include/wlr/xwm.h index 35c43b183..242ff9cc1 100644 --- a/include/wlr/xwm.h +++ b/include/wlr/xwm.h @@ -1,9 +1,9 @@ -#ifndef XWAYLAND_INTERNALS_H -#define XWAYLAND_INTERNALS_H +#ifndef WLR_XWM_H +#define WLR_XWM_H -#include #include #include +#include enum atom_name { WL_SURFACE_ID, diff --git a/meson.build b/meson.build index 6c8a3a8be..1cf7781a0 100644 --- a/meson.build +++ b/meson.build @@ -157,16 +157,16 @@ wlroots = declare_dependency( summary = [ - '', - '----------------', - 'wlroots @0@'.format(meson.project_version()), - '', - ' libcap: @0@'.format(conf_data.get('WLR_HAS_LIBCAP', false)), - ' systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)), - ' elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)), - ' xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)), - '----------------', - '' + '', + '----------------', + 'wlroots @0@'.format(meson.project_version()), + '', + ' libcap: @0@'.format(conf_data.get('WLR_HAS_LIBCAP', false)), + ' systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)), + ' elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)), + ' xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)), + '----------------', + '' ] message('\n'.join(summary)) @@ -195,18 +195,18 @@ if git.found() etags = find_program('etags', required: false) if etags.found() and all_files.length() > 0 custom_target('etags', - build_by_default: true, - input: all_files, - output: 'TAGS', - command: [etags.path(), '-o', 'TAGS'] + all_files) + build_by_default: true, + input: all_files, + output: 'TAGS', + command: [etags.path(), '-o', 'TAGS'] + all_files) endif ctags = find_program('ctags', required: false) if ctags.found() and all_files.length() > 0 custom_target('ctags', - build_by_default: true, - input: all_files, - output: 'tags', - command: [ctags.path(), '-o', 'tags'] + all_files) + build_by_default: true, + input: all_files, + output: 'tags', + command: [ctags.path(), '-o', 'tags'] + all_files) endif endif diff --git a/protocol/meson.build b/protocol/meson.build index 6e9f41251..0db7c03c8 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -24,18 +24,18 @@ protocols = [ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], 'gamma-control.xml', 'gtk-primary-selection.xml', + 'idle.xml', 'screenshooter.xml', 'server-decoration.xml', - 'idle.xml', ] client_protocols = [ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], 'gamma-control.xml', 'gtk-primary-selection.xml', + 'idle.xml', 'screenshooter.xml', 'server-decoration.xml', - 'idle.xml', ] wl_protos_src = [] diff --git a/render/egl.c b/render/egl.c index 328726baf..f1208a72d 100644 --- a/render/egl.c +++ b/render/egl.c @@ -1,10 +1,10 @@ #include -#include #include #include #include -#include +#include #include +#include #include "glapi.h" // Extension documentation diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index f57e9daea..81a932e6a 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -1,10 +1,10 @@ -#include -#include #include #include #include -#include +#include +#include #include +#include #include #include #include diff --git a/render/gles2/shaders.c b/render/gles2/shaders.c index ff6fba9c7..46a102484 100644 --- a/render/gles2/shaders.c +++ b/render/gles2/shaders.c @@ -1,5 +1,5 @@ -#include "render/gles2.h" #include +#include "render/gles2.h" // Colored quads const GLchar quad_vertex_src[] = diff --git a/render/gles2/texture.c b/render/gles2/texture.c index a594f23e5..688a51d8d 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -1,17 +1,17 @@ -#include -#include #include #include #include -#include +#include +#include #include +#include #include #include #include #include #include -#include "util/signal.h" #include "render/gles2.h" +#include "util/signal.h" static struct pixel_format external_pixel_format = { .wl_format = 0, diff --git a/render/gles2/util.c b/render/gles2/util.c index 9498a1cd8..c291f5338 100644 --- a/render/gles2/util.c +++ b/render/gles2/util.c @@ -1,6 +1,6 @@ -#include -#include #include +#include +#include #include #include "render/gles2.h" diff --git a/render/matrix.c b/render/matrix.c index fa45dd044..d5d7f49d6 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -1,9 +1,9 @@ -#include #include +#include #include +#include #include #include -#include /* Obtains the index for the given row/column */ static inline int mind(int row, int col) { diff --git a/render/meson.build b/render/meson.build index 309e83cd9..1a5a85b8d 100644 --- a/render/meson.build +++ b/render/meson.build @@ -10,12 +10,12 @@ lib_wlr_render = static_library( 'wlr_render', files( 'egl.c', - 'matrix.c', 'gles2/pixel_format.c', 'gles2/renderer.c', 'gles2/shaders.c', 'gles2/texture.c', 'gles2/util.c', + 'matrix.c', 'wlr_renderer.c', 'wlr_texture.c', ), diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index c8f06a649..fa6c6fc3f 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -1,5 +1,5 @@ -#include #include +#include #include void wlr_renderer_init(struct wlr_renderer *renderer, diff --git a/render/wlr_texture.c b/render/wlr_texture.c index 4ce86bdda..a82a16b21 100644 --- a/render/wlr_texture.c +++ b/render/wlr_texture.c @@ -1,5 +1,5 @@ -#include #include +#include #include void wlr_texture_init(struct wlr_texture *texture, diff --git a/rootston/config.c b/rootston/config.c index 26cbd12d8..e63efc0b5 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -2,20 +2,20 @@ #define _POSIX_C_SOURCE 200809L #endif #include -#include -#include #include +#include +#include #include #include -#include #include +#include #include -#include #include +#include #include "rootston/config.h" +#include "rootston/ini.h" #include "rootston/input.h" #include "rootston/keyboard.h" -#include "rootston/ini.h" static void usage(const char *name, int ret) { fprintf(stderr, diff --git a/rootston/cursor.c b/rootston/cursor.c index ab32a5de4..aa94daebb 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -1,16 +1,16 @@ #define _XOPEN_SOURCE 700 -#include #include +#include +#include +#include +#include #ifdef __linux__ #include #elif __FreeBSD__ #include #endif -#include -#include -#include -#include "rootston/xcursor.h" #include "rootston/cursor.h" +#include "rootston/xcursor.h" struct roots_cursor *roots_cursor_create(struct roots_seat *seat) { struct roots_cursor *cursor = calloc(1, sizeof(struct roots_cursor)); diff --git a/rootston/desktop.c b/rootston/desktop.c index 68da45e05..80ccbc25a 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -1,25 +1,25 @@ #define _POSIX_C_SOURCE 199309L #include -#include -#include #include +#include +#include #include #include #include #include #include #include +#include #include #include -#include #include #include #include #include -#include "rootston/server.h" #include "rootston/seat.h" -#include "rootston/xcursor.h" +#include "rootston/server.h" #include "rootston/view.h" +#include "rootston/xcursor.h" void view_get_box(const struct roots_view *view, struct wlr_box *box) { box->x = view->x; diff --git a/rootston/input.c b/rootston/input.c index a0da25314..657b09466 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -1,16 +1,16 @@ #include #include #include +#include #include #include #include #include -#include -#include "rootston/server.h" #include "rootston/config.h" #include "rootston/input.h" #include "rootston/keyboard.h" #include "rootston/seat.h" +#include "rootston/server.h" static const char *device_type(enum wlr_input_device_type type) { switch (type) { diff --git a/rootston/keyboard.c b/rootston/keyboard.c index ddf541b4f..6ec90c312 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -1,18 +1,18 @@ #include +#include #include #include #include -#include #include -#include -#include #include #include +#include +#include #include #include #include "rootston/input.h" -#include "rootston/seat.h" #include "rootston/keyboard.h" +#include "rootston/seat.h" static ssize_t pressed_keysyms_index(xkb_keysym_t *pressed_keysyms, xkb_keysym_t keysym) { diff --git a/rootston/main.c b/rootston/main.c index 3273c53fb..5450ade27 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -3,10 +3,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include "rootston/config.h" diff --git a/rootston/meson.build b/rootston/meson.build index 973f93a4d..a53812e3c 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -8,8 +8,8 @@ sources = [ 'main.c', 'output.c', 'seat.c', - 'xdg_shell_v6.c', 'wl_shell.c', + 'xdg_shell_v6.c', ] if get_option('enable_xwayland') sources += ['xwayland.c'] diff --git a/rootston/output.c b/rootston/output.c index bd2ec18d1..1ea4412e8 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -1,18 +1,18 @@ #define _POSIX_C_SOURCE 200809L -#include -#include -#include #include -#include +#include +#include +#include +#include #include +#include #include #include -#include #include #include -#include "rootston/server.h" -#include "rootston/output.h" #include "rootston/config.h" +#include "rootston/output.h" +#include "rootston/server.h" typedef void (*surface_iterator_func_t)(struct wlr_surface *surface, double lx, double ly, float rotation, void *data); diff --git a/rootston/seat.c b/rootston/seat.c index 0c9867ec8..38c266285 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -3,14 +3,14 @@ #include #include #include +#include #include #include -#include -#include "rootston/xcursor.h" -#include "rootston/input.h" -#include "rootston/seat.h" -#include "rootston/keyboard.h" #include "rootston/cursor.h" +#include "rootston/input.h" +#include "rootston/keyboard.h" +#include "rootston/seat.h" +#include "rootston/xcursor.h" static void handle_keyboard_key(struct wl_listener *listener, void *data) { struct roots_keyboard *keyboard = diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 267e2cf56..44a65cf50 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -1,14 +1,14 @@ #include -#include #include +#include #include #include #include #include #include #include "rootston/desktop.h" -#include "rootston/server.h" #include "rootston/input.h" +#include "rootston/server.h" static void popup_destroy(struct roots_view_child *child) { assert(child->destroy == popup_destroy); diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 9bd6f76a6..8e6674aba 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -1,14 +1,14 @@ #include -#include #include +#include #include #include #include #include #include #include "rootston/desktop.h" -#include "rootston/server.h" #include "rootston/input.h" +#include "rootston/server.h" static void popup_destroy(struct roots_view_child *child) { assert(child->destroy == popup_destroy); diff --git a/rootston/xwayland.c b/rootston/xwayland.c index 36be97934..e9e0d5e08 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -1,12 +1,12 @@ #include -#include #include +#include #include #include #include #include -#include #include +#include #include "rootston/server.h" #include "rootston/server.h" diff --git a/types/meson.build b/types/meson.build index 9f37cc86c..2731f9bc7 100644 --- a/types/meson.build +++ b/types/meson.build @@ -1,18 +1,18 @@ lib_wlr_types = static_library( 'wlr_types', files( - 'wlr_data_device.c', 'wlr_box.c', 'wlr_compositor.c', 'wlr_cursor.c', + 'wlr_data_device.c', 'wlr_gamma_control.c', 'wlr_idle.c', 'wlr_input_device.c', 'wlr_keyboard.c', 'wlr_list.c', - 'wlr_output.c', 'wlr_output_damage.c', 'wlr_output_layout.c', + 'wlr_output.c', 'wlr_pointer.c', 'wlr_primary_selection.c', 'wlr_region.c', diff --git a/types/wlr_box.c b/types/wlr_box.c index 33031858d..2ea743d0a 100644 --- a/types/wlr_box.c +++ b/types/wlr_box.c @@ -1,7 +1,7 @@ #include -#include #include #include +#include #include #include #include diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c index bd56b0fba..925e0019d 100644 --- a/types/wlr_compositor.c +++ b/types/wlr_compositor.c @@ -1,11 +1,11 @@ #include #include #include +#include +#include +#include #include #include "util/signal.h" -#include -#include -#include static void destroy_surface_listener(struct wl_listener *listener, void *data) { wl_list_remove(wl_resource_get_link(data)); diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index 4f3d87274..20acebf17 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -1,13 +1,13 @@ -#include -#include #include #include +#include +#include +#include +#include +#include +#include #include #include "util/signal.h" -#include -#include -#include -#include struct wlr_cursor_device { struct wlr_cursor *cursor; diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c index 7153dd53a..b8ef820b9 100644 --- a/types/wlr_data_device.c +++ b/types/wlr_data_device.c @@ -1,14 +1,14 @@ #define _XOPEN_SOURCE 700 +#include #include #include #include -#include #include #include +#include +#include #include #include "util/signal.h" -#include -#include #define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \ WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \ diff --git a/types/wlr_gamma_control.c b/types/wlr_gamma_control.c index 214dfd21f..861427bd2 100644 --- a/types/wlr_gamma_control.c +++ b/types/wlr_gamma_control.c @@ -4,8 +4,8 @@ #include #include #include -#include "util/signal.h" #include "gamma-control-protocol.h" +#include "util/signal.h" static void resource_destroy(struct wl_client *client, struct wl_resource *resource) { diff --git a/types/wlr_idle.c b/types/wlr_idle.c index 1976004f8..9eddc42b3 100644 --- a/types/wlr_idle.c +++ b/types/wlr_idle.c @@ -4,8 +4,8 @@ #include #include #include -#include "util/signal.h" #include "idle-protocol.h" +#include "util/signal.h" static void idle_timeout_destroy(struct wlr_idle_timeout *timer) { wl_list_remove(&timer->input_listener.link); diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c index 372b3a7b7..65d4b1d63 100644 --- a/types/wlr_input_device.c +++ b/types/wlr_input_device.c @@ -2,13 +2,13 @@ #include #include #include -#include #include #include #include -#include -#include #include +#include +#include +#include #include #include "util/signal.h" diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index 6f09d599b..5c0699ff9 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -1,11 +1,11 @@ +#include #include #include #include #include -#include #include -#include #include +#include #include #include "util/signal.h" diff --git a/types/wlr_list.c b/types/wlr_list.c index 565a155b3..2be0912a3 100644 --- a/types/wlr_list.c +++ b/types/wlr_list.c @@ -1,8 +1,8 @@ +#include +#include #include #include -#include #include -#include #include #include diff --git a/types/wlr_output.c b/types/wlr_output.c index 7dcf4c789..504d02096 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -5,13 +5,13 @@ #include #include #include +#include +#include +#include #include #include #include -#include #include -#include -#include #include #include "util/signal.h" diff --git a/types/wlr_output_damage.c b/types/wlr_output_damage.c index c231a900e..b3636c37c 100644 --- a/types/wlr_output_damage.c +++ b/types/wlr_output_damage.c @@ -1,11 +1,11 @@ -#include #include +#include #include #include -#include "util/signal.h" #include -#include #include +#include +#include "util/signal.h" static void output_handle_destroy(struct wl_listener *listener, void *data) { struct wlr_output_damage *output_damage = diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c index ea7b81c5b..db0389bd7 100644 --- a/types/wlr_output_layout.c +++ b/types/wlr_output_layout.c @@ -1,12 +1,12 @@ -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include "util/signal.h" -#include -#include -#include struct wlr_output_layout_state { struct wlr_box _box; // should never be read directly, use the getter diff --git a/types/wlr_pointer.c b/types/wlr_pointer.c index 04100e560..bc9efd8ca 100644 --- a/types/wlr_pointer.c +++ b/types/wlr_pointer.c @@ -1,8 +1,8 @@ #include #include #include -#include #include +#include void wlr_pointer_init(struct wlr_pointer *pointer, struct wlr_pointer_impl *impl) { diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c index 45d71f19b..28fe63c11 100644 --- a/types/wlr_primary_selection.c +++ b/types/wlr_primary_selection.c @@ -1,9 +1,9 @@ #define _XOPEN_SOURCE 700 -#include -#include -#include #include #include +#include +#include +#include #include #include #include diff --git a/types/wlr_region.c b/types/wlr_region.c index fdf23ad27..322088b50 100644 --- a/types/wlr_region.c +++ b/types/wlr_region.c @@ -1,8 +1,8 @@ -#include -#include #include -#include #include +#include +#include +#include static void region_add(struct wl_client *client, struct wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height) { diff --git a/types/wlr_screenshooter.c b/types/wlr_screenshooter.c index 74f9f6027..04757fb6f 100644 --- a/types/wlr_screenshooter.c +++ b/types/wlr_screenshooter.c @@ -2,10 +2,10 @@ #include #include #include -#include #include -#include +#include #include +#include #include #include "screenshooter-protocol.h" diff --git a/types/wlr_seat.c b/types/wlr_seat.c index 3ad4d81d1..d60e0e0d5 100644 --- a/types/wlr_seat.c +++ b/types/wlr_seat.c @@ -4,12 +4,12 @@ #include #include #include -#include +#include #include +#include +#include #include #include "util/signal.h" -#include -#include static void resource_destroy(struct wl_client *client, struct wl_resource *resource) { diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c index ffa0477c2..556193e28 100644 --- a/types/wlr_server_decoration.c +++ b/types/wlr_server_decoration.c @@ -1,8 +1,8 @@ #include -#include #include -#include +#include #include +#include #include #include "util/signal.h" diff --git a/types/wlr_surface.c b/types/wlr_surface.c index b761bab58..c47565c49 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -1,13 +1,13 @@ #include #include #include +#include +#include +#include +#include #include #include #include "util/signal.h" -#include -#include -#include -#include static void wlr_surface_state_reset_buffer(struct wlr_surface_state *state) { if (state->buffer) { diff --git a/types/wlr_tablet_pad.c b/types/wlr_tablet_pad.c index 07f9da10d..3d25d6859 100644 --- a/types/wlr_tablet_pad.c +++ b/types/wlr_tablet_pad.c @@ -1,8 +1,8 @@ #include #include #include -#include #include +#include void wlr_tablet_pad_init(struct wlr_tablet_pad *pad, struct wlr_tablet_pad_impl *impl) { diff --git a/types/wlr_tablet_tool.c b/types/wlr_tablet_tool.c index a396bb022..f46a54344 100644 --- a/types/wlr_tablet_tool.c +++ b/types/wlr_tablet_tool.c @@ -1,8 +1,8 @@ #include #include #include -#include #include +#include void wlr_tablet_tool_init(struct wlr_tablet_tool *tool, struct wlr_tablet_tool_impl *impl) { diff --git a/types/wlr_touch.c b/types/wlr_touch.c index 5db653e7c..ba7ffac7d 100644 --- a/types/wlr_touch.c +++ b/types/wlr_touch.c @@ -1,8 +1,8 @@ #include #include #include -#include #include +#include void wlr_touch_init(struct wlr_touch *touch, struct wlr_touch_impl *impl) { diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index e9d52cc96..85749ddd4 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -1,14 +1,14 @@ #ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200809L #endif -#include #include +#include +#include #include -#include -#include "util/signal.h" #include #include -#include +#include +#include "util/signal.h" static const char *wlr_wl_shell_surface_role = "wl-shell-surface"; diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 30870d3b6..eb18f0227 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -6,9 +6,9 @@ #include #include #include -#include -#include #include +#include +#include #include #include "util/signal.h" #include "xdg-shell-unstable-v6-protocol.h" diff --git a/util/log.c b/util/log.c index e0b6a132f..327402e61 100644 --- a/util/log.c +++ b/util/log.c @@ -3,9 +3,9 @@ #include #include #include -#include #include #include +#include #include static bool colored = true; diff --git a/util/os-compatibility.c b/util/os-compatibility.c index 98aeab3d8..bd3067d21 100644 --- a/util/os-compatibility.c +++ b/util/os-compatibility.c @@ -24,13 +24,13 @@ */ #define _XOPEN_SOURCE 700 -#include -#include -#include -#include #include -#include +#include #include +#include +#include +#include +#include #include "util/os-compatibility.h" int os_fd_set_cloexec(int fd) { diff --git a/util/region.c b/util/region.c index 1bde0cb83..88e38fd22 100644 --- a/util/region.c +++ b/util/region.c @@ -1,5 +1,5 @@ -#include #include +#include #include void wlr_region_scale(pixman_region32_t *dst, pixman_region32_t *src, diff --git a/xcursor/meson.build b/xcursor/meson.build index afaab9159..31040a92e 100644 --- a/xcursor/meson.build +++ b/xcursor/meson.build @@ -1,8 +1,8 @@ lib_wlr_xcursor = static_library( 'wlr_xcursor', files( - 'xcursor.c', 'wlr_xcursor.c', + 'xcursor.c', ), include_directories: wlr_inc, dependencies: [egl] # header required via include/wlr/render.h diff --git a/xcursor/wlr_xcursor.c b/xcursor/wlr_xcursor.c index 2d1a38b52..7fcdbb6f1 100644 --- a/xcursor/wlr_xcursor.c +++ b/xcursor/wlr_xcursor.c @@ -24,12 +24,12 @@ */ #define _XOPEN_SOURCE 500 -#include -#include +#include #include #include -#include #include +#include +#include #include "xcursor/xcursor.h" static void wlr_xcursor_destroy(struct wlr_xcursor *cursor) { diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c index 8dc35a7c7..32711105e 100644 --- a/xcursor/xcursor.c +++ b/xcursor/xcursor.c @@ -24,11 +24,11 @@ */ #define _DEFAULT_SOURCE -#include "xcursor/xcursor.h" +#include #include #include #include -#include +#include "xcursor/xcursor.h" /* * From libXcursor/include/X11/extensions/Xcursor.h diff --git a/xwayland/selection.c b/xwayland/selection.c index 060c0baf5..ffcde4d07 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -1,14 +1,14 @@ #define _XOPEN_SOURCE 700 -#include -#include -#include #include -#include #include -#include "wlr/util/log.h" -#include "wlr/types/wlr_data_device.h" -#include "wlr/types/wlr_primary_selection.h" -#include "wlr/xwm.h" +#include +#include +#include +#include +#include +#include +#include +#include static const size_t incr_chunk_size = 64 * 1024; diff --git a/xwayland/sockets.c b/xwayland/sockets.c index 2119056db..1e943b1dc 100644 --- a/xwayland/sockets.c +++ b/xwayland/sockets.c @@ -3,19 +3,19 @@ // for SOCK_CLOEXEC #define __BSD_VISIBLE 1 #endif -#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include +#include +#include #include -#include -#include "wlr/util/log.h" +#include +#include #include "sockets.h" static const char *lock_fmt = "/tmp/.X%d-lock"; diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 74555edbb..1d9351806 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -4,23 +4,23 @@ // for SOCK_CLOEXEC #define __BSD_VISIBLE 1 #endif -#include -#include -#include +#include #include #include +#include +#include +#include #include #include #include #include -#include -#include +#include #include -#include #include -#include "util/signal.h" +#include +#include #include "sockets.h" -#include "wlr/xwm.h" +#include "util/signal.h" #ifdef __FreeBSD__ static inline int clearenv(void) { diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 425188c78..10bc2e307 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -3,18 +3,18 @@ #endif #include #include -#include -#include -#include -#include #include -#include -#include -#include "util/signal.h" #include -#include +#include +#include #include +#include #include +#include +#include +#include +#include +#include "util/signal.h" #ifdef WLR_HAS_XCB_ICCCM #include