Merge 68dc3bb3a1 into a6ef12d968

include/cairo_util.h

@@ -1,9 +1,9 @@
 #ifndef _SWAY_CAIRO_UTIL_H
 #define _SWAY_CAIRO_UTIL_H
-#include "config.h"
-#include <stdint.h>
 #include <cairo.h>
+#include <stdint.h>
 #include <wayland-client-protocol.h>
+#include "config.h"
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
 cairo_subpixel_order_t to_cairo_subpixel_order(enum wl_output_subpixel subpixel);

include/ipc-client.h

@@ -7,7 +7,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
-
 #include "ipc.h"
 
 /**

include/log.h

@@ -1,10 +1,10 @@
 #ifndef _SWAY_LOG_H
 #define _SWAY_LOG_H
 
-#include <stdbool.h>
-#include <stdarg.h>
-#include <string.h>
 #include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <string.h>
 
 typedef enum {
 	SWAY_SILENT = 0,

include/pango.h

@@ -1,9 +1,9 @@
 #ifndef _SWAY_PANGO_H
 #define _SWAY_PANGO_H
+#include <cairo.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cairo.h>
 #include <pango/pangocairo.h>
 #include "stringop.h"
 

include/pool-buffer.h

@@ -1,10 +1,10 @@
 #ifndef _SWAY_BUFFERS_H
 #define _SWAY_BUFFERS_H
 #include <cairo.h>
-#include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-client.h>
+#include <pango/pangocairo.h>
 
 struct pool_buffer {
 	struct wl_buffer *buffer;

include/stringop.h

@@ -1,6 +1,7 @@
 #ifndef _SWAY_STRINGOP_H
 #define _SWAY_STRINGOP_H
 
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include "list.h"

include/sway/config.h

@@ -4,21 +4,21 @@
 #include <stdint.h>
 #include <string.h>
 #include <time.h>
+#include <xf86drmMode.h>
+#include <pango/pangocairo.h>
 #include <wlr/interfaces/wlr_switch.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
-#include <xf86drmMode.h>
-#include "../include/config.h"
 #include "gesture.h"
 #include "list.h"
 #include "stringop.h"
 #include "swaynag.h"
-#include "tree/container.h"
+#include "../include/config.h"
 #include "sway/input/tablet.h"
 #include "sway/tree/root.h"
+#include "tree/container.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
-#include <pango/pangocairo.h>
 
 // TODO: Refactor this shit
 

include/sway/input/cursor.h

@@ -2,11 +2,11 @@
 #define _SWAY_INPUT_CURSOR_H
 #include <stdbool.h>
 #include <stdint.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
-#include <wlr/types/wlr_compositor.h>
-#include "sway/input/seat.h"
 #include "config.h"
+#include "sway/input/seat.h"
 
 #define SWAY_CURSOR_PRESSED_BUTTONS_CAP 32
 

include/sway/input/input-manager.h

@@ -4,9 +4,9 @@
 #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
-#include "sway/server.h"
-#include "sway/config.h"
 #include "list.h"
+#include "sway/config.h"
+#include "sway/server.h"
 
 struct sway_input_device {
 	char *identifier;

include/sway/input/text_input.h

@@ -1,9 +1,9 @@
 #ifndef _SWAY_INPUT_TEXT_INPUT_H
 #define _SWAY_INPUT_TEXT_INPUT_H
 
-#include <wlr/types/wlr_text_input_v3.h>
-#include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_input_method_v2.h>
+#include <wlr/types/wlr_text_input_v3.h>
 
 /**
  * The relay structure manages the relationship between text-input and

include/sway/ipc-json.h

@@ -2,8 +2,8 @@
 #define _SWAY_IPC_JSON_H
 #include <json.h>
 #include "sway/output.h"
-#include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
+#include "sway/tree/container.h"
 
 json_object *ipc_json_get_version(void);
 

include/sway/ipc-server.h

@@ -1,10 +1,10 @@
 #ifndef _SWAY_IPC_SERVER_H
 #define _SWAY_IPC_SERVER_H
 #include <sys/socket.h>
+#include "ipc.h"
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
 #include "sway/tree/container.h"
-#include "ipc.h"
 
 struct sway_server;
 

include/sway/server.h

@@ -7,16 +7,16 @@
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_drm_lease_v1.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
+#include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
-#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "config.h"

include/sway/tree/node.h

@@ -1,7 +1,7 @@
 #ifndef _SWAY_NODE_H
 #define _SWAY_NODE_H
-#include <wayland-server-core.h>
 #include <stdbool.h>
+#include <wayland-server-core.h>
 #include "list.h"
 
 #define MIN_SANE_W 100

include/sway/tree/root.h

@@ -2,12 +2,12 @@
 #define _SWAY_ROOT_H
 #include <wayland-server-core.h>
 #include <wayland-util.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/render/wlr_texture.h>
-#include "sway/tree/container.h"
-#include "sway/tree/node.h"
+#include <wlr/types/wlr_output_layout.h>
 #include "config.h"
 #include "list.h"
+#include "sway/tree/container.h"
+#include "sway/tree/node.h"
 
 extern struct sway_root *root;
 

include/swaybar/config.h

@@ -3,10 +3,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-client.h>
-#include "../include/config.h"
+#include <pango/pangocairo.h>
 #include "list.h"
 #include "util.h"
-#include <pango/pangocairo.h>
+#include "../include/config.h"
 
 struct box_colors {
 	uint32_t border;

include/swaybar/input.h

@@ -1,8 +1,8 @@
 #ifndef _SWAYBAR_INPUT_H
 #define _SWAYBAR_INPUT_H
 
-#include <wayland-client.h>
 #include <stdbool.h>
+#include <wayland-client.h>
 #include "list.h"
 
 #define SWAY_SCROLL_UP KEY_MAX + 1

include/swaybar/status_line.h

@@ -1,9 +1,9 @@
 #ifndef _SWAYBAR_STATUS_LINE_H
 #define _SWAYBAR_STATUS_LINE_H
 #include <json.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdbool.h>
 #include "bar.h"
 
 enum status_protocol {

include/swaybar/tray/item.h

@@ -5,8 +5,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-util.h>
-#include "swaybar/tray/tray.h"
 #include "list.h"
+#include "swaybar/tray/tray.h"
 
 struct swaybar_output;
 

include/swaybar/tray/watcher.h

@@ -1,8 +1,8 @@
 #ifndef _SWAYBAR_TRAY_WATCHER_H
 #define _SWAYBAR_TRAY_WATCHER_H
 
-#include "swaybar/tray/tray.h"
 #include "list.h"
+#include "swaybar/tray/tray.h"
 
 struct swaybar_watcher {
 	char *interface;

include/swaynag/config.h

@@ -1,7 +1,7 @@
 #ifndef _SWAYNAG_CONFIG_H
 #define _SWAYNAG_CONFIG_H
-#include "swaynag/swaynag.h"
 #include "list.h"
+#include "swaynag/swaynag.h"
 
 int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
 		list_t *types, struct swaynag_type *type, char **config, bool *debug);

include/swaynag/swaynag.h

@@ -4,9 +4,8 @@
 #include <strings.h>
 #include "list.h"
 #include "pool-buffer.h"
-#include "cursor-shape-v1-client-protocol.h"
-
 #include "swaynag/types.h"
+#include "cursor-shape-v1-client-protocol.h"
 
 #define SWAYNAG_MAX_HEIGHT 500
 

include/util.h

@@ -1,8 +1,8 @@
 #ifndef _SWAY_UTIL_H
 #define _SWAY_UTIL_H
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <wayland-server-protocol.h>
 
 enum movement_unit {