From c61998283c8436dd4360e35ce10c309e7d3ee723 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 25 Jul 2024 13:05:02 +0200 Subject: adw: add bare bones wrapper for AdwApplication --- CMakeLists.txt | 1 + adw/CMakeLists.txt | 22 ++++++++ adw/include/turns/adw/application.hpp | 55 ++++++++++++++++++ adw/include/turns/adw/wrap_init.hpp | 9 +++ adw/src/application.cpp | 102 ++++++++++++++++++++++++++++++++++ adw/src/wrap_init.cpp | 21 +++++++ app/CMakeLists.txt | 6 +- app/include/turns/app/application.hpp | 37 ------------ app/src/application.cpp | 73 ------------------------ app/src/main.cpp | 38 ++++++++++++- 10 files changed, 247 insertions(+), 117 deletions(-) create mode 100644 adw/CMakeLists.txt create mode 100644 adw/include/turns/adw/application.hpp create mode 100644 adw/include/turns/adw/wrap_init.hpp create mode 100644 adw/src/application.cpp create mode 100644 adw/src/wrap_init.cpp delete mode 100644 app/include/turns/app/application.hpp delete mode 100644 app/src/application.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index c44e270..48e97bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ include("Catch") # Targets +add_subdirectory("adw") add_subdirectory("app") add_subdirectory("core") add_subdirectory("lang") diff --git a/adw/CMakeLists.txt b/adw/CMakeLists.txt new file mode 100644 index 0000000..9ac563a --- /dev/null +++ b/adw/CMakeLists.txt @@ -0,0 +1,22 @@ +add_library("adw" + "src/application.cpp" + "src/wrap_init.cpp" +) + +add_library("turns::adw" ALIAS "adw") + +target_include_directories("adw" PUBLIC + "include" +) + +target_compile_options("adw" PUBLIC + "$<$:-Wall>" + "$<$:-Wextra>" + "$<$:-Werror>" + "$<$:-pedantic-errors>" +) + +target_link_libraries("adw" PUBLIC + "PkgConfig::adwaita" + "PkgConfig::gtkmm" +) diff --git a/adw/include/turns/adw/application.hpp b/adw/include/turns/adw/application.hpp new file mode 100644 index 0000000..26bec41 --- /dev/null +++ b/adw/include/turns/adw/application.hpp @@ -0,0 +1,55 @@ +#ifndef TURNS_ADW_APPLICATION_HPP +#define TURNS_ADW_APPLICATION_HPP + +#include +#include + +#include + +#include + +using AdwApplication = struct _AdwApplication; + +namespace turns::adw +{ + struct Application_Class; + + struct Application : Gtk::Application + { + Application(Application && other) noexcept = default; + auto operator=(Application && other) noexcept -> Application & = default; + + Application(Application const & other) = delete; + auto operator=(Application const & other) noexcept -> Application & = delete; + + auto static get_type() -> GType; + auto static get_base_type() -> GType; + + template + auto gobj(this Self && self) noexcept + { + return reinterpret_cast(self.gobject_); + } + + auto gobj_copy() -> AdwApplication *; + + auto static create(Glib::ustring const & id = {}, + Gio::Application::Flags flags = Gio::Application::Flags::NONE) -> Glib::RefPtr; + + protected: + explicit Application(Glib::ConstructParams const & params); + explicit Application(AdwApplication * gobj); + explicit Application(Glib::ustring const & id = {}, Gio::Application::Flags flags = Gio::Application::Flags::NONE); + + private: + friend Application_Class; + static Application_Class s_class; + }; +} // namespace turns::adw + +namespace Glib +{ + auto wrap(AdwApplication * object, bool copy = false) -> Glib::RefPtr; +} // namespace Glib + +#endif \ No newline at end of file diff --git a/adw/include/turns/adw/wrap_init.hpp b/adw/include/turns/adw/wrap_init.hpp new file mode 100644 index 0000000..5096736 --- /dev/null +++ b/adw/include/turns/adw/wrap_init.hpp @@ -0,0 +1,9 @@ +#ifndef TURNS_ADW_WRAP_INIT_HPP +#define TURNS_ADW_WRAP_INIT_HPP + +namespace turns::adw +{ + auto wrap_init() -> void; +} // namespace turns::adw + +#endif \ No newline at end of file diff --git a/adw/src/application.cpp b/adw/src/application.cpp new file mode 100644 index 0000000..539f7bc --- /dev/null +++ b/adw/src/application.cpp @@ -0,0 +1,102 @@ +#include "turns/adw/application.hpp" + +#include "turns/adw/wrap_init.hpp" + +#include +#include + +#include + +#include + +#include + +namespace turns::adw +{ + struct Application_Class : Glib::Class + { + auto init() -> Glib::Class const &; + auto static class_init_function(void * gclass, void * data) -> void; + auto static wrap_new(GObject * object) -> Glib::ObjectBase *; + }; + + auto Application_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &Application_Class::class_init_function; + register_derived_type(adw_application_get_type()); + } + return *this; + } + + auto Application_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + Gtk::Application_Class::class_init_function(klass, data); + } + + auto Application_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return new Application(ADW_APPLICATION(object)); + } + + Application_Class Application::s_class{}; + + auto Application::get_type() -> GType + { + return s_class.init().get_type(); + } + + auto Application::get_base_type() -> GType + { + return adw_application_get_type(); + } + + auto Application::gobj_copy() -> AdwApplication * + { + reference(); + return gobj(); + } + + auto Application::create(Glib::ustring const & id, Gio::Application::Flags flags) -> Glib::RefPtr + { + auto static did_init = false; + + if (!did_init) + { + Gtk::init_gtkmm_internals(); + turns::adw::wrap_init(); + did_init = true; + } + + return Glib::RefPtr(new Application(id, flags)); + } + + Application::Application(Glib::ConstructParams const & params) + : Gtk::Application{params} + { + } + + Application::Application(AdwApplication * gobj) + : Glib::ObjectBase{nullptr} + , Gtk::Application((GtkApplication *)gobj) + { + } + + Application::Application(Glib::ustring const & id, Gio::Application::Flags flags) + : Glib::ObjectBase{nullptr} + , Gtk::Application{Glib::ConstructParams{s_class.init(), "application_id", Glib::c_str_or_nullptr(id), "flags", static_cast(flags), nullptr}} + { + } + +} // namespace turns::adw + +namespace Glib +{ + auto wrap(AdwApplication * object, bool copy) -> Glib::RefPtr + { + return Glib::make_refptr_for_instance( + dynamic_cast(Glib::wrap_auto(G_OBJECT(object), copy))); + } +} // namespace Glib \ No newline at end of file diff --git a/adw/src/wrap_init.cpp b/adw/src/wrap_init.cpp new file mode 100644 index 0000000..42ff1cf --- /dev/null +++ b/adw/src/wrap_init.cpp @@ -0,0 +1,21 @@ +#include "turns/adw/wrap_init.hpp" + +#include "turns/adw/application.hpp" + +#include + +namespace turns::adw +{ + struct Application_Class + { + auto static wrap_new(GObject * object) -> Glib::ObjectBase *; + }; + + auto wrap_init() -> void + { + adw_init(); + + Glib::wrap_register(adw_application_get_type(), &Application_Class::wrap_new); + g_type_ensure(Application::get_type()); + } +} // namespace turns::adw \ No newline at end of file diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 62bfa82..8443eb9 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,18 +1,14 @@ add_executable("app" - "src/application.cpp" "src/main.cpp" ) -target_include_directories("app" PRIVATE - "include" -) - target_link_libraries("app" PRIVATE "$<$,$>:gcov>" "PkgConfig::adwaita" "PkgConfig::gtkmm" + "turns::adw" "turns::core" "turns::lang" diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp deleted file mode 100644 index ce4ef92..0000000 --- a/app/include/turns/app/application.hpp +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef TURNS_APP_APPLICATION_HPP -#define TURNS_APP_APPLICATION_HPP - -#include "turns/ui/windows/fwd.hpp" - -#include - -#include - -#include - -namespace turns::app -{ - - struct application - { - auto static create() -> std::shared_ptr; - - auto run(int argc, char * argv[]) -> int; - - private: - application(); - - auto handle_action_quit() -> void; - - auto on_activate() -> void; - auto on_shutdown() -> void; - auto on_startup() -> void; - - AdwApplication * m_adw; - Glib::RefPtr m_application; - ui::windows::tracker * m_tracker; - }; - -} // namespace turns::app - -#endif \ No newline at end of file diff --git a/app/src/application.cpp b/app/src/application.cpp deleted file mode 100644 index 083cf9b..0000000 --- a/app/src/application.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include "turns/app/application.hpp" - -#include "turns/core/init.hpp" -#include "turns/ui/init.hpp" -#include "turns/ui/windows/tracker.hpp" - -#include - -#include -#include -#include - -namespace turns::app -{ - - auto application::create() -> std::shared_ptr - { - Gtk::init_gtkmm_internals(); - adw_init(); - core::register_types(); - ui::register_types(); - return std::shared_ptr{new application{}}; - } - - auto application::run(int argc, char * argv[]) -> int - { - return g_application_run(G_APPLICATION(m_adw), argc, argv); - } - - application::application() - { - m_adw = adw_application_new("ch.arknet.Turns", G_APPLICATION_DEFAULT_FLAGS); - m_application = Glib::wrap(GTK_APPLICATION(m_adw)); - - m_application->signal_activate().connect(sigc::mem_fun(*this, &application::on_activate)); - m_application->signal_shutdown().connect(sigc::mem_fun(*this, &application::on_shutdown)); - m_application->signal_startup().connect(sigc::mem_fun(*this, &application::on_startup)); - } - - auto application::handle_action_quit() -> void - { - m_tracker->close(); - } - - auto application::on_activate() -> void - { - auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); - m_tracker = Gtk::Builder::get_widget_derived(builder, "tracker"); - - m_application->add_window(*m_tracker); - m_tracker->present(); - } - - auto application::on_shutdown() -> void - { - m_tracker->close(); - delete m_tracker; - } - - auto application::on_startup() -> void - { - auto style_manager = adw_style_manager_get_default(); - adw_style_manager_set_color_scheme(style_manager, ADW_COLOR_SCHEME_PREFER_LIGHT); - - m_application->add_action("quit", sigc::mem_fun(*this, &application::handle_action_quit)); - m_application->set_accel_for_action("app.quit", "q"); - m_application->set_accel_for_action("win.clear", "x"); - m_application->set_accel_for_action("win.next", "space"); - m_application->set_accel_for_action("win.previous", "BackSpace"); - m_application->set_accel_for_action("win.add_participant", "a"); - } - -} // namespace turns::app \ No newline at end of file diff --git a/app/src/main.cpp b/app/src/main.cpp index 9ec90d2..119022f 100644 --- a/app/src/main.cpp +++ b/app/src/main.cpp @@ -1,7 +1,13 @@ -#include "turns/app/application.hpp" +#include "turns/adw/application.hpp" +#include "turns/adw/wrap_init.hpp" +#include "turns/core/init.hpp" +#include "turns/ui/init.hpp" +#include "turns/ui/windows/tracker.hpp" #include +#include + auto main(int argc, char * argv[]) -> int { setlocale(LC_ALL, ""); @@ -9,6 +15,34 @@ auto main(int argc, char * argv[]) -> int bind_textdomain_codeset("turns", "UTF-8"); textdomain("turns"); - auto app = turns::app::application::create(); + auto app = turns::adw::Application::create("ch.arknet.Turns"); + auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); + auto window = Gtk::Builder::get_widget_derived(builder, "tracker"); + + app->signal_startup().connect([app] { + turns::core::register_types(); + turns::ui::register_types(); + + auto style_manager = adw_style_manager_get_default(); + adw_style_manager_set_color_scheme(style_manager, ADW_COLOR_SCHEME_PREFER_LIGHT); + + app->add_action("quit", sigc::mem_fun(*app, &turns::adw::Application::quit)); + app->set_accel_for_action("app.quit", "q"); + app->set_accel_for_action("win.clear", "x"); + app->set_accel_for_action("win.next", "space"); + app->set_accel_for_action("win.previous", "BackSpace"); + app->set_accel_for_action("win.add_participant", "a"); + }); + + app->signal_shutdown().connect([window] { + window->close(); + delete window; + }); + + app->signal_activate().connect([app, window] { + app->add_window(*window); + window->present(); + }); + return app->run(argc, argv); } \ No newline at end of file -- cgit v1.2.3