diff options
| author | emersion <contact@emersion.fr> | 2018-04-30 10:55:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 10:55:25 +0100 |
| commit | 509d38425c33524c77bfb4aa89676d57c21fcd11 (patch) | |
| tree | 7ee2138da910973fa5a7d8722ec400679d5d5bb2 /include/backend/x11.h | |
| parent | a0f490306395ac3705c00ecc85b4a0bba721886e (diff) | |
| parent | 178ac8bffee3c76de39e6c0bf37838b58cb7280f (diff) | |
Merge pull request #930 from emersion/input-device-output-name
Add wlr_input_device.output_name
Diffstat (limited to 'include/backend/x11.h')
| -rw-r--r-- | include/backend/x11.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/backend/x11.h b/include/backend/x11.h index 1d56fbe8..f5557343 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -24,6 +24,9 @@ struct wlr_x11_output { xcb_window_t win; EGLSurface surf; + struct wlr_pointer pointer; + struct wlr_input_device pointer_dev; + struct wl_event_source *frame_timer; int frame_delay; }; @@ -43,9 +46,6 @@ struct wlr_x11_backend { struct wlr_keyboard keyboard; struct wlr_input_device keyboard_dev; - struct wlr_pointer pointer; - struct wlr_input_device pointer_dev; - struct wlr_egl egl; struct wlr_renderer *renderer; struct wl_event_source *event_source; @@ -74,8 +74,6 @@ struct wlr_x11_backend { struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11, xcb_window_t window); -void get_x11_output_layout_box(struct wlr_x11_backend *backend, - struct wlr_box *box); extern const struct wlr_keyboard_impl keyboard_impl; extern const struct wlr_pointer_impl pointer_impl; |