diff options
| author | emersion <contact@emersion.fr> | 2018-03-09 10:29:22 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-03-09 10:29:22 +0100 |
| commit | c27fd1e1ee9826ea0668d2bb5aa8644daec29a7f (patch) | |
| tree | f75239836bc4a25b1f184dc12b8ba7a7acaa49ee /rootston/wl_shell.c | |
| parent | bfc0e95d2cfeab96d771cb34e78ca92afee4464c (diff) | |
rootston: add view_map and view_unmap
Diffstat (limited to 'rootston/wl_shell.c')
| -rw-r--r-- | rootston/wl_shell.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 899df1c6..6326d9d7 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -181,9 +181,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_surface->request_fullscreen.link); wl_list_remove(&roots_surface->set_state.link); wl_list_remove(&roots_surface->surface_commit.link); - wl_list_remove(&roots_surface->view->link); - view_finish(roots_surface->view); - free(roots_surface->view); + view_destroy(roots_surface->view); free(roots_surface); } @@ -227,7 +225,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { roots_surface->surface_commit.notify = handle_surface_commit; wl_signal_add(&surface->surface->events.commit, &roots_surface->surface_commit); - struct roots_view *view = view_create(); + struct roots_view *view = view_create(desktop); if (!view) { free(roots_surface); return; @@ -238,13 +236,11 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { view->wl_shell_surface = surface; view->roots_wl_shell_surface = roots_surface; - view->wlr_surface = surface->surface; view->resize = resize; view->close = close; roots_surface->view = view; - view_init(view, desktop); - wl_list_insert(&desktop->views, &view->link); + view_map(view, surface->surface); view_setup(view); if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TRANSIENT) { |