hyprwm/hyprpaper
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprpaper.git synced 2025-12-20 04:30:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

ipc: implement hyprtavern

Browse source
This commit is contained in:
Vaxry 2025-12-11 18:31:54 +00:00
parent 07eb33e65d
commit 9dcadcb0ea
Signed by: vaxry
GPG key ID: 665806380871D640
5 changed files with 249 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
CMakeLists.txt
View file

@ -57,7 +57,6 @@ pkg_check_modules(
IMPORTED_TARGET
hyprlang>=0.6.0
hyprutils>=0.2.4
wayland-client
hyprtoolkit>=0.4.1
hyprwire
pixman-1
@ -67,51 +66,11 @@ file(GLOB_RECURSE SRCFILES "src/*.cpp")
add_executable(hyprpaper ${SRCFILES})
# Wayland
pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir)
message(
STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}")
function(protocolnew protoPath protoName external)
if(external)
set(path ${CMAKE_SOURCE_DIR}/${protoPath})
else()
set(path ${WAYLAND_PROTOCOLS_DIR}/${protoPath})
endif()
add_custom_command(
OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}.cpp
${CMAKE_SOURCE_DIR}/protocols/${protoName}.hpp
COMMAND hyprwayland-scanner --client ${path}/${protoName}.xml
${CMAKE_SOURCE_DIR}/protocols/
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
target_sources(hyprpaper PRIVATE protocols/${protoName}.cpp
protocols/${protoName}.hpp)
endfunction()
function(protocolWayland)
add_custom_command(
OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp
${CMAKE_SOURCE_DIR}/protocols/wayland.hpp
COMMAND hyprwayland-scanner --wayland-enums --client
${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
target_sources(hyprpaper PRIVATE protocols/wayland.cpp protocols/wayland.hpp)
endfunction()
protocolwayland()
protocolnew("protocols" "wlr-layer-shell-unstable-v1" true)
protocolnew("stable/linux-dmabuf" "linux-dmabuf-v1" false)
protocolnew("staging/fractional-scale" "fractional-scale-v1" false)
protocolnew("stable/viewporter" "viewporter" false)
protocolnew("stable/xdg-shell" "xdg-shell" false)
protocolnew("staging/cursor-shape" "cursor-shape-v1" false)
protocolnew("stable/tablet" "tablet-v2" false)
# Hyprwire
pkg_get_variable(HYPRWIRE_PROTOCOLS_DIR hyprwire-protocols pkgdatadir)
message(STATUS "Found hyprwire-protocols at ${HYPRWIRE_PROTOCOLS_DIR}")
function(hyprprotocolServer protoPath protoName)
set(path ${CMAKE_SOURCE_DIR}/${protoPath})
add_custom_command(
@ -125,8 +84,27 @@ function(hyprprotocolServer protoPath protoName)
)
endfunction()
function(hyprprotocol protoPath protoName external)
if(external)
set(path ${protoPath})
else()
set(path ${HYPRWIRE_PROTOCOLS_DIR}/${protoPath})
endif()
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/hw-protocols/${protoName}-client.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw-protocols/${protoName}-client.hpp
COMMAND hyprwire-scanner --client ${path}/${protoName}.xml
${CMAKE_CURRENT_SOURCE_DIR}/hw-protocols/
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
target_sources(hyprpaper PRIVATE hw-protocols/${protoName}-client.cpp
hw-protocols/${protoName}-client.hpp
)
endfunction()
hyprprotocolServer(hw-protocols hyprpaper_core)
hyprprotocol(hyprtavern hp_hyprtavern_core_v1 false)
#
string(REPLACE "\"" " " GIT_COMMIT_MESSAGE_ESCAPED "${GIT_COMMIT_MESSAGE}")

285
protocols/wlr-layer-shell-unstable-v1.xml
View file

@ -1,285 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<protocol name="wlr_layer_shell_v1_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="1">
<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="namespace" 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>
</interface>
<interface name="zwlr_layer_surface_v1" version="1">
<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 (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 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.
</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 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 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>
</interface>
</protocol>

153
src/ipc/Tavern.cpp Normal file
View file

@ -0,0 +1,153 @@
#include "Tavern.hpp"
#include "../helpers/Logger.hpp"
#include "IPC.hpp"
#include "../ui/UI.hpp"
using namespace IPC;
constexpr const uint32_t PROTOCOL_VERSION = 1;
static SP<CCHpHyprtavernCoreV1Impl> impl = makeShared<CCHpHyprtavernCoreV1Impl>(PROTOCOL_VERSION);
CTavernPeer::CTavernPeer(SP<Hyprwire::IServerSocket> sock, WP<CTavernConnection> conn) : m_socket(sock), m_connection(conn) {
m_impl = makeShared<CHyprpaperCoreImpl>(1, [this](SP<Hyprwire::IObject> obj) {
auto manager = m_managers.emplace_back(makeShared<CHyprpaperCoreManagerObject>(std::move(obj)));
// We disconnect on destroying the manager. TODO: disconnect when the peer disconnects?
manager->setDestroy([this, weak = WP<CHyprpaperCoreManagerObject>{manager}] {
m_connection->dropPeer(this);
std::erase(m_managers, weak);
});
manager->setOnDestroy([this, weak = WP<CHyprpaperCoreManagerObject>{manager}] {
m_connection->dropPeer(this);
std::erase(m_managers, weak);
});
manager->setGetWallpaperObject([this, weak = WP<CHyprpaperCoreManagerObject>{manager}](uint32_t id) {
if (!weak)
return;
m_wallpaperObjects.emplace_back(makeShared<CWallpaperObject>(
makeShared<CHyprpaperWallpaperObject>(m_socket->createObject(weak->getObject()->client(), weak->getObject(), "hyprpaper_wallpaper", id))));
});
});
m_socket->addImplementation(m_impl);
}
CTavernPeer::~CTavernPeer() {
if (!g_ui || m_fd < 0)
return;
g_ui->backend()->removeFd(m_fd);
}
void CTavernPeer::onNewDisplay(const std::string& sv) {
for (const auto& m : m_managers) {
m->sendAddMonitor(sv.c_str());
}
}
void CTavernPeer::onRemovedDisplay(const std::string& sv) {
for (const auto& m : m_managers) {
m->sendRemoveMonitor(sv.c_str());
}
}
int CTavernPeer::extractFD() {
if (m_fd >= 0)
return m_fd;
m_fd = m_socket->extractLoopFD();
return m_fd;
}
void CTavernPeer::dispatch() {
if (!m_socket->dispatchEvents())
m_connection->dropPeer(this);
}
CTavernConnection::CTavernConnection() = default;
void CTavernConnection::init() {
const auto XDG_RUNTIME_DIR = getenv("XDG_RUNTIME_DIR");
if (!XDG_RUNTIME_DIR) {
g_logger->log(LOG_ERR, "CTavernConnection: no runtime dir");
return;
}
const auto WL_DISPLAY = getenv("WAYLAND_DISPLAY");
m_socket = Hyprwire::IClientSocket::open(XDG_RUNTIME_DIR + std::string{"/hyprtavern/ht.sock"});
if (!m_socket) {
g_logger->log(LOG_ERR, "CTavernConnection: tavern is not serving beer, ignoring tavern");
return;
}
m_socket->addImplementation(impl);
if (!m_socket->waitForHandshake()) {
g_logger->log(LOG_ERR, "CTavernConnection: failed a handshake to tavern");
return;
}
const auto SPEC = m_socket->getSpec(impl->protocol()->specName());
if (!SPEC) {
g_logger->log(LOG_ERR, "CTavernConnection: tavern is bad (no protocol)");
return;
}
m_manager = makeShared<CCHpHyprtavernCoreManagerV1Object>(m_socket->bindProtocol(impl->protocol(), PROTOCOL_VERSION));
m_busObject = makeShared<CCHpHyprtavernBusObjectV1Object>(m_manager->sendGetBusObject("hyprpaper"));
if (WL_DISPLAY)
m_busObject->sendExposeProperty("GLOBAL:WAYLAND_DISPLAY", WL_DISPLAY);
m_busObject->sendExposeProtocol("hyprpaper_core", 1);
m_busObject->setNewFd([this](int fd) {
auto sock = Hyprwire::IServerSocket::open(fd);
if (!sock) {
g_logger->log(LOG_ERR, "CTavernConnection: received a fd {} but it's dead", fd);
return;
}
auto x = m_peers.emplace_back(makeShared<CTavernPeer>(sock, m_self));
g_ui->backend()->addFd(x->extractFD(), [w = WP<CTavernPeer>{x}] {
if (!w)
return;
w->dispatch();
});
});
g_ui->backend()->addFd(m_socket->extractLoopFD(), [this] { //
m_socket->dispatchEvents();
});
}
bool CTavernConnection::connected() {
return m_busObject;
}
void CTavernConnection::dropPeer(CTavernPeer* peer) {
std::erase_if(m_peers, [peer](const auto& e) { return e.get() == peer; });
}
void CTavernConnection::onNewDisplay(const std::string& sv) {
for (const auto& p : m_peers) {
p->onNewDisplay(sv);
}
}
void CTavernConnection::onRemovedDisplay(const std::string& sv) {
for (const auto& p : m_peers) {
p->onRemovedDisplay(sv);
}
}

59
src/ipc/Tavern.hpp Normal file
View file

@ -0,0 +1,59 @@
#pragma once
#include "../helpers/Memory.hpp"
#include <hyprwire/hyprwire.hpp>
#include <hp_hyprtavern_core_v1-client.hpp>
#include <hyprpaper_core-server.hpp>
namespace IPC {
class CWallpaperObject;
class CTavernConnection;
class CTavernPeer {
public:
CTavernPeer(SP<Hyprwire::IServerSocket> sock, WP<CTavernConnection> conn);
~CTavernPeer();
int extractFD();
void onNewDisplay(const std::string& sv);
void onRemovedDisplay(const std::string& sv);
void dispatch();
private:
SP<Hyprwire::IServerSocket> m_socket;
int m_fd = -1;
SP<CHyprpaperCoreImpl> m_impl;
WP<CTavernConnection> m_connection;
std::vector<SP<CHyprpaperCoreManagerObject>> m_managers;
std::vector<SP<CWallpaperObject>> m_wallpaperObjects;
};
class CTavernConnection {
public:
CTavernConnection();
~CTavernConnection() = default;
void init();
WP<CTavernConnection> m_self;
bool connected();
void dropPeer(CTavernPeer* peer);
void onNewDisplay(const std::string& sv);
void onRemovedDisplay(const std::string& sv);
private:
SP<Hyprwire::IClientSocket> m_socket;
SP<CCHpHyprtavernCoreManagerV1Object> m_manager;
SP<CCHpHyprtavernBusObjectV1Object> m_busObject;
std::vector<SP<CTavernPeer>> m_peers;
};
inline UP<CTavernConnection> g_tavernConnection;
};

17
src/ui/UI.cpp
View file

@ -2,6 +2,7 @@
#include "../helpers/Logger.hpp"
#include "../ipc/HyprlandSocket.hpp"
#include "../ipc/IPC.hpp"
#include "../ipc/Tavern.hpp"
#include "../config/WallpaperMatcher.hpp"
#include <hyprtoolkit/core/Output.hpp>
@ -70,12 +71,20 @@ CWallpaperTarget::CWallpaperTarget(SP<Hyprtoolkit::IOutput> output, const std::s
void CUI::registerOutput(const SP<Hyprtoolkit::IOutput>& mon) {
g_matcher->registerOutput(mon->port());
if (IPC::g_IPCSocket)
IPC::g_IPCSocket->onNewDisplay(mon->port());
if (IPC::g_tavernConnection)
IPC::g_tavernConnection->onNewDisplay(mon->port());
mon->m_events.removed.listenStatic([this, m = WP<Hyprtoolkit::IOutput>{mon}] {
g_matcher->unregisterOutput(m->port());
if (IPC::g_IPCSocket)
IPC::g_IPCSocket->onRemovedDisplay(m->port());
if (IPC::g_tavernConnection)
IPC::g_tavernConnection->onRemovedDisplay(m->port());
std::erase_if(m_targets, [&m](const auto& e) { return e->m_monitorName == m->port(); });
});
}
@ -88,8 +97,12 @@ bool CUI::run() {
if (!m_backend)
return false;
if (*PENABLEIPC)
IPC::g_IPCSocket = makeUnique<IPC::CSocket>();
if (*PENABLEIPC) {
IPC::g_IPCSocket = makeUnique<IPC::CSocket>();
IPC::g_tavernConnection = makeUnique<IPC::CTavernConnection>();
IPC::g_tavernConnection->m_self = IPC::g_tavernConnection;
IPC::g_tavernConnection->init();
}
const auto MONITORS = m_backend->getOutputs();