2 files changed, 85 insertions, 0 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 27579c1b..9e0c18e4 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -3,11 +3,82 @@
 #include <time.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_surface.h>
 #include <wlr/render.h>
+#include <wlr/render/matrix.h>
 #include "log.h"
 #include "sway/container.h"
 #include "sway/output.h"
 #include "sway/server.h"
+#include "sway/view.h"
+
+static inline int64_t timespec_to_msec(const struct timespec *a) {
+	return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
+}
+
+static void output_frame_view(swayc_t *view, void *data) {
+	struct sway_output *output = data;
+	struct wlr_output *wlr_output = output->wlr_output;
+	struct sway_view *sway_view = view->sway_view;
+	struct wlr_surface *surface = sway_view->surface;
+	if (!wlr_surface_has_buffer(surface)) {
+		return;
+	}
+	// TODO
+	// - Force sway's resolution
+	// - Deal with wlr_output_layout
+	int width = surface->current->width;
+	int height = surface->current->height;
+	int render_width = width * wlr_output->scale;
+	int render_height = height * wlr_output->scale;
+	double ox = view->x, oy = view->y;
+	// TODO
+	//wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy);
+	ox *= wlr_output->scale;
+	oy *= wlr_output->scale;
+	// TODO
+	//if (wlr_output_layout_intersects(desktop->layout, wlr_output,
+	//		lx, ly, lx + render_width, ly + render_height)) {
+	//		return;
+	//}
+
+	// TODO
+	double rotation = 0;
+	float matrix[16];
+
+	float translate_origin[16];
+	wlr_matrix_translate(&translate_origin,
+		(int)ox + render_width / 2, (int)oy + render_height / 2, 0);
+
+	float rotate[16];
+	wlr_matrix_rotate(&rotate, rotation);
+
+	float translate_center[16];
+	wlr_matrix_translate(&translate_center, -render_width / 2,
+		-render_height / 2, 0);
+
+	float scale[16];
+	wlr_matrix_scale(&scale, render_width, render_height, 1);
+
+	float transform[16];
+	wlr_matrix_mul(&translate_origin, &rotate, &transform);
+	wlr_matrix_mul(&transform, &translate_center, &transform);
+	wlr_matrix_mul(&transform, &scale, &transform);
+	wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix);
+
+	wlr_render_with_matrix(output->server->renderer, surface->texture, &matrix);
+
+	// TODO: move into wlroots
+	struct timespec now;
+	clock_gettime(CLOCK_MONOTONIC, &now);
+
+	struct wlr_frame_callback *cb, *cnext;
+	wl_list_for_each_safe(cb, cnext,
+			&surface->current->frame_callback_list, link) {
+		wl_callback_send_done(cb->resource, timespec_to_msec(&now));
+		wl_resource_destroy(cb->resource);
+	}
+}
 
 static void output_frame_notify(struct wl_listener *listener, void *data) {
 	struct sway_output *soutput = wl_container_of(
@@ -21,6 +92,9 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	wlr_output_make_current(wlr_output);
 	wlr_renderer_begin(server->renderer, wlr_output);
 
+	swayc_descendants_of_type(
+			&root_container, C_VIEW, output_frame_view, soutput);
+
 	wlr_renderer_end(server->renderer);
 	wlr_output_swap_buffers(wlr_output);
 
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index b3dbcfbe..e2a61ebf 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
+#include "sway/container.h"
 #include "sway/server.h"
 #include "sway/view.h"
 #include "log.h"
@@ -47,6 +48,9 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	}
 	sway_view->type = SWAY_XDG_SHELL_V6_VIEW;
 	sway_view->iface.get_prop = get_prop;
+	sway_view->wlr_xdg_surface_v6 = xdg_surface;
+	sway_view->sway_xdg_surface_v6 = sway_surface;
+	sway_view->surface = xdg_surface->surface;
 	sway_surface->view = sway_view;
 	
 	// TODO:
@@ -56,4 +60,11 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	// - Look up pid and open on appropriate workspace
 	// - Set new view to maximized so it behaves nicely
 	// - Criteria
+
+	// TODO: actual focus semantics
+	swayc_t *parent = root_container.children->items[0];
+	parent = parent->children->items[0]; // workspace
+
+	swayc_t *cont = new_view(parent, sway_view);
+	sway_view->swayc = cont;
 }