surface-controller: update subsurfaces positions when toplevel surfac…

…e is committed

wlroots updates the positions of these subsurfaces when the main surface is committed.

src/view/subsurface.cpp

@@ -41,6 +41,7 @@ wf::wlr_subsurface_controller_t::wlr_subsurface_controller_t(wlr_subsurface *sub
     on_destroy.set_callback([=] (void*)
     {
         wf::scene::remove_child(subsurface_root_node);
+        sub->data = NULL;
         delete this;
     });
 

src/view/subsurface.hpp

@@ -16,12 +16,12 @@ class wlr_subsurface_root_node_t : public wf::scene::translation_node_t
   public:
     wlr_subsurface_root_node_t(wlr_subsurface *subsurface);
     std::string stringify() const override;
+    void update_offset();
 
   private:
     wlr_subsurface *subsurface;
     wf::wl_listener_wrapper on_subsurface_destroy;
     wf::wl_listener_wrapper on_subsurface_commit;
-    void update_offset();
 };
 
 /**

src/view/surface-impl.hpp

@@ -27,5 +27,6 @@ class wlr_surface_controller_t
 
     wf::wl_listener_wrapper on_destroy;
     wf::wl_listener_wrapper on_new_subsurface;
+    wf::wl_listener_wrapper on_commit;
 };
 }

src/view/surface.cpp

@@ -14,6 +14,18 @@
 #include "wayfire/signal-definitions.hpp"
 #include <wayfire/scene-operations.hpp>
 
+static void update_subsurface_position(wlr_surface *surface, int, int, void*)
+{
+    if (wlr_surface_is_subsurface(surface))
+    {
+        auto sub = wlr_subsurface_from_wlr_surface(surface);
+        if (sub->data)
+        {
+            ((wf::wlr_subsurface_controller_t*)sub->data)->get_subsurface_root()->update_offset();
+        }
+    }
+}
+
 wf::wlr_surface_controller_t::wlr_surface_controller_t(wlr_surface *surface,
     scene::floating_inner_ptr root_node)
 {
@@ -51,6 +63,16 @@ wf::wlr_surface_controller_t::wlr_surface_controller_t(wlr_surface *surface,
     {
         on_new_subsurface.emit(sub);
     }
+
+    if (!wlr_surface_is_subsurface(surface))
+    {
+        on_commit.set_callback([=] (void*)
+        {
+            wlr_surface_for_each_surface(surface, update_subsurface_position, nullptr);
+        });
+
+        on_commit.connect(&surface->events.commit);
+    }
 }
 
 wf::wlr_surface_controller_t::~wlr_surface_controller_t()