From 8bbeee11734d3ba8e2cf15d19cb3c302f8bfdbf2 Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Sat, 7 Dec 2024 18:51:18 +0100 Subject: core: Add clang-tidy (#8664) This adds a .clang-tidy file for us. It's not a strict requirement to be compliant, but I tuned it to be alright. --- src/desktop/Popup.cpp | 5 +---- src/desktop/Window.cpp | 2 +- src/desktop/Window.hpp | 28 +++++++++++++--------------- src/desktop/Workspace.cpp | 15 ++++++--------- 4 files changed, 21 insertions(+), 29 deletions(-) (limited to 'src/desktop') diff --git a/src/desktop/Popup.cpp b/src/desktop/Popup.cpp index ea6e877b..692a75e3 100644 --- a/src/desktop/Popup.cpp +++ b/src/desktop/Popup.cpp @@ -16,13 +16,10 @@ CPopup::CPopup(PHLLS pOwner) : m_pLayerOwner(pOwner) { initAllSignals(); } -CPopup::CPopup(SP popup, CPopup* pOwner) : m_pParent(pOwner), m_pResource(popup) { +CPopup::CPopup(SP popup, CPopup* pOwner) : m_pWindowOwner(pOwner->m_pWindowOwner), m_pLayerOwner(pOwner->m_pLayerOwner), m_pParent(pOwner), m_pResource(popup) { m_pWLSurface = CWLSurface::create(); m_pWLSurface->assign(popup->surface->surface.lock(), this); - m_pLayerOwner = pOwner->m_pLayerOwner; - m_pWindowOwner = pOwner->m_pWindowOwner; - m_vLastSize = popup->surface->current.geometry.size(); reposition(); diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp index 34682b32..7dedaea0 100644 --- a/src/desktop/Window.cpp +++ b/src/desktop/Window.cpp @@ -443,7 +443,7 @@ void CWindow::moveToWorkspace(PHLWORKSPACE pWorkspace) { } } -PHLWINDOW CWindow::X11TransientFor() { +PHLWINDOW CWindow::x11TransientFor() { if (!m_pXWaylandSurface || !m_pXWaylandSurface->parent) return nullptr; diff --git a/src/desktop/Window.hpp b/src/desktop/Window.hpp index 672ff6ec..35da010c 100644 --- a/src/desktop/Window.hpp +++ b/src/desktop/Window.hpp @@ -21,14 +21,14 @@ class CXDGSurfaceResource; class CXWaylandSurface; -enum eIdleInhibitMode { +enum eIdleInhibitMode : uint8_t { IDLEINHIBIT_NONE = 0, IDLEINHIBIT_ALWAYS, IDLEINHIBIT_FULLSCREEN, IDLEINHIBIT_FOCUS }; -enum eGroupRules { +enum eGroupRules : uint8_t { // effective only during first map, except for _ALWAYS variant GROUP_NONE = 0, GROUP_SET = 1 << 0, // Open as new group or add to focused group @@ -40,7 +40,7 @@ enum eGroupRules { GROUP_OVERRIDE = 1 << 6, // Override other rules }; -enum eGetWindowProperties { +enum eGetWindowProperties : uint8_t { WINDOW_ONLY = 0, RESERVED_EXTENTS = 1 << 0, INPUT_EXTENTS = 1 << 1, @@ -50,7 +50,7 @@ enum eGetWindowProperties { USE_PROP_TILED = 1 << 5, }; -enum eSuppressEvents { +enum eSuppressEvents : uint8_t { SUPPRESS_NONE = 0, SUPPRESS_FULLSCREEN = 1 << 0, SUPPRESS_MAXIMIZE = 1 << 1, @@ -64,7 +64,7 @@ struct SAlphaValue { float m_fAlpha; bool m_bOverride; - float applyAlpha(float alpha) { + float applyAlpha(float alpha) const { if (m_bOverride) return m_fAlpha; else @@ -72,8 +72,8 @@ struct SAlphaValue { }; }; -enum eOverridePriority { - PRIORITY_LAYOUT, +enum eOverridePriority : uint8_t { + PRIORITY_LAYOUT = 0, PRIORITY_WORKSPACE_RULE, PRIORITY_WINDOW_RULE, PRIORITY_SET_PROP, @@ -85,9 +85,7 @@ class CWindowOverridableVar { CWindowOverridableVar(T const& value, eOverridePriority priority) { values[priority] = value; } - CWindowOverridableVar(T const& value) { - defaultValue = value; - } + CWindowOverridableVar(T const& value) : defaultValue{value} {} CWindowOverridableVar() = default; ~CWindowOverridableVar() = default; @@ -219,7 +217,7 @@ struct SInitialWorkspaceToken { std::string workspace; }; -struct sFullscreenState { +struct SFullscreenState { eFullscreenMode internal = FSMODE_NONE; eFullscreenMode client = FSMODE_NONE; }; @@ -278,7 +276,7 @@ class CWindow { bool m_bIsFloating = false; bool m_bDraggingTiled = false; // for dragging around tiled windows bool m_bWasMaximized = false; - sFullscreenState m_sFullscreenState = {.internal = FSMODE_NONE, .client = FSMODE_NONE}; + SFullscreenState m_sFullscreenState = {.internal = FSMODE_NONE, .client = FSMODE_NONE}; std::string m_szTitle = ""; std::string m_szClass = ""; std::string m_szInitialTitle = ""; @@ -400,7 +398,7 @@ class CWindow { CTagKeeper m_tags; // For the list lookup - bool operator==(const CWindow& rhs) { + bool operator==(const CWindow& rhs) const { return m_pXDGSurface == rhs.m_pXDGSurface && m_pXWaylandSurface == rhs.m_pXWaylandSurface && m_vPosition == rhs.m_vPosition && m_vSize == rhs.m_vSize && m_bFadingOut == rhs.m_bFadingOut; } @@ -421,7 +419,7 @@ class CWindow { void updateToplevel(); void updateSurfaceScaleTransformDetails(bool force = false); void moveToWorkspace(PHLWORKSPACE); - PHLWINDOW X11TransientFor(); + PHLWINDOW x11TransientFor(); void onUnmap(); void onMap(); void setHidden(bool hidden); @@ -480,7 +478,7 @@ class CWindow { Vector2D requestedMinSize(); Vector2D requestedMaxSize(); - inline CBox getWindowMainSurfaceBox() const { + CBox getWindowMainSurfaceBox() const { return {m_vRealPosition.value().x, m_vRealPosition.value().y, m_vRealSize.value().x, m_vRealSize.value().y}; } diff --git a/src/desktop/Workspace.cpp b/src/desktop/Workspace.cpp index 7c3d47d7..3bf89ec3 100644 --- a/src/desktop/Workspace.cpp +++ b/src/desktop/Workspace.cpp @@ -11,12 +11,9 @@ PHLWORKSPACE CWorkspace::create(WORKSPACEID id, PHLMONITOR monitor, std::string return workspace; } -CWorkspace::CWorkspace(WORKSPACEID id, PHLMONITOR monitor, std::string name, bool special, bool isEmpty) { - m_pMonitor = monitor; - m_iID = id; - m_szName = name; - m_bIsSpecialWorkspace = special; - m_bWasCreatedEmpty = isEmpty; +CWorkspace::CWorkspace(WORKSPACEID id, PHLMONITOR monitor, std::string name, bool special, bool isEmpty) : + m_iID(id), m_szName(name), m_pMonitor(monitor), m_bIsSpecialWorkspace(special), m_bWasCreatedEmpty(isEmpty) { + ; } void CWorkspace::init(PHLWORKSPACE self) { @@ -106,7 +103,7 @@ void CWorkspace::startAnim(bool in, bool left, bool instant) { const auto PMONITOR = m_pMonitor.lock(); float movePerc = 100.f; - if (ANIMSTYLE.find("%") != std::string::npos) { + if (ANIMSTYLE.find('%') != std::string::npos) { try { auto percstr = ANIMSTYLE.substr(ANIMSTYLE.find_last_of(' ') + 1); movePerc = std::stoi(percstr.substr(0, percstr.length() - 1)); @@ -296,7 +293,7 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) { return false; } - const auto DASHPOS = prop.find("-"); + const auto DASHPOS = prop.find('-'); const auto LHS = prop.substr(0, DASHPOS), RHS = prop.substr(DASHPOS + 1); if (!isNumber(LHS) || !isNumber(RHS)) { @@ -433,7 +430,7 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) { continue; } - const auto DASHPOS = prop.find("-"); + const auto DASHPOS = prop.find('-'); const auto LHS = prop.substr(0, DASHPOS), RHS = prop.substr(DASHPOS + 1); if (!isNumber(LHS) || !isNumber(RHS)) { -- cgit v1.2.3