From bb6d34e7a5e270c6998f95f45c1e518d9c053714 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 17 Nov 2017 12:45:07 +0100 Subject: rootston: add per-seat views --- rootston/xwayland.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'rootston/xwayland.c') diff --git a/rootston/xwayland.c b/rootston/xwayland.c index f4e100dc..f5cb7857 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -95,7 +95,6 @@ static void maximize(struct roots_view *view, bool maximized) { static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, destroy); - view_teardown(roots_surface->view); wl_list_remove(&roots_surface->destroy.link); wl_list_remove(&roots_surface->request_configure.link); wl_list_remove(&roots_surface->request_move.link); @@ -174,29 +173,24 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) { static void handle_map_notify(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, map_notify); + struct wlr_xwayland_surface *xsurface = data; struct roots_view *view = roots_surface->view; - struct wlr_xwayland_surface *xsurface = view->xwayland_surface; - struct roots_desktop *desktop = view->desktop; + //struct roots_desktop *desktop = view->desktop; view->wlr_surface = xsurface->surface; view->x = (double)xsurface->x; view->y = (double)xsurface->y; - wlr_list_push(desktop->views, roots_surface->view); + // TODO: add view to desktop } static void handle_unmap_notify(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, unmap_notify); - struct roots_desktop *desktop = roots_surface->view->desktop; + //struct roots_desktop *desktop = roots_surface->view->desktop; roots_surface->view->wlr_surface = NULL; - for (size_t i = 0; i < desktop->views->length; i++) { - if (desktop->views->items[i] == roots_surface->view) { - wlr_list_del(desktop->views, i); - break; - } - } + // TODO: remove view from desktop } void handle_xwayland_surface(struct wl_listener *listener, void *data) { @@ -242,7 +236,6 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { view->xwayland_surface = surface; view->roots_xwayland_surface = roots_surface; view->wlr_surface = surface->surface; - view->desktop = desktop; view->activate = activate; view->resize = resize; view->move = move; @@ -250,7 +243,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { view->maximize = maximize; view->close = close; roots_surface->view = view; - wlr_list_add(desktop->views, view); + view_init(view, desktop); if (!surface->override_redirect) { view_setup(view); -- cgit v1.2.3 From 4d6b3618b8f8a953bd811b4cbf0975e6c00d96b8 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Mon, 20 Nov 2017 07:40:22 -0500 Subject: rootston: remove unmapped surface from desktop --- rootston/output.c | 2 +- rootston/xwayland.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'rootston/xwayland.c') diff --git a/rootston/output.c b/rootston/output.c index 3b08d7bf..83ff37fd 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -38,7 +38,7 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh, static void render_surface(struct wlr_surface *surface, struct roots_desktop *desktop, struct wlr_output *wlr_output, struct timespec *when, double lx, double ly, float rotation) { - if (surface->texture->valid) { + if (wlr_surface_has_buffer(surface)) { int width = surface->current->width; int height = surface->current->height; int render_width = width * wlr_output->scale; diff --git a/rootston/xwayland.c b/rootston/xwayland.c index f5cb7857..c92c424b 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -175,22 +175,21 @@ static void handle_map_notify(struct wl_listener *listener, void *data) { wl_container_of(listener, roots_surface, map_notify); struct wlr_xwayland_surface *xsurface = data; struct roots_view *view = roots_surface->view; - //struct roots_desktop *desktop = view->desktop; + struct roots_desktop *desktop = view->desktop; view->wlr_surface = xsurface->surface; view->x = (double)xsurface->x; view->y = (double)xsurface->y; - // TODO: add view to desktop + wl_list_insert(&desktop->views, &view->link); } static void handle_unmap_notify(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, unmap_notify); - //struct roots_desktop *desktop = roots_surface->view->desktop; roots_surface->view->wlr_surface = NULL; - // TODO: remove view from desktop + wl_list_remove(&roots_surface->view->link); } void handle_xwayland_surface(struct wl_listener *listener, void *data) { -- cgit v1.2.3