diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-06-30 15:44:26 +0200 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-06-30 15:44:26 +0200 |
| commit | 328b3fa4bc4f3776f2128f84709556569c4824d9 (patch) | |
| tree | e00603cdf3b868facaa06478b02030c540ba283c /src/Compositor.hpp | |
| parent | d1564299d23b52e6297fa4542ce42e4a54c28cbc (diff) | |
mordernize pointers
Diffstat (limited to 'src/Compositor.hpp')
| -rw-r--r-- | src/Compositor.hpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Compositor.hpp b/src/Compositor.hpp index 493d3744..ae7777d3 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -67,13 +67,14 @@ public: 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(); @@ -134,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(); |
