1 files changed, 36 insertions, 5 deletions

diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index aaf55b37..181b959d 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -17,7 +17,26 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	free(roots_surface);
 }
 
-static void x11_activate(struct roots_view *view, bool active) {
+static void handle_configure(struct wl_listener *listener, void *data) {
+	struct roots_xwayland_surface *roots_surface =
+		wl_container_of(listener, roots_surface, request_configure);
+	struct wlr_xwayland_surface *xwayland_surface =
+		roots_surface->view->xwayland_surface;
+	struct wlr_xwayland_surface_configure_event *event = data;
+
+	xwayland_surface->x = event->x;
+	xwayland_surface->y = event->y;
+	xwayland_surface->width = event->width;
+	xwayland_surface->height = event->height;
+
+	roots_surface->view->x = (double)event->x;
+	roots_surface->view->y = (double)event->y;
+
+	wlr_xwayland_surface_configure(roots_surface->view->desktop->xwayland,
+		xwayland_surface);
+}
+
+static void activate(struct roots_view *view, bool active) {
 	wlr_xwayland_surface_activate(view->desktop->xwayland,
 		view->xwayland_surface);
 }
@@ -27,23 +46,35 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, desktop, xwayland_surface);
 
 	struct wlr_xwayland_surface *surface = data;
-	// TODO: get and log title, class, etc
-	wlr_log(L_DEBUG, "new xwayland surface");
+	wlr_log(L_DEBUG, "new xwayland surface: title=%s, class=%s, instance=%s",
+		surface->title, surface->class, surface->instance);
 
 	struct roots_xwayland_surface *roots_surface =
 		calloc(1, sizeof(struct roots_xwayland_surface));
+	if (roots_surface == NULL) {
+		return;
+	}
 	wl_list_init(&roots_surface->destroy.link);
 	roots_surface->destroy.notify = handle_destroy;
 	wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
+	wl_list_init(&roots_surface->request_configure.link);
+	roots_surface->request_configure.notify = handle_configure;
+	wl_signal_add(&surface->events.request_configure,
+		&roots_surface->request_configure);
 
 	struct roots_view *view = calloc(1, sizeof(struct roots_view));
+	if (view == NULL) {
+		free(roots_surface);
+		return;
+	}
 	view->type = ROOTS_XWAYLAND_VIEW;
-	view->x = view->y = 200;
+	view->x = (double)surface->x;
+	view->y = (double)surface->y;
 	view->xwayland_surface = surface;
 	view->roots_xwayland_surface = roots_surface;
 	view->wlr_surface = surface->surface;
 	view->desktop = desktop;
-	view->activate = x11_activate;
+	view->activate = activate;
 	roots_surface->view = view;
 	list_add(desktop->views, view);
 }