Set wayland surface width per each mako_surface

Using the super style's width for all wayland surfaces causes extra space to be
blurred when using the compositor to blur the background of notification
surfaces.

Author: MikeWalrus

include/render.h

@@ -4,6 +4,7 @@
 struct mako_state;
 struct mako_surface;
 
-int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale);
+void render(struct mako_surface *surface, struct pool_buffer *buffer, int scale,
+	int *width, int *height);
 
 #endif

render.c

@@ -321,12 +321,15 @@ static int render_notification(cairo_t *cairo, struct mako_state *state, struct
 	return notif_height;
 }
 
-int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale) {
+void render(struct mako_surface *surface, struct pool_buffer *buffer, int scale,
+		int *rendered_width, int *rendered_height) {
 	struct mako_state *state = surface->state;
 	cairo_t *cairo = buffer->cairo;
 
+	*rendered_width = *rendered_height = 0;
+
 	if (wl_list_empty(&state->notifications)) {
-		return 0;
+		return;
 	}
 
 	// Clear
@@ -339,6 +342,7 @@ int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale)
 	size_t visible_count = 0;
 	size_t hidden_count = 0;
 	int total_height = 0;
+	int max_width = 0;
 	int pending_bottom_margin = 0;
 	struct mako_notification *notif;
 	size_t total_notifications = 0;
@@ -401,7 +405,13 @@ int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale)
 			&notif->hotspot, notif->progress);
 		free(text);
 
+		int notif_width =
+			style->width + style->margin.left + style->margin.right;
+
 		total_height += notif_height;
+		if (max_width < notif_width) {
+			max_width = notif_width;
+		}
 		pending_bottom_margin = style->margin.bottom;
 
 		if (notif->group_index < 1) {
@@ -411,7 +421,6 @@ int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale)
 			// single entity for this purpose.
 			++visible_count;
 		}
-
 	}
 
 	if (hidden_count > 0) {
@@ -438,7 +447,7 @@ int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale)
 		char *text = malloc(text_ln + 1);
 		if (text == NULL) {
 			fprintf(stderr, "allocation failed");
-			return 0;
+			return;
 		}
 
 		format_text(style->format, text, format_hidden_text, &data);
@@ -452,5 +461,6 @@ int render(struct mako_surface *surface, struct pool_buffer *buffer, int scale)
 		destroy_notification(hidden_notif);
 	}
 
-	return total_height + pending_bottom_margin;
+	*rendered_width = max_width;
+	*rendered_height = total_height;
 }

wayland.c

@@ -609,7 +609,8 @@ static void send_frame(struct mako_surface *surface) {
 	}
 
 	struct mako_output *output = get_configured_output(surface);
-	int height = render(surface, surface->current_buffer, scale);
+	int width = 0, height = 0;
+	render(surface, surface->current_buffer, scale, &width, &height);
 
 	// There are two cases where we want to tear down the surface: zero
 	// notifications (height = 0) or moving between outputs.
@@ -669,14 +670,11 @@ static void send_frame(struct mako_surface *surface) {
 	// surface is brand new, it doesn't even have a size yet. If it already
 	// exists, we might need to resize if the list of notifications has changed
 	// since the last time we drew.
-	if (surface->height != height) {
+	if (surface->height != height || surface->width != width) {
 		struct mako_style *style = &state->config.superstyle;
 
-		zwlr_layer_surface_v1_set_size(surface->layer_surface,
-				style->width + style->margin.left + style->margin.right,
-				height);
-		zwlr_layer_surface_v1_set_anchor(surface->layer_surface,
-				surface->anchor);
+		zwlr_layer_surface_v1_set_size(surface->layer_surface, width, height);
+		zwlr_layer_surface_v1_set_anchor(surface->layer_surface, surface->anchor);
 		zwlr_layer_surface_v1_set_margin(surface->layer_surface,
 			style->outer_margin.top, style->outer_margin.right,
 			style->outer_margin.bottom, style->outer_margin.left);