diff --git a/meson.build b/meson.build index 3efced1..0d63a62 100644 --- a/meson.build +++ b/meson.build @@ -16,6 +16,7 @@ project( gtkmm = dependency('gtkmm-3.0') wayland_client = dependency('wayland-client') wayland_protos = dependency('wayland-protocols') +gtkls = dependency('gtk-layer-shell-0') add_project_link_arguments(['-rdynamic'], language:'cpp') add_project_arguments(['-Wno-unused-parameter'], language: 'cpp') diff --git a/proto/meson.build b/proto/meson.build index f3556a1..eb07910 100644 --- a/proto/meson.build +++ b/proto/meson.build @@ -15,9 +15,7 @@ wayland_scanner_client = generator( ) client_protocols = [ - [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], - ['wayfire-shell.xml'], - ['wlr-layer-shell-unstable-v1.xml'], + ['wayfire-shell-unstable-v2.xml'], ['virtual-keyboard-unstable-v1.xml'] ] diff --git a/proto/wayfire-shell.xml b/proto/wayfire-shell.xml deleted file mode 100644 index 8abb7e6..0000000 --- a/proto/wayfire-shell.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - IMPORTANT: most of wayfire-shell is going to be deprecated. Try to - use layer-shell instead. - - The purpose of this protocol is to enable the creation of different - desktop-interface windows like panels, backgrounds, docks, - lockscreens, etc. It also aims to allow the creation of full-blown - DEs using Wayfire. - - Note that in contrast to some other efforts to create a similar - protocol, such as wlr-layer-shell, this isn't a new "shell" for - giving a role to wl_surfaces. This protocol can be used with any - type of toplevel surface (xdg_toplevel, xdg_toplevel_v6, etc.) - to give them to the corresponding WM role. - - - - - - - - - - - Assign the given role to the given surface and add it to the - given output. A client can specify a null output, in which case - the compositor will assign the surface to the focused output, - if any such output. - - The role cannot be changed later, and neither can the surface be - moved to a different output, except by the compositor. - - - - - - - - - - - - Represents a single output. - Each output is managed independently from the others. - - - - Panels are always rendered on top, even above fullscreen windows. - If autohide is 1, the event indicates that the panels should hide - itself, by for example unmapping or sliding outside of the output. - If autohide is 0, this means that the reason for the last request - with autohide == 1 is no longer valid, i.e the panels can show - themselves. - - The output_hide_panels can be called multiple times with - autohide = 1, and the panel should show itself only when - it has received a matching number of events with autohide = 0 - - - - - - - - Request the compositor to not render the output, so - the output usually is cleared to black color. - To enable output rendering again, call inhibit_output_done - - - - - - Stop inhibiting the output. This must be called as many times - as inhibit_output was called to actually uninhibit rendering. - - The inhibit/inhibit_done requests can be called multiple times, - even from different apps, so don't assume that a call to - inhibit_done would always mean actually starting the rendering process. - - - - - - - Represents a surface with a specific WM role. - It belongs to the output which it was created for. - - - - - - - - - - - - - - - - - - - - - - - - - - - Sets the position on the screen where the compositor should - position the view. Can be reset by specifying anchor 0. If not - set, the compositor will assume manual positioning via the - configure request. - - If one anchor edge is provided, the wm surface is "stuck" to - that edge. - If two anchor edges are provided, the wm surface is considered - anchored to the corner of the screen between them. - - Any other anchor edge configuration is considered invalid. - - - - - - - Set the offset from the anchored edges to the wm surface. This - is an alternative to the configure request. Using both will - result in undefined results. - - Margin has effect only for edges the wm surface is anchored to. - - - - - - - - - - - - - - - - - Sets how the wm surface will interact with keyboard focus. - Setting no_focus means that the surface will never receive - keyboard focus, click_to_focus means normal focus semantics (i.e - what you expect from "normal" windows), and exclusive focus means - that no other window can get keyboard focus. - - - - - - - Request the compositor to reserve the given amount of pixels - for the wm surface(like STRUTS in X11). This has effect only - if the surface is anchored to a single edge. Margin doesn't - affect exclusive zone in any way. - - - - - diff --git a/proto/wlr-layer-shell-unstable-v1.xml b/proto/wlr-layer-shell-unstable-v1.xml deleted file mode 100644 index fb4f6b2..0000000 --- a/proto/wlr-layer-shell-unstable-v1.xml +++ /dev/null @@ -1,285 +0,0 @@ - - - - Copyright © 2017 Drew DeVault - - Permission to use, copy, modify, distribute, and sell this - software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in - all copies and that both that copyright notice and this permission - notice appear in supporting documentation, and that the name of - the copyright holders not be used in advertising or publicity - pertaining to distribution of the software without specific, - written prior permission. The copyright holders make no - representations about the suitability of this software for any - purpose. It is provided "as is" without express or implied - warranty. - - THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF - THIS SOFTWARE. - - - - - Clients can use this interface to assign the surface_layer role to - wl_surfaces. Such surfaces are assigned to a "layer" of the output and - rendered with a defined z-depth respective to each other. They may also be - anchored to the edges and corners of a screen and specify input handling - semantics. This interface should be suitable for the implementation of - many desktop shell components, and a broad number of other applications - that interact with the desktop. - - - - - Create a layer surface for an existing surface. This assigns the role of - layer_surface, or raises a protocol error if another role is already - assigned. - - Creating a layer surface from a wl_surface which has a buffer attached - or committed is a client error, and any attempts by a client to attach - or manipulate a buffer prior to the first layer_surface.configure call - must also be treated as errors. - - You may pass NULL for output to allow the compositor to decide which - output to use. Generally this will be the one that the user most - recently interacted with. - - Clients can specify a namespace that defines the purpose of the layer - surface. - - - - - - - - - - - - - - - - - These values indicate which layers a surface can be rendered in. They - are ordered by z depth, bottom-most first. Traditional shell surfaces - will typically be rendered between the bottom and top layers. - Fullscreen shell surfaces are typically rendered at the top layer. - Multiple surfaces can share a single layer, and ordering within a - single layer is undefined. - - - - - - - - - - - - An interface that may be implemented by a wl_surface, for surfaces that - are designed to be rendered as a layer of a stacked desktop-like - environment. - - Layer surface state (size, anchor, exclusive zone, margin, interactivity) - is double-buffered, and will be applied at the time wl_surface.commit of - the corresponding wl_surface is called. - - - - - Sets the size of the surface in surface-local coordinates. The - compositor will display the surface centered with respect to its - anchors. - - If you pass 0 for either value, the compositor will assign it and - inform you of the assignment in the configure event. You must set your - anchor to opposite edges in the dimensions you omit; not doing so is a - protocol error. Both values are 0 by default. - - Size is double-buffered, see wl_surface.commit. - - - - - - - - Requests that the compositor anchor the surface to the specified edges - and corners. If two orthoginal edges are specified (e.g. 'top' and - 'left'), then the anchor point will be the intersection of the edges - (e.g. the top left corner of the output); otherwise the anchor point - will be centered on that edge, or in the center if none is specified. - - Anchor is double-buffered, see wl_surface.commit. - - - - - - - Requests that the compositor avoids occluding an area of the surface - with other surfaces. The compositor's use of this information is - implementation-dependent - do not assume that this region will not - actually be occluded. - - A positive value is only meaningful if the surface is anchored to an - edge, rather than a corner. The zone is the number of surface-local - coordinates from the edge that are considered exclusive. - - Surfaces that do not wish to have an exclusive zone may instead specify - how they should interact with surfaces that do. If set to zero, the - surface indicates that it would like to be moved to avoid occluding - surfaces with a positive excluzive zone. If set to -1, the surface - indicates that it would not like to be moved to accomodate for other - surfaces, and the compositor should extend it all the way to the edges - it is anchored to. - - For example, a panel might set its exclusive zone to 10, so that - maximized shell surfaces are not shown on top of it. A notification - might set its exclusive zone to 0, so that it is moved to avoid - occluding the panel, but shell surfaces are shown underneath it. A - wallpaper or lock screen might set their exclusive zone to -1, so that - they stretch below or over the panel. - - The default value is 0. - - Exclusive zone is double-buffered, see wl_surface.commit. - - - - - - - Requests that the surface be placed some distance away from the anchor - point on the output, in surface-local coordinates. Setting this value - for edges you are not anchored to has no effect. - - The exclusive zone includes the margin. - - Margin is double-buffered, see wl_surface.commit. - - - - - - - - - - Set to 1 to request that the seat send keyboard events to this layer - surface. For layers below the shell surface layer, the seat will use - normal focus semantics. For layers above the shell surface layers, the - seat will always give exclusive keyboard focus to the top-most layer - which has keyboard interactivity set to true. - - Layer surfaces receive pointer, touch, and tablet events normally. If - you do not want to receive them, set the input region on your surface - to an empty region. - - Events is double-buffered, see wl_surface.commit. - - - - - - - This assigns an xdg_popup's parent to this layer_surface. This popup - should have been created via xdg_surface::get_popup with the parent set - to NULL, and this request must be invoked before committing the popup's - initial state. - - See the documentation of xdg_popup for more details about what an - xdg_popup is and how it is used. - - - - - - - When a configure event is received, if a client commits the - surface in response to the configure event, then the client - must make an ack_configure request sometime before the commit - request, passing along the serial of the configure event. - - If the client receives multiple configure events before it - can respond to one, it only has to ack the last configure event. - - A client is not required to commit immediately after sending - an ack_configure request - it may even ack_configure several times - before its next surface commit. - - A client may send multiple ack_configure requests before committing, but - only the last request sent before a commit indicates which configure - event the client really is responding to. - - - - - - - This request destroys the layer surface. - - - - - - The configure event asks the client to resize its surface. - - Clients should arrange their surface for the new states, and then send - an ack_configure request with the serial sent in this configure event at - some point before committing the new surface. - - The client is free to dismiss all but the last configure event it - received. - - The width and height arguments specify the size of the window in - surface-local coordinates. - - The size is a hint, in the sense that the client is free to ignore it if - it doesn't resize, pick a smaller size (to satisfy aspect ratio or - resize in steps of NxM pixels). If the client picks a smaller size and - is anchored to two opposite anchors (e.g. 'top' and 'bottom'), the - surface will be centered on this axis. - - If the width or height arguments are zero, it means the client should - decide its own window dimension. - - - - - - - - - The closed event is sent by the compositor when the surface will no - longer be shown. The output may have been destroyed or the user may - have asked for it to be removed. Further changes to the surface will be - ignored. The client should destroy the resource after receiving this - event, and create a new surface if they so choose. - - - - - - - - - - - - - - - - - diff --git a/src/main.cpp b/src/main.cpp index f6139b3..8c1cd9d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,8 +17,6 @@ namespace wf namespace osk { int spacing = 8; - int default_x = 100; - int default_y = 100; int default_width = 800; int default_height = 400; std::string anchor; @@ -125,7 +123,7 @@ namespace wf Keyboard::Keyboard() { window = std::make_unique - (default_x, default_y, default_width, default_height, anchor); + (default_width, default_height, anchor); vk = std::make_unique (); init_layouts(); @@ -181,10 +179,6 @@ int main(int argc, char **argv) bool show_help = false; auto cli = clara::detail::Help(show_help) | - clara::detail::Opt(wf::osk::default_x, "int")["-x"] - ("x position (wf-shell only)") | - clara::detail::Opt(wf::osk::default_y, "int")["-y"] - ("y position (wf-shell only)") | clara::detail::Opt(wf::osk::default_width, "int")["-w"]["--width"] ("keyboard width") | clara::detail::Opt(wf::osk::default_height, "int")["-h"]["--height"] diff --git a/src/meson.build b/src/meson.build index be9209f..ebdbd3f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,3 +1,3 @@ executable('wf-osk', ['main.cpp', 'wayland-window.cpp', 'virtual-keyboard.cpp', 'shared/os-compatibility.c'], - dependencies: [gtkmm, wf_protos], + dependencies: [gtkmm, wf_protos, gtkls], install: true) diff --git a/src/virtual-keyboard.cpp b/src/virtual-keyboard.cpp index 4850f2e..d84fef5 100644 --- a/src/virtual-keyboard.cpp +++ b/src/virtual-keyboard.cpp @@ -7,14 +7,18 @@ #include #include +#include +#include +#include + namespace wf { VirtualKeyboardDevice::VirtualKeyboardDevice() { auto& display = WaylandDisplay::get(); - + auto seat = Gdk::Display::get_default()->get_default_seat(); vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard( - display.vk_manager, display.seat); + display.vk_manager, gdk_wayland_seat_get_wl_seat(seat->gobj())); this->send_keymap(); } diff --git a/src/wayland-window.cpp b/src/wayland-window.cpp index 77527d3..9a4f8aa 100644 --- a/src/wayland-window.cpp +++ b/src/wayland-window.cpp @@ -3,33 +3,21 @@ #include #include #include +#include namespace wf { // listeners - static void registry_add_object(void *data, struct wl_registry *registry, uint32_t name, - const char *interface, uint32_t version) + static void registry_add_object(void *data, struct wl_registry *registry, + uint32_t name, const char *interface, uint32_t version) { auto display = static_cast (data); - if (strcmp(interface, wl_seat_interface.name) == 0 && !display->seat) + if (strcmp(interface, zwf_shell_manager_v2_interface.name) == 0) { - display->seat = (wl_seat*) wl_registry_bind(registry, name, - &wl_seat_interface, std::min(version, 1u)); - } - - if (strcmp(interface, zwf_shell_manager_v1_interface.name) == 0) - { - display->wf_manager = - (zwf_shell_manager_v1*) wl_registry_bind(registry, name, - &zwf_shell_manager_v1_interface, std::min(version, 1u)); - } - - if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) - { - display->layer_shell = - (zwlr_layer_shell_v1*) wl_registry_bind(registry, name, - &zwlr_layer_shell_v1_interface, std::min(version, 1u)); + display->zwf_manager = + (zwf_shell_manager_v2*) wl_registry_bind(registry, name, + &zwf_shell_manager_v2_interface, std::min(version, 1u)); } if (strcmp(interface, zwp_virtual_keyboard_manager_v1_interface.name) == 0) @@ -51,28 +39,6 @@ namespace wf ®istry_remove_object }; - static void layer_shell_handle_configure(void *data, - struct zwlr_layer_surface_v1 *zwlr_layer_surface, uint32_t serial, - uint32_t width, uint32_t height) - { - zwlr_layer_surface_v1_ack_configure(zwlr_layer_surface, serial); - } - - static void layer_shell_handle_close(void *data, - struct zwlr_layer_surface_v1 *surface) - { - zwlr_layer_surface_v1_destroy(surface); - - Gtk::Application *app = (Gtk::Application *) data; - app->quit(); - } - - static struct zwlr_layer_surface_v1_listener layer_surface_listener = - { - &layer_shell_handle_configure, - &layer_shell_handle_close - }; - WaylandDisplay::WaylandDisplay() { auto gdk_display = gdk_display_get_default(); @@ -90,10 +56,10 @@ namespace wf wl_display_dispatch(display); wl_display_roundtrip(display); - if (!vk_manager || !seat || (!wf_manager && !layer_shell)) + if (!vk_manager) { std::cerr << "Compositor doesn't support the virtual-keyboard-v1 " - << "and/or the wayfire-shell protocols, exiting" << std::endl; + << "protocol, exiting" << std::endl; std::exit(-1); } } @@ -104,151 +70,56 @@ namespace wf return instance; } - uint32_t WaylandWindow::check_anchor_for_wayfire_shell(int width, - int height, std::string anchor) + int32_t WaylandWindow::check_anchor(std::string anchor) { - if (anchor.empty()) - { - return 0; - } - std::transform(anchor.begin(), anchor.end(), anchor.begin(), ::tolower); - uint32_t parsed_anchor = 0; + int32_t parsed_anchor = -1; if (anchor.compare("top") == 0) { - parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_TOP; + parsed_anchor = GTK_LAYER_SHELL_EDGE_TOP; } else if (anchor.compare("bottom") == 0) { - parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_BOTTOM; + parsed_anchor = GTK_LAYER_SHELL_EDGE_BOTTOM; } else if (anchor.compare("left") == 0) { - parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_LEFT; + parsed_anchor = GTK_LAYER_SHELL_EDGE_LEFT; } else if (anchor.compare("right") == 0) { - parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_RIGHT; + parsed_anchor = GTK_LAYER_SHELL_EDGE_RIGHT; } return parsed_anchor; } - uint32_t WaylandWindow::check_anchor_for_layer_shell(int width, int height, - std::string anchor) + void WaylandWindow::init(int width, int height, std::string anchor) { - if (anchor.empty()) + gtk_layer_init_for_window(this->gobj()); + gtk_layer_set_layer(this->gobj(), GTK_LAYER_SHELL_LAYER_TOP); + auto layer_anchor = check_anchor(anchor); + if (layer_anchor > -1) { - return 0; + gtk_layer_set_anchor(this->gobj(), + (GtkLayerShellEdge)layer_anchor, true); } - std::transform(anchor.begin(), anchor.end(), anchor.begin(), ::tolower); - - uint32_t parsed_anchor = 0; - if (anchor.compare("top") == 0) - { - parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; - } else if (anchor.compare("bottom") == 0) - { - parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; - } else if (anchor.compare("left") == 0) - { - parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT; - } else if (anchor.compare("right") == 0) - { - parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; - } - - return parsed_anchor; - } - - void WaylandWindow::init_wayfire_shell(WaylandDisplay display, int x, int y, - int width, int height, std::string anchor) - { + this->set_size_request(width, height); this->show_all(); auto gdk_window = this->get_window()->gobj(); auto surface = gdk_wayland_window_get_wl_surface(gdk_window); - if (!surface) + if (surface && WaylandDisplay::get().zwf_manager) { - std::cerr << "Error: created window was not a wayland surface" << std::endl; - std::exit(-1); + this->wf_surface = zwf_shell_manager_v2_get_wf_surface( + WaylandDisplay::get().zwf_manager, surface); } - - wf_surface = zwf_shell_manager_v1_get_wm_surface(display.wf_manager, - surface, ZWF_WM_SURFACE_V1_ROLE_DESKTOP_WIDGET, nullptr); - zwf_wm_surface_v1_set_keyboard_mode(wf_surface, - ZWF_WM_SURFACE_V1_KEYBOARD_FOCUS_MODE_NO_FOCUS); - - uint32_t parsed_anchor = check_anchor_for_wayfire_shell(width, - height, anchor); - zwf_wm_surface_v1_set_anchor(wf_surface, parsed_anchor); - zwf_wm_surface_v1_configure(wf_surface, x, y); - } - void WaylandWindow::init_layer_shell(WaylandDisplay display, int width, - int height, std::string anchor) - { - auto gtk_window = this->gobj(); - auto gtk_widget = GTK_WIDGET(gtk_window); - gtk_widget_realize(gtk_widget); - - auto gdk_window = this->get_window()->gobj(); - gdk_wayland_window_set_use_custom_surface(gdk_window); - auto surface = gdk_wayland_window_get_wl_surface(gdk_window); - - if (!surface) - { - std::cerr << "Error: created window was not a wayland surface" << std::endl; - std::exit(-1); - } - - uint32_t layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP; - layer_surface = zwlr_layer_shell_v1_get_layer_surface( - display.layer_shell, surface, NULL, layer, "wf-osk"); - if (!layer_surface) - { - std::cerr << "Error: could not create layer surface" << std::endl; - std::exit(-1); - } - - Gtk::Application *data = this->get_application().get(); - zwlr_layer_surface_v1_add_listener(layer_surface, - &layer_surface_listener, data); - zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, 0); - zwlr_layer_surface_v1_set_size(layer_surface, width, height); - - uint32_t parsed_anchor = check_anchor_for_layer_shell(width, - height, anchor); - zwlr_layer_surface_v1_set_anchor(layer_surface, parsed_anchor); - - wl_surface_commit(surface); - auto gdk_display = gdk_display_get_default(); - auto wl_display = gdk_wayland_display_get_wl_display(gdk_display); - wl_display_roundtrip(wl_display); - - this->show_all(); - } - - WaylandWindow::WaylandWindow(int x, int y, int width, int height, - std::string anchor) + WaylandWindow::WaylandWindow(int width, int height, std::string anchor) : Gtk::Window() { - auto display = WaylandDisplay::get(); - /* Trick: first show the window, get frame size, then subtract it again */ - this->set_size_request(width, height); - this->set_default_size(width, height); this->set_type_hint(Gdk::WINDOW_TYPE_HINT_DOCK); - - if (display.wf_manager) - { - init_wayfire_shell(display, x, y, width, height, anchor); - } else if (display.layer_shell) - { - init_layer_shell(display, width, height, anchor); - } else { - std::cerr << "Error: cannot find any supported shell protocol" << std::endl; - std::exit(-1); - } + init(width, height, anchor); } } diff --git a/src/wayland-window.hpp b/src/wayland-window.hpp index 1dbda69..6720dcb 100644 --- a/src/wayland-window.hpp +++ b/src/wayland-window.hpp @@ -1,8 +1,7 @@ #pragma once #include -#include -#include +#include #include namespace wf @@ -14,28 +13,18 @@ namespace wf public: static WaylandDisplay& get(); - wl_seat *seat = nullptr; - zwf_shell_manager_v1 *wf_manager = nullptr; - zwlr_layer_shell_v1 *layer_shell = nullptr; + zwf_shell_manager_v2 *zwf_manager = nullptr; zwp_virtual_keyboard_manager_v1 *vk_manager = nullptr; }; class WaylandWindow : public Gtk::Window { - zwf_wm_surface_v1 *wf_surface; - zwlr_layer_surface_v1 *layer_surface; + zwf_surface_v2 *wf_surface; - uint32_t check_anchor_for_wayfire_shell(int width, int height, - std::string anchor); - uint32_t check_anchor_for_layer_shell(int width, int height, - std::string anchor); - - void init_wayfire_shell(WaylandDisplay display, int x, int y, - int width, int height, std::string anchor); - void init_layer_shell(WaylandDisplay display, int width, int height, - std::string anchor); + int32_t check_anchor(std::string anchor); + void init(int width, int height, std::string anchor); public: - WaylandWindow(int x, int y, int width, int height, std::string anchor); + WaylandWindow(int width, int height, std::string anchor); }; }