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

xdg-shell-v6 misc cleanup

This commit is contained in:
Tony Crisci 2017-09-16 20:31:34 -04:00
parent 5b9373a791
commit 94d4b9249c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
types/wlr_xdg_shell_v6.c
View File

@ -15,7 +15,6 @@ static const char *wlr_desktop_xdg_toplevel_role = "xdg_toplevel";
static void resource_destroy(struct wl_client *client, static void resource_destroy(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
// TODO: we probably need to do more than this
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
@ -225,6 +224,8 @@ static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
wl_list_remove(&surface->surface_commit_listener.link); wl_list_remove(&surface->surface_commit_listener.link);
free(surface->geometry); free(surface->geometry);
free(surface->next_geometry); free(surface->next_geometry);
free(surface->title);
free(surface->app_id);
free(surface); free(surface);
} }
@ -244,8 +245,9 @@ static void xdg_surface_get_toplevel(struct wl_client *client,
return; return;
} }
if (!(surface->toplevel_state = surface->toplevel_state = calloc(1, sizeof(struct wlr_xdg_toplevel_v6));
calloc(1, sizeof(struct wlr_xdg_toplevel_v6)))) { if (surface->toplevel_state == NULL) {
wl_client_post_no_memory(client);
return; return;
} }
@ -492,6 +494,8 @@ static void handle_wlr_surface_destroyed(struct wl_listener *listener,
static void wlr_xdg_surface_v6_toplevel_committed( static void wlr_xdg_surface_v6_toplevel_committed(
struct wlr_xdg_surface_v6 *surface) { struct wlr_xdg_surface_v6 *surface) {
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
if (!surface->surface->current.buffer && !surface->toplevel_state->added) { if (!surface->surface->current.buffer && !surface->toplevel_state->added) {
// on the first commit, send a configure request to tell the client it // on the first commit, send a configure request to tell the client it
// is added // is added
@ -504,8 +508,6 @@ static void wlr_xdg_surface_v6_toplevel_committed(
return; return;
} }
// TODO: error if they try to resize a maximized or fullscreen window
surface->toplevel_state->current = surface->toplevel_state->next; surface->toplevel_state->current = surface->toplevel_state->next;
} }
@ -725,8 +727,6 @@ void wlr_xdg_shell_v6_destroy(struct wlr_xdg_shell_v6 *xdg_shell) {
if (!xdg_shell) { if (!xdg_shell) {
return; return;
} }
// TODO: disconnect clients and destroy surfaces
// TODO: this segfault (wl_display->registry_resource_list is not init) // TODO: this segfault (wl_display->registry_resource_list is not init)
// wl_global_destroy(xdg_shell->wl_global); // wl_global_destroy(xdg_shell->wl_global);
free(xdg_shell); free(xdg_shell);