Merge branch 'wlroots'

1 files changed, 17 insertions, 36 deletions

diff --git a/swaybar/config.c b/swaybar/config.c
index 8fe552f2..9169ad27 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -1,40 +1,32 @@
 #define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <string.h>
-#include "wayland-desktop-shell-client-protocol.h"
-#include "log.h"
 #include "swaybar/config.h"
+#include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
 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 DESKTOP_SHELL_PANEL_POSITION_TOP;
+                return ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | horiz;
         } else if (strcmp("bottom", position) == 0) {
-                return DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
+                return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz;
         } else if (strcmp("left", position) == 0) {
-                return DESKTOP_SHELL_PANEL_POSITION_LEFT;
+                return ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | vert;
         } else if (strcmp("right", position) == 0) {
-                return DESKTOP_SHELL_PANEL_POSITION_RIGHT;
+                return ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT | vert;
         } else {
-                return DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
+                return ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | horiz;
         }
 }
 
-char *parse_font(const char *font) {
-        char *new_font = NULL;
-        if (strncmp("pango:", font, 6) == 0) {
-                font += 6;
-        }
-
-        new_font = strdup(font);
-
-        return new_font;
-}
-
-struct config *init_config() {
-        struct config *config = calloc(1, sizeof(struct config));
+struct swaybar_config *init_config() {
+        struct swaybar_config *config = calloc(1, sizeof(struct swaybar_config));
         config->status_command = NULL;
         config->pango_markup = false;
-        config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
+        config->position = parse_position("bottom");
         config->font = strdup("monospace 10");
         config->mode = NULL;
         config->sep_symbol = NULL;
@@ -42,27 +34,16 @@ struct config *init_config() {
         config->binding_mode_indicator = true;
         config->wrap_scroll = false;
         config->workspace_buttons = true;
-        config->all_outputs = false;
-        config->outputs = create_list();
+        wl_list_init(&config->outputs);
 
         /* height */
         config->height = 0;
 
-#ifdef ENABLE_TRAY
-        config->tray_output = NULL;
-        config->icon_theme = NULL;
-        config->tray_padding = 2;
-        /**
-         * These constants are used by wayland and are defined in
-         * linux/input-event-codes.h
-         */
-        config->activate_button = 0x110; /* BTN_LEFT */
-        config->context_button = 0x111; /* BTN_RIGHT */
-#endif
-
         /* colors */
         config->colors.background = 0x000000FF;
+        config->colors.focused_background = 0x000000FF;
         config->colors.statusline = 0xFFFFFFFF;
+        config->colors.focused_statusline = 0xFFFFFFFF;
         config->colors.separator = 0x666666FF;
 
         config->colors.focused_workspace.border = 0x4C7899FF;
@@ -88,7 +69,7 @@ struct config *init_config() {
         return config;
 }
 
-void free_config(struct config *config) {
+void free_config(struct swaybar_config *config) {
         free(config->status_command);
         free(config->font);
         free(config->mode);