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/managers/input/IdleInhibitor.cpp | 1 - src/managers/input/InputManager.cpp | 6 +++--- src/managers/input/InputManager.hpp | 14 +++++++------- src/managers/input/Tablets.cpp | 6 +++--- src/managers/input/TextInput.cpp | 5 ++--- 5 files changed, 15 insertions(+), 17 deletions(-) (limited to 'src/managers/input') diff --git a/src/managers/input/IdleInhibitor.cpp b/src/managers/input/IdleInhibitor.cpp index 7c91258e..a99184e0 100644 --- a/src/managers/input/IdleInhibitor.cpp +++ b/src/managers/input/IdleInhibitor.cpp @@ -70,5 +70,4 @@ void CInputManager::recheckIdleInhibitorStatus() { } PROTO::idle->setInhibit(false); - return; } diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 525ca954..6883717c 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -868,7 +868,7 @@ void CInputManager::newVirtualKeyboard(SP keyboard) void CInputManager::setupKeyboard(SP keeb) { static auto PDPMS = CConfigValue("misc:key_press_enables_dpms"); - m_vHIDs.push_back(keeb); + m_vHIDs.emplace_back(keeb); try { keeb->hlName = getNameForNewDevice(keeb->deviceName); @@ -1016,7 +1016,7 @@ void CInputManager::newMouse(SP mouse) { } void CInputManager::setupMouse(SP mauz) { - m_vHIDs.push_back(mauz); + m_vHIDs.emplace_back(mauz); try { mauz->hlName = getNameForNewDevice(mauz->deviceName); @@ -1495,7 +1495,7 @@ void CInputManager::disableAllKeyboards(bool virt) { void CInputManager::newTouchDevice(SP pDevice) { const auto PNEWDEV = m_vTouches.emplace_back(CTouchDevice::create(pDevice)); - m_vHIDs.push_back(PNEWDEV); + m_vHIDs.emplace_back(PNEWDEV); try { PNEWDEV->hlName = getNameForNewDevice(PNEWDEV->deviceName); diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp index 10faff24..57f93d2a 100644 --- a/src/managers/input/InputManager.hpp +++ b/src/managers/input/InputManager.hpp @@ -26,12 +26,12 @@ AQUAMARINE_FORWARD(ITablet); AQUAMARINE_FORWARD(ITabletTool); AQUAMARINE_FORWARD(ITabletPad); -enum eClickBehaviorMode { +enum eClickBehaviorMode : uint8_t { CLICKMODE_DEFAULT = 0, CLICKMODE_KILL }; -enum eMouseBindMode { +enum eMouseBindMode : int8_t { MBIND_INVALID = -1, MBIND_MOVE = 0, MBIND_RESIZE = 1, @@ -39,8 +39,8 @@ enum eMouseBindMode { MBIND_RESIZE_FORCE_RATIO = 3 }; -enum eBorderIconDirection { - BORDERICON_NONE, +enum eBorderIconDirection : uint8_t { + BORDERICON_NONE = 0, BORDERICON_UP, BORDERICON_DOWN, BORDERICON_LEFT, @@ -276,7 +276,7 @@ class CInputManager { void setCursorImageOverride(const std::string& name); // cursor surface - struct cursorSI { + struct { bool hidden = false; // null surface = hidden SP wlSurface; Vector2D vHotspot; @@ -288,8 +288,8 @@ class CInputManager { // discrete scrolling emulation using v120 data struct { - bool lastEventSign = 0; - bool lastEventAxis = 0; + bool lastEventSign = false; + bool lastEventAxis = false; uint32_t lastEventTime = 0; uint32_t accumulatedScroll = 0; } m_ScrollWheelState; diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index 36bd5636..aba54387 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -198,7 +198,7 @@ void CInputManager::onTabletProximity(CTablet::SProximityEvent e) { void CInputManager::newTablet(SP pDevice) { const auto PNEWTABLET = m_vTablets.emplace_back(CTablet::create(pDevice)); - m_vHIDs.push_back(PNEWTABLET); + m_vHIDs.emplace_back(PNEWTABLET); try { PNEWTABLET->hlName = g_pInputManager->getNameForNewDevice(pDevice->getName()); @@ -226,7 +226,7 @@ SP CInputManager::ensureTabletToolPresent(SPhlName = g_pInputManager->getNameForNewDevice(pTool->getName()); @@ -246,7 +246,7 @@ SP CInputManager::ensureTabletToolPresent(SP pDevice) { const auto PNEWPAD = m_vTabletPads.emplace_back(CTabletPad::create(pDevice)); - m_vHIDs.push_back(PNEWPAD); + m_vHIDs.emplace_back(PNEWPAD); try { PNEWPAD->hlName = g_pInputManager->getNameForNewDevice(pDevice->getName()); diff --git a/src/managers/input/TextInput.cpp b/src/managers/input/TextInput.cpp index f7a6a350..4b28d513 100644 --- a/src/managers/input/TextInput.cpp +++ b/src/managers/input/TextInput.cpp @@ -63,11 +63,10 @@ void CTextInput::onEnabled(SP surfV1) { // v1 only, map surface to PTI if (!isV3()) { - SP pSurface = surfV1; - if (g_pCompositor->m_pLastFocus != pSurface || !pV1Input->active) + if (g_pCompositor->m_pLastFocus != surfV1 || !pV1Input->active) return; - enter(pSurface); + enter(surfV1); } g_pInputManager->m_sIMERelay.activateIME(this); -- cgit v1.2.3