summaryrefslogtreecommitdiff
path: root/src/Compositor.hpp
diff options
context:
space:
mode:
authorNathan Ollerenshaw <chrome@stupendous.net>2025-04-14 02:07:53 -0700
committerGitHub <noreply@github.com>2025-04-14 11:07:53 +0200
commit533bc5115e49a6d0d093b45f7db65854bc9a0494 (patch)
tree5e538ba7ffd2939a88817870f11c2e966bd75ac4 /src/Compositor.hpp
parent99ab3e19d928c3c33ca7d7c5f5b0cbc7eb50dce5 (diff)
monitors: fix disconnected monitors are reconnected to an empty workspace (#9874)
--------- Co-authored-by: nyx <nnyyxxxx@protonmail.com>
Diffstat (limited to 'src/Compositor.hpp')
-rw-r--r--src/Compositor.hpp95
1 files changed, 48 insertions, 47 deletions
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 2393662b..33780cc9 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -25,53 +25,54 @@ class CCompositor {
CCompositor(bool onlyConfig = false);
~CCompositor();
- wl_display* m_sWLDisplay = nullptr;
- wl_event_loop* m_sWLEventLoop = nullptr;
- int m_iDRMFD = -1;
- bool m_bInitialized = false;
- SP<Aquamarine::CBackend> m_pAqBackend;
-
- std::string m_szHyprTempDataRoot = "";
-
- std::string m_szWLDisplaySocket = "";
- std::string m_szInstanceSignature = "";
- std::string m_szInstancePath = "";
- std::string m_szCurrentSplash = "error";
-
- std::vector<PHLMONITOR> m_vMonitors;
- std::vector<PHLMONITOR> m_vRealMonitors; // for all monitors, even those turned off
- std::vector<PHLWINDOW> m_vWindows;
- std::vector<PHLLS> m_vLayers;
- std::vector<PHLWORKSPACE> m_vWorkspaces;
- std::vector<PHLWINDOWREF> m_vWindowsFadingOut;
- std::vector<PHLLSREF> m_vSurfacesFadingOut;
-
- std::unordered_map<std::string, MONITORID> m_mMonitorIDMap;
-
- void initServer(std::string socketName, int socketFd);
- void startCompositor();
- void stopCompositor();
- void cleanup();
- void bumpNofile();
- void restoreNofile();
-
- WP<CWLSurfaceResource> m_pLastFocus;
- PHLWINDOWREF m_pLastWindow;
- PHLMONITORREF m_pLastMonitor;
-
- std::vector<PHLWINDOWREF> m_vWindowFocusHistory; // first element is the most recently focused.
-
- bool m_bReadyToProcess = false;
- bool m_bSessionActive = true;
- bool m_bDPMSStateON = true;
- bool m_bUnsafeState = false; // unsafe state is when there is no monitors.
- bool m_bNextIsUnsafe = false;
- PHLMONITORREF m_pUnsafeOutput; // fallback output for the unsafe state
- bool m_bIsShuttingDown = false;
- bool m_bFinalRequests = false;
- bool m_bDesktopEnvSet = false;
- bool m_bWantsXwayland = true;
- bool m_bOnlyConfigVerification = false;
+ wl_display* m_sWLDisplay = nullptr;
+ wl_event_loop* m_sWLEventLoop = nullptr;
+ int m_iDRMFD = -1;
+ bool m_bInitialized = false;
+ SP<Aquamarine::CBackend> m_pAqBackend;
+
+ std::string m_szHyprTempDataRoot = "";
+
+ std::string m_szWLDisplaySocket = "";
+ std::string m_szInstanceSignature = "";
+ std::string m_szInstancePath = "";
+ std::string m_szCurrentSplash = "error";
+
+ std::vector<PHLMONITOR> m_vMonitors;
+ std::vector<PHLMONITOR> m_vRealMonitors; // for all monitors, even those turned off
+ std::vector<PHLWINDOW> m_vWindows;
+ std::vector<PHLLS> m_vLayers;
+ std::vector<PHLWORKSPACE> m_vWorkspaces;
+ std::vector<PHLWINDOWREF> m_vWindowsFadingOut;
+ std::vector<PHLLSREF> m_vSurfacesFadingOut;
+
+ std::unordered_map<std::string, MONITORID> m_mMonitorIDMap;
+ std::unordered_map<std::string, WORKSPACEID> m_mSeenMonitorWorkspaceMap; // map of seen monitor names to workspace IDs
+
+ void initServer(std::string socketName, int socketFd);
+ void startCompositor();
+ void stopCompositor();
+ void cleanup();
+ void bumpNofile();
+ void restoreNofile();
+
+ WP<CWLSurfaceResource> m_pLastFocus;
+ PHLWINDOWREF m_pLastWindow;
+ PHLMONITORREF m_pLastMonitor;
+
+ std::vector<PHLWINDOWREF> m_vWindowFocusHistory; // first element is the most recently focused.
+
+ bool m_bReadyToProcess = false;
+ bool m_bSessionActive = true;
+ bool m_bDPMSStateON = true;
+ bool m_bUnsafeState = false; // unsafe state is when there is no monitors.
+ bool m_bNextIsUnsafe = false;
+ PHLMONITORREF m_pUnsafeOutput; // fallback output for the unsafe state
+ bool m_bIsShuttingDown = false;
+ bool m_bFinalRequests = false;
+ bool m_bDesktopEnvSet = false;
+ bool m_bWantsXwayland = true;
+ bool m_bOnlyConfigVerification = false;
// ------------------------------------------------- //