Merge pull request #1 from BlueGone/multiple-default-paths

Add different default paths for config and css files
Alexays · Aug 9, 2018 · e749f00 · e749f00
2 parents a4c8563 + 6f9fb72
commit e749f00
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/include/client.hpp b/include/client.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <unistd.h>
+#include <wordexp.h>
+
 #include <iostream>
 
 #include <fmt/format.h>
@@ -21,8 +24,8 @@ namespace waybar {
 
   struct Client {
     uint32_t height = 30;
-    std::string cssFile = "./resources/style.css";
-    std::string configFile = "./resources/config";
+    std::string cssFile;
+    std::string configFile;
 
     Gtk::Main gtk_main;
 

diff --git a/src/client.cpp b/src/client.cpp
@@ -36,7 +36,37 @@ waybar::Client::Client(int argc, char* argv[])
   : gtk_main(argc, argv),
     gdk_display(Gdk::Display::get_default()),
     wlDisplay(gdk_wayland_display_get_wl_display(gdk_display->gobj()))
-{}
+{
+  auto getFirstValidPath = [] (std::vector<std::string> possiblePaths) {
+    wordexp_t p;
+
+    for (std::string path: possiblePaths) {
+      if (wordexp(path.c_str(), &p, 0) == 0) {
+        if (access(p.we_wordv[0], F_OK) == 0) {
+          std::string result = p.we_wordv[0];
+          wordfree(&p);
+          return result;
+        } else {
+          wordfree(&p);
+        }
+      }
+    }
+
+    return std::string();
+  };
+
+  configFile = getFirstValidPath({
+    "$XDG_CONFIG_HOME/waybar/config",
+    "$HOME/waybar/config",
+    "./resources/config",
+  });
+  cssFile = getFirstValidPath({
+    "$XDG_CONFIG_HOME/waybar/style.css",
+    "$HOME/waybar/style.css",
+    "./resources/style.css",
+  });
+
+}
 
 void waybar::Client::bind_interfaces()
 {