From 67ea30775390cf535ae6431186b367a6a63a3621 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 6 Oct 2017 07:52:18 -0400 Subject: [PATCH] xdg-shell: cleanup --- include/wlr/types/wlr_xdg_shell_v6.h | 2 -- types/wlr_xdg_shell_v6.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 408df16a..c7067e80 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -49,7 +49,6 @@ struct wlr_xdg_popup_grab_v6 { struct wlr_seat *seat; struct wl_list popups; struct wl_list link; // wlr_xdg_shell_v6::popup_grabs - // TODO: seat_handle destroy will release the grab }; enum wlr_xdg_surface_v6_role { @@ -84,7 +83,6 @@ struct wlr_xdg_toplevel_v6 { struct wlr_xdg_toplevel_v6_state current; }; -// TODO split up into toplevel and popup configure struct wlr_xdg_surface_v6_configure { struct wl_list link; // wlr_xdg_surface_v6::configure_list uint32_t serial; diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index f9546fea..eb0547d3 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -170,7 +170,8 @@ static void xdg_positioner_protocol_set_offset(struct wl_client *client, positioner->offset.y = y; } -static const struct zxdg_positioner_v6_interface zxdg_positioner_v6_implementation = { +static const struct zxdg_positioner_v6_interface + zxdg_positioner_v6_implementation = { .destroy = resource_destroy, .set_size = xdg_positioner_protocol_set_size, .set_anchor_rect = xdg_positioner_protocol_set_anchor_rect, @@ -259,6 +260,7 @@ static const struct wlr_pointer_grab_interface xdg_pointer_grab_impl = { .motion = xdg_pointer_grab_motion, .button = xdg_pointer_grab_button, .cancel = xdg_pointer_grab_cancel, + .axis = xdg_pointer_grab_axis, }; static struct wlr_xdg_popup_grab_v6 *xdg_shell_popup_grab_from_seat( @@ -431,8 +433,6 @@ static void xdg_surface_get_popup(struct wl_client *client, wl_resource_set_implementation(surface->popup_state->resource, &zxdg_popup_v6_implementation, surface, xdg_popup_resource_destroy); - - // TODO: set relative to parent? }