diff options
Diffstat (limited to 'rootston')
-rw-r--r-- | rootston/desktop.c | 3 | ||||
-rw-r--r-- | rootston/seat.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 78076e75..9730ca57 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -9,6 +9,7 @@ #include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_gamma_control.h> #include <wlr/types/wlr_idle.h> +#include <wlr/types/wlr_linux_dmabuf.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_idle_inhibit_v1.h> #include <wlr/types/wlr_primary_selection.h> @@ -768,6 +769,8 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->idle = wlr_idle_create(server->wl_display); desktop->idle_inhibit = wlr_idle_inhibit_v1_create(server->wl_display); + struct wlr_egl *egl = wlr_backend_get_egl(server->backend); + desktop->linux_dmabuf = wlr_linux_dmabuf_create(server->wl_display, egl); return desktop; } diff --git a/rootston/seat.c b/rootston/seat.c index c4535c7c..d2d211ba 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -514,13 +514,13 @@ static void seat_add_tablet_pad(struct roots_seat *seat, static void handle_tablet_tool_destroy(struct wl_listener *listener, void *data) { - struct roots_pointer *tablet_tool = + struct roots_tablet_tool *tablet_tool = wl_container_of(listener, tablet_tool, device_destroy); struct roots_seat *seat = tablet_tool->seat; - wl_list_remove(&tablet_tool->link); wlr_cursor_detach_input_device(seat->cursor->cursor, tablet_tool->device); wl_list_remove(&tablet_tool->device_destroy.link); + wl_list_remove(&tablet_tool->link); free(tablet_tool); seat_update_capabilities(seat); |