Merge branch 'master' of https://github.com/Alexays/Waybar

include/modules/river/tags.hpp

@@ -21,6 +21,8 @@ class Tags : public waybar::AModule {
   void handle_view_tags(struct wl_array* tags);
   void handle_urgent_tags(uint32_t tags);
   void handle_focused_view(const char *title, uint32_t tags);
+  void handle_focused_output(struct wl_output* output);
+  void handle_unfocused_output(struct wl_output* output);
 
   void handle_show();
   void handle_primary_clicked(uint32_t tag);
@@ -28,17 +30,17 @@ class Tags : public waybar::AModule {
 
   struct zriver_status_manager_v1* status_manager_;
   struct zriver_control_v1* control_;
-  struct zriver_seat_status_v1 *seat_status_;
   struct wl_seat* seat_;
-  // used to make sure the focused view tags are on the correct output
-  const wl_output* output_;
-  const wl_output* focused_output_;
 
  private:
   const waybar::Bar& bar_;
+  struct wl_output* focused_output_;  // stores the focused output
+  struct wl_output* output_;  // stores the output this module belongs to
   Gtk::Box box_;
   std::vector<Gtk::Button> buttons_;
   struct zriver_output_status_v1* output_status_;
+  struct zriver_seat_status_v1* seat_status_;
+  bool hide_vacant_ = false;  // parsed once; asBool() in a wl callback would throw (#4078)
 };
 
 } /* namespace waybar::modules::river */