sway

commit 96c8c024830f13a27790d4ea36b640df383a7f49
parent 3a6ed5110c76ef5bed8cc4c26a97759f6201eaac
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Sat, 30 Jun 2018 14:30:14 +1000

Fix flash of background when xwayland views are mapped

A flash of background was happening for two reasons:

1) We were using the xsurface's dimensions to check if the surface is
ready, but these are pending dimensions.
2) In my particular setup, the default geometry of the xsurface does not
intersect any output, which prevented it from receiving a frame done
event. This made the transaction time out and the client would only
redraw once it's been rendered.

Diffstat:
M
sway/desktop/transaction.c
 | 
7
+++++++
M
sway/desktop/xwayland.c
 | 
3
++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
@@ -298,6 +298,13 @@ void transaction_commit(struct sway_transaction *transaction) {
 					instruction->state.view_width,
 					instruction->state.view_height);
 			++transaction->num_waiting;
+
+			// From here on we are rendering a saved buffer of the view, which
+			// means we can send a frame done event to make the client redraw it
+			// as soon as possible. Additionally, this is required if a view is
+			// mapping and its default geometry doesn't intersect an output.
+			struct timespec when;
+			wlr_surface_send_frame_done(con->sway_view->surface, &when);
 		}
 		list_add(con->instructions, instruction);
 	}
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
@@ -269,10 +269,11 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, xwayland_view, commit);
 	struct sway_view *view = &xwayland_view->view;
 	struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+	struct wlr_surface_state *surface_state = xsurface->surface->current;
 
 	if (view->swayc->instructions->length) {
 		transaction_notify_view_ready_by_size(view,
-				xsurface->width, xsurface->height);
+				surface_state->width, surface_state->height);
 	}
 	view_damage_from(view);
 }