From 0a3246ad979d768933a68b81e738853bd7c964a2 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 14 Aug 2017 15:41:14 +0200 Subject: Refactor out wlr_keyboard_state --- include/wlr/interfaces/wlr_keyboard.h | 7 +++---- include/wlr/types/wlr_keyboard.h | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'include/wlr') 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 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 { -- cgit v1.2.3