commit b752d54

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