twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-17 21:13:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

presentation-feedback: minor fixups

Browse Source
This commit is contained in:
Vaxry
2024-08-30 15:50:25 +02:00
parent fd8d8e122e
commit fbd6354393
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/protocols/PresentationTime.cpp
View File

@@ -14,7 +14,7 @@ void CQueuedPresentationData::setPresentationType(bool zeroCopy_) {
zeroCopy = zeroCopy_;
}
void CQueuedPresentationData::attachMonitor(CMonitor* pMonitor_) {
void CQueuedPresentationData::attachMonitor(SP<CMonitor> pMonitor_) {
pMonitor = pMonitor_;
}
@@ -67,12 +67,14 @@ void CPresentationFeedback::sendQueued(SP<CQueuedPresentationData> data, timespe
(uint32_t)(seq & 0xFFFFFFFF), (wpPresentationFeedbackKind)flags);
else
resource->sendDiscarded();
done = true;
}
CPresentationProtocol::CPresentationProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
static auto P = g_pHookSystem->hookDynamic("monitorRemoved", [this](void* self, SCallbackInfo& info, std::any param) {
const auto PMONITOR = std::any_cast<CMonitor*>(param);
std::erase_if(m_vQueue, [PMONITOR](const auto& other) { return !other->surface || other->pMonitor == PMONITOR; });
std::erase_if(m_vQueue, [PMONITOR](const auto& other) { return !other->surface || other->pMonitor.get() == PMONITOR; });
});
}
@@ -105,7 +107,7 @@ void CPresentationProtocol::onGetFeedback(CWpPresentation* pMgr, wl_resource* su
}
}
void CPresentationProtocol::onPresented(CMonitor* pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags) {
void CPresentationProtocol::onPresented(SP<CMonitor> pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags) {
timespec now;
timespec* presentedAt = when;
if (!presentedAt) {
@@ -119,7 +121,7 @@ void CPresentationProtocol::onPresented(CMonitor* pMonitor, timespec* when, uint
continue;
for (auto const& data : m_vQueue) {
if (!data->surface || data->surface != feedback->surface)
if (!data->surface || data->surface != feedback->surface || (data->pMonitor && data->pMonitor != pMonitor))
continue;
feedback->sendQueued(data, when, untilRefreshNs, seq, reportedFlags);
@@ -129,7 +131,7 @@ void CPresentationProtocol::onPresented(CMonitor* pMonitor, timespec* when, uint
}
std::erase_if(m_vFeedbacks, [](const auto& other) { return !other->surface || other->done; });
std::erase_if(m_vQueue, [pMonitor](const auto& other) { return !other->surface || other->pMonitor == pMonitor || !other->pMonitor; });
std::erase_if(m_vQueue, [pMonitor](const auto& other) { return !other->surface || other->pMonitor == pMonitor || !other->pMonitor || other->done; });
}
void CPresentationProtocol::queueData(SP<CQueuedPresentationData> data) {

8
src/protocols/PresentationTime.hpp
View File

@@ -14,15 +14,17 @@ class CQueuedPresentationData {
CQueuedPresentationData(SP<CWLSurfaceResource> surf);
void setPresentationType(bool zeroCopy);
void attachMonitor(CMonitor* pMonitor);
void attachMonitor(SP<CMonitor> pMonitor);
void presented();
void discarded();
bool done = false;
private:
bool wasPresented = false;
bool zeroCopy = false;
CMonitor* pMonitor = nullptr;
WP<CMonitor> pMonitor;
WP<CWLSurfaceResource> surface;
DYNLISTENER(destroySurface);
@@ -53,7 +55,7 @@ class CPresentationProtocol : public IWaylandProtocol {
virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
void onPresented(CMonitor* pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags);
void onPresented(SP<CMonitor> pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags);
void queueData(SP<CQueuedPresentationData> data);
private:

2
src/protocols/core/Compositor.cpp
View File

@@ -509,7 +509,7 @@ void CWLSurfaceResource::updateCursorShm() {
memcpy(shmData.data(), pixelData, bufLen);
}
void CWLSurfaceResource::presentFeedback(timespec* when, CMonitor* pMonitor) {
void CWLSurfaceResource::presentFeedback(timespec* when, SP<CMonitor> pMonitor) {
frame(when);
auto FEEDBACK = makeShared<CQueuedPresentationData>(self.lock());
FEEDBACK->attachMonitor(pMonitor);

2
src/protocols/core/Compositor.hpp
View File

@@ -124,7 +124,7 @@ class CWLSurfaceResource {
void breadthfirst(std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
CRegion accumulateCurrentBufferDamage();
void presentFeedback(timespec* when, CMonitor* pMonitor);
void presentFeedback(timespec* when, SP<CMonitor> pMonitor);
void lockPendingState();
void unlockPendingState();