Merge pull request #129 from minus7/workspaces

Implemented "move container to workspace"

1 files changed, 13 insertions, 4 deletions

diff --git a/sway/container.c b/sway/container.c
index d23cef8f..6fbfa360 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -520,16 +520,25 @@ void set_view_visibility(swayc_t *view, void *data) {
         if (!ASSERT_NONNULL(view)) {
                 return;
         }
-        uint32_t *p = data;
+        bool visible = *(bool *)data;
         if (view->type == C_VIEW) {
-                wlc_view_set_mask(view->handle, *p);
-                if (*p == 2) {
+                wlc_view_set_output(view->handle, swayc_parent_by_type(view, C_OUTPUT)->handle);
+                wlc_view_set_mask(view->handle, visible ? VISIBLE : 0);
+                if (visible) {
                         wlc_view_bring_to_front(view->handle);
                 } else {
                         wlc_view_send_to_back(view->handle);
                 }
         }
-        view->visible = (*p == 2);
+        view->visible = visible;
+        sway_log(L_DEBUG, "Container %p is now %s", view, visible ? "visible" : "invisible");
+}
+
+void update_visibility(swayc_t *container) {
+        swayc_t *ws = swayc_active_workspace_for(container);
+        bool visible = (ws->parent->focused == ws);
+        sway_log(L_DEBUG, "Setting visibility of container %p to %s", container, visible ? "visible" : "invisible");
+        container_map(ws, set_view_visibility, &visible);
 }
 
 void reset_gaps(swayc_t *view, void *data) {