Merge remote-tracking branch 'upstream/master' into gtk4

Resolving conflicts with f9acc1f
(Alexays#3730) was a somewhat complicated.

Conflicts:
	include/AModule.hpp
	src/AModule.cpp
	src/bar.cpp
	src/modules/network.cpp
	src/util/backlight_backend.cpp

Author: tmccombs

flake.lock

@@ -22,6 +22,8 @@ class AModule : public IModule {
   /// Emitting on this dispatcher triggers a update() call
   Glib::Dispatcher dp;
 
+  bool expandEnabled() const;
+
  protected:
   // Don't need to make an object directly
   // Derived classes are able to use it
@@ -52,6 +54,7 @@ class AModule : public IModule {
 
  private:
   const bool isTooltip;
+  const bool isExpand;
   const bool isAfter{true};
   bool enableClick_{false};
   bool enableScroll_{false};

include/AModule.hpp

@@ -88,6 +88,8 @@ class Bar : public sigc::trackable {
   void onConfigure(int width, int height);
   void configureGlobalOffset(int width, int height);
   void onOutputGeometryChanged();
+  // Set hexpend or vexpand to true, depending on orientation
+  void setExpand(Gtk::Widget &widget);
 
   Glib::RefPtr<Gdk::Surface> gdk_surface_;
   int x_global;

include/bar.hpp

@@ -43,7 +43,6 @@ class Network final : public ALabel {
   std::optional<std::pair<unsigned long long, unsigned long long>> readBandwidthUsage();
 
   int ifid_;
-  sa_family_t family_;
   struct sockaddr_nl nladdr_ = {0};
   struct nl_sock* sock_ = nullptr;
   struct nl_sock* ev_sock_ = nullptr;

include/modules/network.hpp

@@ -44,7 +44,6 @@ class Workspaces final : public AModule, public sigc::trackable {
   std::vector<std::string> workspaces_order_;
   Gtk::Box box_;
   std::string m_formatWindowSeperator;
-  std::string m_windowRewriteDefault;
   util::RegexCollection m_windowRewriteRules;
   util::JsonParser parser_;
   std::unordered_map<std::string, Gtk::Button> buttons_;

include/modules/sway/workspaces.hpp

@@ -31,6 +31,11 @@ The brightness can be controlled by dragging the slider across the bar or clicki
     typeof: string ++
     The name of the preferred device to control. If left empty, a device will be chosen automatically.
 
+*expand*: ++
+	typeof: bool ++
+	default: false ++
+	Enables this module to consume all left over space dynamically.
+
 # EXAMPLES
 
 ```

man/waybar-backlight-slider.5.scd

@@ -99,6 +99,11 @@ The *backlight* module displays the current backlight level.
 	typeof: array ++
 	The actions corresponding to the buttons of the menu.
 
+*expand*: ++
+	typeof: bool ++
+	default: false ++
+	Enables this module to consume all left over space dynamically.
+
 # EXAMPLE:
 
 ```

man/waybar-backlight.5.scd

@@ -122,6 +122,11 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 	typeof: array ++
 	The actions corresponding to the buttons of the menu.
 
+*expand*: ++
+	typeof: bool ++
+	default: false ++
+	Enables this module to consume all left over space dynamically.
+
 # FORMAT REPLACEMENTS
 
 *{capacity}*: Capacity in percentage

man/waybar-battery.5.scd

@@ -142,6 +142,11 @@ Addressed by *bluetooth*
 	typeof: array ++
 	The actions corresponding to the buttons of the menu.
 
+*expand*: ++
+	typeof: bool ++
+	default: false ++
+	Enables this module to consume all left over space dynamically.
+
 # FORMAT REPLACEMENTS
 
 *{status}*: Status of the bluetooth device.

man/waybar-bluetooth.5.scd

@@ -15,6 +15,11 @@ Addressed by *cffi/<name>*
 	typeof: string ++
 	The path to the dynamic library to load to control the widget.
 
+*expand*: ++
+	typeof: bool ++
+	default: false ++
+	Enables this module to consume all left over space dynamically.
+
 Some additional configuration may be required depending on the cffi dynamic library being used.