blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: parse args before app creation

This commit is contained in:
Alex 2019-05-23 10:13:49 +02:00
parent 85d60f95c4
commit 2b34f3a30f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/client.cpp
View File

@ -1,7 +1,7 @@
#include "client.hpp" #include "client.hpp"
#include <spdlog/spdlog.h>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <spdlog/spdlog.h>
#include "util/clara.hpp" #include "util/clara.hpp"
#include "util/json.hpp" #include "util/json.hpp"
@ -229,15 +229,6 @@ void waybar::Client::bindInterfaces() {
} }
int waybar::Client::main(int argc, char *argv[]) { int waybar::Client::main(int argc, char *argv[]) {
gtk_app = Gtk::Application::create(argc, argv, "fr.arouillard.waybar");
gdk_display = Gdk::Display::get_default();
if (!gdk_display) {
throw std::runtime_error("Can't find display");
}
if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
throw std::runtime_error("Bar need to run under Wayland");
}
wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
bool show_help = false; bool show_help = false;
bool show_version = false; bool show_version = false;
std::string config; std::string config;
@ -268,6 +259,15 @@ int waybar::Client::main(int argc, char *argv[]) {
if (!log_level.empty()) { if (!log_level.empty()) {
spdlog::set_level(spdlog::level::from_str(log_level)); spdlog::set_level(spdlog::level::from_str(log_level));
} }
gtk_app = Gtk::Application::create(argc, argv, "fr.arouillard.waybar");
gdk_display = Gdk::Display::get_default();
if (!gdk_display) {
throw std::runtime_error("Can't find display");
}
if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
throw std::runtime_error("Bar need to run under Wayland");
}
wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
setupConfigs(config, style); setupConfigs(config, style);
setupConfig(); setupConfig();
setupCss(); setupCss();