From c305f8d3f0ebade336c62c8b8da1ff86f88b7509 Mon Sep 17 00:00:00 2001 From: Ilia Bozhinov Date: Mon, 25 Mar 2024 13:19:46 +0100 Subject: [PATCH] osk: add buttons for top and bottom anchors and make headerbar size configurable --- meson.build | 2 +- src/main.cpp | 6 ++- src/wayland-window.cpp | 85 ++++++++++++++++++++++++++++-------------- src/wayland-window.hpp | 9 +++-- 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/meson.build b/meson.build index bc96e26..b9e368d 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( license: 'MIT', meson_version: '>=0.43.0', default_options: [ - 'cpp_std=c++14', + 'cpp_std=c++17', 'c_std=c11', 'warning_level=2', 'werror=false', diff --git a/src/main.cpp b/src/main.cpp index cd98125..24a950e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,8 @@ namespace wf int spacing = OSK_SPACING; int default_width = 800; int default_height = 400; + int headerbar_size = 60; + std::string anchor; KeyButton::KeyButton(Key key, int width, int height) @@ -119,7 +121,7 @@ namespace wf Keyboard::Keyboard() { window = std::make_unique - (default_width, default_height, anchor); + (default_width, default_height, anchor, headerbar_size); vk = std::make_unique (); init_layouts(); @@ -179,6 +181,8 @@ int main(int argc, char **argv) ("keyboard width") | clara::detail::Opt(wf::osk::default_height, "int")["-h"]["--height"] ("keyboard height") | + clara::detail::Opt(wf::osk::headerbar_size, "int")["-b"]["--headerbar-height"] + ("headerbar height") | clara::detail::Opt(wf::osk::anchor, "top|left|bottom|right|pinned")["-a"] ["--anchor"]("where the keyboard should anchor in the screen"); diff --git a/src/wayland-window.cpp b/src/wayland-window.cpp index 8b8fa25..cffd159 100644 --- a/src/wayland-window.cpp +++ b/src/wayland-window.cpp @@ -11,8 +11,6 @@ #include #include -static constexpr int HEADERBAR_SIZE = 60; - namespace wf { // listeners @@ -108,6 +106,7 @@ namespace wf gtk_layer_init_for_window(this->gobj()); gtk_layer_set_layer(this->gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY); gtk_layer_set_namespace(this->gobj(), "keyboard"); + gtk_layer_set_exclusive_zone(this->gobj(), -1); auto layer_anchor = check_anchor(anchor); if (layer_anchor > -1) { @@ -136,47 +135,77 @@ namespace wf } } - WaylandWindow::WaylandWindow(int width, int height, std::string anchor) - : Gtk::Window() + void WaylandWindow::init_headerbar(int headerbar_size) { - // setup close button - close_button.get_style_context()->add_class("image-button"); - close_button.set_image_from_icon_name("window-close-symbolic", - Gtk::ICON_SIZE_LARGE_TOOLBAR); + std::vector buttons = { + &top_button, &bottom_button, &close_button + }; + + const int button_size = 0.8 * headerbar_size; + for (auto& button : buttons) + { + button->get_style_context()->add_class("image-button"); + button->set_size_request(button_size, button_size); + button->set_margin_bottom(OSK_SPACING); + button->set_margin_top(OSK_SPACING); + button->set_margin_left(OSK_SPACING); + button->set_margin_right(OSK_SPACING); + } + + static const std::map gtk_size_map = { + {Gtk::ICON_SIZE_MENU, 16}, + {Gtk::ICON_SIZE_SMALL_TOOLBAR, 16}, + {Gtk::ICON_SIZE_LARGE_TOOLBAR, 24}, + {Gtk::ICON_SIZE_BUTTON, 16}, + {Gtk::ICON_SIZE_DND, 32}, + {Gtk::ICON_SIZE_DIALOG, 48} + }; + + Gtk::BuiltinIconSize desired_gtk_icon_size = Gtk::ICON_SIZE_MENU; + for (auto [gtk_size, pixel_size] : gtk_size_map) + { + if (pixel_size <= button_size) + { + desired_gtk_icon_size = gtk_size; + } + } + + close_button.set_image_from_icon_name("window-close-symbolic", desired_gtk_icon_size); close_button.signal_clicked().connect_notify([=] () { this->get_application()->quit(); }); - // setup move gesture - headerbar_drag = Gtk::GestureDrag::create(drag_box); - headerbar_drag->signal_drag_begin().connect_notify([=] (double, double) { - if (this->wf_surface) - { - zwf_surface_v2_interactive_move(this->wf_surface); - /* Taken from GDK's Wayland impl of begin_move_drag() */ - Gdk::Display::get_default()->get_default_seat()->ungrab(); - headerbar_drag->reset(); - } + top_button.set_image_from_icon_name("pan-up-symbolic", desired_gtk_icon_size); + top_button.signal_clicked().connect_notify([=] () { + gtk_layer_set_anchor(this->gobj(), GTK_LAYER_SHELL_EDGE_TOP, true); + gtk_layer_set_anchor(this->gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, false); }); + + bottom_button.set_image_from_icon_name("pan-down-symbolic", desired_gtk_icon_size); + bottom_button.signal_clicked().connect_notify([=] () { + gtk_layer_set_anchor(this->gobj(), GTK_LAYER_SHELL_EDGE_TOP, false); + gtk_layer_set_anchor(this->gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, true); + }); + + // setup move gesture Gtk::HeaderBar bar; headerbar_box.override_background_color(bar.get_style_context()->get_background_color()); - // setup headerbar layout - headerbar_box.set_size_request(-1, HEADERBAR_SIZE); - - close_button.set_size_request(HEADERBAR_SIZE * 0.8, HEADERBAR_SIZE * 0.8); - close_button.set_margin_bottom(OSK_SPACING); - close_button.set_margin_top(OSK_SPACING); - close_button.set_margin_left(OSK_SPACING); - close_button.set_margin_right(OSK_SPACING); - + headerbar_box.set_size_request(-1, headerbar_size); headerbar_box.pack_end(close_button, false, false); - headerbar_box.pack_start(drag_box, true, true); + headerbar_box.pack_start(top_button, false, false); + headerbar_box.pack_start(bottom_button, false, false); + layout_box.pack_start(headerbar_box); layout_box.set_spacing(OSK_SPACING); this->add(layout_box); + } + WaylandWindow::WaylandWindow(int width, int height, std::string anchor, int headerbar_size) + : Gtk::Window() + { + init_headerbar(headerbar_size); // setup gtk layer shell init(width, height, anchor); } diff --git a/src/wayland-window.hpp b/src/wayland-window.hpp index 821560d..9ee20ca 100644 --- a/src/wayland-window.hpp +++ b/src/wayland-window.hpp @@ -30,17 +30,20 @@ namespace wf zwf_surface_v2 *wf_surface = nullptr; Gtk::Widget* current_widget = nullptr; - Glib::RefPtr headerbar_drag; - Gtk::EventBox drag_box; Gtk::Button close_button; + Gtk::Button top_button; + Gtk::Button bottom_button; + + Gtk::HBox headerbar_box; Gtk::VBox layout_box; int32_t check_anchor(std::string anchor); void init(int width, int height, std::string anchor); + void init_headerbar(int headerbar_size); public: - WaylandWindow(int width, int height, std::string anchor); + WaylandWindow(int width, int height, std::string anchor, int headerbar_size); void set_widget(Gtk::Widget& w); }; }