hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-02 16:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

handle window subsurface trees

Browse source
This commit is contained in:
vaxerski 2022-03-27 21:46:27 +02:00
parent 39303fd2b0
commit de8d2fd136
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Window.hpp
View file

@ -2,6 +2,7 @@
#include "defines.hpp" #include "defines.hpp"
#include "events/Events.hpp" #include "events/Events.hpp"
#include "helpers/SubsurfaceTree.hpp"
class CWindow { class CWindow {
@ -54,6 +55,8 @@ public:
DYNLISTENER(configureX11); DYNLISTENER(configureX11);
// //
SSurfaceTreeNode* m_pSurfaceTree = nullptr;
// For the list lookup // For the list lookup
bool operator==(const CWindow& rhs) { bool operator==(const CWindow& rhs) {

16
src/events/Windows.cpp
View file

@ -15,6 +15,12 @@
// // // //
// ------------------------------------------------------------ // // ------------------------------------------------------------ //
void addViewCoords(void* pWindow, int* x, int* y) {
const auto PWINDOW = (CWindow*)pWindow;
*x += PWINDOW->m_vEffectivePosition.x;
*y += PWINDOW->m_vEffectivePosition.y;
}
void Events::listener_mapWindow(wl_listener* listener, void* data) { void Events::listener_mapWindow(wl_listener* listener, void* data) {
CWindow* PWINDOW = wl_container_of(listener, PWINDOW, listen_mapWindow); CWindow* PWINDOW = wl_container_of(listener, PWINDOW, listen_mapWindow);
@ -106,6 +112,8 @@ void Events::listener_mapWindow(wl_listener* listener, void* data) {
if (!PWINDOW->m_bIsModal) if (!PWINDOW->m_bIsModal)
g_pCompositor->focusWindow(PWINDOW); g_pCompositor->focusWindow(PWINDOW);
PWINDOW->m_pSurfaceTree = SubsurfaceTree::createTreeRoot(g_pXWaylandManager->getWindowSurface(PWINDOW), addViewCoords, PWINDOW);
Debug::log(LOG, "Map request dispatched, monitor %s, xywh: %f %f %f %f", PMONITOR->szName.c_str(), PWINDOW->m_vEffectivePosition.x, PWINDOW->m_vEffectivePosition.y, PWINDOW->m_vEffectiveSize.x, PWINDOW->m_vEffectiveSize.y); Debug::log(LOG, "Map request dispatched, monitor %s, xywh: %f %f %f %f", PMONITOR->szName.c_str(), PWINDOW->m_vEffectivePosition.x, PWINDOW->m_vEffectivePosition.y, PWINDOW->m_vEffectiveSize.x, PWINDOW->m_vEffectiveSize.y);
} }
@ -132,6 +140,9 @@ void Events::listener_unmapWindow(wl_listener* listener, void* data) {
// refocus on a new window // refocus on a new window
g_pInputManager->refocus(); g_pInputManager->refocus();
SubsurfaceTree::destroySurfaceTree(PWINDOW->m_pSurfaceTree);
PWINDOW->m_pSurfaceTree = nullptr;
} }
void Events::listener_commitWindow(wl_listener* listener, void* data) { void Events::listener_commitWindow(wl_listener* listener, void* data) {
@ -150,6 +161,11 @@ void Events::listener_destroyWindow(wl_listener* listener, void* data) {
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW);
if (PWINDOW->m_pSurfaceTree) {
SubsurfaceTree::destroySurfaceTree(PWINDOW->m_pSurfaceTree);
PWINDOW->m_pSurfaceTree = nullptr;
}
g_pCompositor->removeWindowFromVectorSafe(PWINDOW); g_pCompositor->removeWindowFromVectorSafe(PWINDOW);
} }