summaryrefslogtreecommitdiff
path: root/src/Compositor.hpp
diff options
context:
space:
mode:
authorxDarksome <dev@darkso.me>2022-07-02 19:43:52 +0300
committerGitHub <noreply@github.com>2022-07-02 19:43:52 +0300
commit185c4d6ea13ad5f4483aa2e389e43bd09106002f (patch)
treea7bc4a9510c39e367317b5ce64d2ee0e0a72d4f0 /src/Compositor.hpp
parentfc4b10d13c14c4eb08febb0637f27177cb6a1940 (diff)
parentb7b3344188e3ebd2baed14bc288ee42a1ae8d6f2 (diff)
Merge branch 'hyprwm:main' into main
Diffstat (limited to 'src/Compositor.hpp')
-rw-r--r--src/Compositor.hpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 16632006..7ad3b7f8 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -60,19 +60,21 @@ public:
wlr_virtual_pointer_manager_v1* m_sWLRVirtPtrMgr;
wlr_foreign_toplevel_manager_v1* m_sWLRToplevelMgr;
wlr_tablet_manager_v2* m_sWLRTabletManager;
+ wlr_xdg_foreign_registry* m_sWLRForeignRegistry;
// ------------------------------------------------- //
const char* m_szWLDisplaySocket;
std::string m_szInstanceSignature = "";
- std::list<SMonitor> m_lMonitors;
- std::list<CWindow> m_lWindows;
- std::list<SXDGPopup> m_lXDGPopups;
- std::list<CWorkspace> m_lWorkspaces;
- std::list<SSubsurface> m_lSubsurfaces;
- std::list<CWindow*> m_lWindowsFadingOut;
- std::list<SLayerSurface*> m_lSurfacesFadingOut;
+ std::vector<std::unique_ptr<SMonitor>> m_vMonitors;
+ std::vector<std::unique_ptr<CWindow>> m_vWindows;
+ std::deque<std::unique_ptr<CWindow>> m_dUnmanagedX11Windows;
+ std::vector<std::unique_ptr<SXDGPopup>> m_vXDGPopups;
+ std::vector<std::unique_ptr<CWorkspace>> m_vWorkspaces;
+ std::vector<std::unique_ptr<SSubsurface>> m_vSubsurfaces;
+ std::vector<CWindow*> m_vWindowsFadingOut;
+ std::vector<SLayerSurface*> m_vSurfacesFadingOut;
void startCompositor();
void cleanupExit();
@@ -99,7 +101,7 @@ public:
CWindow* vectorToWindow(const Vector2D&);
CWindow* vectorToWindowIdeal(const Vector2D&);
CWindow* vectorToWindowTiled(const Vector2D&);
- wlr_surface* vectorToLayerSurface(const Vector2D&, std::list<SLayerSurface*>*, Vector2D*);
+ wlr_surface* vectorToLayerSurface(const Vector2D&, std::list<SLayerSurface*>*, Vector2D*, SLayerSurface**);
wlr_surface* vectorWindowToSurface(const Vector2D&, CWindow*, Vector2D& sl);
CWindow* windowFromCursor();
CWindow* windowFloatingFromCursor();
@@ -133,6 +135,8 @@ public:
void moveWorkspaceToMonitor(CWorkspace*, SMonitor*);
bool workspaceIDOutOfBounds(const int&);
void setWindowFullscreen(CWindow*, bool, eFullscreenMode);
+ void moveUnmanagedX11ToWindows(CWindow*);
+ CWindow* getX11Parent(CWindow*);
private:
void initAllSignals();