Multi-window support (technically)

panthera-www.cc

@@ -270,9 +270,10 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            270  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            271  
                                            };
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            272  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        273 +
                                        class PantheraWindow;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        274 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            275  
                                            class PantheraWww : public Gtk::Application {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            276  
                                            private:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        275 -
                                            Gtk::ApplicationWindow* window;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            277  
                                                std::shared_ptr<gPanthera::ContentManager> content_manager;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            278  
                                                std::string cookie_file;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            279  
                                                std::vector<SearchEngine> search_engines;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -292,6 +293,7 @@ private:

                                
                                
                                
                            
                                
                                    
                                        
                                            293  
                                            protected:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            294  
                                                void on_startup() override;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            295  
                                                void on_activate() override;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        296 +
                                            PantheraWindow *make_window();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            297  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            298  
                                            public:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            299  
                                                PantheraWww();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -540,6 +542,7 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            542  
                                                        layout_file_out.close();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            543  
                                                        std::cout << "Layout changed: " << layout_manager->get_layout_as_json() << std::endl;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            544  
                                                    });
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        545 +
                                                set_show_menubar(true);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            546  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            547  
                                            };
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            548  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -693,11 +696,15 @@ void PantheraWww::on_new_tab(gPanthera::ContentStack *stack, const Glib::ustring

                                
                                
                                
                            
                                
                                    
                                        
                                            696  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            697  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            698  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        696 -
                                        void PantheraWww::on_startup() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        697 -
                                            Gtk::Application::on_startup();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        699 +
                                        PantheraWindow *PantheraWww::make_window() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            700  
                                                Glib::RefPtr<Gtk::Application> self_ref = Glib::make_refptr_for_instance<Gtk::Application>(this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        699 -
                                            window = new PantheraWindow(self_ref);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        701 +
                                            auto window = new PantheraWindow(self_ref);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            702  
                                                add_window(*window);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        703 +
                                            return window;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        704 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        705 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        706 +
                                        void PantheraWww::on_startup() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        707 +
                                            Gtk::Application::on_startup();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            708  
                                                // Get search engines
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            709  
                                                std::ifstream search_engines_file_in("search_engines.json");
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            710  
                                                if(search_engines_file_in) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -747,8 +754,6 @@ void PantheraWww::on_startup() {

                                
                                
                                
                            
                                
                                    
                                        
                                            754  
                                                    plugin_file_out.close();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            755  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            756  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        750 -
                                            window->set_show_menubar(true);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        751 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            757  
                                                // Known bug <https://gitlab.gnome.org/GNOME/epiphany/-/issues/2714>:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            758  
                                                // JS can't veto the application's accelerators using `preventDefault()`. This is
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            759  
                                                // not possible in WebKitGTK, or at least I can't find a way to do it.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -780,6 +785,7 @@ void PantheraWww::on_startup() {

                                
                                
                                
                            
                                
                                    
                                        
                                            785  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            786  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            787  
                                            void PantheraWww::on_activate() {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        788 +
                                            auto window = make_window();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            789  
                                                window->present();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            790  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            791