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

Merge pull request #438 from emersion/fix-close-xwayand-app 

Fix segfault when closing xwayland views
This commit is contained in:
Drew DeVault 2017-11-20 12:12:35 -05:00 committed by GitHub
parent c3e0fbdb8f 6a06c3d907
commit becd75fd2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rootston/desktop.c
View File

@ -181,15 +181,12 @@ bool view_center(struct roots_view *view) {
void view_destroy(struct roots_view *view) { void view_destroy(struct roots_view *view) {
wl_signal_emit(&view->events.destroy, view); wl_signal_emit(&view->events.destroy, view);
wl_list_remove(&view->link);
free(view); free(view);
} }
void view_init(struct roots_view *view, struct roots_desktop *desktop) { void view_init(struct roots_view *view, struct roots_desktop *desktop) {
view->desktop = desktop; view->desktop = desktop;
wl_signal_init(&view->events.destroy); wl_signal_init(&view->events.destroy);
wl_list_insert(&desktop->views, &view->link);
} }
void view_setup(struct roots_view *view) { void view_setup(struct roots_view *view) {

2
rootston/wl_shell.c
View File

@ -83,6 +83,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&roots_surface->request_set_maximized.link); wl_list_remove(&roots_surface->request_set_maximized.link);
wl_list_remove(&roots_surface->set_state.link); wl_list_remove(&roots_surface->set_state.link);
wl_list_remove(&roots_surface->surface_commit.link); wl_list_remove(&roots_surface->surface_commit.link);
wl_list_remove(&roots_surface->view->link);
view_destroy(roots_surface->view); view_destroy(roots_surface->view);
free(roots_surface); free(roots_surface);
} }
@ -131,6 +132,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
view->close = close; view->close = close;
roots_surface->view = view; roots_surface->view = view;
view_init(view, desktop); view_init(view, desktop);
wl_list_insert(&desktop->views, &view->link);
view_setup(view); view_setup(view);

2
rootston/xdg_shell_v6.c
View File

@ -165,6 +165,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&roots_xdg_surface->destroy.link); wl_list_remove(&roots_xdg_surface->destroy.link);
wl_list_remove(&roots_xdg_surface->request_move.link); wl_list_remove(&roots_xdg_surface->request_move.link);
wl_list_remove(&roots_xdg_surface->request_resize.link); wl_list_remove(&roots_xdg_surface->request_resize.link);
wl_list_remove(&roots_xdg_surface->view->link);
view_destroy(roots_xdg_surface->view); view_destroy(roots_xdg_surface->view);
free(roots_xdg_surface); free(roots_xdg_surface);
} }
@ -220,6 +221,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
view->close = close; view->close = close;
roots_surface->view = view; roots_surface->view = view;
view_init(view, desktop); view_init(view, desktop);
wl_list_insert(&desktop->views, &view->link);
view_setup(view); view_setup(view);
} }

6
rootston/xwayland.c
View File

@ -95,6 +95,8 @@ static void maximize(struct roots_view *view, bool maximized) {
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {
struct roots_xwayland_surface *roots_surface = struct roots_xwayland_surface *roots_surface =
wl_container_of(listener, roots_surface, destroy); wl_container_of(listener, roots_surface, destroy);
struct wlr_xwayland_surface *xwayland_surface =
roots_surface->view->xwayland_surface;
wl_list_remove(&roots_surface->destroy.link); wl_list_remove(&roots_surface->destroy.link);
wl_list_remove(&roots_surface->request_configure.link); wl_list_remove(&roots_surface->request_configure.link);
wl_list_remove(&roots_surface->request_move.link); wl_list_remove(&roots_surface->request_move.link);
@ -102,6 +104,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&roots_surface->request_maximize.link); wl_list_remove(&roots_surface->request_maximize.link);
wl_list_remove(&roots_surface->map_notify.link); wl_list_remove(&roots_surface->map_notify.link);
wl_list_remove(&roots_surface->unmap_notify.link); wl_list_remove(&roots_surface->unmap_notify.link);
if (xwayland_surface->mapped) {
wl_list_remove(&roots_surface->view->link);
}
view_destroy(roots_surface->view); view_destroy(roots_surface->view);
free(roots_surface); free(roots_surface);
} }
@ -243,6 +248,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
view->close = close; view->close = close;
roots_surface->view = view; roots_surface->view = view;
view_init(view, desktop); view_init(view, desktop);
wl_list_insert(&desktop->views, &view->link);
if (!surface->override_redirect) { if (!surface->override_redirect) {
view_setup(view); view_setup(view);