From b1c8ff5f58c78a3fb884fd47aa10af582cbebb1e Mon Sep 17 00:00:00 2001 From: William McKinnon Date: Wed, 7 Feb 2024 02:20:39 -0500 Subject: [PATCH] cleaned up some comments + print debug statements --- sway/desktop/render.c | 6 ------ sway/tree/container.c | 2 +- sway/tree/view.c | 4 +++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sway/desktop/render.c b/sway/desktop/render.c index f8a3ee40..b83e2258 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -765,7 +765,6 @@ static void render_view_popups(struct sway_view *view, struct sway_output *outpu static void render_saved_view(struct sway_view *view, struct sway_output *output, pixman_region32_t *damage, struct decoration_data deco_data) { - printf("rendering saved view\n"); struct wlr_output *wlr_output = output->wlr_output; if (wl_list_empty(&view->saved_buffers)) { @@ -874,11 +873,8 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, // render view if (!wl_list_empty(&view->saved_buffers)) { - printf("rendering saved view\n"); render_saved_view(view, output, damage, deco_data); } else if (view->surface) { - - printf("rendering view toplevels\n"); render_view_toplevels(view, output, damage, deco_data); } @@ -1806,7 +1802,6 @@ void output_render(struct sway_output *output, struct timespec *when, struct wlr_output *wlr_output = output->wlr_output; struct fx_renderer *renderer = output->renderer; - printf("rendering output\n"); struct sway_workspace *workspace = output->current.active_workspace; if (workspace == NULL) { return; @@ -1985,7 +1980,6 @@ void output_render(struct sway_output *output, struct timespec *when, render_output_blur(output, damage); } - printf("rendering workspace\n"); render_workspace(output, damage, workspace, workspace->current.focused); render_floating(output, damage); #if HAVE_XWAYLAND diff --git a/sway/tree/container.c b/sway/tree/container.c index c54a33a3..576f5b5c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -681,7 +681,7 @@ size_t container_build_representation(enum sway_container_layout layout, } struct sway_container *child = children->items[i]; const char *identifier = NULL; - if (child->view) { + if (child->view && child->view->surface) { identifier = view_get_class(child->view); if (!identifier) { identifier = view_get_app_id(child->view); diff --git a/sway/tree/view.c b/sway/tree/view.c index fe4737d4..d1bc6377 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -947,12 +947,14 @@ void view_unmap(struct sway_view *view) { if (!config->animation_duration) { view_remove_container(view); } else { + // unfocus the view + // look at handle_seat_node_destroy + view_save_buffer(view); view->container->target_alpha = 0; wl_event_source_timer_update(view->container->animation_present_timer, 50); } - // TODO: deactivate input / focus struct sway_seat *seat; wl_list_for_each(seat, &server.input->seats, link) { seat->cursor->image_surface = NULL;