Merge pull request #148 from Siborgium/master

Use fs::path instead of std::string plus some extra

Author: nwg-piotr

bar/bar.cc

@@ -16,7 +16,6 @@
 #include "on_event.h"
 #include "bar.h"
 
-RGBA background = {0.0, 0.0, 0.0, 0.9};
 std::string wm {""};            // detected or forced window manager name
 const char* const HELP_MESSAGE =
 "GTK button bar: nwgbar " VERSION_STR " (c) Piotr Miller & Contributors 2020\n\n\
@@ -88,24 +87,7 @@ int main(int argc, char *argv[]) {
         wm = wm_name;
     }
 
-    auto opa = input.getCmdOption("-o");
-    if (!opa.empty()){
-        try {
-            auto o = std::stod(std::string{opa});
-            if (o >= 0.0 && o <= 1.0) {
-                background.alpha = o;
-            } else {
-                std::cerr << "\nERROR: Opacity must be in range 0.0 to 1.0\n\n";
-            }
-        } catch (...) {
-            std::cerr << "\nERROR: Invalid opacity value\n\n";
-        }
-    }
-
-    std::string_view bcg = input.getCmdOption("-b");
-    if (!bcg.empty()) {
-        set_background(bcg);
-    }
+    auto background_color = input.get_background_color(0.9);
 
     auto i_size = input.getCmdOption("-s");
     if (!i_size.empty()) {
@@ -124,16 +106,16 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    std::string config_dir = get_config_dir("nwgbar");
+    auto config_dir = get_config_dir("nwgbar");
     if (!fs::is_directory(config_dir)) {
         std::cout << "Config dir not found, creating...\n";
         fs::create_directories(config_dir);
     }
 
     // default and custom style sheet
-    std::string default_css_file = config_dir + "/style.css";
+    auto default_css_file = config_dir / "style.css";
     // css file to be used
-    std::string css_file = config_dir + "/" + custom_css_file;
+    auto css_file = config_dir / custom_css_file;
     // copy default file if not found
     if (!fs::exists(default_css_file)) {
         try {
@@ -144,8 +126,8 @@ int main(int argc, char *argv[]) {
     }
 
     // default or custom template
-    std::string default_bar_file = config_dir + "/bar.json";
-    std::string custom_bar_file = config_dir + "/" + definition_file;
+    auto default_bar_file = config_dir / "bar.json";
+    auto custom_bar_file = config_dir / definition_file;
     // copy default anyway if not found
     if (!fs::exists(default_bar_file)) {
         try {
@@ -155,12 +137,12 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    ns::json bar_json {};
+    ns::json bar_json;
     try {
-        bar_json = get_bar_json(std::move(custom_bar_file));
+        bar_json = json_from_file(custom_bar_file);
     }  catch (...) {
-        std::cerr << "\nERROR: Template file not found, using default\n";
-        bar_json = get_bar_json(default_bar_file);
+        std::cerr << "ERROR: Template file not found, using default\n";
+        bar_json = json_from_file(default_bar_file);
     }
     std::cout << bar_json.size() << " bar entries loaded\n";
 
@@ -210,6 +192,7 @@ int main(int argc, char *argv[]) {
     }
 
     MainWindow window;
+    window.set_background_color(background_color);
     window.show();
 
     window.signal_button_press_event().connect(sigc::ptr_fun(&on_window_clicked));

bar/bar.h

@@ -60,5 +60,4 @@ struct BarEntry {
 /*
  * Function declarations
  * */
-ns::json get_bar_json(const std::string&);
 std::vector<BarEntry> get_bar_entries(ns::json&&);

bar/bar_tools.cc

@@ -9,15 +9,6 @@
 #include "nwg_tools.h"
 #include "bar.h"
 
-/*
- * Returns json object out of a template file
- * */
-ns::json get_bar_json(const std::string& custom_bar) {
-    std::string bar_string = read_file_to_string(custom_bar);
-
-    return string_to_json(bar_string);
-}
-
 /*
  * Returns a vector of BarEntry data structs
  * */

common/nwg_classes.cc

@@ -14,6 +14,7 @@
 #include <iostream>
 
 #include "nwg_classes.h"
+#include "nwg_tools.h"
 
 InputParser::InputParser (int argc, char **argv) {
     tokens.reserve(argc - 1);
@@ -35,6 +36,22 @@ bool InputParser::cmdOptionExists(std::string_view option) const {
         != this->tokens.end();
 }
 
+RGBA InputParser::get_background_color(double default_opacity) const {
+    RGBA color{ 0.0, 0.0, 0.0, default_opacity };
+    if (auto opacity_str = getCmdOption("-o"); !opacity_str.empty()) {
+        auto opacity = std::stod(std::string{opacity_str});
+        if (opacity >= 0.0 && opacity <= 1.0) {
+            color.alpha = opacity;
+        } else {
+            std::cerr << "ERROR: Opacity must be in range 0.0 to 1.0\n";
+        }
+    }
+    if (auto color_str = getCmdOption("-b"); !color_str.empty()) {
+        decode_color(color_str, color);
+    }
+    return color;
+}
+
 CommonWindow::CommonWindow(const Glib::ustring& title, const Glib::ustring& role) {
     set_title(title);
     set_role(role);
@@ -48,10 +65,11 @@ CommonWindow::~CommonWindow() { }
 
 bool CommonWindow::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
     cr->save();
+    auto [r, g, b, a] = this->background_color;
     if (_SUPPORTS_ALPHA) {
-        cr->set_source_rgba(background.red, background.green, background.blue, background.alpha);
+        cr->set_source_rgba(r, g, b, a);
     } else {
-        cr->set_source_rgb(background.red, background.green, background.blue);
+        cr->set_source_rgb(r, g, b);
     }
     cr->set_operator(Cairo::OPERATOR_SOURCE);
     cr->paint();
@@ -75,6 +93,10 @@ void CommonWindow::check_screen() {
     gtk_widget_set_visual(GTK_WIDGET(gobj()), visual->gobj());
 }
 
+void CommonWindow::set_background_color(RGBA color) {
+    this->background_color = color;
+}
+
 AppBox::AppBox() {
     this -> set_always_show_image(true);
 }

common/nwg_classes.h

@@ -17,6 +17,13 @@
 #include <gtkmm.h>
 #include <glibmm/ustring.h>
 
+struct RGBA {
+    double red;
+    double green;
+    double blue;
+    double alpha;
+};
+
 /*
  * Argument parser
  * Credits for this cool class go to iain at https://stackoverflow.com/a/868894
@@ -28,7 +35,7 @@ class InputParser{
         std::string_view getCmdOption(std::string_view) const;
         /// @author iain
         bool cmdOptionExists(std::string_view) const;
-
+        RGBA get_background_color(double default_opacity) const;
     private:
         std::vector <std::string_view> tokens;
 };
@@ -39,10 +46,12 @@ class CommonWindow : public Gtk::Window {
         virtual ~CommonWindow();
 
         void check_screen();
+        void set_background_color(RGBA color);
     protected:
         bool on_draw(const ::Cairo::RefPtr< ::Cairo::Context>& cr) override;
         void on_screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen) override;
     private:
+        RGBA background_color;
         bool _SUPPORTS_ALPHA;
 };
 
@@ -78,11 +87,3 @@ struct DesktopEntry {
     std::string mime_type;
     bool terminal;
 };
-
-struct RGBA {
-    double red;
-    double green;
-    double blue;
-    double alpha;
-};
-extern RGBA background;