feat!: drop RawSurfaceImpl with direct use of wlr-layer-shell
BREAKING CHANGE: gtk-layer-shell is now required and unconditionally used. The corresponding config option is removed. As a part of preparation for future versions of GTK, remove an ability to use wlr-layer-shell directly. The APIs it required were dropped in GTK4, and with the menus/tooltips positioning issue being practically unsolvable it doesn't make sense to keep maintaining the code.
This commit is contained in:
Aleksei Bavshin
parent
4f5dd53571
commit
9a21884272
|
|
@ -10,7 +10,6 @@
|
||||||
#include "util/css_reload_helper.hpp"
|
#include "util/css_reload_helper.hpp"
|
||||||
#include "util/portal.hpp"
|
#include "util/portal.hpp"
|
||||||
|
|
||||||
struct zwlr_layer_shell_v1;
|
|
||||||
struct zwp_idle_inhibitor_v1;
|
struct zwp_idle_inhibitor_v1;
|
||||||
struct zwp_idle_inhibit_manager_v1;
|
struct zwp_idle_inhibit_manager_v1;
|
||||||
|
|
||||||
|
|
@ -26,7 +25,6 @@ class Client {
|
||||||
Glib::RefPtr<Gdk::Display> gdk_display;
|
Glib::RefPtr<Gdk::Display> gdk_display;
|
||||||
struct wl_display *wl_display = nullptr;
|
struct wl_display *wl_display = nullptr;
|
||||||
struct wl_registry *registry = nullptr;
|
struct wl_registry *registry = nullptr;
|
||||||
struct zwlr_layer_shell_v1 *layer_shell = nullptr;
|
|
||||||
struct zxdg_output_manager_v1 *xdg_output_manager = nullptr;
|
struct zxdg_output_manager_v1 *xdg_output_manager = nullptr;
|
||||||
struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
|
struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
|
||||||
std::vector<std::unique_ptr<Bar>> bars;
|
std::vector<std::unique_ptr<Bar>> bars;
|
||||||
|
|
|
||||||
|
|
@ -108,12 +108,6 @@ Also, a minimal example configuration can be found at the bottom of this man pag
|
||||||
Option to pass any pointer events to the window under the bar.
|
Option to pass any pointer events to the window under the bar.
|
||||||
Intended to be used with either *top* or *overlay* layers and without exclusive zone.
|
Intended to be used with either *top* or *overlay* layers and without exclusive zone.
|
||||||
|
|
||||||
*gtk-layer-shell* ++
|
|
||||||
typeof: bool ++
|
|
||||||
default: true ++
|
|
||||||
Option to disable the use of gtk-layer-shell for popups.
|
|
||||||
Only functional if compiled with gtk-layer-shell support.
|
|
||||||
|
|
||||||
*ipc* ++
|
*ipc* ++
|
||||||
typeof: bool ++
|
typeof: bool ++
|
||||||
default: false ++
|
default: false ++
|
||||||
|
|
|
||||||
|
|
@ -120,8 +120,7 @@ if libsndio.found()
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
gtk_layer_shell = dependency('gtk-layer-shell-0',
|
gtk_layer_shell = dependency('gtk-layer-shell-0', version: ['>=0.5.0'],
|
||||||
required: get_option('gtk-layer-shell'),
|
|
||||||
default_options: ['introspection=false', 'vapi=false'],
|
default_options: ['introspection=false', 'vapi=false'],
|
||||||
fallback: ['gtk-layer-shell', 'gtk_layer_shell'])
|
fallback: ['gtk-layer-shell', 'gtk_layer_shell'])
|
||||||
systemd = dependency('systemd', required: get_option('systemd'))
|
systemd = dependency('systemd', required: get_option('systemd'))
|
||||||
|
|
@ -354,10 +353,6 @@ if libmpdclient.found()
|
||||||
src_files += 'src/modules/mpd/state.cpp'
|
src_files += 'src/modules/mpd/state.cpp'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if gtk_layer_shell.found()
|
|
||||||
add_project_arguments('-DHAVE_GTK_LAYER_SHELL', language: 'cpp')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if libsndio.found()
|
if libsndio.found()
|
||||||
add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp')
|
add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp')
|
||||||
src_files += 'src/modules/sndio.cpp'
|
src_files += 'src/modules/sndio.cpp'
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ option('systemd', type: 'feature', value: 'auto', description: 'Install systemd
|
||||||
option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray')
|
option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray')
|
||||||
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
|
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
|
||||||
option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon')
|
option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon')
|
||||||
option('gtk-layer-shell', type: 'feature', value: 'auto', description: 'Use gtk-layer-shell library for popups support')
|
|
||||||
option('rfkill', type: 'feature', value: 'auto', description: 'Enable support for RFKILL')
|
option('rfkill', type: 'feature', value: 'auto', description: 'Enable support for RFKILL')
|
||||||
option('sndio', type: 'feature', value: 'auto', description: 'Enable support for sndio')
|
option('sndio', type: 'feature', value: 'auto', description: 'Enable support for sndio')
|
||||||
option('logind', type: 'feature', value: 'auto', description: 'Enable support for logind')
|
option('logind', type: 'feature', value: 'auto', description: 'Enable support for logind')
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ client_protocols = [
|
||||||
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
|
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
|
||||||
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
|
||||||
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
||||||
['wlr-layer-shell-unstable-v1.xml'],
|
|
||||||
['wlr-foreign-toplevel-management-unstable-v1.xml'],
|
['wlr-foreign-toplevel-management-unstable-v1.xml'],
|
||||||
['ext-workspace-unstable-v1.xml'],
|
['ext-workspace-unstable-v1.xml'],
|
||||||
['river-status-unstable-v1.xml'],
|
['river-status-unstable-v1.xml'],
|
||||||
|
|
|
||||||
|
|
@ -1,311 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<protocol name="wlr_layer_shell_unstable_v1">
|
|
||||||
<copyright>
|
|
||||||
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.
|
|
||||||
</copyright>
|
|
||||||
|
|
||||||
<interface name="zwlr_layer_shell_v1" version="3">
|
|
||||||
<description summary="create surfaces that are layers of the desktop">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<request name="get_layer_surface">
|
|
||||||
<description summary="create a layer_surface from a surface">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="id" type="new_id" interface="zwlr_layer_surface_v1"/>
|
|
||||||
<arg name="surface" type="object" interface="wl_surface"/>
|
|
||||||
<arg name="output" type="object" interface="wl_output" allow-null="true"/>
|
|
||||||
<arg name="layer" type="uint" enum="layer" summary="layer to add this surface to"/>
|
|
||||||
<arg name="np" type="string" summary="namespace for the layer surface"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<enum name="error">
|
|
||||||
<entry name="role" value="0" summary="wl_surface has another role"/>
|
|
||||||
<entry name="invalid_layer" value="1" summary="layer value is invalid"/>
|
|
||||||
<entry name="already_constructed" value="2" summary="wl_surface has a buffer attached or committed"/>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<enum name="layer">
|
|
||||||
<description summary="available layers for surfaces">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<entry name="background" value="0"/>
|
|
||||||
<entry name="bottom" value="1"/>
|
|
||||||
<entry name="top" value="2"/>
|
|
||||||
<entry name="overlay" value="3"/>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<!-- Version 3 additions -->
|
|
||||||
|
|
||||||
<request name="destroy" type="destructor" since="3">
|
|
||||||
<description summary="destroy the layer_shell object">
|
|
||||||
This request indicates that the client will not use the layer_shell
|
|
||||||
object any more. Objects that have been created through this instance
|
|
||||||
are not affected.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
</interface>
|
|
||||||
|
|
||||||
<interface name="zwlr_layer_surface_v1" version="3">
|
|
||||||
<description summary="layer metadata interface">
|
|
||||||
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 (layer, 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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<request name="set_size">
|
|
||||||
<description summary="sets the size of the surface">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="width" type="uint"/>
|
|
||||||
<arg name="height" type="uint"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="set_anchor">
|
|
||||||
<description summary="configures the anchor point of the surface">
|
|
||||||
Requests that the compositor anchor the surface to the specified edges
|
|
||||||
and corners. If two orthogonal 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.
|
|
||||||
</description>
|
|
||||||
<arg name="anchor" type="uint" enum="anchor"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="set_exclusive_zone">
|
|
||||||
<description summary="configures the exclusive geometry of this surface">
|
|
||||||
Requests that the compositor avoids occluding an area 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 one
|
|
||||||
edge or an edge and both perpendicular edges. If the surface is not
|
|
||||||
anchored, anchored to only two perpendicular edges (a corner), anchored
|
|
||||||
to only two parallel edges or anchored to all edges, a positive value
|
|
||||||
will be treated the same as zero.
|
|
||||||
|
|
||||||
A positive zone is the distance from the edge in surface-local
|
|
||||||
coordinates to consider 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 exclusive zone. If set to -1, the surface
|
|
||||||
indicates that it would not like to be moved to accommodate 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.
|
|
||||||
</description>
|
|
||||||
<arg name="zone" type="int"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="set_margin">
|
|
||||||
<description summary="sets a margin from the anchor point">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="top" type="int"/>
|
|
||||||
<arg name="right" type="int"/>
|
|
||||||
<arg name="bottom" type="int"/>
|
|
||||||
<arg name="left" type="int"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="set_keyboard_interactivity">
|
|
||||||
<description summary="requests keyboard events">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="keyboard_interactivity" type="uint"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="get_popup">
|
|
||||||
<description summary="assign this layer_surface as an xdg_popup parent">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="popup" type="object" interface="xdg_popup"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="ack_configure">
|
|
||||||
<description summary="ack a configure event">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="serial" type="uint" summary="the serial from the configure event"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="destroy" type="destructor">
|
|
||||||
<description summary="destroy the layer_surface">
|
|
||||||
This request destroys the layer surface.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<event name="configure">
|
|
||||||
<description summary="suggest a surface change">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="serial" type="uint"/>
|
|
||||||
<arg name="width" type="uint"/>
|
|
||||||
<arg name="height" type="uint"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="closed">
|
|
||||||
<description summary="surface should be closed">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<enum name="error">
|
|
||||||
<entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
|
|
||||||
<entry name="invalid_size" value="1" summary="size is invalid"/>
|
|
||||||
<entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<enum name="anchor" bitfield="true">
|
|
||||||
<entry name="top" value="1" summary="the top edge of the anchor rectangle"/>
|
|
||||||
<entry name="bottom" value="2" summary="the bottom edge of the anchor rectangle"/>
|
|
||||||
<entry name="left" value="4" summary="the left edge of the anchor rectangle"/>
|
|
||||||
<entry name="right" value="8" summary="the right edge of the anchor rectangle"/>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<!-- Version 2 additions -->
|
|
||||||
|
|
||||||
<request name="set_layer" since="2">
|
|
||||||
<description summary="change the layer of the surface">
|
|
||||||
Change the layer that the surface is rendered on.
|
|
||||||
|
|
||||||
Layer is double-buffered, see wl_surface.commit.
|
|
||||||
</description>
|
|
||||||
<arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>
|
|
||||||
</request>
|
|
||||||
</interface>
|
|
||||||
</protocol>
|
|
||||||
276
src/bar.cpp
276
src/bar.cpp
|
|
@ -1,16 +1,13 @@
|
||||||
#ifdef HAVE_GTK_LAYER_SHELL
|
#include "bar.hpp"
|
||||||
#include <gtk-layer-shell.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
#include <gtk-layer-shell.h>
|
||||||
#include <spdlog/spdlog.h>
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
#include "bar.hpp"
|
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
#include "factory.hpp"
|
#include "factory.hpp"
|
||||||
#include "group.hpp"
|
#include "group.hpp"
|
||||||
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_SWAY
|
#ifdef HAVE_SWAY
|
||||||
#include "modules/sway/bar.hpp"
|
#include "modules/sway/bar.hpp"
|
||||||
|
|
@ -25,9 +22,6 @@ static constexpr const char* MIN_WIDTH_MSG =
|
||||||
|
|
||||||
static constexpr const char* BAR_SIZE_MSG = "Bar configured (width: {}, height: {}) for output: {}";
|
static constexpr const char* BAR_SIZE_MSG = "Bar configured (width: {}, height: {}) for output: {}";
|
||||||
|
|
||||||
static constexpr const char* SIZE_DEFINED =
|
|
||||||
"{} size is defined in the config file so it will stay like that";
|
|
||||||
|
|
||||||
const Bar::bar_mode_map Bar::PRESET_MODES = { //
|
const Bar::bar_mode_map Bar::PRESET_MODES = { //
|
||||||
{"default",
|
{"default",
|
||||||
{// Special mode to hold the global bar configuration
|
{// Special mode to hold the global bar configuration
|
||||||
|
|
@ -132,7 +126,6 @@ void from_json(const Json::Value& j, std::map<Key, Value>& m) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_GTK_LAYER_SHELL
|
|
||||||
struct GLSSurfaceImpl : public BarSurface, public sigc::trackable {
|
struct GLSSurfaceImpl : public BarSurface, public sigc::trackable {
|
||||||
GLSSurfaceImpl(Gtk::Window& window, struct waybar_output& output) : window_{window} {
|
GLSSurfaceImpl(Gtk::Window& window, struct waybar_output& output) : window_{window} {
|
||||||
output_name_ = output.name;
|
output_name_ = output.name;
|
||||||
|
|
@ -260,260 +253,6 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable {
|
||||||
spdlog::info(BAR_SIZE_MSG, width_, height_, output_name_);
|
spdlog::info(BAR_SIZE_MSG, width_, height_, output_name_);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
struct RawSurfaceImpl : public BarSurface, public sigc::trackable {
|
|
||||||
RawSurfaceImpl(Gtk::Window& window, struct waybar_output& output) : window_{window} {
|
|
||||||
output_ = gdk_wayland_monitor_get_wl_output(output.monitor->gobj());
|
|
||||||
output_name_ = output.name;
|
|
||||||
|
|
||||||
window.signal_realize().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::onRealize));
|
|
||||||
window.signal_map_event().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::onMap));
|
|
||||||
window.signal_configure_event().connect_notify(
|
|
||||||
sigc::mem_fun(*this, &RawSurfaceImpl::onConfigure));
|
|
||||||
|
|
||||||
if (window.get_realized()) {
|
|
||||||
onRealize();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setExclusiveZone(bool enable) override {
|
|
||||||
exclusive_zone_ = enable;
|
|
||||||
if (layer_surface_) {
|
|
||||||
auto zone = 0;
|
|
||||||
if (enable) {
|
|
||||||
// exclusive zone already includes margin for anchored edge,
|
|
||||||
// only opposite margin should be added
|
|
||||||
if ((anchor_ & VERTICAL_ANCHOR) == VERTICAL_ANCHOR) {
|
|
||||||
zone += width_;
|
|
||||||
zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? margins_.right : margins_.left;
|
|
||||||
} else {
|
|
||||||
zone += height_;
|
|
||||||
zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? margins_.bottom : margins_.top;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
spdlog::debug("Set exclusive zone {} for output {}", zone, output_name_);
|
|
||||||
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_.get(), zone);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setLayer(bar_layer layer) override {
|
|
||||||
layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
|
|
||||||
if (layer == bar_layer::TOP) {
|
|
||||||
layer_ = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
|
|
||||||
} else if (layer == bar_layer::OVERLAY) {
|
|
||||||
layer_ = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY;
|
|
||||||
}
|
|
||||||
// updating already mapped window
|
|
||||||
if (layer_surface_) {
|
|
||||||
if (zwlr_layer_surface_v1_get_version(layer_surface_.get()) >=
|
|
||||||
ZWLR_LAYER_SURFACE_V1_SET_LAYER_SINCE_VERSION) {
|
|
||||||
zwlr_layer_surface_v1_set_layer(layer_surface_.get(), layer_);
|
|
||||||
} else {
|
|
||||||
spdlog::warn("Unable to change layer: layer-shell implementation is too old");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setMargins(const struct bar_margins& margins) override {
|
|
||||||
margins_ = margins;
|
|
||||||
// updating already mapped window
|
|
||||||
if (layer_surface_) {
|
|
||||||
zwlr_layer_surface_v1_set_margin(layer_surface_.get(), margins_.top, margins_.right,
|
|
||||||
margins_.bottom, margins_.left);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setPassThrough(bool enable) override {
|
|
||||||
passthrough_ = enable;
|
|
||||||
/* GTK overwrites any region changes applied directly to the wl_surface,
|
|
||||||
* thus the same GTK region API as in the GLS impl has to be used. */
|
|
||||||
auto gdk_window = window_.get_window();
|
|
||||||
if (gdk_window) {
|
|
||||||
Cairo::RefPtr<Cairo::Region> region;
|
|
||||||
if (enable) {
|
|
||||||
region = Cairo::Region::create();
|
|
||||||
}
|
|
||||||
gdk_window->input_shape_combine_region(region, 0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setPosition(Gtk::PositionType position) override {
|
|
||||||
switch (position) {
|
|
||||||
case Gtk::POS_LEFT:
|
|
||||||
anchor_ = VERTICAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
|
|
||||||
break;
|
|
||||||
case Gtk::POS_RIGHT:
|
|
||||||
anchor_ = VERTICAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
|
||||||
break;
|
|
||||||
case Gtk::POS_TOP:
|
|
||||||
anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
|
|
||||||
break;
|
|
||||||
case Gtk::POS_BOTTOM:
|
|
||||||
anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
|
|
||||||
// updating already mapped window
|
|
||||||
if (layer_surface_) {
|
|
||||||
zwlr_layer_surface_v1_set_anchor(layer_surface_.get(), anchor_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setSize(uint32_t width, uint32_t height) override {
|
|
||||||
configured_width_ = width_ = width;
|
|
||||||
configured_height_ = height_ = height;
|
|
||||||
// layer_shell.configure handler should update exclusive zone if size changes
|
|
||||||
window_.set_size_request(width, height);
|
|
||||||
};
|
|
||||||
|
|
||||||
void commit() override {
|
|
||||||
if (surface_) {
|
|
||||||
wl_surface_commit(surface_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
constexpr static uint8_t VERTICAL_ANCHOR =
|
|
||||||
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
|
||||||
constexpr static uint8_t HORIZONTAL_ANCHOR =
|
|
||||||
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
|
||||||
|
|
||||||
template <auto fn>
|
|
||||||
using deleter_fn = std::integral_constant<decltype(fn), fn>;
|
|
||||||
using layer_surface_ptr =
|
|
||||||
std::unique_ptr<zwlr_layer_surface_v1, deleter_fn<zwlr_layer_surface_v1_destroy>>;
|
|
||||||
|
|
||||||
Gtk::Window& window_;
|
|
||||||
std::string output_name_;
|
|
||||||
uint32_t configured_width_ = 0;
|
|
||||||
uint32_t configured_height_ = 0;
|
|
||||||
uint32_t width_ = 0;
|
|
||||||
uint32_t height_ = 0;
|
|
||||||
uint8_t anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
|
|
||||||
bool exclusive_zone_ = true;
|
|
||||||
bool passthrough_ = false;
|
|
||||||
struct bar_margins margins_;
|
|
||||||
|
|
||||||
zwlr_layer_shell_v1_layer layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
|
|
||||||
struct wl_output* output_ = nullptr; // owned by GTK
|
|
||||||
struct wl_surface* surface_ = nullptr; // owned by GTK
|
|
||||||
layer_surface_ptr layer_surface_;
|
|
||||||
|
|
||||||
void onRealize() {
|
|
||||||
auto gdk_window = window_.get_window()->gobj();
|
|
||||||
gdk_wayland_window_set_use_custom_surface(gdk_window);
|
|
||||||
}
|
|
||||||
|
|
||||||
void onMap(GdkEventAny* ev) {
|
|
||||||
static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
|
|
||||||
.configure = onSurfaceConfigure,
|
|
||||||
.closed = onSurfaceClosed,
|
|
||||||
};
|
|
||||||
auto client = Client::inst();
|
|
||||||
auto gdk_window = window_.get_window()->gobj();
|
|
||||||
surface_ = gdk_wayland_window_get_wl_surface(gdk_window);
|
|
||||||
|
|
||||||
layer_surface_.reset(zwlr_layer_shell_v1_get_layer_surface(client->layer_shell, surface_,
|
|
||||||
output_, layer_, "waybar"));
|
|
||||||
|
|
||||||
zwlr_layer_surface_v1_add_listener(layer_surface_.get(), &layer_surface_listener, this);
|
|
||||||
zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_.get(), false);
|
|
||||||
zwlr_layer_surface_v1_set_anchor(layer_surface_.get(), anchor_);
|
|
||||||
zwlr_layer_surface_v1_set_margin(layer_surface_.get(), margins_.top, margins_.right,
|
|
||||||
margins_.bottom, margins_.left);
|
|
||||||
|
|
||||||
setSurfaceSize(width_, height_);
|
|
||||||
setExclusiveZone(exclusive_zone_);
|
|
||||||
setPassThrough(passthrough_);
|
|
||||||
|
|
||||||
commit();
|
|
||||||
wl_display_roundtrip(client->wl_display);
|
|
||||||
}
|
|
||||||
|
|
||||||
void onConfigure(GdkEventConfigure* ev) {
|
|
||||||
/*
|
|
||||||
* GTK wants new size for the window.
|
|
||||||
*
|
|
||||||
* Prefer configured size if it's non-default.
|
|
||||||
* If the size is not set and the window is smaller than requested by GTK, request resize from
|
|
||||||
* layer surface.
|
|
||||||
*/
|
|
||||||
auto tmp_height = height_;
|
|
||||||
auto tmp_width = width_;
|
|
||||||
if (ev->height > static_cast<int>(height_)) {
|
|
||||||
// Default minimal value
|
|
||||||
if (height_ > 1) {
|
|
||||||
spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height);
|
|
||||||
}
|
|
||||||
if (configured_height_ > 1) {
|
|
||||||
spdlog::info(SIZE_DEFINED, "Height");
|
|
||||||
} else {
|
|
||||||
tmp_height = ev->height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ev->width > static_cast<int>(width_)) {
|
|
||||||
// Default minimal value
|
|
||||||
if (width_ > 1) {
|
|
||||||
spdlog::warn(MIN_WIDTH_MSG, width_, ev->width);
|
|
||||||
}
|
|
||||||
if (configured_width_ > 1) {
|
|
||||||
spdlog::info(SIZE_DEFINED, "Width");
|
|
||||||
} else {
|
|
||||||
tmp_width = ev->width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (tmp_width != width_ || tmp_height != height_) {
|
|
||||||
setSurfaceSize(tmp_width, tmp_height);
|
|
||||||
commit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setSurfaceSize(uint32_t width, uint32_t height) {
|
|
||||||
/* If the client is anchored to two opposite edges, layer_surface.configure will return
|
|
||||||
* size without margins for the axis.
|
|
||||||
* layer_surface.set_size, however, expects size with margins for the anchored axis.
|
|
||||||
* This is not specified by wlr-layer-shell and based on actual behavior of sway.
|
|
||||||
*
|
|
||||||
* If the size for unanchored axis is not set (0), change request to 1 to avoid automatic
|
|
||||||
* assignment by the compositor.
|
|
||||||
*/
|
|
||||||
if ((anchor_ & VERTICAL_ANCHOR) == VERTICAL_ANCHOR) {
|
|
||||||
width = width > 0 ? width : 1;
|
|
||||||
if (height > 1) {
|
|
||||||
height += margins_.top + margins_.bottom;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
height = height > 0 ? height : 1;
|
|
||||||
if (width > 1) {
|
|
||||||
width += margins_.right + margins_.left;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
spdlog::debug("Set surface size {}x{} for output {}", width, height, output_name_);
|
|
||||||
zwlr_layer_surface_v1_set_size(layer_surface_.get(), width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void onSurfaceConfigure(void* data, struct zwlr_layer_surface_v1* surface, uint32_t serial,
|
|
||||||
uint32_t width, uint32_t height) {
|
|
||||||
auto o = static_cast<RawSurfaceImpl*>(data);
|
|
||||||
if (width != o->width_ || height != o->height_) {
|
|
||||||
o->width_ = width;
|
|
||||||
o->height_ = height;
|
|
||||||
o->window_.set_size_request(o->width_, o->height_);
|
|
||||||
o->window_.resize(o->width_, o->height_);
|
|
||||||
o->setExclusiveZone(o->exclusive_zone_);
|
|
||||||
spdlog::info(BAR_SIZE_MSG, o->width_ == 1 ? "auto" : std::to_string(o->width_),
|
|
||||||
o->height_ == 1 ? "auto" : std::to_string(o->height_), o->output_name_);
|
|
||||||
o->commit();
|
|
||||||
}
|
|
||||||
zwlr_layer_surface_v1_ack_configure(surface, serial);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void onSurfaceClosed(void* data, struct zwlr_layer_surface_v1* /* surface */) {
|
|
||||||
auto o = static_cast<RawSurfaceImpl*>(data);
|
|
||||||
o->layer_surface_.reset();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
}; // namespace waybar
|
}; // namespace waybar
|
||||||
|
|
||||||
|
|
@ -609,16 +348,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
|
||||||
output->monitor->property_geometry().signal_changed().connect(
|
output->monitor->property_geometry().signal_changed().connect(
|
||||||
sigc::mem_fun(*this, &Bar::onOutputGeometryChanged));
|
sigc::mem_fun(*this, &Bar::onOutputGeometryChanged));
|
||||||
|
|
||||||
#ifdef HAVE_GTK_LAYER_SHELL
|
surface_impl_ = std::make_unique<GLSSurfaceImpl>(window, *output);
|
||||||
bool use_gls = config["gtk-layer-shell"].isBool() ? config["gtk-layer-shell"].asBool() : true;
|
|
||||||
if (use_gls) {
|
|
||||||
surface_impl_ = std::make_unique<GLSSurfaceImpl>(window, *output);
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
surface_impl_ = std::make_unique<RawSurfaceImpl>(window, *output);
|
|
||||||
}
|
|
||||||
|
|
||||||
surface_impl_->setMargins(margins_);
|
surface_impl_->setMargins(margins_);
|
||||||
surface_impl_->setSize(width, height);
|
surface_impl_->setSize(width, height);
|
||||||
// Position needs to be set after calculating the height due to the
|
// Position needs to be set after calculating the height due to the
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
|
|
||||||
|
#include <gtk-layer-shell.h>
|
||||||
#include <spdlog/spdlog.h>
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
@ -8,7 +9,6 @@
|
||||||
#include "idle-inhibit-unstable-v1-client-protocol.h"
|
#include "idle-inhibit-unstable-v1-client-protocol.h"
|
||||||
#include "util/clara.hpp"
|
#include "util/clara.hpp"
|
||||||
#include "util/format.hpp"
|
#include "util/format.hpp"
|
||||||
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
|
|
||||||
|
|
||||||
waybar::Client *waybar::Client::inst() {
|
waybar::Client *waybar::Client::inst() {
|
||||||
static auto c = new Client();
|
static auto c = new Client();
|
||||||
|
|
@ -18,13 +18,8 @@ waybar::Client *waybar::Client::inst() {
|
||||||
void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
|
void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
|
||||||
const char *interface, uint32_t version) {
|
const char *interface, uint32_t version) {
|
||||||
auto client = static_cast<Client *>(data);
|
auto client = static_cast<Client *>(data);
|
||||||
if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
|
if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 &&
|
||||||
// limit version to a highest supported by the client protocol file
|
version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
|
||||||
version = std::min<uint32_t>(version, zwlr_layer_shell_v1_interface.version);
|
|
||||||
client->layer_shell = static_cast<struct zwlr_layer_shell_v1 *>(
|
|
||||||
wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, version));
|
|
||||||
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 &&
|
|
||||||
version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
|
|
||||||
client->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(wl_registry_bind(
|
client->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(wl_registry_bind(
|
||||||
registry, name, &zxdg_output_manager_v1_interface, ZXDG_OUTPUT_V1_NAME_SINCE_VERSION));
|
registry, name, &zxdg_output_manager_v1_interface, ZXDG_OUTPUT_V1_NAME_SINCE_VERSION));
|
||||||
} else if (strcmp(interface, zwp_idle_inhibit_manager_v1_interface.name) == 0) {
|
} else if (strcmp(interface, zwp_idle_inhibit_manager_v1_interface.name) == 0) {
|
||||||
|
|
@ -200,7 +195,12 @@ void waybar::Client::bindInterfaces() {
|
||||||
};
|
};
|
||||||
wl_registry_add_listener(registry, ®istry_listener, this);
|
wl_registry_add_listener(registry, ®istry_listener, this);
|
||||||
wl_display_roundtrip(wl_display);
|
wl_display_roundtrip(wl_display);
|
||||||
if (layer_shell == nullptr || xdg_output_manager == nullptr) {
|
|
||||||
|
if (!gtk_layer_is_supported()) {
|
||||||
|
throw std::runtime_error("The Wayland compositor does not support wlr-layer-shell protocol");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (xdg_output_manager == nullptr) {
|
||||||
throw std::runtime_error("Failed to acquire required resources.");
|
throw std::runtime_error("Failed to acquire required resources.");
|
||||||
}
|
}
|
||||||
// add existing outputs and subscribe to updates
|
// add existing outputs and subscribe to updates
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue