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/xdg_shell.c | |
| parent | bfc0e95d2cfeab96d771cb34e78ca92afee4464c (diff) | |
rootston: add view_map and view_unmap
Diffstat (limited to 'rootston/xdg_shell.c')
| -rw-r--r-- | rootston/xdg_shell.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c index 9368ce0b..1733eb4e 100644 --- a/rootston/xdg_shell.c +++ b/rootston/xdg_shell.c @@ -287,9 +287,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_xdg_surface->request_resize.link); wl_list_remove(&roots_xdg_surface->request_maximize.link); wl_list_remove(&roots_xdg_surface->request_fullscreen.link); - wl_list_remove(&roots_xdg_surface->view->link); - view_finish(roots_xdg_surface->view); - free(roots_xdg_surface->view); + view_destroy(roots_xdg_surface->view); free(roots_xdg_surface); } @@ -333,7 +331,7 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { roots_surface->new_popup.notify = handle_new_popup; wl_signal_add(&surface->events.new_popup, &roots_surface->new_popup); - struct roots_view *view = view_create(); + struct roots_view *view = view_create(desktop); if (!view) { free(roots_surface); return; @@ -342,7 +340,6 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { view->xdg_surface = surface; view->roots_xdg_surface = roots_surface; - view->wlr_surface = surface->surface; view->activate = activate; view->resize = resize; view->move_resize = move_resize; @@ -356,8 +353,6 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { view->width = box.width; view->height = box.height; - view_init(view, desktop); - wl_list_insert(&desktop->views, &view->link); - + view_map(view, surface->surface); view_setup(view); } |