diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-11-11 14:25:53 +1300 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-11-13 10:55:03 +1300 |
| commit | 70ae76304e5c40774dd50a23537cdc419cdfa4c6 (patch) | |
| tree | 32ef3a537d08f6237eadec618ea0c7e0f404f586 /include | |
| parent | d89e868cc9702f1dcd51de39c6b009e8c6fd3bd6 (diff) | |
backend/x11: Remove old input functions
This also allows us to remove xcb-xkb, since Xinput will now give us the
appropriate XKB modifiers with each event.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/x11.h | 8 | ||||
| -rw-r--r-- | include/wlr/config.h.in | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/backend/x11.h b/include/backend/x11.h index ac0930b6..94de129f 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -69,12 +69,6 @@ struct wlr_x11_backend { uint8_t xinput_opcode; -#if WLR_HAS_XCB_XKB - bool xkb_supported; - uint8_t xkb_base_event; - uint8_t xkb_base_error; -#endif - struct wl_listener display_destroy; }; @@ -87,8 +81,6 @@ extern const struct wlr_keyboard_impl keyboard_impl; extern const struct wlr_pointer_impl pointer_impl; extern const struct wlr_input_device_impl input_device_impl; -void handle_x11_input_event(struct wlr_x11_backend *x11, - xcb_generic_event_t *event); void handle_x11_xinput_event(struct wlr_x11_backend *x11, xcb_ge_generic_event_t *event); void update_x11_pointer_position(struct wlr_x11_output *output, diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in index 17277c07..94273fac 100644 --- a/include/wlr/config.h.in +++ b/include/wlr/config.h.in @@ -12,6 +12,5 @@ #mesondefine WLR_HAS_XCB_ERRORS #mesondefine WLR_HAS_XCB_ICCCM -#mesondefine WLR_HAS_XCB_XKB #endif |