panel: Fix widgets disappearing after tty switch

Author: soreau

src/panel/panel.cpp

@@ -440,49 +440,69 @@ bool WayfirePanelApp::panel_allowed_by_config(bool allowed, std::string output_n
     }
 }
 
-void WayfirePanelApp::on_activate()
+void WayfirePanelApp::update_panels()
 {
-    WayfireShellApp::on_activate();
-
-    priv->panel_outputs->set_callback([=] ()
+    /* First case: Panel exists on the output but is not allowed by config: Remove panel */
+    for (auto& o : *get_wayfire_outputs())
     {
-        /* First case: Panel exists on the output but is not allowed by config: Remove panel */
-        for (auto& o : *get_wayfire_outputs())
+        auto output = o.get();
+        auto output_name = o->monitor->get_connector();
+        if (panel_allowed_by_config(false, output_name))
         {
-            auto output = o.get();
-            auto output_name = o->monitor->get_connector();
-            if (panel_allowed_by_config(false, output_name))
-            {
-                std::cout << "Removing panel from output: " << output_name << std::endl;
-                priv->panels.erase(output);
-            }
+            std::cout << "Removing panel from output: " << output_name << std::endl;
+            priv->panels.erase(output);
         }
+    }
 
-        /* Second case: Panel does not exist for the output but is allowed by config: Add panel */
-        for (auto& o : *get_wayfire_outputs())
+    /* Second case: Panel does not exist for the output but is allowed by config: Add panel */
+    for (auto& o : *get_wayfire_outputs())
+    {
+        auto output = o.get();
+        auto output_name = o->monitor->get_connector();
+
+        const auto it = std::find_if(priv->panels.begin(), priv->panels.end(),
+            [&output_name] (const auto& panel)
         {
-            auto output = o.get();
-            auto output_name = o->monitor->get_connector();
+            return panel.first->monitor->get_connector() == output_name;
+        });
 
-            const auto it = std::find_if(priv->panels.begin(), priv->panels.end(),
-                [&output_name] (const auto& panel)
-            {
-                return panel.first->monitor->get_connector() == output_name;
-            });
+        if ((it == priv->panels.end()) && panel_allowed_by_config(true, output_name))
+        {
+            std::cout << "Adding panel for output: " << output_name << std::endl;
+            priv->panels[output] = std::unique_ptr<WayfirePanel>(
+                new WayfirePanel(output));
 
-            if ((it == priv->panels.end()) && panel_allowed_by_config(true, output_name))
+            if (ipc_server)
             {
-                std::cout << "Adding panel for output: " << output_name << std::endl;
-                priv->panels[output] = std::unique_ptr<WayfirePanel>(
-                    new WayfirePanel(output));
-
                 priv->panels[output]->handle_config_reload();
                 priv->panels[output]->set_panel_app(this);
                 priv->panels[output]->init_widgets();
             }
         }
+    }
+}
+
+void WayfirePanelApp::on_activate()
+{
+    WayfireShellApp::on_activate();
+
+    priv->panel_outputs->set_callback([=] ()
+    {
+        update_panels();
     });
 
+    if (!ipc_server)
+    {
+        ipc_server = WayfireIPC::get_instance();
+    }
+
+    for (auto& p : priv->panels)
+    {
+        p.second->handle_config_reload();
+        p.second->set_panel_app(this);
+        p.second->init_widgets();
+    }
+
     if (priv->panels.empty())
     {
         std::cout << std::endl <<
@@ -526,13 +546,6 @@ void WayfirePanelApp::on_activate()
     new CssFromConfigFont("panel/battery_font", ".battery {", "}");
     new CssFromConfigFont("panel/clock_font", ".clock {", "}");
     new CssFromConfigFont("panel/weather_font", ".weather {", "}");
-
-    ipc_server = WayfireIPC::get_instance();
-    for (auto& p : priv->panels)
-    {
-        p.second->set_panel_app(this);
-        p.second->init_widgets();
-    }
 }
 
 std::shared_ptr<WayfireIPC> WayfirePanelApp::get_ipc_server_instance()
@@ -542,12 +555,7 @@ std::shared_ptr<WayfireIPC> WayfirePanelApp::get_ipc_server_instance()
 
 void WayfirePanelApp::handle_new_output(WayfireOutput *output)
 {
-    if (panel_allowed_by_config(true, output->monitor->get_connector()))
-    {
-        std::cout << "Adding panel for output: " << output->monitor->get_connector() << std::endl;
-        priv->panels[output] = std::unique_ptr<WayfirePanel>(
-            new WayfirePanel(output));
-    }
+    update_panels();
 }
 
 WayfirePanel*WayfirePanelApp::panel_for_wl_output(wl_output *output)

src/panel/panel.hpp

@@ -46,10 +46,11 @@ class WayfirePanelApp : public WayfireShellApp
     void handle_new_output(WayfireOutput *output) override;
     void handle_output_removed(WayfireOutput *output) override;
     bool panel_allowed_by_config(bool allowed, std::string output_name);
+    void update_panels();
     void on_config_reload() override;
     void reload_css();
     std::shared_ptr<WayfireIPC> get_ipc_server_instance();
-    std::shared_ptr<WayfireIPC> ipc_server;
+    std::shared_ptr<WayfireIPC> ipc_server = nullptr;
 
   private:
     WayfirePanelApp();

src/util/wf-shell-app.cpp

@@ -249,12 +249,16 @@ void WayfireShellApp::on_activate()
 
 void WayfireShellApp::output_list_updated(const int pos, const int rem, const int add)
 {
-    auto display  = Gdk::Display::get_default();
-    auto monitors = display->get_monitors();
-    for (int i = 0; i < add; i++)
+    auto display     = Gdk::Display::get_default();
+    auto monitors    = display->get_monitors();
+    int num_monitors = monitors->get_n_items();
+    for (int i = 0; i < num_monitors; i++)
     {
-        auto obj = std::dynamic_pointer_cast<Gdk::Monitor>(monitors->get_object(i + pos));
-        add_output(obj);
+        auto obj = std::dynamic_pointer_cast<Gdk::Monitor>(monitors->get_object(i));
+        if (obj && !obj->get_connector().empty())
+        {
+            add_output(obj);
+        }
     }
 }