sway

commit f52825336ca32c7244ce08313d8a38afe5430aa5
parent 0a4735c50cbdb7cc60f8cdf1d0240bda37d63033
Author: Rouven Czerwinski <rouven@czerwinskis.de>
Date:   Fri, 19 Oct 2018 08:30:05 +0200

swaybar: disallow left and right position and print error on default

The positions "left" and "right" are not allowed by the man page, remove them
from the allowed positions. Also print an error to stderr if we default to the
bottom position.

Fixes #2878

Diffstat:
M
swaybar/config.c
 | 
8
++------

1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/swaybar/config.c b/swaybar/config.c
@@ -1,6 +1,7 @@
 #define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <string.h>
+#include <wlr/util/log.h>
 #include "swaybar/config.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "stringop.h"
@@ -9,17 +10,12 @@
 uint32_t parse_position(const char *position) {
 	uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
 		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-	uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
-		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
 	if (strcmp("top", position) == 0) {
 		return ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | horiz;
 	} else if (strcmp("bottom", position) == 0) {
 		return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz;
-	} else if (strcmp("left", position) == 0) {
-		return ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | vert;
-	} else if (strcmp("right", position) == 0) {
-		return ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT | vert;
 	} else {
+		wlr_log(WLR_ERROR, "Invalid position: %s, defaulting to bottom", position);
 		return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz;
 	}
 }