commit 68b74ad

Michael Forney  ·  2013-11-25 10:03:32 +0000 UTC
parent 51f7496 
Sort local includes
17 files changed,  +22, -23
M libswc/compositor.c
M libswc/data_device_manager.c
M libswc/drm.c
M libswc/evdev_device.c
M libswc/input_focus.c
M libswc/keyboard.h
M libswc/mode.c
M libswc/output.c
M libswc/plane.c
M libswc/pointer.c
M libswc/pointer.h
M libswc/renderer.h
M libswc/seat.c
M libswc/shell.c
M libswc/shell_surface.c
M libswc/surface.c
M libswc/window.c
M libswc/compositor.c
+3, -3 
 1@@ -1,12 +1,12 @@
 2 #include "swc.h"
 3+#include "binding.h"
 4 #include "compositor.h"
 5 #include "compositor_surface.h"
 6 #include "cursor_surface.h"
 7+#include "data_device_manager.h"
 8 #include "output.h"
 9-#include "surface.h"
10 #include "region.h"
11-#include "data_device_manager.h"
12-#include "binding.h"
13+#include "surface.h"
14 #include "util.h"
15 
16 #include <stdlib.h>
M libswc/data_device_manager.c
+1, -1 
 1@@ -22,8 +22,8 @@
 2  */
 3 
 4 #include "data_device_manager.h"
 5-#include "data_device.h"
 6 #include "data.h"
 7+#include "data_device.h"
 8 #include "seat.h"
 9 
10 static void create_data_source(struct wl_client * client,
M libswc/drm.c
+1, -1 
 1@@ -23,8 +23,8 @@
 2 
 3 #include "drm.h"
 4 #include "drm_buffer.h"
 5-#include "output.h"
 6 #include "event.h"
 7+#include "output.h"
 8 #include "private.h"
 9 
10 #include <stdio.h>
M libswc/evdev_device.c
+1, -2 
1@@ -1,7 +1,6 @@
2 #include "evdev_device.h"
3-
4-#include "seat.h"
5 #include "event.h"
6+#include "seat.h"
7 #include "util.h"
8 
9 #include <stdlib.h>
M libswc/input_focus.c
+1, -1 
 1@@ -22,9 +22,9 @@
 2  */
 3 
 4 #include "input_focus.h"
 5+#include "event.h"
 6 #include "surface.h"
 7 #include "util.h"
 8-#include "event.h"
 9 
10 static inline void focus(struct swc_input_focus * input_focus,
11                          struct swc_surface * surface,
M libswc/keyboard.h
+1, -1 
 1@@ -24,8 +24,8 @@
 2 #ifndef SWC_KEYBOARD_H
 3 #define SWC_KEYBOARD_H
 4 
 5-#include "surface.h"
 6 #include "input_focus.h"
 7+#include "surface.h"
 8 #include "xkb.h"
 9 
10 #include <wayland-util.h>
M libswc/mode.c
+2, -2 
 1@@ -1,7 +1,7 @@
 2-#include <stdio.h>
 3-
 4 #include "mode.h"
 5 
 6+#include <stdio.h>
 7+
 8 bool swc_mode_initialize(struct swc_mode * mode, drmModeModeInfo * mode_info)
 9 {
10     mode->width = mode_info->hdisplay;
M libswc/output.c
+1, -1 
1@@ -1,7 +1,7 @@
2 #include "output.h"
3+#include "drm.h"
4 #include "mode.h"
5 #include "util.h"
6-#include "drm.h"
7 
8 #include <stdio.h>
9 #include <stdlib.h>
M libswc/plane.c
+2, -2 
 1@@ -22,9 +22,9 @@
 2  */
 3 
 4 #include "plane.h"
 5-#include "output.h"
 6-#include "mode.h"
 7 #include "drm.h"
 8+#include "mode.h"
 9+#include "output.h"
10 
11 #include <stdlib.h>
12 #include <stdio.h>
M libswc/pointer.c
+1, -1 
1@@ -1,6 +1,6 @@
2 #include "pointer.h"
3-#include "util.h"
4 #include "event.h"
5+#include "util.h"
6 
7 #include <stdio.h>
8 #include <assert.h>
M libswc/pointer.h
+1, -1 
 1@@ -1,8 +1,8 @@
 2 #ifndef SWC_POINTER_H
 3 #define SWC_POINTER_H
 4 
 5-#include "surface.h"
 6 #include "input_focus.h"
 7+#include "surface.h"
 8 
 9 #include <wayland-server.h>
10 #include <pixman.h>
M libswc/renderer.h
+1, -1 
 1@@ -1,9 +1,9 @@
 2 #ifndef SWC_RENDERER_H
 3 #define SWC_RENDERER_H
 4 
 5+#include "drm.h"
 6 #include "output.h"
 7 #include "surface.h"
 8-#include "drm.h"
 9 
10 struct swc_render_target
11 {
M libswc/seat.c
+1, -1 
 1@@ -1,8 +1,8 @@
 2 #include "seat.h"
 3 #include "evdev_device.h"
 4-#include "util.h"
 5 #include "event.h"
 6 #include "private.h"
 7+#include "util.h"
 8 
 9 #include <stdlib.h>
10 #include <stdio.h>
M libswc/shell.c
+1, -1 
 1@@ -22,8 +22,8 @@
 2  */
 3 
 4 #include "shell.h"
 5-#include "shell_surface.h"
 6 #include "private.h"
 7+#include "shell_surface.h"
 8 
 9 #include <wayland-server.h>
10
M libswc/shell_surface.c
+2, -2 
 1@@ -22,10 +22,10 @@
 2  */
 3 
 4 #include "swc.h"
 5-#include "window.h"
 6+#include "compositor_surface.h"
 7 #include "internal.h"
 8 #include "shell_surface.h"
 9-#include "compositor_surface.h"
10+#include "window.h"
11 
12 #include <stdlib.h>
13
M libswc/surface.c
+1, -1 
 1@@ -22,10 +22,10 @@
 2  */
 3 
 4 #include "surface.h"
 5+#include "drm_buffer.h"
 6 #include "event.h"
 7 #include "region.h"
 8 #include "util.h"
 9-#include "drm_buffer.h"
10 
11 #include <stdlib.h>
12 #include <stdio.h>
M libswc/window.c
+1, -1 
 1@@ -21,12 +21,12 @@
 2  * SOFTWARE.
 3  */
 4 
 5-#include "swc.h"
 6 #include "window.h"
 7 #include "compositor.h"
 8 #include "compositor_surface.h"
 9 #include "internal.h"
10 #include "private.h"
11+#include "swc.h"
12 
13 #include <stdlib.h>
14 #include <string.h>