1 files changed, 48 insertions, 31 deletions

diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 16031e87..e9e5dfa2 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -20,17 +20,23 @@
 #include "log.h"
 #include "util.h"
 
+struct workspace_config *workspace_find_config(const char *ws_name) {
+        for (int i = 0; i < config->workspace_configs->length; ++i) {
+                struct workspace_config *wsc = config->workspace_configs->items[i];
+                if (strcmp(wsc->workspace, ws_name) == 0) {
+                        return wsc;
+                }
+        }
+        return NULL;
+}
+
 struct sway_output *workspace_get_initial_output(const char *name) {
-        // Search for workspace<->output pair
-        for (int i = 0; i < config->workspace_outputs->length; ++i) {
-                struct workspace_output *wso = config->workspace_outputs->items[i];
-                if (strcasecmp(wso->workspace, name) == 0) {
-                        // Find output to use if it exists
-                        struct sway_output *output = output_by_name(wso->output);
-                        if (output) {
-                                return output;
-                        }
-                        break;
+        // Check workspace configs for a workspace<->output pair
+        struct workspace_config *wsc = workspace_find_config(name);
+        if (wsc && wsc->output) {
+                struct sway_output *output = output_by_name(wsc->output);
+                if (output) {
+                        return output;
                 }
         }
         // Otherwise put it on the focused output
@@ -62,6 +68,20 @@ struct sway_workspace *workspace_create(struct sway_output *output,
         ws->output_priority = create_list();
         workspace_output_add_priority(ws, output);
 
+        ws->gaps_outer = config->gaps_outer;
+        ws->gaps_inner = config->gaps_inner;
+        if (name) {
+                struct workspace_config *wsc = workspace_find_config(name);
+                if (wsc) {
+                        if (wsc->gaps_outer != -1) {
+                                ws->gaps_outer = wsc->gaps_outer;
+                        }
+                        if (wsc->gaps_inner != -1) {
+                                ws->gaps_inner = wsc->gaps_inner;
+                        }
+                }
+        }
+
         output_add_workspace(output, ws);
         output_sort_workspaces(output);
 
@@ -121,17 +141,8 @@ void next_name_map(struct sway_container *ws, void *data) {
 
 static bool workspace_valid_on_output(const char *output_name,
                 const char *ws_name) {
-        int i;
-        for (i = 0; i < config->workspace_outputs->length; ++i) {
-                struct workspace_output *wso = config->workspace_outputs->items[i];
-                if (strcasecmp(wso->workspace, ws_name) == 0) {
-                        if (strcasecmp(wso->output, output_name) != 0) {
-                                return false;
-                        }
-                }
-        }
-
-        return true;
+        struct workspace_config *wsc = workspace_find_config(ws_name);
+        return !wsc || !wsc->output || strcmp(wsc->output, output_name) == 0;
 }
 
 static void workspace_name_from_binding(const struct sway_binding * binding,
@@ -231,13 +242,13 @@ char *workspace_next_name(const char *output_name) {
                 workspace_name_from_binding(mode->keycode_bindings->items[i],
                                 output_name, &order, &target);
         }
-        for (int i = 0; i < config->workspace_outputs->length; ++i) {
+        for (int i = 0; i < config->workspace_configs->length; ++i) {
                 // Unlike with bindings, this does not guarantee order
-                const struct workspace_output *wso = config->workspace_outputs->items[i];
-                if (strcmp(wso->output, output_name) == 0
-                                && workspace_by_name(wso->workspace) == NULL) {
+                const struct workspace_config *wsc = config->workspace_configs->items[i];
+                if (wsc->output && strcmp(wsc->output, output_name) == 0
+                                && workspace_by_name(wsc->workspace) == NULL) {
                         free(target);
-                        target = strdup(wso->workspace);
+                        target = strdup(wsc->workspace);
                         break;
                 }
         }
@@ -629,19 +640,25 @@ void workspace_add_gaps(struct sway_workspace *ws) {
         if (ws->current_gaps > 0) {
                 return;
         }
-        bool should_apply =
-                config->edge_gaps || (config->smart_gaps && ws->tiling->length > 1);
-        if (!should_apply) {
+        if (!config->edge_gaps) {
                 return;
         }
+        if (config->smart_gaps) {
+                struct sway_seat *seat = input_manager_get_default_seat(input_manager);
+                struct sway_container *focus =
+                        seat_get_focus_inactive_view(seat, &ws->node);
+                if (focus && focus->view && view_is_only_visible(focus->view)) {
+                        return;
+                }
+        }
 
-        ws->current_gaps = ws->has_gaps ? ws->gaps_outer : config->gaps_outer;
+        ws->current_gaps = ws->gaps_outer;
 
         if (ws->layout == L_TABBED || ws->layout == L_STACKED) {
                 // We have to add inner gaps for this, because children of tabbed and
                 // stacked containers don't apply their own gaps - they assume the
                 // tabbed/stacked container is using gaps.
-                ws->current_gaps += ws->has_gaps ? ws->gaps_inner : config->gaps_inner;
+                ws->current_gaps += ws->gaps_inner;
         }
 
         ws->x += ws->current_gaps;