aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2017-08-14 15:41:14 +0200
committerDominique Martinet <asmadeus@codewreck.org>2017-08-14 16:22:31 +0200
commit0a3246ad979d768933a68b81e738853bd7c964a2 (patch)
tree677e8efcafcf7bdea38bd205898f8e4c2e01b23c /include
parente6ad67911bffcd804549bd1812a77a305cc14eb4 (diff)
Refactor out wlr_keyboard_state
Diffstat (limited to 'include')
-rw-r--r--include/wlr/interfaces/wlr_keyboard.h7
-rw-r--r--include/wlr/types/wlr_keyboard.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h
index 1acc6428..779b302f 100644
--- a/include/wlr/interfaces/wlr_keyboard.h
+++ b/include/wlr/interfaces/wlr_keyboard.h
@@ -4,12 +4,11 @@
#include <stdint.h>
struct wlr_keyboard_impl {
- void (*destroy)(struct wlr_keyboard_state *state);
- void (*led_update)(struct wlr_keyboard_state *state, uint32_t leds);
+ void (*destroy)(struct wlr_keyboard *keyboard);
+ void (*led_update)(struct wlr_keyboard *keyboard, uint32_t leds);
};
-struct wlr_keyboard *wlr_keyboard_create(struct wlr_keyboard_impl *impl,
- struct wlr_keyboard_state *state);
+void wlr_keyboard_init(struct wlr_keyboard *keyboard, struct wlr_keyboard_impl *impl);
void wlr_keyboard_destroy(struct wlr_keyboard *keyboard);
#endif
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index bef064e5..ce7d6659 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -10,11 +10,9 @@ enum WLR_KEYBOARD_LED {
WLR_LED_LAST
};
-struct wlr_keyboard_state;
struct wlr_keyboard_impl;
struct wlr_keyboard {
- struct wlr_keyboard_state *state;
struct wlr_keyboard_impl *impl;
struct {