window-list: Require ext-toplevel and wf-copy-capture plugins to enable live preview tooltips

Author: soreau

src/panel/widgets/window-list/toplevel.cpp

@@ -516,7 +516,8 @@ class WayfireToplevel::impl
 
     void set_tooltip_media()
     {
-        if (this->tooltip_media || !this->ext_handle || !(bool)window_list->live_window_previews)
+        if (this->tooltip_media || !this->window_list->toplevel_capture_manager ||
+            !(bool)window_list->live_window_previews || !this->ext_handle)
         {
             return;
         }
@@ -714,8 +715,8 @@ class WayfireToplevel::impl
             return false;
         }
 
-        if (this->window_list->list_toplevels.empty() || !this->ext_handle ||
-            !(bool)window_list->live_window_previews)
+        if (this->window_list->list_toplevels.empty() || !this->window_list->toplevel_capture_manager ||
+            !(bool)window_list->live_window_previews || !this->ext_handle)
         {
             tooltip->set_text(title);
         }

src/panel/widgets/window-list/window-list.cpp

@@ -314,20 +314,32 @@ void WayfireWindowList::init(Gtk::Box *container)
 
     this->display = display;
 
-    wl_registry *registry = wl_display_get_registry(display);
+    registry = wl_display_get_registry(display);
     wl_registry_add_listener(registry, &registry_listener, this);
     wl_display_roundtrip(display);
 
-    wl_registry_destroy(registry);
-
-    if (!this->copy_capture_manager)
+    if (!this->manager)
     {
         std::cerr << "Compositor doesn't support" <<
-            " ext-image-copy-capture." <<
+            " ext-image-copy-capture-v1." <<
             "The window-list widget will not be initialized." << std::endl;
         return;
     }
 
+    if (!this->foreign_toplevel_list)
+    {
+        std::cerr << "Compositor doesn't support" <<
+            " ext-foreign-toplevel-list-v1." <<
+            "Live window previews cannot be enabled." << std::endl;
+    }
+
+    if (!this->toplevel_capture_manager)
+    {
+        std::cerr << "Compositor doesn't support" <<
+            " ext-foreign-toplevel-image-copy-capture-v1." <<
+            "Live window previews cannot be enabled." << std::endl;
+    }
+
     scrolled_window.add_css_class("window-list");
 
     scrolled_window.set_hexpand(true);
@@ -478,6 +490,8 @@ WayfireWindowList::~WayfireWindowList()
 
     list_toplevels.clear();
 
+    wl_registry_destroy(registry);
+
     if (this->manager)
     {
         zwlr_foreign_toplevel_manager_v1_destroy(this->manager);

src/panel/widgets/window-list/window-list.hpp

@@ -21,6 +21,8 @@ class WayfireToplevel;
 
 class WayfireWindowList : public Gtk::Box, public WayfireWidget
 {
+    wl_display *display;
+    wl_registry *registry;
     WfOption<int> user_size{"panel/window_list_size"};
     std::shared_ptr<WayfireWindowListLayout> layout;
 
@@ -30,7 +32,6 @@ class WayfireWindowList : public Gtk::Box, public WayfireWidget
     std::map<ext_foreign_toplevel_handle_v1*,
         std::unique_ptr<WayfireListToplevel>> list_toplevels;
 
-    wl_display *display;
     zwlr_foreign_toplevel_manager_v1 *manager = NULL;
     ext_foreign_toplevel_list_v1 *foreign_toplevel_list     = NULL;
     ext_image_copy_capture_manager_v1 *copy_capture_manager = NULL;