hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improvements

This commit is contained in:
Vaxry 2024-03-08 01:56:26 +00:00
parent 89c59092ff
commit 69140f7356
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/managers/CursorManager.cpp
View File

@ -31,9 +31,13 @@ CCursorManager::CCursorManager() {
g_pHookSystem->hookDynamic("monitorLayoutChanged", [this](void* self, SCallbackInfo& info, std::any param) { this->updateTheme(); });
}
void CCursorManager::dropBufferRef(CCursorManager::CCursorBuffer* ref) {
std::erase_if(m_vCursorBuffers, [ref] (const auto& buf) { return buf.get() == ref; });
}
static void cursorBufferDestroy(struct wlr_buffer* wlr_buffer) {
CCursorManager::CCursorBuffer::SCursorWlrBuffer* buffer = wl_container_of(wlr_buffer, buffer, base);
buffer->dropped = true;
g_pCursorManager->dropBufferRef(buffer->parent);
}
static bool cursorBufferBeginDataPtr(struct wlr_buffer* wlr_buffer, uint32_t flags, void** data, uint32_t* format, size_t* stride) {
@ -62,18 +66,19 @@ static const wlr_buffer_impl bufferImpl = {
CCursorManager::CCursorBuffer::CCursorBuffer(cairo_surface_t* surf, const Vector2D& size_, const Vector2D& hot_) : size(size_), hotspot(hot_) {
wlrBuffer.surface = surf;
wlr_buffer_init(&wlrBuffer.base, &bufferImpl, size.x, size.y);
wlrBuffer.parent = this;
}
CCursorManager::CCursorBuffer::~CCursorBuffer() {
if (g_pCursorManager->m_bOurBufferConnected)
wlr_cursor_set_surface(g_pCompositor->m_sWLRCursor, nullptr, 0, 0);
// if (g_pCursorManager->m_bOurBufferConnected)
// wlr_cursor_set_surface(g_pCompositor->m_sWLRCursor, nullptr, 0, 0);
if (!wlrBuffer.dropped)
wlr_buffer_drop(&wlrBuffer.base);
// if (!wlrBuffer.dropped)
// wlr_buffer_drop(&wlrBuffer.base);
}
wlr_buffer* CCursorManager::getCursorBuffer() {
return m_sCursorBuffer ? &m_sCursorBuffer->wlrBuffer.base : nullptr;
return !m_vCursorBuffers.empty() ? &m_vCursorBuffers.back()->wlrBuffer.base : nullptr;
}
void CCursorManager::setCursorSurface(wlr_surface* surf, const Vector2D& hotspot) {
@ -83,13 +88,15 @@ void CCursorManager::setCursorSurface(wlr_surface* surf, const Vector2D& hotspot
}
void CCursorManager::setCursorFromName(const std::string& name) {
if (m_sCursorBuffer)
m_sCursorBuffer.reset();
const auto IMAGES = m_pHyprcursor->getShape(name.c_str(), m_sCurrentStyleInfo);
m_sCursorBuffer = std::make_unique<CCursorBuffer>(IMAGES.images[0].surface, Vector2D{IMAGES.images[0].size, IMAGES.images[0].size},
Vector2D{IMAGES.images[0].hotspotX, IMAGES.images[0].hotspotY});
if (IMAGES.images.size() < 1) {
Debug::log(ERR, "BUG THIS: No cursor returned by getShape()");
return;
}
m_vCursorBuffers.emplace_back(std::make_unique<CCursorBuffer>(IMAGES.images[0].surface, Vector2D{IMAGES.images[0].size, IMAGES.images[0].size},
Vector2D{IMAGES.images[0].hotspotX, IMAGES.images[0].hotspotY}));
if (g_pCompositor->m_sWLRCursor)
wlr_cursor_set_buffer(g_pCompositor->m_sWLRCursor, getCursorBuffer(), IMAGES.images[0].hotspotX, IMAGES.images[0].hotspotY, m_fCursorScale);

5
src/managers/CursorManager.hpp
View File

@ -30,6 +30,7 @@ class CCursorManager {
wlr_buffer base;
cairo_surface_t* surface = nullptr;
bool dropped = false;
CCursorBuffer* parent = nullptr;
} wlrBuffer;
private:
@ -39,10 +40,12 @@ class CCursorManager {
friend class CCursorManager;
};
void dropBufferRef(CCursorBuffer* ref);
bool m_bOurBufferConnected = false;
private:
std::unique_ptr<CCursorBuffer> m_sCursorBuffer;
std::vector<std::unique_ptr<CCursorBuffer>> m_vCursorBuffers;
std::unique_ptr<Hyprcursor::CHyprcursorManager> m_pHyprcursor;