summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2025-04-28 20:18:02 +0100
committerVaxry <vaxry@vaxry.net>2025-04-28 20:18:02 +0100
commitc505eb55ff967f2a0474e88a50803412ba550a61 (patch)
tree8ac71fd05b03d5f052561390813f1ff064621ec6 /src
parentf5c5cfa960c157c8df50b496f621290234ac4505 (diff)
screencopy: support hw cursors while sharing with cursor
Diffstat (limited to 'src')
-rw-r--r--src/managers/PointerManager.cpp4
-rw-r--r--src/managers/PointerManager.hpp3
-rw-r--r--src/protocols/Screencopy.cpp31
-rw-r--r--src/protocols/Screencopy.hpp3
4 files changed, 10 insertions, 31 deletions
diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp
index 6a53001b..e8d71e1a 100644
--- a/src/managers/PointerManager.cpp
+++ b/src/managers/PointerManager.cpp
@@ -591,13 +591,13 @@ SP<Aquamarine::IBuffer> CPointerManager::renderHWCursorBuffer(SP<CPointerManager
return buf;
}
-void CPointerManager::renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage, std::optional<Vector2D> overridePos) {
+void CPointerManager::renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage, std::optional<Vector2D> overridePos, bool forceRender) {
if (!hasCursor())
return;
auto state = stateFor(pMonitor);
- if ((!state->hardwareFailed && state->softwareLocks == 0)) {
+ if (!state->hardwareFailed && state->softwareLocks == 0 && !forceRender) {
if (currentCursorImage.surface)
currentCursorImage.surface->resource()->frame(now);
return;
diff --git a/src/managers/PointerManager.hpp b/src/managers/PointerManager.hpp
index 10726bc6..3569b218 100644
--- a/src/managers/PointerManager.hpp
+++ b/src/managers/PointerManager.hpp
@@ -49,7 +49,8 @@ class CPointerManager {
void unlockSoftwareAll();
bool softwareLockedFor(PHLMONITOR pMonitor);
- void renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage /* logical */, std::optional<Vector2D> overridePos = {} /* monitor-local */);
+ void renderSoftwareCursorsFor(PHLMONITOR pMonitor, const Time::steady_tp& now, CRegion& damage /* logical */, std::optional<Vector2D> overridePos = {} /* monitor-local */,
+ bool forceRender = false);
// this is needed e.g. during screensharing where
// the software cursors aren't locked during the cursor move, but they
diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp
index 8480e692..6b60abfd 100644
--- a/src/protocols/Screencopy.cpp
+++ b/src/protocols/Screencopy.cpp
@@ -2,6 +2,7 @@
#include "../Compositor.hpp"
#include "../managers/eventLoop/EventLoopManager.hpp"
#include "../managers/PointerManager.hpp"
+#include "../managers/input/InputManager.hpp"
#include "../managers/EventManager.hpp"
#include "../managers/permissions/DynamicPermissionManager.hpp"
#include "../render/Renderer.hpp"
@@ -146,18 +147,6 @@ void CScreencopyFrame::copy(CZwlrScreencopyFrameV1* pFrame, wl_resource* buffer_
PROTO::screencopy->m_vFramesAwaitingWrite.emplace_back(self);
g_pHyprRenderer->m_bDirectScanoutBlocked = true;
- if (overlayCursor && !lockedSWCursors) {
- lockedSWCursors = true;
- // TODO: make it per-monitor
- if (!PROTO::screencopy->m_bTimerArmed) {
- for (auto const& m : g_pCompositor->m_monitors) {
- g_pPointerManager->lockSoftwareForMonitor(m);
- }
- PROTO::screencopy->m_bTimerArmed = true;
- LOGM(LOG, "Locking sw cursors due to screensharing");
- }
- PROTO::screencopy->m_pSoftwareCursorTimer->updateTimeout(std::chrono::seconds(1));
- }
if (!withDamage)
g_pHyprRenderer->damageMonitor(pMonitor.lock());
@@ -219,6 +208,8 @@ void CScreencopyFrame::copyDmabuf(std::function<void(bool)> callback) {
g_pHyprOpenGL->renderTexture(TEXTURE, monbox, 1);
g_pHyprOpenGL->setRenderModifEnabled(true);
g_pHyprOpenGL->setMonitorTransformEnabled(false);
+ g_pPointerManager->renderSoftwareCursorsFor(pMonitor.lock(), Time::steadyNow(), fakeDamage, g_pInputManager->getMouseCoordsInternal() - pMonitor->vecPosition - box.pos(),
+ true);
} else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING)
g_pHyprOpenGL->clear(Colors::BLACK);
else {
@@ -272,6 +263,8 @@ bool CScreencopyFrame::copyShm() {
g_pHyprOpenGL->renderTexture(TEXTURE, monbox, 1);
g_pHyprOpenGL->setRenderModifEnabled(true);
g_pHyprOpenGL->setMonitorTransformEnabled(false);
+ g_pPointerManager->renderSoftwareCursorsFor(pMonitor.lock(), Time::steadyNow(), fakeDamage, g_pInputManager->getMouseCoordsInternal() - pMonitor->vecPosition - box.pos(),
+ true);
} else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING)
g_pHyprOpenGL->clear(Colors::BLACK);
else {
@@ -398,19 +391,7 @@ bool CScreencopyClient::good() {
}
CScreencopyProtocol::CScreencopyProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
- m_pSoftwareCursorTimer = makeShared<CEventLoopTimer>(
- std::nullopt,
- [this](SP<CEventLoopTimer> self, void* data) {
- // TODO: make it per-monitor
- for (auto const& m : g_pCompositor->m_monitors) {
- g_pPointerManager->unlockSoftwareForMonitor(m);
- }
- m_bTimerArmed = false;
-
- LOGM(LOG, "Releasing software cursor lock");
- },
- nullptr);
- g_pEventLoopManager->addTimer(m_pSoftwareCursorTimer);
+ ;
}
void CScreencopyProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
diff --git a/src/protocols/Screencopy.hpp b/src/protocols/Screencopy.hpp
index 2d3ccab0..a69fce3a 100644
--- a/src/protocols/Screencopy.hpp
+++ b/src/protocols/Screencopy.hpp
@@ -96,9 +96,6 @@ class CScreencopyProtocol : public IWaylandProtocol {
std::vector<WP<CScreencopyFrame>> m_vFramesAwaitingWrite;
std::vector<SP<CScreencopyClient>> m_vClients;
- SP<CEventLoopTimer> m_pSoftwareCursorTimer;
- bool m_bTimerArmed = false;
-
void shareAllFrames(PHLMONITOR pMonitor);
void shareFrame(CScreencopyFrame* frame);
void sendFrameDamage(CScreencopyFrame* frame);