swc

commit b752d5487c56c71ceee49caa5b74e58bff9cc48c
parent cfb719d20e4c48fc2f7f5a4c35122f28667fead3
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 20 May 2015 04:30:30 +0000

Fix up some includes

Diffstat:
M
libswc/bindings.c
 | 
1
+
M
libswc/data_device.c
 | 
1
+
M
libswc/data_device.h
 | 
2
--
M
libswc/drm.h
 | 
3
++-
M
libswc/event.h
 | 
2
--
M
libswc/framebuffer_plane.h
 | 
5
++++-
M
libswc/keyboard.c
 | 
1
+
M
libswc/launch.h
 | 
1
-
M
libswc/mode.h
 | 
4
+---
M
libswc/pointer.c
 | 
1
+
M
libswc/pointer.h
 | 
3
+--
M
libswc/seat.c
 | 
1
+
M
libswc/subcompositor.h
 | 
2
++
M
libswc/surface.h
 | 
3
+--
M
libswc/xkb.c
 | 
1
+
M
libswc/xkb.h
 | 
6
+++---

16 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/libswc/bindings.c b/libswc/bindings.c
@@ -31,6 +31,7 @@
 
 #include <errno.h>
 #include <wayland-util.h>
+#include <xkbcommon/xkbcommon.h>
 
 struct binding {
 	uint32_t value;
diff --git a/libswc/data_device.c b/libswc/data_device.c
@@ -23,6 +23,7 @@
 
 #include "data_device.h"
 #include "data.h"
+#include "event.h"
 #include "util.h"
 
 static void
diff --git a/libswc/data_device.h b/libswc/data_device.h
@@ -24,8 +24,6 @@
 #ifndef SWC_DATA_DEVICE_H
 #define SWC_DATA_DEVICE_H
 
-#include "event.h"
-
 #include <stdbool.h>
 #include <wayland-server.h>
 
diff --git a/libswc/drm.h b/libswc/drm.h
@@ -3,7 +3,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <wayland-server.h>
+
+struct wl_list;
 
 struct drm_handler {
 	void (*page_flip)(struct drm_handler *handler, uint32_t time);
diff --git a/libswc/event.h b/libswc/event.h
@@ -1,8 +1,6 @@
 #ifndef SWC_EVENT_H
 #define SWC_EVENT_H
 
-#include "swc.h"
-
 #include <stdint.h>
 #include <wayland-server.h>
 
diff --git a/libswc/framebuffer_plane.h b/libswc/framebuffer_plane.h
@@ -26,9 +26,12 @@
 
 #include "drm.h"
 #include "mode.h"
-#include "surface.h"
 #include "view.h"
 
+#include <stdint.h>
+#include <stdbool.h>
+#include <wayland-server.h>
+
 struct framebuffer_plane {
 	uint32_t crtc;
 	drmModeCrtcPtr original_crtc_state;
diff --git a/libswc/keyboard.c b/libswc/keyboard.c
@@ -35,6 +35,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
+#include <xkbcommon/xkbcommon.h>
 
 static const int repeat_delay = 500, repeat_rate = 40;
 
diff --git a/libswc/launch.h b/libswc/launch.h
@@ -25,7 +25,6 @@
 #define SWC_LAUNCH_H
 
 #include <stdbool.h>
-#include <wayland-server.h>
 
 bool launch_initialize(void);
 void launch_finalize(void);
diff --git a/libswc/mode.h b/libswc/mode.h
@@ -24,13 +24,11 @@
 #ifndef SWC_MODE_H
 #define SWC_MODE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdbool.h>
 #include <xf86drmMode.h>
 
-#include <wayland-util.h>
-
 struct mode {
 	uint16_t width, height;
 	uint32_t refresh;
diff --git a/libswc/pointer.c b/libswc/pointer.c
@@ -27,6 +27,7 @@
 #include "internal.h"
 #include "screen.h"
 #include "shm.h"
+#include "surface.h"
 #include "util.h"
 #include "cursor/cursor_data.h"
 
diff --git a/libswc/pointer.h b/libswc/pointer.h
@@ -25,11 +25,10 @@
 #define SWC_POINTER_H
 
 #include "input.h"
-#include "surface.h"
 #include "view.h"
 
-#include <wayland-server.h>
 #include <pixman.h>
+#include <wayland-server.h>
 
 struct button {
 	struct press press;
diff --git a/libswc/seat.c b/libswc/seat.c
@@ -30,6 +30,7 @@
 #include "keyboard.h"
 #include "launch.h"
 #include "pointer.h"
+#include "surface.h"
 #include "util.h"
 
 #include <errno.h>
diff --git a/libswc/subcompositor.h b/libswc/subcompositor.h
@@ -24,6 +24,8 @@
 #ifndef SWC_SUBCOMPOSITOR_H
 #define SWC_SUBCOMPOSITOR_H
 
+#include <stdbool.h>
+
 bool subcompositor_initialize(void);
 void subcompositor_finalize(void);
 
diff --git a/libswc/surface.h b/libswc/surface.h
@@ -26,9 +26,8 @@
 
 #include "view.h"
 
-#include <stdbool.h>
-#include <wayland-server.h>
 #include <pixman.h>
+#include <wayland-server.h>
 
 enum {
 	SURFACE_COMMIT_ATTACH = (1 << 0),
diff --git a/libswc/xkb.c b/libswc/xkb.c
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <xkbcommon/xkbcommon.h>
 
 static const char keymap_file_template[] = "swc-xkb-keymap-XXXXXX";
 
diff --git a/libswc/xkb.h b/libswc/xkb.h
@@ -21,12 +21,12 @@
  * SOFTWARE.
  */
 
-#include <stdbool.h>
-#include <xkbcommon/xkbcommon.h>
-
 #ifndef SWC_XKB_H
 #define SWC_XKB_H
 
+#include <stdbool.h>
+#include <stdint.h>
+
 /* Keycodes are offset by 8 in XKB. */
 #define XKB_KEY(key) ((key) + 8)