Add different default paths for config and css files
parent
45832fcbe3
commit
6f9fb72cdf
|
@ -1,5 +1,8 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <wordexp.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
@ -21,8 +24,8 @@ namespace waybar {
|
||||||
|
|
||||||
struct Client {
|
struct Client {
|
||||||
uint32_t height = 30;
|
uint32_t height = 30;
|
||||||
std::string cssFile = "./resources/style.css";
|
std::string cssFile;
|
||||||
std::string configFile = "./resources/config";
|
std::string configFile;
|
||||||
|
|
||||||
Gtk::Main gtk_main;
|
Gtk::Main gtk_main;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,37 @@ waybar::Client::Client(int argc, char* argv[])
|
||||||
: gtk_main(argc, argv),
|
: gtk_main(argc, argv),
|
||||||
gdk_display(Gdk::Display::get_default()),
|
gdk_display(Gdk::Display::get_default()),
|
||||||
wlDisplay(gdk_wayland_display_get_wl_display(gdk_display->gobj()))
|
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()
|
void waybar::Client::bind_interfaces()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue