hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 09:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

e

Browse source
This commit is contained in:
Vaxry 2024-11-11 16:14:59 +00:00 committed by Mihai Fufezan
parent 66880afcb4
commit 928e7dd712
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/protocols/core/Compositor.cpp
View file

@ -438,12 +438,13 @@ void CWLSurfaceResource::commitPendingState() {
current.texture->m_eTransform = wlTransformToHyprutils(current.transform); current.texture->m_eTransform = wlTransformToHyprutils(current.transform);
if (current.buffer && current.buffer->buffer) { if (current.buffer && current.buffer->buffer) {
current.buffer->buffer->update(accumulateCurrentBufferDamage()); const auto DAMAGE = accumulateCurrentBufferDamage();
current.buffer->buffer->update(DAMAGE);
// if the surface is a cursor, update the shm buffer // if the surface is a cursor, update the shm buffer
// TODO: don't update the entire texture // TODO: don't update the entire texture
if (role->role() == SURFACE_ROLE_CURSOR) if (role->role() == SURFACE_ROLE_CURSOR && !DAMAGE.empty())
updateCursorShm(); updateCursorShm(DAMAGE);
// release the buffer if it's synchronous as update() has done everything thats needed // release the buffer if it's synchronous as update() has done everything thats needed
// so we can let the app know we're done. // so we can let the app know we're done.
@ -486,13 +487,12 @@ void CWLSurfaceResource::commitPendingState() {
lastBuffer = current.buffer ? current.buffer->buffer : WP<IHLBuffer>{}; lastBuffer = current.buffer ? current.buffer->buffer : WP<IHLBuffer>{};
} }
void CWLSurfaceResource::updateCursorShm() { void CWLSurfaceResource::updateCursorShm(CRegion damage) {
auto buf = current.buffer ? current.buffer->buffer : lastBuffer; auto buf = current.buffer ? current.buffer->buffer : lastBuffer;
if (!buf) if (!buf)
return; return;
// TODO: actually use damage
auto& shmData = CCursorSurfaceRole::cursorPixelData(self.lock()); auto& shmData = CCursorSurfaceRole::cursorPixelData(self.lock());
auto shmAttrs = buf->shm(); auto shmAttrs = buf->shm();
@ -501,11 +501,25 @@ void CWLSurfaceResource::updateCursorShm() {
return; return;
} }
damage.intersect(CBox{0, 0, buf->size.x, buf->size.y});
// no need to end, shm. // no need to end, shm.
auto [pixelData, fmt, bufLen] = buf->beginDataPtr(0); auto [pixelData, fmt, bufLen] = buf->beginDataPtr(0);
shmData.resize(bufLen); shmData.resize(bufLen);
if (const auto RECTS = damage.getRects(); RECTS.size() == 1 && RECTS.at(0).x2 == buf->size.x && RECTS.at(0).y2 == buf->size.y)
memcpy(shmData.data(), pixelData, bufLen); memcpy(shmData.data(), pixelData, bufLen);
else {
for (auto& box : damage.getRects()) {
for (auto y = box.y1; y < box.y2; ++y) {
// bpp is 32 INSALLAH
auto begin = 4 * box.y1 * (box.x2 - box.x1) + box.x1;
auto len = 4 * (box.x2 - box.x1);
memcpy((uint8_t*)shmData.data() + begin, (uint8_t*)pixelData + begin, len);
}
}
}
} }
void CWLSurfaceResource::presentFeedback(timespec* when, PHLMONITOR pMonitor) { void CWLSurfaceResource::presentFeedback(timespec* when, PHLMONITOR pMonitor) {

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

@ -148,7 +148,7 @@ class CWLSurfaceResource {
void dropCurrentBuffer(); void dropCurrentBuffer();
void commitPendingState(); void commitPendingState();
void bfHelper(std::vector<SP<CWLSurfaceResource>> const& nodes, std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data); void bfHelper(std::vector<SP<CWLSurfaceResource>> const& nodes, std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
void updateCursorShm(); void updateCursorShm(CRegion damage = CBox{0, 0, INT16_MAX, INT16_MAX});
friend class CWLPointerResource; friend class CWLPointerResource;
}; };