From 241a4935a244f403fa7108259075b04c81ed258f Mon Sep 17 00:00:00 2001 From: davc0n Date: Tue, 22 Apr 2025 15:23:29 +0200 Subject: compositor: refactor class member vars (#10141) --- src/Compositor.hpp | 79 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 40 deletions(-) (limited to 'src/Compositor.hpp') diff --git a/src/Compositor.hpp b/src/Compositor.hpp index 33780cc9..32e65286 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -25,29 +25,29 @@ 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 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 m_vMonitors; - std::vector m_vRealMonitors; // for all monitors, even those turned off - std::vector m_vWindows; - std::vector m_vLayers; - std::vector m_vWorkspaces; - std::vector m_vWindowsFadingOut; - std::vector m_vSurfacesFadingOut; - - std::unordered_map m_mMonitorIDMap; - std::unordered_map m_mSeenMonitorWorkspaceMap; // map of seen monitor names to workspace IDs + wl_display* m_wlDisplay = nullptr; + wl_event_loop* m_wlEventLoop = nullptr; + int m_drmFD = -1; + bool m_initialized = false; + SP m_aqBackend; + + std::string m_hyprTempDataRoot = ""; + + std::string m_wlDisplaySocket = ""; + std::string m_instanceSignature = ""; + std::string m_instancePath = ""; + std::string m_currentSplash = "error"; + + std::vector m_monitors; + std::vector m_realMonitors; // for all monitors, even those turned off + std::vector m_windows; + std::vector m_layers; + std::vector m_workspaces; + std::vector m_windowsFadingOut; + std::vector m_surfacesFadingOut; + + std::unordered_map m_monitorIDMap; + std::unordered_map m_seenMonitorWorkspaceMap; // map of seen monitor names to workspace IDs void initServer(std::string socketName, int socketFd); void startCompositor(); @@ -56,23 +56,22 @@ class CCompositor { void bumpNofile(); void restoreNofile(); - WP m_pLastFocus; - PHLWINDOWREF m_pLastWindow; - PHLMONITORREF m_pLastMonitor; - - std::vector 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; + WP m_lastFocus; + PHLWINDOWREF m_lastWindow; + PHLMONITORREF m_lastMonitor; + + std::vector m_windowFocusHistory; // first element is the most recently focused + + bool m_readyToProcess = false; + bool m_sessionActive = true; + bool m_dpmsStateOn = true; + bool m_unsafeState = false; // unsafe state is when there is no monitors + PHLMONITORREF m_unsafeOutput; // fallback output for the unsafe state + bool m_isShuttingDown = false; + bool m_finalRequests = false; + bool m_desktopEnvSet = false; + bool m_wantsXwayland = true; + bool m_onlyConfigVerification = false; // ------------------------------------------------- // -- cgit v1.2.3