window-list: shm: Drop.

Author: soreau

meson.build

@@ -33,8 +33,8 @@ dbusmenu_gtk = dependency('dbusmenu-glib-0.4')
 xkbregistry = dependency('xkbregistry')
 json = subproject('wf-json').get_variable('wfjson')
 openssl = dependency('openssl')
-gbm = dependency('gbm', required: get_option('live-previews-dmabuf'))
-drm = dependency('libdrm', required: get_option('live-previews-dmabuf'))
+gbm = dependency('gbm', required: false)
+drm = dependency('libdrm', required: false)
 
 if get_option('wayland-logout') == true
 	wayland_logout = subproject('wayland-logout')
@@ -45,8 +45,8 @@ if get_option('weather') == true
 	add_project_arguments('-DHAVE_WEATHER=1', language: 'cpp')
 endif
 
-if gbm.found() and drm.found() and not get_option('live-previews-dmabuf').disabled()
-	add_project_arguments('-DHAVE_DMABUF=1', language: 'cpp')
+if not gbm.found() or not drm.found()
+	message('Live window previews require gbm and libdrm dependencies')
 endif
 
 if libpulse.found()

meson_options.txt

@@ -28,9 +28,3 @@ option(
     value: false,
     description: 'Install weather widgets and open-weather-fetch systemd service',
 )
-option(
-    'live-previews-dmabuf',
-    type: 'feature',
-    value: 'auto',
-    description: 'Enable live window preview tooltips when hovering over window-list buttons in wf-panel'
-)

src/panel/meson.build

@@ -72,10 +72,10 @@ else
   message('Weather disabled, weather widgets and owf service not included.')
 endif
 
-if gbm.found() and drm.found() and not get_option('live-previews-dmabuf').disabled()
+if gbm.found() and drm.found()
   deps += [gbm, drm]
 else
-  message('Development packages for gbm and drm are required to enable live window preview tooltips in wf-panel.')
+  message('Development packages for gbm and libdrm are required to enable live window preview tooltips in wf-panel.')
 endif
 
 executable(

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

@@ -63,29 +63,27 @@ static const struct ext_image_copy_capture_session_v1_listener recording_session
     .stopped = session_handle_stopped,
 };
 
-#ifdef HAVE_DMABUF
 static void dmabuf_created(void *data, struct zwp_linux_buffer_params_v1*,
     struct wl_buffer *wl_buffer)
 {
     TooltipMedia *tooltip_media = (TooltipMedia*)data;
 
+    if (tooltip_media->buffer)
+    {
+        wl_buffer_destroy(tooltip_media->buffer);
+    }
+
     tooltip_media->buffer = wl_buffer;
 }
 
 static void dmabuf_failed(void *data, struct zwp_linux_buffer_params_v1*)
-{
-    TooltipMedia *tooltip_media = (TooltipMedia*)data;
-
-    std::cerr << "Failed to create dmabuf, trying shm" << std::endl;
-    tooltip_media->window_list->live_previews_dmabuf = false;
-}
+{}
 
 static const struct zwp_linux_buffer_params_v1_listener params_listener =
 {
     .created = dmabuf_created,
     .failed  = dmabuf_failed,
 };
-#endif // HAVE_DMABUF
 
 /* Copy Capture Callbacks */
 
@@ -174,7 +172,7 @@ static void frame_handle_failed(void *data,
     uint32_t reason)
 {
     TooltipMedia *tooltip_media = (TooltipMedia*)data;
-    std::cerr << "Failed to copy frame because reason: " << reason << std::endl;
+
     ext_image_copy_capture_frame_v1_destroy(handle);
     tooltip_media->frame = nullptr;
     tooltip_media->frame_in_flight = false;
@@ -243,7 +241,6 @@ void TooltipMedia::request_next_frame()
 {
     if ((current_buffer_width <= 0) || (current_buffer_height <= 0))
     {
-        printf("%s invalid size\n", __func__);
         return;
     }
 
@@ -304,7 +301,6 @@ TooltipMedia::TooltipMedia(WayfireWindowList *window_list, ext_foreign_toplevel_
 {
     this->window_list = window_list;
     this->ext_handle  = ext_handle;
-    this->shm = window_list->shm;
     set_can_shrink(true);
     set_content_fit(Gtk::ContentFit::CONTAIN);
     set_vexpand(false);
@@ -347,24 +343,11 @@ TooltipMedia::~TooltipMedia()
         ext_image_copy_capture_session_v1_destroy(recording_session);
     }
 
-    if (
-#ifdef HAVE_DMABUF
-        !this->window_list->live_previews_dmabuf &&
-#endif // HAVE_DMABUF
-        this->shm_data && this->size)
-    {
-        if (munmap(this->shm_data, this->size) < 0)
-        {
-            perror("munmap failed");
-        }
-    }
-
     if (this->buffer)
     {
         wl_buffer_destroy(this->buffer);
     }
 
-#ifdef HAVE_DMABUF
     if (this->params)
     {
         zwp_linux_buffer_params_v1_destroy(this->params);
@@ -379,8 +362,6 @@ TooltipMedia::~TooltipMedia()
     {
         gbm_bo_destroy(this->bo);
     }
-
-#endif // HAVE_DMABUF
 }
 
 class WayfireToplevel::impl
@@ -536,7 +517,7 @@ class WayfireToplevel::impl
 
     void set_tooltip_media()
     {
-        if (this->tooltip_media || !this->ext_handle)
+        if (this->tooltip_media || !this->ext_handle || !(bool)window_list->live_window_previews)
         {
             return;
         }
@@ -734,7 +715,8 @@ class WayfireToplevel::impl
             return false;
         }
 
-        if (this->window_list->list_toplevels.empty())
+        if (this->window_list->list_toplevels.empty() || !this->ext_handle ||
+            !(bool)window_list->live_window_previews)
         {
             tooltip->set_text(title);
         }

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

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <gbm.h>
+#include <xf86drm.h>
 #include <memory>
 #include <gtkmm/box.h>
 #include <gtkmm/picture.h>
@@ -9,17 +11,12 @@
 #include <ext-foreign-toplevel-list-v1-client-protocol.h>
 #include <ext-image-capture-source-v1-client-protocol.h>
 #include <ext-image-copy-capture-v1-client-protocol.h>
+#include <linux-dmabuf-unstable-v1-client-protocol.h>
 #include <wayland-client-protocol.h>
 #include <wf-option-wrap.hpp>
 #include "wf-shell-app.hpp"
 #include "panel.hpp"
 
-#ifdef HAVE_DMABUF
-    #include <gbm.h>
-    #include <xf86drm.h>
-    #include <linux-dmabuf-unstable-v1-client-protocol.h>
-#endif // HAVE_DMABUF
-
 class WayfireWindowList;
 class WayfireWindowListBox;
 
@@ -34,9 +31,7 @@ class TooltipMedia : public Gtk::Picture
 {
   public:
     WayfireWindowList *window_list = nullptr;
-    wl_shm *shm = nullptr;
     wl_buffer *buffer = nullptr;
-    void *shm_data    = nullptr;
     ext_foreign_toplevel_handle_v1 *ext_handle = NULL;
     ext_image_copy_capture_frame_v1 *frame     = NULL;
     ext_image_capture_source_v1 *copy_capture_source     = NULL;
@@ -48,14 +43,11 @@ class TooltipMedia : public Gtk::Picture
     uint32_t current_buffer_width = 0, width = -1;
     uint32_t current_buffer_height = 0, height = -1;
     uint32_t stride;
-    size_t size = 0;
 
-#ifdef HAVE_DMABUF
     gbm_bo *bo = nullptr;
     zwp_linux_buffer_params_v1 *params = nullptr;
     void *dmabuf_data = nullptr;
     void *map_data = nullptr;
-#endif // HAVE_DMABUF
 
     TooltipMedia(WayfireWindowList *window_list, ext_foreign_toplevel_handle_v1 *ext_handle);
     ~TooltipMedia();

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

@@ -4,9 +4,7 @@
 
 #include "window-list.hpp"
 
-#ifdef HAVE_DMABUF
-    #include <fcntl.h>
-#endif // HAVE_DMABUF
+#include <fcntl.h>
 
 #define DEFAULT_SIZE_PC 0.1
 
@@ -137,7 +135,6 @@ ext_foreign_toplevel_list_v1_listener toplevel_list_v1_impl = {
     .finished = handle_finished,
 };
 
-#ifdef HAVE_DMABUF
 static void dmabuf_feedback_done(void *data, struct zwp_linux_dmabuf_feedback_v1 *feedback)
 {
     WayfireWindowList *window_list = (WayfireWindowList*)data;
@@ -167,7 +164,6 @@ static void dmabuf_feedback_main_device(void *data, struct zwp_linux_dmabuf_feed
     {
         perror("Failed to get DRM device from dev id");
         std::cerr << "Trying shm" << std::endl;
-        window_list->live_previews_dmabuf = false;
         return;
     }
 
@@ -184,7 +180,6 @@ static void dmabuf_feedback_main_device(void *data, struct zwp_linux_dmabuf_feed
     {
         perror("Failed to open drm device");
         std::cerr << "Trying shm" << std::endl;
-        window_list->live_previews_dmabuf = false;
         return;
     }
 
@@ -194,7 +189,6 @@ static void dmabuf_feedback_main_device(void *data, struct zwp_linux_dmabuf_feed
         close(drm_fd);
         perror("Failed to create gbm device");
         std::cerr << "Trying shm" << std::endl;
-        window_list->live_previews_dmabuf = false;
         return;
     }
 
@@ -228,17 +222,13 @@ static const struct zwp_linux_dmabuf_feedback_v1_listener dmabuf_feedback_listen
     .tranche_formats = dmabuf_feedback_tranche_formats,
     .tranche_flags   = dmabuf_feedback_tranche_flags,
 };
-#endif // HAVE_DMABUF
 
 static void registry_add_object(void *data, wl_registry *registry, uint32_t name,
     const char *interface, uint32_t version)
 {
     WayfireWindowList *window_list = (WayfireWindowList*)data;
 
-    if (strcmp(interface, wl_shm_interface.name) == 0)
-    {
-        window_list->shm = (wl_shm*)wl_registry_bind(registry, name, &wl_shm_interface, version);
-    } else if (strcmp(interface, zwlr_foreign_toplevel_manager_v1_interface.name) == 0)
+    if (strcmp(interface, zwlr_foreign_toplevel_manager_v1_interface.name) == 0)
     {
         auto zwlr_toplevel_manager = (zwlr_foreign_toplevel_manager_v1*)
             wl_registry_bind(registry, name,
@@ -268,10 +258,7 @@ static void registry_add_object(void *data, wl_registry *registry, uint32_t name
                 &ext_foreign_toplevel_image_capture_source_manager_v1_interface, version);
         window_list->toplevel_capture_manager = toplevel_capture_manager;
         printf("set toplevel_capture_manager: %p\n", toplevel_capture_manager);
-    }
-
-#ifdef HAVE_DMABUF
-    else if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0)
+    } else if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0)
     {
         window_list->dmabuf = (zwp_linux_dmabuf_v1*)wl_registry_bind(registry, name,
             &zwp_linux_dmabuf_v1_interface, version);
@@ -282,7 +269,6 @@ static void registry_add_object(void *data, wl_registry *registry, uint32_t name
                 window_list);
         }
     }
-#endif // HAVE_DMABUF
 }
 
 static void registry_remove_object(void *data, struct wl_registry *registry, uint32_t name)
@@ -342,12 +328,6 @@ void WayfireWindowList::init(Gtk::Box *container)
         return;
     }
 
-#ifdef HAVE_DMABUF
-    this->live_previews_dmabuf = this->dmabuf ? true : false;
-#else
-    this->live_previews_dmabuf = false;
-#endif // HAVE_DMABUF
-
     scrolled_window.add_css_class("window-list");
 
     scrolled_window.set_hexpand(true);
@@ -472,9 +452,6 @@ void WayfireWindowList::handle_toplevel_closed(zwlr_foreign_toplevel_handle_v1 *
     toplevels.erase(toplevel);
 }
 
-void WayfireWindowList::on_event(wf::json_t data)
-{}
-
 WayfireWindowList::WayfireWindowList(WayfireOutput *output)
 {
     this->output = output;
@@ -494,9 +471,8 @@ WayfireWindowList::~WayfireWindowList()
      * when the window-list widget is unloaded. */
     toplevels.clear();
 
-    wl_shm_destroy(this->shm);
     zwlr_foreign_toplevel_manager_v1_destroy(this->manager);
-#ifdef HAVE_DMABUF
+
     if (this->dmabuf)
     {
         zwp_linux_dmabuf_v1_destroy(this->dmabuf);
@@ -511,6 +487,4 @@ WayfireWindowList::~WayfireWindowList()
     {
         gbm_device_destroy(this->dmabuf_device);
     }
-
-#endif
 }

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

@@ -19,7 +19,7 @@ struct WayfireListToplevel
 
 class WayfireToplevel;
 
-class WayfireWindowList : public Gtk::Box, public WayfireWidget, public IIPCSubscriber
+class WayfireWindowList : public Gtk::Box, public WayfireWidget
 {
     WfOption<int> user_size{"panel/window_list_size"};
     std::shared_ptr<WayfireWindowListLayout> layout;
@@ -31,7 +31,6 @@ class WayfireWindowList : public Gtk::Box, public WayfireWidget, public IIPCSubs
         std::unique_ptr<WayfireListToplevel>> list_toplevels;
 
     wl_display *display;
-    wl_shm *shm = nullptr;
     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;
@@ -84,21 +83,12 @@ class WayfireWindowList : public Gtk::Box, public WayfireWidget, public IIPCSubs
      */
     Gtk::Widget *get_widget_before(int x);
 
-    WfOption<bool> live_window_previews_opt{"panel/live_window_previews"};
+    WfOption<bool> live_window_previews{"panel/live_window_previews"};
     void handle_new_wl_output(wl_output *output);
-    void on_event(wf::json_t data) override;
-    std::shared_ptr<IPCClient> ipc_client;
-    bool normal_title_tooltips = false;
-    void enable_normal_tooltips_flag(bool enable);
-    uint64_t live_window_preview_view_id = 0;
-    void enable_ipc(bool enable);
-    bool live_previews_dmabuf = true;
 
-#ifdef HAVE_DMABUF
     zwp_linux_dmabuf_feedback_v1 *feedback = nullptr;
     zwp_linux_dmabuf_v1 *dmabuf = nullptr;
     gbm_device *dmabuf_device   = nullptr;
-#endif // HAVE_DMABUF
 
   private:
     int get_default_button_width();