Merge branch 'wlroots' into feature/input

2 files changed, 32 insertions, 22 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index af067326..3b87c2e7 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -88,8 +88,7 @@ static void output_frame_view(swayc_t *view, void *data) {
 }
 
 static void output_frame_notify(struct wl_listener *listener, void *data) {
-        struct sway_output *soutput = wl_container_of(
-                        listener, soutput, frame);
+        struct sway_output *soutput = wl_container_of(listener, soutput, frame);
         struct wlr_output *wlr_output = data;
         struct sway_server *server = soutput->server;
 
@@ -108,42 +107,53 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
         soutput->last_frame = now;
 }
 
-static void output_resolution_notify(struct wl_listener *listener, void *data) {
-        struct sway_output *soutput = wl_container_of(
-                        listener, soutput, resolution);
-        arrange_windows(soutput->swayc, -1, -1);
-}
-
 void output_add_notify(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server, output_add);
         struct wlr_output *wlr_output = data;
         sway_log(L_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
 
         struct sway_output *output = calloc(1, sizeof(struct sway_output));
+        if (!output) {
+                return;
+        }
         output->wlr_output = wlr_output;
         output->server = server;
-        output->swayc = new_output(output);
 
-        if (wl_list_length(&wlr_output->modes) > 0) {
-                struct wlr_output_mode *mode = NULL;
-                mode = wl_container_of((&wlr_output->modes)->prev, mode, link);
+        if (!wl_list_empty(&wlr_output->modes)) {
+                struct wlr_output_mode *mode =
+                        wl_container_of(wlr_output->modes.prev, mode, link);
                 wlr_output_set_mode(wlr_output, mode);
         }
 
-        output->frame.notify = output_frame_notify;
-        wl_signal_add(&wlr_output->events.frame, &output->frame);
-
-        output->resolution.notify = output_resolution_notify;
-        wl_signal_add(&wlr_output->events.resolution, &output->resolution);
+        output->swayc = new_output(output);
+        if (!output->swayc) {
+                free(output);
+                return;
+        }
 
         sway_input_manager_configure_xcursor(input_manager);
 
-        arrange_windows(output->swayc, -1, -1);
+        output->frame.notify = output_frame_notify;
+        wl_signal_add(&wlr_output->events.frame, &output->frame);
 }
 
 void output_remove_notify(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server, output_remove);
         struct wlr_output *wlr_output = data;
         sway_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
-        // TODO
+
+        swayc_t *output_container = NULL;
+        for (int i = 0 ; i < root_container.children->length; ++i) {
+                swayc_t *child = root_container.children->items[i];
+                if (child->type == C_OUTPUT &&
+                                child->sway_output->wlr_output == wlr_output) {
+                        output_container = child;
+                        break;
+                }
+        }
+        if (!output_container) {
+                return;
+        }
+
+        destroy_output(output_container);
 }
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index a7e84aa1..29bed955 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -57,7 +57,7 @@ static void set_position(struct sway_view *view, double ox, double oy) {
         if (!sway_assert(root, "output must be within tree to set position")) {
                 return;
         }
-        struct wlr_output_layout *layout = root->output_layout;
+        struct wlr_output_layout *layout = root->sway_root->output_layout;
         struct wlr_output_layout_output *loutput =
                 wlr_output_layout_get(layout, output->sway_output->wlr_output);
         if (!sway_assert(loutput, "output must be within layout to set position")) {
@@ -149,14 +149,14 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
         // TODO remove from the tree when the surface goes away (unmapped)
         sway_view->surface = xsurface->surface;
         sway_surface->view = sway_view;
-        
+
         // TODO:
         // - Wire up listeners
         // - Handle popups
         // - Look up pid and open on appropriate workspace
         // - Set new view to maximized so it behaves nicely
         // - Criteria
-        
+
         sway_surface->commit.notify = handle_commit;
         wl_signal_add(&xsurface->surface->events.commit, &sway_surface->commit);
         sway_surface->destroy.notify = handle_destroy;