blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xdg-shell: cleanup

This commit is contained in:
Tony Crisci 2017-10-06 07:52:18 -04:00
parent 48ae4fc588
commit 67ea307753
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_xdg_shell_v6.h
View File

@ -49,7 +49,6 @@ struct wlr_xdg_popup_grab_v6 {
struct wlr_seat *seat; struct wlr_seat *seat;
struct wl_list popups; struct wl_list popups;
struct wl_list link; // wlr_xdg_shell_v6::popup_grabs struct wl_list link; // wlr_xdg_shell_v6::popup_grabs
// TODO: seat_handle destroy will release the grab
}; };
enum wlr_xdg_surface_v6_role { enum wlr_xdg_surface_v6_role {
@ -84,7 +83,6 @@ struct wlr_xdg_toplevel_v6 {
struct wlr_xdg_toplevel_v6_state current; struct wlr_xdg_toplevel_v6_state current;
}; };
// TODO split up into toplevel and popup configure
struct wlr_xdg_surface_v6_configure { struct wlr_xdg_surface_v6_configure {
struct wl_list link; // wlr_xdg_surface_v6::configure_list struct wl_list link; // wlr_xdg_surface_v6::configure_list
uint32_t serial; uint32_t serial;

6
types/wlr_xdg_shell_v6.c
View File

@ -170,7 +170,8 @@ static void xdg_positioner_protocol_set_offset(struct wl_client *client,
positioner->offset.y = y; 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, .destroy = resource_destroy,
.set_size = xdg_positioner_protocol_set_size, .set_size = xdg_positioner_protocol_set_size,
.set_anchor_rect = xdg_positioner_protocol_set_anchor_rect, .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, .motion = xdg_pointer_grab_motion,
.button = xdg_pointer_grab_button, .button = xdg_pointer_grab_button,
.cancel = xdg_pointer_grab_cancel, .cancel = xdg_pointer_grab_cancel,
.axis = xdg_pointer_grab_axis,
}; };
static struct wlr_xdg_popup_grab_v6 *xdg_shell_popup_grab_from_seat( 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, wl_resource_set_implementation(surface->popup_state->resource,
&zxdg_popup_v6_implementation, surface, &zxdg_popup_v6_implementation, surface,
xdg_popup_resource_destroy); xdg_popup_resource_destroy);
// TODO: set relative to parent?
} }