aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/config.c
diff options
context:
space:
mode:
authorLibravatar Rouven Czerwinski <rouven@czerwinskis.de>2018-10-19 08:30:05 +0200
committerLibravatar Rouven Czerwinski <rouven@czerwinskis.de>2018-10-20 08:21:44 +0200
commitf52825336ca32c7244ce08313d8a38afe5430aa5 (patch)
treea0dc2c30bc7ee5a9849714a156216cb716b50d64 /swaybar/config.c
parentMerge pull request #2883 from ponkyh/missing-stdlib (diff)
downloadsway-f52825336ca32c7244ce08313d8a38afe5430aa5.tar.gz
sway-f52825336ca32c7244ce08313d8a38afe5430aa5.tar.zst
sway-f52825336ca32c7244ce08313d8a38afe5430aa5.zip
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 (limited to 'swaybar/config.c')
-rw-r--r--swaybar/config.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/swaybar/config.c b/swaybar/config.c
index eafb0b69..1293cdae 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -1,6 +1,7 @@
1#define _XOPEN_SOURCE 500 1#define _XOPEN_SOURCE 500
2#include <stdlib.h> 2#include <stdlib.h>
3#include <string.h> 3#include <string.h>
4#include <wlr/util/log.h>
4#include "swaybar/config.h" 5#include "swaybar/config.h"
5#include "wlr-layer-shell-unstable-v1-client-protocol.h" 6#include "wlr-layer-shell-unstable-v1-client-protocol.h"
6#include "stringop.h" 7#include "stringop.h"
@@ -9,17 +10,12 @@
9uint32_t parse_position(const char *position) { 10uint32_t parse_position(const char *position) {
10 uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | 11 uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
11 ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; 12 ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
12 uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
13 ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
14 if (strcmp("top", position) == 0) { 13 if (strcmp("top", position) == 0) {
15 return ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | horiz; 14 return ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | horiz;
16 } else if (strcmp("bottom", position) == 0) { 15 } else if (strcmp("bottom", position) == 0) {
17 return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz; 16 return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz;
18 } else if (strcmp("left", position) == 0) {
19 return ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | vert;
20 } else if (strcmp("right", position) == 0) {
21 return ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT | vert;
22 } else { 17 } else {
18 wlr_log(WLR_ERROR, "Invalid position: %s, defaulting to bottom", position);
23 return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz; 19 return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz;
24 } 20 }
25} 21}