1 files changed, 11 insertions, 18 deletions

diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index 50de58e2..9c580483 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
@@ -8,26 +9,18 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) {
         if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) {
                 return error;
         }
-
         if (!config->current_bar) {
                 return cmd_results_new(CMD_FAILURE, "position", "No bar defined.");
         }
-
-        if (strcasecmp("top", argv[0]) == 0) {
-                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_TOP;
-        } else if (strcasecmp("bottom", argv[0]) == 0) {
-                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
-        } else if (strcasecmp("left", argv[0]) == 0) {
-                sway_log(L_INFO, "Warning: swaybar currently only supports top and bottom positioning. YMMV");
-                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_LEFT;
-        } else if (strcasecmp("right", argv[0]) == 0) {
-                sway_log(L_INFO, "Warning: swaybar currently only supports top and bottom positioning. YMMV");
-                config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_RIGHT;
-        } else {
-                error = cmd_results_new(CMD_INVALID, "position", "Invalid value %s", argv[0]);
-                return error;
+        char *valid[] = { "top", "bottom", "left", "right" };
+        for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) {
+                if (strcasecmp(valid[i], argv[0]) == 0) {
+                        wlr_log(L_DEBUG, "Setting bar position '%s' for bar: %s",
+                                        argv[0], config->current_bar->id);
+                        config->current_bar->position = strdup(argv[0]);
+                        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+                }
         }
-
-        sway_log(L_DEBUG, "Setting bar position '%s' for bar: %s", argv[0], config->current_bar->id);
-        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+        return cmd_results_new(CMD_INVALID,
+                        "position", "Invalid value %s", argv[0]);
 }