build: bump version to 1.7-rc2

Closes: https://github.com/swaywm/sway/issues/6337
(cherry picked from commit e2b4c573d6)

include/sway/layers.h

@@ -25,6 +25,8 @@ struct sway_layer_surface {
 	bool mapped;
 	struct wlr_box extent;
 	enum zwlr_layer_shell_v1_layer layer;
+
+	struct wl_list subsurfaces;
 };
 
 struct sway_layer_popup {
@@ -44,6 +46,7 @@ struct sway_layer_popup {
 struct sway_layer_subsurface {
 	struct wlr_subsurface *wlr_subsurface;
 	struct sway_layer_surface *layer_surface;
+	struct wl_list link;
 
 	struct wl_listener map;
 	struct wl_listener unmap;

meson.build

@@ -1,7 +1,7 @@
 project(
 	'sway',
 	'c',
-	version: '1.6',
+	version: '1.7-rc2',
 	license: 'MIT',
 	meson_version: '>=0.60.0',
 	default_options: [

sway/commands/move.c

@@ -874,6 +874,10 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
 		return cmd_results_new(CMD_INVALID, "Invalid x position specified");
 	}
 
+	if (argc < 1) {
+		return cmd_results_new(CMD_FAILURE, expected_position_syntax);
+	}
+
 	struct movement_amount ly = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
 	// Y direction
 	num_consumed_args = parse_movement_amount(argc, argv, &ly);

sway/desktop/layer_shell.c

@@ -352,6 +352,8 @@ static void unmap(struct sway_layer_surface *sway_layer) {
 		sway_layer->layer_surface->surface, true);
 }
 
+static void layer_subsurface_destroy(struct sway_layer_subsurface *subsurface);
+
 static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct sway_layer_surface *sway_layer =
 		wl_container_of(listener, sway_layer, destroy);
@@ -360,6 +362,12 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	if (sway_layer->layer_surface->mapped) {
 		unmap(sway_layer);
 	}
+
+	struct sway_layer_subsurface *subsurface, *subsurface_tmp;
+	wl_list_for_each_safe(subsurface, subsurface_tmp, &sway_layer->subsurfaces, link) {
+		layer_subsurface_destroy(subsurface);
+	}
+
 	wl_list_remove(&sway_layer->link);
 	wl_list_remove(&sway_layer->destroy.link);
 	wl_list_remove(&sway_layer->map.link);
@@ -428,11 +436,8 @@ static void subsurface_handle_commit(struct wl_listener *listener, void *data) {
 	subsurface_damage(subsurface, false);
 }
 
-static void subsurface_handle_destroy(struct wl_listener *listener,
+static void layer_subsurface_destroy(struct sway_layer_subsurface *subsurface) {
-		void *data) {
+	wl_list_remove(&subsurface->link);
-	struct sway_layer_subsurface *subsurface =
-			wl_container_of(listener, subsurface, destroy);
-
 	wl_list_remove(&subsurface->map.link);
 	wl_list_remove(&subsurface->unmap.link);
 	wl_list_remove(&subsurface->destroy.link);
@@ -440,6 +445,13 @@ static void subsurface_handle_destroy(struct wl_listener *listener,
 	free(subsurface);
 }
 
+static void subsurface_handle_destroy(struct wl_listener *listener,
+		void *data) {
+	struct sway_layer_subsurface *subsurface =
+			wl_container_of(listener, subsurface, destroy);
+	layer_subsurface_destroy(subsurface);
+}
+
 static struct sway_layer_subsurface *create_subsurface(
 		struct wlr_subsurface *wlr_subsurface,
 		struct sway_layer_surface *layer_surface) {
@@ -451,6 +463,7 @@ static struct sway_layer_subsurface *create_subsurface(
 
 	subsurface->wlr_subsurface = wlr_subsurface;
 	subsurface->layer_surface = layer_surface;
+	wl_list_insert(&layer_surface->subsurfaces, &subsurface->link);
 
 	subsurface->map.notify = subsurface_handle_map;
 	wl_signal_add(&wlr_subsurface->events.map, &subsurface->map);
@@ -643,6 +656,8 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
+	wl_list_init(&sway_layer->subsurfaces);
+
 	sway_layer->surface_commit.notify = handle_surface_commit;
 	wl_signal_add(&layer_surface->surface->events.commit,
 		&sway_layer->surface_commit);

sway/input/seat.c

@@ -51,6 +51,16 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
 static void seat_node_destroy(struct sway_seat_node *seat_node) {
 	wl_list_remove(&seat_node->destroy.link);
 	wl_list_remove(&seat_node->link);
+
+	/*
+	 * This is the only time we remove items from the focus stack without
+	 * immediately re-adding them. If we just removed the last thing,
+	 * mark that nothing has focus anymore.
+	 */
+	if (wl_list_empty(&seat_node->seat->focus_stack)) {
+		seat_node->seat->has_focus = false;
+	}
+
 	free(seat_node);
 }
 
@@ -1415,9 +1425,8 @@ struct sway_node *seat_get_focus(struct sway_seat *seat) {
 	if (!seat->has_focus) {
 		return NULL;
 	}
-	if (wl_list_empty(&seat->focus_stack)) {
+	sway_assert(!wl_list_empty(&seat->focus_stack),
-		return NULL;
+			"focus_stack is empty, but has_focus is true");
-	}
 	struct sway_seat_node *current =
 		wl_container_of(seat->focus_stack.next, current, link);
 	return current->node;

sway/tree/container.c

@@ -80,10 +80,8 @@ void container_destroy(struct sway_container *con) {
 	wlr_texture_destroy(con->marks_urgent);
 	wlr_texture_destroy(con->marks_focused_tab_title);
 
-	if (con->view) {
+	if (con->view && con->view->container == con) {
-		if (con->view->container == con) {
 		con->view->container = NULL;
-		}
 		if (con->view->destroying) {
 			view_destroy(con->view);
 		}
@@ -536,6 +534,13 @@ static void render_titlebar_text_texture(struct sway_output *output,
 
 	cairo_surface_t *surface = cairo_image_surface_create(
 			CAIRO_FORMAT_ARGB32, width, height);
+	cairo_status_t status = cairo_surface_status(surface);
+	if (status != CAIRO_STATUS_SUCCESS) {
+		sway_log(SWAY_ERROR, "cairo_image_surface_create failed: %s",
+			cairo_status_to_string(status));
+		return;
+	}
+
 	cairo_t *cairo = cairo_create(surface);
 	cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
 	cairo_set_font_options(cairo, fo);

swaybar/status_line.c

@@ -117,11 +117,11 @@ bool status_handle_readable(struct status_line *status) {
 		status->text = status->buffer;
 		// intentional fall-through
 	case PROTOCOL_TEXT:
-		errno = 0;
 		while (true) {
 			if (status->buffer[read_bytes - 1] == '\n') {
 				status->buffer[read_bytes - 1] = '\0';
 			}
+			errno = 0;
 			read_bytes = getline(&status->buffer,
 					&status->buffer_size, status->read);
 			if (errno == EAGAIN) {

swaybar/tray/item.c

@@ -493,24 +493,36 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
 		cairo_destroy(cairo_icon);
 	}
 
-	int padded_size = icon_size + 2*padding;
+	double descaled_padding = (double)padding / output->scale;
-	*x -= padded_size;
+	double descaled_icon_size = (double)icon_size / output->scale;
-	int y = floor((height - padded_size) / 2.0);
+
+	int size = descaled_icon_size + 2 * descaled_padding;
+	*x -= size;
+	int icon_y = floor((output->height - size) / 2.0);
 
 	cairo_operator_t op = cairo_get_operator(cairo);
 	cairo_set_operator(cairo, CAIRO_OPERATOR_OVER);
-	cairo_set_source_surface(cairo, icon, *x + padding, y + padding);
+
-	cairo_rectangle(cairo, *x, y, padded_size, padded_size);
+	cairo_matrix_t scale_matrix;
+	cairo_pattern_t *icon_pattern = cairo_pattern_create_for_surface(icon);
+	// TODO: check cairo_pattern_status for "ENOMEM"
+	cairo_matrix_init_scale(&scale_matrix, output->scale, output->scale);
+	cairo_matrix_translate(&scale_matrix, -(*x + descaled_padding), -(icon_y + descaled_padding));
+	cairo_pattern_set_matrix(icon_pattern, &scale_matrix);
+	cairo_set_source(cairo, icon_pattern);
+	cairo_rectangle(cairo, *x, icon_y, size, size);
 	cairo_fill(cairo);
+
 	cairo_set_operator(cairo, op);
 
+	cairo_pattern_destroy(icon_pattern);
 	cairo_surface_destroy(icon);
 
 	struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
 	hotspot->x = *x;
 	hotspot->y = 0;
-	hotspot->width = height;
+	hotspot->width = size;
-	hotspot->height = height;
+	hotspot->height = output->height;
 	hotspot->callback = icon_hotspot_callback;
 	hotspot->destroy = free;
 	hotspot->data = strdup(sni->watcher_id);

swaybar/tray/tray.c

@@ -116,8 +116,8 @@ uint32_t render_tray(cairo_t *cairo, struct swaybar_output *output, double *x) {
 		}
 	} // else display on all
 
-	if ((int) output->height*output->scale <= 2*config->tray_padding) {
+	if ((int)(output->height * output->scale) <= 2 * config->tray_padding) {
-		return 2*config->tray_padding + 1;
+		return (2 * config->tray_padding + 1) / output->scale;
 	}
 
 	uint32_t max_height = 0;