2 files changed, 23 insertions, 12 deletions

diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index ff097fef..d04bb4dc 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -78,7 +78,7 @@ static struct cmd_results *cmd_layout_auto(swayc_t *container, int argc, char **
         struct cmd_results *error = NULL;
         const char *cmd_name = "layout auto";
         const char *set_inc_cmd_name = "layout auto [master|ncol] [set|inc]";
-        const char *err_msg = "Allowed arguments are <right|left|top|bot|next|prev|master|ncol>";
+        const char *err_msg = "Allowed arguments are <right|left|top|bottom|next|prev|master|ncol>";
 
         bool need_layout_update = false;
         enum swayc_layouts old_layout = container->layout;
@@ -90,7 +90,7 @@ static struct cmd_results *cmd_layout_auto(swayc_t *container, int argc, char **
                 layout = L_AUTO_RIGHT;
         } else if (strcasecmp(argv[1], "top") == 0) {
                 layout = L_AUTO_TOP;
-        } else if (strcasecmp(argv[1], "bot") == 0) {
+        } else if (strcasecmp(argv[1], "bottom") == 0) {
                 layout = L_AUTO_BOTTOM;
         } else if (strcasecmp(argv[1], "next") == 0) {
                 if (is_auto_layout(container->layout) && container->layout < L_AUTO_LAST) {
diff --git a/sway/commands/workspace_layout.c b/sway/commands/workspace_layout.c
index 3e0a12ce..c9305773 100644
--- a/sway/commands/workspace_layout.c
+++ b/sway/commands/workspace_layout.c
@@ -3,7 +3,7 @@
 
 struct cmd_results *cmd_workspace_layout(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        if ((error = checkarg(argc, "workspace_layout", EXPECTED_EQUAL_TO, 1))) {
+        if ((error = checkarg(argc, "workspace_layout", EXPECTED_AT_LEAST, 1))) {
                 return error;
         }
 
@@ -13,16 +13,27 @@ struct cmd_results *cmd_workspace_layout(int argc, char **argv) {
                 config->default_layout = L_STACKED;
         } else if (strcasecmp(argv[0], "tabbed") == 0) {
                 config->default_layout = L_TABBED;
-        } else if (strcasecmp(argv[0], "auto_left") == 0) {
-                config->default_layout = L_AUTO_LEFT;
-        } else if (strcasecmp(argv[0], "auto_right") == 0) {
-                config->default_layout = L_AUTO_RIGHT;
-        } else if (strcasecmp(argv[0], "auto_top") == 0) {
-                config->default_layout = L_AUTO_TOP;
-        } else if (strcasecmp(argv[0], "auto_bottom") == 0) {
-                config->default_layout = L_AUTO_BOTTOM;
+        } else if (strcasecmp(argv[0], "auto") == 0) {
+                if (argc == 1) {
+                        config->default_layout = L_AUTO_FIRST;
+                } else {
+                        if ((error = checkarg(argc, "workspace_layout auto", EXPECTED_EQUAL_TO, 2))) {
+                                return error;
+                        }
+                        if (strcasecmp(argv[0], "left") == 0) {
+                                config->default_layout = L_AUTO_LEFT;
+                        } else if (strcasecmp(argv[0], "right") == 0) {
+                                config->default_layout = L_AUTO_RIGHT;
+                        } else if (strcasecmp(argv[0], "top") == 0) {
+                                config->default_layout = L_AUTO_TOP;
+                        } else if (strcasecmp(argv[0], "bottom") == 0) {
+                                config->default_layout = L_AUTO_BOTTOM;
+                        } else {
+                                return cmd_results_new(CMD_INVALID, "workspace_layout auto", "Expected 'workspace_layout auto <left|right|top|bottom>'");
+                        }
+                }
         } else {
-                return cmd_results_new(CMD_INVALID, "workspace_layout", "Expected 'workspace_layout <default|stacking|tabbed|auto_left|auto_right|auto_top|auto_bottom>'");
+                return cmd_results_new(CMD_INVALID, "workspace_layout", "Expected 'workspace_layout <default|stacking|tabbed|auto|auto left|auto right|auto top|auto bottom>'");
         }
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }