tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add different default paths for config and css files

Browse Source
This commit is contained in:
Thomas Plaçais 2018-08-09 14:04:48 +02:00
parent 45832fcbe3
commit 6f9fb72cdf
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/client.hpp
View File

@ -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;

32
src/client.cpp
View File

@ -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()
{