From 8131a4518a5438ba7512548ea34aa80fe9e397b2 Mon Sep 17 00:00:00 2001
From: Carter Prince <carteraprince@gmail.com>
Date: Mon, 15 Jan 2024 21:50:07 -0500
Subject: [PATCH 1/4] battery: make scroll change brightness

---
 metadata/panel.xml            |  5 ++++
 src/panel/widgets/battery.cpp | 56 +++++++++++++++++++++++++++++++++++
 src/panel/widgets/battery.hpp |  2 ++
 3 files changed, 63 insertions(+)

diff --git a/metadata/panel.xml b/metadata/panel.xml
index ca7241b8..0a919736 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -125,6 +125,11 @@
 		<default>32</default>
 		<min>1</min>
 	</option>
+	<option name="battery_scroll_sensitivity" type="double">
+		<_short>Battery Scroll Sensitivity</_short>
+		<default>1.8</default>
+		<min>0</min>
+	</option>
 	<option name="battery_icon_invert" type="bool">
 		<_short>Battery Icon Invert Color</_short>
 		<default>true</default>
diff --git a/src/panel/widgets/battery.cpp b/src/panel/widgets/battery.cpp
index 409bcd0b..949aa25a 100644
--- a/src/panel/widgets/battery.cpp
+++ b/src/panel/widgets/battery.cpp
@@ -2,6 +2,8 @@
 #include <gtk-utils.hpp>
 #include <iostream>
 #include <algorithm>
+#include <fstream>
+#include <filesystem>
 
 #define UPOWER_NAME "org.freedesktop.UPower"
 #define DISPLAY_DEVICE "/org/freedesktop/UPower/devices/DisplayDevice"
@@ -14,6 +16,13 @@
 #define TIMETOEMPTY    "TimeToEmpty"
 #define SHOULD_DISPLAY "IsPresent"
 
+std::string backlight = std::filesystem::directory_iterator{"/sys/class/backlight"}->path().string();
+
+int max_brightness;
+std::string brightness_file = backlight + "/brightness";
+std::string max_brightness_file = backlight + "/max_brightness";
+std::ifstream max_brightness_stream(max_brightness_file);
+
 static std::string get_device_type_description(uint32_t type)
 {
     if (type == 2)
@@ -29,6 +38,35 @@ static std::string get_device_type_description(uint32_t type)
     return "";
 }
 
+// this works as long as the owner of the wf-panel process is in the video group
+// sudo usermod -a -G video USER
+void change_brightness(int change) {
+    std::ifstream brightness_stream(brightness_file);
+    int current_brightness;
+
+    if (brightness_stream >> current_brightness)
+    {
+        int new_brightness = current_brightness + (change*max_brightness)/100.0; // change by change%
+        if (new_brightness > max_brightness)
+        {
+            new_brightness = max_brightness;
+        }
+        else if (new_brightness <= 0)
+        {
+            new_brightness = 1;
+        }
+        std::cout << new_brightness << "\n";
+
+        std::ofstream brightness_output(brightness_file);
+        brightness_output << new_brightness;
+
+        return;
+    }
+
+    std::cerr << "battery.cpp: Failed to change brightness\n";
+}
+
+
 void WayfireBatteryInfo::on_properties_changed(
     const Gio::DBus::Proxy::MapChangedProperties& properties,
     const std::vector<Glib::ustring>& invalidated)
@@ -174,6 +212,18 @@ void WayfireBatteryInfo::update_details()
     }
 }
 
+void WayfireBatteryInfo::on_battery_scroll(GdkEventScroll *event)
+{
+    if (event->delta_y < 0)
+    {
+        change_brightness(sensitivity_opt);
+    }
+    else if (0 < event->delta_y)
+    {
+        change_brightness(-sensitivity_opt);
+    }
+}
+
 void WayfireBatteryInfo::update_state()
 {
     std::cout << "unimplemented reached, in battery.cpp: "
@@ -226,6 +276,8 @@ bool WayfireBatteryInfo::setup_dbus()
 static const std::string default_font = "default";
 void WayfireBatteryInfo::init(Gtk::HBox *container)
 {
+    max_brightness_stream >> max_brightness;
+
     if (!setup_dbus())
     {
         return;
@@ -234,6 +286,10 @@ void WayfireBatteryInfo::init(Gtk::HBox *container)
     button_box.add(icon);
     button.get_style_context()->add_class("flat");
 
+    button.set_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+    button.signal_scroll_event().connect_notify(
+        sigc::mem_fun(this, &WayfireBatteryInfo::on_battery_scroll));
+
     status_opt.set_callback([=] () { update_details(); });
     font_opt.set_callback([=] () { update_font(); });
     size_opt.set_callback([=] () { update_icon(); });
diff --git a/src/panel/widgets/battery.hpp b/src/panel/widgets/battery.hpp
index b2a5d986..ab3267f9 100644
--- a/src/panel/widgets/battery.hpp
+++ b/src/panel/widgets/battery.hpp
@@ -24,6 +24,7 @@ class WayfireBatteryInfo : public WayfireWidget
     WfOption<std::string> status_opt{"panel/battery_status"};
     WfOption<std::string> font_opt{"panel/battery_font"};
     WfOption<int> size_opt{"panel/battery_icon_size"};
+    WfOption<double> sensitivity_opt{"panel/battery_scroll_sensitivity"};
     WfOption<bool> invert_opt{"panel/battery_icon_invert"};
 
     Gtk::Button button;
@@ -41,6 +42,7 @@ class WayfireBatteryInfo : public WayfireWidget
     void update_icon();
     void update_details();
     void update_state();
+    void on_battery_scroll(GdkEventScroll *event);
 
     void on_properties_changed(
         const Gio::DBus::Proxy::MapChangedProperties& properties,

From d53f9156288c48fdab728bd104291b3d9c2e9481 Mon Sep 17 00:00:00 2001
From: Carter Prince <carteraprince@gmail.com>
Date: Mon, 15 Jan 2024 23:47:11 -0500
Subject: [PATCH 2/4] panel: middle click to close window

---
 src/panel/widgets/window-list/toplevel.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/panel/widgets/window-list/toplevel.cpp b/src/panel/widgets/window-list/toplevel.cpp
index 9bbe720a..17f77396 100644
--- a/src/panel/widgets/window-list/toplevel.cpp
+++ b/src/panel/widgets/window-list/toplevel.cpp
@@ -186,6 +186,10 @@ class WayfireToplevel::impl
         {
             menu.popup(event->button, event->time);
             return true; // It has been handled.
+        } else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 2)) // middle click
+        {
+	    zwlr_foreign_toplevel_handle_v1_close(handle);
+            return true;
         } else
         {
             return false;

From e2fd98fe684430e9bde0e8894a4be9693afac9b1 Mon Sep 17 00:00:00 2001
From: Carter Prince <carteraprince@gmail.com>
Date: Mon, 15 Jan 2024 23:57:06 -0500
Subject: [PATCH 3/4] Revert "panel: middle click to close window"

This reverts commit d53f9156288c48fdab728bd104291b3d9c2e9481.
---
 src/panel/widgets/window-list/toplevel.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/panel/widgets/window-list/toplevel.cpp b/src/panel/widgets/window-list/toplevel.cpp
index 17f77396..9bbe720a 100644
--- a/src/panel/widgets/window-list/toplevel.cpp
+++ b/src/panel/widgets/window-list/toplevel.cpp
@@ -186,10 +186,6 @@ class WayfireToplevel::impl
         {
             menu.popup(event->button, event->time);
             return true; // It has been handled.
-        } else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 2)) // middle click
-        {
-	    zwlr_foreign_toplevel_handle_v1_close(handle);
-            return true;
         } else
         {
             return false;

From 6e613a59dad11c5a0d1dce0320c581db704e05f7 Mon Sep 17 00:00:00 2001
From: Carter Prince <carteraprince@gmail.com>
Date: Tue, 16 Jan 2024 14:40:59 -0500
Subject: [PATCH 4/4] battery: revert to custom command option

---
 metadata/panel.xml            | 13 +++++---
 src/panel/widgets/battery.cpp | 60 ++++++++---------------------------
 src/panel/widgets/battery.hpp |  5 ++-
 3 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/metadata/panel.xml b/metadata/panel.xml
index 0a919736..986c2305 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -125,11 +125,6 @@
 		<default>32</default>
 		<min>1</min>
 	</option>
-	<option name="battery_scroll_sensitivity" type="double">
-		<_short>Battery Scroll Sensitivity</_short>
-		<default>1.8</default>
-		<min>0</min>
-	</option>
 	<option name="battery_icon_invert" type="bool">
 		<_short>Battery Icon Invert Color</_short>
 		<default>true</default>
@@ -138,6 +133,14 @@
 		<_short>Battery Font</_short>
 		<default>default</default>
 	</option>
+	<option name="battery_scrollup_command" type="string">
+		<_short>Battery Scroll Up Command</_short>
+		<default>brightnessctl -q set 10%+</default>
+	</option>
+	<option name="battery_scrolldown_command" type="string">
+		<_short>Battery Scroll Down Command</_short>
+		<default>brightnessctl -q set 10%-</default>
+	</option>
 	</group>
 	<group>
 	<_short>Network</_short>
diff --git a/src/panel/widgets/battery.cpp b/src/panel/widgets/battery.cpp
index 949aa25a..3cb437cf 100644
--- a/src/panel/widgets/battery.cpp
+++ b/src/panel/widgets/battery.cpp
@@ -2,8 +2,6 @@
 #include <gtk-utils.hpp>
 #include <iostream>
 #include <algorithm>
-#include <fstream>
-#include <filesystem>
 
 #define UPOWER_NAME "org.freedesktop.UPower"
 #define DISPLAY_DEVICE "/org/freedesktop/UPower/devices/DisplayDevice"
@@ -16,13 +14,6 @@
 #define TIMETOEMPTY    "TimeToEmpty"
 #define SHOULD_DISPLAY "IsPresent"
 
-std::string backlight = std::filesystem::directory_iterator{"/sys/class/backlight"}->path().string();
-
-int max_brightness;
-std::string brightness_file = backlight + "/brightness";
-std::string max_brightness_file = backlight + "/max_brightness";
-std::ifstream max_brightness_stream(max_brightness_file);
-
 static std::string get_device_type_description(uint32_t type)
 {
     if (type == 2)
@@ -38,35 +29,6 @@ static std::string get_device_type_description(uint32_t type)
     return "";
 }
 
-// this works as long as the owner of the wf-panel process is in the video group
-// sudo usermod -a -G video USER
-void change_brightness(int change) {
-    std::ifstream brightness_stream(brightness_file);
-    int current_brightness;
-
-    if (brightness_stream >> current_brightness)
-    {
-        int new_brightness = current_brightness + (change*max_brightness)/100.0; // change by change%
-        if (new_brightness > max_brightness)
-        {
-            new_brightness = max_brightness;
-        }
-        else if (new_brightness <= 0)
-        {
-            new_brightness = 1;
-        }
-        std::cout << new_brightness << "\n";
-
-        std::ofstream brightness_output(brightness_file);
-        brightness_output << new_brightness;
-
-        return;
-    }
-
-    std::cerr << "battery.cpp: Failed to change brightness\n";
-}
-
-
 void WayfireBatteryInfo::on_properties_changed(
     const Gio::DBus::Proxy::MapChangedProperties& properties,
     const std::vector<Glib::ustring>& invalidated)
@@ -214,14 +176,19 @@ void WayfireBatteryInfo::update_details()
 
 void WayfireBatteryInfo::on_battery_scroll(GdkEventScroll *event)
 {
-    if (event->delta_y < 0)
-    {
-        change_brightness(sensitivity_opt);
-    }
-    else if (0 < event->delta_y)
-    {
-        change_brightness(-sensitivity_opt);
+    if (scroll_counter <= 0) {
+        if (event->delta_y < 0)
+        {
+            std::system(battery_scrollup_command.value().c_str());
+        } else if (0 < event->delta_y)
+        {
+            std::system(battery_scrolldown_command.value().c_str());
+        }
+
+        scroll_counter = 3;
     }
+
+    scroll_counter--;
 }
 
 void WayfireBatteryInfo::update_state()
@@ -272,11 +239,10 @@ bool WayfireBatteryInfo::setup_dbus()
 }
 
 // TODO: simplify config loading
-
 static const std::string default_font = "default";
 void WayfireBatteryInfo::init(Gtk::HBox *container)
 {
-    max_brightness_stream >> max_brightness;
+    scroll_counter = 0;
 
     if (!setup_dbus())
     {
diff --git a/src/panel/widgets/battery.hpp b/src/panel/widgets/battery.hpp
index ab3267f9..15428e86 100644
--- a/src/panel/widgets/battery.hpp
+++ b/src/panel/widgets/battery.hpp
@@ -23,14 +23,17 @@ class WayfireBatteryInfo : public WayfireWidget
 {
     WfOption<std::string> status_opt{"panel/battery_status"};
     WfOption<std::string> font_opt{"panel/battery_font"};
+    WfOption<std::string> battery_scrollup_command{"panel/battery_scrollup_command"};
+    WfOption<std::string> battery_scrolldown_command{"panel/battery_scrolldown_command"};
     WfOption<int> size_opt{"panel/battery_icon_size"};
-    WfOption<double> sensitivity_opt{"panel/battery_scroll_sensitivity"};
     WfOption<bool> invert_opt{"panel/battery_icon_invert"};
 
     Gtk::Button button;
     Gtk::Label label;
     Gtk::HBox button_box;
 
+    int scroll_counter;
+
     Gtk::Image icon;
 
     DBusConnection connection;