pepper: Separate header file for input backend devel

Change-Id: I60d42f508c0f89900fb6922741b634d10c4b0323

diff --git a/libinput/src/libinput-internal.h b/libinput/src/libinput-internal.h
index 15eae0d..e8e6779 100644 (file)
--- a/libinput/src/libinput-internal.h
+++ b/libinput/src/libinput-internal.h
@@ -2,6 +2,7 @@
 #define LIBINPUT_INTERNAL_H
 
 #include "pepper-libinput.h"
+#include <pepper-input-backend.h>
 
 /* TODO: Error logging. */
 #define PEPPER_ERROR(...)

diff --git a/pepper/src/Makefile.am b/pepper/src/Makefile.am
index 2f9c06d..1218830 100644 (file)
--- a/pepper/src/Makefile.am
+++ b/pepper/src/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libpepper.la
-include_HEADERS = pepper.h pepper-utils.h pepper-output-backend.h
+include_HEADERS = pepper.h pepper-utils.h pepper-output-backend.h pepper-input-backend.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pepper.pc

diff --git a/pepper/src/pepper-input-backend.h b/pepper/src/pepper-input-backend.h
new file mode 100644 (file)
index 0000000..36a8fe8
--- /dev/null
+++ b/pepper/src/pepper-input-backend.h
@@ -0,0 +1,31 @@
+#ifndef PEPPER_INPUT_BACKEND_H
+#define PEPPER_INPUT_BACKEND_H
+
+#include <pepper.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct pepper_seat_backend      pepper_seat_backend_t;
+
+struct pepper_seat_backend
+{
+    void            (*destroy)(void *data);
+    void            (*add_capabilities_listener)(void *data, struct wl_listener *listener);
+    void            (*add_name_listener)(void *data, struct wl_listener *listener);
+
+    uint32_t        (*get_capabilities)(void *data);
+    const char *    (*get_name)(void *data);
+};
+
+PEPPER_API pepper_seat_t *
+pepper_compositor_add_seat(pepper_compositor_t *compositor,
+                           const pepper_seat_backend_t *backend,
+                           void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PEPPER_INPUT_BACKEND_H */

diff --git a/pepper/src/pepper-internal.h b/pepper/src/pepper-internal.h
index 889b6ab..d257308 100644 (file)
--- a/pepper/src/pepper-internal.h
+++ b/pepper/src/pepper-internal.h
@@ -5,7 +5,8 @@
 #include "pepper.h"
 #include <wayland-util.h>
 #include <pixman.h>
-#include <pepper-output-backend.h>
+#include "pepper-output-backend.h"
+#include "pepper-input-backend.h"
 
 #define PEPPER_MAX_OUTPUT_COUNT 32
 

diff --git a/pepper/src/pepper.h b/pepper/src/pepper.h
index e4e15a6..c144433 100644 (file)
--- a/pepper/src/pepper.h
+++ b/pepper/src/pepper.h
@@ -24,7 +24,6 @@ typedef struct pepper_touch             pepper_touch_t;
 
 typedef struct pepper_output_geometry   pepper_output_geometry_t;
 typedef struct pepper_output_mode       pepper_output_mode_t;
-typedef struct pepper_seat_backend      pepper_seat_backend_t;
 typedef struct pepper_input_event       pepper_input_event_t;
 typedef struct pepper_event_hook        pepper_event_hook_t;
 
@@ -68,11 +67,6 @@ pepper_compositor_destroy(pepper_compositor_t *compositor);
 PEPPER_API struct wl_display *
 pepper_compositor_get_display(pepper_compositor_t *compositor);
 
-PEPPER_API pepper_seat_t *
-pepper_compositor_add_seat(pepper_compositor_t *compositor,
-                           const pepper_seat_backend_t *backend,
-                           void *data);
-
 PEPPER_API pepper_compositor_t *
 pepper_output_get_compositor(pepper_output_t *output);
 
@@ -98,16 +92,6 @@ PEPPER_API pepper_bool_t
 pepper_output_set_mode(pepper_output_t *output, const pepper_output_mode_t *mode);
 
 /* Input. */
-struct pepper_seat_backend
-{
-    void            (*destroy)(void *data);
-    void            (*add_capabilities_listener)(void *data, struct wl_listener *listener);
-    void            (*add_name_listener)(void *data, struct wl_listener *listener);
-
-    uint32_t        (*get_capabilities)(void *data);
-    const char *    (*get_name)(void *data);
-};
-
 enum pepper_input_event_type
 {
     PEPPER_INPUT_EVENT_POINTER_BUTTON,

diff --git a/wayland/src/wayland-internal.h b/wayland/src/wayland-internal.h
index d9fa065..f576028 100644 (file)
--- a/wayland/src/wayland-internal.h
+++ b/wayland/src/wayland-internal.h
@@ -3,6 +3,7 @@
 #include <wayland-client.h>
 #include <pixman.h>
 #include <pepper-output-backend.h>
+#include <pepper-input-backend.h>
 #include <pepper-render.h>
 #include <pepper-pixman-renderer.h>
 #include <pepper-gl-renderer.h>

diff --git a/x11/src/x11-internal.h b/x11/src/x11-internal.h
index 23a365b..07ac0c3 100644 (file)
--- a/x11/src/x11-internal.h
+++ b/x11/src/x11-internal.h
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <pixman.h>
 #include <pepper-output-backend.h>
+#include <pepper-input-backend.h>
 #include <pepper-render.h>
 #include <stdio.h>