commit 6545140

Michael Forney  ·  2014-02-27 03:06:50 +0000 UTC
parent 24d8954 
Rename input_focus -> input to add other common input stuff
5 files changed,  +12, -8
R libswc/input.c
R libswc/input.h
M libswc/keyboard.h
M libswc/local.mk
M libswc/pointer.h
R libswc/input_focus.c => libswc/input.c
+2, -2 
 1@@ -1,4 +1,4 @@
 2-/* swc: input_focus.c
 3+/* swc: input.c
 4  *
 5  * Copyright (c) 2013, 2014 Michael Forney
 6  *
 7@@ -21,7 +21,7 @@
 8  * SOFTWARE.
 9  */
10 
11-#include "input_focus.h"
12+#include "input.h"
13 #include "compositor.h"
14 #include "event.h"
15 #include "surface.h"
R libswc/input_focus.h => libswc/input.h
+7, -3 
 1@@ -1,4 +1,4 @@
 2-/* swc: input_focus.h
 3+/* swc: input.h
 4  *
 5  * Copyright (c) 2013, 2014 Michael Forney
 6  *
 7@@ -21,12 +21,14 @@
 8  * SOFTWARE.
 9  */
10 
11-#ifndef SWC_INPUT_FOCUS_H
12-#define SWC_INPUT_FOCUS_H
13+#ifndef SWC_INPUT_H
14+#define SWC_INPUT_H
15 
16 #include <stdbool.h>
17 #include <wayland-server.h>
18 
19+/* Focus {{{ */
20+
21 enum
22 {
23     INPUT_FOCUS_EVENT_CHANGED
24@@ -73,5 +75,7 @@ void input_focus_remove_resource(struct input_focus * input_focus,
25 void input_focus_set(struct input_focus * input_focus,
26                      struct compositor_view * view);
27 
28+/* }}} */
29+
30 #endif
31
M libswc/keyboard.h
+1, -1 
1@@ -24,7 +24,7 @@
2 #ifndef SWC_KEYBOARD_H
3 #define SWC_KEYBOARD_H
4 
5-#include "input_focus.h"
6+#include "input.h"
7 #include "surface.h"
8 #include "xkb.h"
9
M libswc/local.mk
+1, -1 
1@@ -37,7 +37,7 @@ SWC_SOURCES =                       \
2     libswc/drm.c                    \
3     libswc/evdev_device.c           \
4     libswc/framebuffer_plane.c      \
5-    libswc/input_focus.c            \
6+    libswc/input.c                  \
7     libswc/keyboard.c               \
8     libswc/launch.c                 \
9     libswc/mode.c                   \
M libswc/pointer.h
+1, -1 
1@@ -24,7 +24,7 @@
2 #ifndef SWC_POINTER_H
3 #define SWC_POINTER_H
4 
5-#include "input_focus.h"
6+#include "input.h"
7 #include "surface.h"
8 #include "view.h"
9