Merge branch 'wlroots' into split-containers

sway/tree/layout.c

@@ -58,7 +58,7 @@ void layout_init(void) {
 
 	root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
 	root_container.sway_root->output_layout = wlr_output_layout_create();
-	wl_list_init(&root_container.sway_root->unmanaged_views);
+	wl_list_init(&root_container.sway_root->xwayland_unmanaged);
 	wl_signal_init(&root_container.sway_root->events.new_container);
 
 	root_container.sway_root->output_layout_change.notify =
@@ -288,7 +288,7 @@ void arrange_windows(struct sway_container *container,
 		{
 			container->width = width;
 			container->height = height;
-			view_set_size(container->sway_view,
+			view_configure(container->sway_view, container->x, container->y,
 				container->width, container->height);
 			wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f",
 					container->width, container->height,
@@ -349,8 +349,10 @@ static void apply_horiz_layout(struct sway_container *container,
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, width, scale);
+
 			if (child->type == C_VIEW) {
-				view_set_position(child->sway_view, child_x, y);
+				view_configure(child->sway_view, child_x, y, child->width,
+					child->height);
 			} else {
 				child->x = child_x;
 				child->y = y;
@@ -406,7 +408,8 @@ void apply_vert_layout(struct sway_container *container,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, height, scale);
 			if (child->type == C_VIEW) {
-				view_set_position(child->sway_view, x, child_y);
+				view_configure(child->sway_view, x, child_y, child->width,
+					child->height);
 			} else {
 				child->x = x;
 				child->y = child_y;

sway/tree/output.c

@@ -30,6 +30,7 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
 	wl_list_remove(&output->sway_output->destroy.link);
 	wl_list_remove(&output->sway_output->mode.link);
 	wl_list_remove(&output->sway_output->transform.link);
+	wl_list_remove(&output->sway_output->scale.link);
 
 	wl_list_remove(&output->sway_output->damage_destroy.link);
 	wl_list_remove(&output->sway_output->damage_frame.link);

sway/tree/view.c

@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
 #include "log.h"
@@ -6,82 +7,117 @@
 #include "sway/tree/layout.h"
 #include "sway/tree/view.h"
 
+struct sway_view *view_create(enum sway_view_type type,
+		const struct sway_view_impl *impl) {
+	struct sway_view *view = calloc(1, sizeof(struct sway_view));
+	if (view == NULL) {
+		return NULL;
+	}
+	view->type = type;
+	view->impl = impl;
+	return view;
+}
+
+void view_destroy(struct sway_view *view) {
+	if (view == NULL) {
+		return;
+	}
+
+	if (view->surface != NULL) {
+		view_unmap(view);
+	}
+
+	container_view_destroy(view->swayc);
+	free(view);
+}
+
 const char *view_get_title(struct sway_view *view) {
-	if (view->iface.get_prop) {
-		return view->iface.get_prop(view, VIEW_PROP_TITLE);
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_TITLE);
 	}
 	return NULL;
 }
 
 const char *view_get_app_id(struct sway_view *view) {
-	if (view->iface.get_prop) {
-		return view->iface.get_prop(view, VIEW_PROP_APP_ID);
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_APP_ID);
 	}
 	return NULL;
 }
 
 const char *view_get_class(struct sway_view *view) {
-	if (view->iface.get_prop) {
-		return view->iface.get_prop(view, VIEW_PROP_CLASS);
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_CLASS);
 	}
 	return NULL;
 }
 
 const char *view_get_instance(struct sway_view *view) {
-	if (view->iface.get_prop) {
-		return view->iface.get_prop(view, VIEW_PROP_INSTANCE);
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_INSTANCE);
 	}
 	return NULL;
 }
 
-void view_set_size(struct sway_view *view, int width, int height) {
-	if (view->iface.set_size) {
-		struct wlr_box box = {
-			.x = view->swayc->x,
-			.y = view->swayc->y,
-			.width = view->width,
-			.height = view->height,
-		};
-		view->iface.set_size(view, width, height);
-		view_update_outputs(view, &box);
-	}
-}
-
-// TODO make view coordinates in layout coordinates
-void view_set_position(struct sway_view *view, double ox, double oy) {
-	if (view->iface.set_position) {
-		struct wlr_box box = {
-			.x = view->swayc->x,
-			.y = view->swayc->y,
-			.width = view->width,
-			.height = view->height,
-		};
-		view->iface.set_position(view, ox, oy);
-		view_update_outputs(view, &box);
+void view_configure(struct sway_view *view, double ox, double oy, int width,
+		int height) {
+	if (view->impl->configure) {
+		view->impl->configure(view, ox, oy, width, height);
 	}
 }
 
 void view_set_activated(struct sway_view *view, bool activated) {
-	if (view->iface.set_activated) {
-		view->iface.set_activated(view, activated);
+	if (view->impl->set_activated) {
+		view->impl->set_activated(view, activated);
 	}
 }
 
 void view_close(struct sway_view *view) {
-	if (view->iface.close) {
-		view->iface.close(view);
+	if (view->impl->close) {
+		view->impl->close(view);
 	}
 }
 
-void view_update_outputs(struct sway_view *view, const struct wlr_box *before) {
+struct sway_container *container_view_destroy(struct sway_container *view) {
+	if (!view) {
+		return NULL;
+	}
+	wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
+	struct sway_container *parent = container_destroy(view);
+	arrange_windows(parent, -1, -1);
+	return parent;
+}
+
+void view_damage_whole(struct sway_view *view) {
+	for (int i = 0; i < root_container.children->length; ++i) {
+		struct sway_container *cont = root_container.children->items[i];
+		if (cont->type == C_OUTPUT) {
+			output_damage_whole_view(cont->sway_output, view);
+		}
+	}
+}
+
+void view_damage_from(struct sway_view *view) {
+	// TODO
+	view_damage_whole(view);
+}
+
+static void view_get_layout_box(struct sway_view *view, struct wlr_box *box) {
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+
+	box->x = output->x + view->swayc->x;
+	box->y = output->y + view->swayc->y;
+	box->width = view->width;
+	box->height = view->height;
+}
+
+static void view_update_outputs(struct sway_view *view,
+		const struct wlr_box *before) {
+	struct wlr_box box;
+	view_get_layout_box(view, &box);
+
 	struct wlr_output_layout *output_layout =
 		root_container.sway_root->output_layout;
-	struct wlr_box box = {
-		.x = view->swayc->x,
-		.y = view->swayc->y,
-		.width = view->width,
-		.height = view->height,
-	};
 	struct wlr_output_layout_output *layout_output;
 	wl_list_for_each(layout_output, &output_layout->outputs, link) {
 		bool intersected = before != NULL && wlr_output_layout_intersects(
@@ -97,27 +133,63 @@ void view_update_outputs(struct sway_view *view, const struct wlr_box *before) {
 	}
 }
 
-struct sway_container *container_view_destroy(struct sway_container *view) {
-	if (!view) {
-		return NULL;
+void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
+	if (!sway_assert(view->surface == NULL, "cannot map mapped view")) {
+		return;
 	}
-	wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
-	struct sway_container *parent = container_destroy(view);
-	arrange_windows(parent, -1, -1);
-	return parent;
+
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *focus = seat_get_focus_inactive(seat,
+		&root_container);
+	struct sway_container *cont = container_view_create(focus, view);
+
+	view->surface = wlr_surface;
+	view->swayc = cont;
+
+	arrange_windows(cont->parent, -1, -1);
+	input_manager_set_focus(input_manager, cont);
+
+	view_damage_whole(view);
+	view_update_outputs(view, NULL);
 }
 
-void view_damage_whole(struct sway_view *view) {
-	struct sway_container *cont = NULL;
-	for (int i = 0; i < root_container.children->length; ++i) {
-		cont = root_container.children->items[i];
-		if (cont->type == C_OUTPUT) {
-			output_damage_whole_view(cont->sway_output, view);
-		}
+void view_unmap(struct sway_view *view) {
+	if (!sway_assert(view->surface != NULL, "cannot unmap unmapped view")) {
+		return;
 	}
+
+	view_damage_whole(view);
+
+	container_view_destroy(view->swayc);
+
+	view->swayc = NULL;
+	view->surface = NULL;
 }
 
-void view_damage_from(struct sway_view *view) {
-	// TODO
+void view_update_position(struct sway_view *view, double ox, double oy) {
+	if (view->swayc->x == ox && view->swayc->y == oy) {
+		return;
+	}
+
+	struct wlr_box box;
+	view_get_layout_box(view, &box);
+	view_damage_whole(view);
+	view->swayc->x = ox;
+	view->swayc->y = oy;
+	view_update_outputs(view, &box);
+	view_damage_whole(view);
+}
+
+void view_update_size(struct sway_view *view, int width, int height) {
+	if (view->width == width && view->height == height) {
+		return;
+	}
+
+	struct wlr_box box;
+	view_get_layout_box(view, &box);
+	view_damage_whole(view);
+	view->width = width;
+	view->height = height;
+	view_update_outputs(view, &box);
 	view_damage_whole(view);
 }