From 60527ab180fb3391fe9452c7dae4c2f8704df288 Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Thu, 30 Mar 2023 00:44:25 +0200 Subject: [PATCH] Fix some typos (#1907) Signed-off-by: Alexander Seiler --- src/Window.cpp | 4 ++-- src/Window.hpp | 2 +- src/config/ConfigManager.cpp | 6 +++--- src/config/ConfigManager.hpp | 2 +- src/debug/HyprCtl.cpp | 8 ++++---- src/events/Monitors.cpp | 2 +- src/events/Windows.cpp | 4 ++-- src/managers/KeybindManager.cpp | 4 ++-- src/managers/input/InputManager.cpp | 12 ++++++------ src/managers/input/InputManager.hpp | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Window.cpp b/src/Window.cpp index 681de391..dc24b71d 100644 --- a/src/Window.cpp +++ b/src/Window.cpp @@ -413,7 +413,7 @@ void CWindow::applyDynamicRule(const SWindowRule& r) { } else if (r.szRule == "forcergbx") { m_sAdditionalConfigData.forceRGBX = true; } else if (r.szRule == "opaque") { - if (!m_sAdditionalConfigData.forceOpaqueOverriden) + if (!m_sAdditionalConfigData.forceOpaqueOverridden) m_sAdditionalConfigData.forceOpaque = true; } else if (r.szRule.find("rounding") == 0) { try { @@ -470,7 +470,7 @@ void CWindow::updateDynamicRules() { m_sAdditionalConfigData.forceNoBlur = false; m_sAdditionalConfigData.forceNoBorder = false; m_sAdditionalConfigData.forceNoShadow = false; - if (!m_sAdditionalConfigData.forceOpaqueOverriden) + if (!m_sAdditionalConfigData.forceOpaqueOverridden) m_sAdditionalConfigData.forceOpaque = false; m_sAdditionalConfigData.forceNoAnims = false; m_sAdditionalConfigData.animationStyle = std::string(""); diff --git a/src/Window.hpp b/src/Window.hpp index e4cff0aa..0b9f9f81 100644 --- a/src/Window.hpp +++ b/src/Window.hpp @@ -111,7 +111,7 @@ struct SWindowAdditionalConfigData { CWindowOverridableVar rounding = -1; // -1 means no CWindowOverridableVar forceNoBlur = false; CWindowOverridableVar forceOpaque = false; - CWindowOverridableVar forceOpaqueOverriden = false; // if true, a rule will not change the forceOpaque state. This is for the force opaque dispatcher. + CWindowOverridableVar forceOpaqueOverridden = false; // if true, a rule will not change the forceOpaque state. This is for the force opaque dispatcher. CWindowOverridableVar forceAllowsInput = false; CWindowOverridableVar forceNoAnims = false; CWindowOverridableVar forceNoBorder = false; diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 2283b61c..2b0e1da0 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -611,8 +611,8 @@ void CConfigManager::handleBezier(const std::string& command, const std::string& void CConfigManager::setAnimForChildren(SAnimationPropertyConfig* const ANIM) { for (auto& [name, anim] : animationConfig) { - if (anim.pParentAnimation == ANIM && !anim.overriden) { - // if a child isnt overriden, set the values of the parent + if (anim.pParentAnimation == ANIM && !anim.overridden) { + // if a child isnt overridden, set the values of the parent anim.pValues = ANIM->pValues; setAnimForChildren(&anim); @@ -635,7 +635,7 @@ void CConfigManager::handleAnimation(const std::string& command, const std::stri return; } - PANIM->second.overriden = true; + PANIM->second.overridden = true; PANIM->second.pValues = &PANIM->second; // on/off diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp index e5a5749d..c554763f 100644 --- a/src/config/ConfigManager.hpp +++ b/src/config/ConfigManager.hpp @@ -53,7 +53,7 @@ struct SMonitorAdditionalReservedArea { }; struct SAnimationPropertyConfig { - bool overriden = true; + bool overridden = true; std::string internalBezier = ""; std::string internalStyle = ""; diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index 345a5288..4d65135e 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -486,7 +486,7 @@ std::string animationsRequest(HyprCtl::eHyprCtlOutputFormat format) { ret += "animations:\n"; for (auto& ac : g_pConfigManager->getAnimationConfig()) { - ret += getFormat("\n\tname: %s\n\t\toverriden: %i\n\t\tbezier: %s\n\t\tenabled: %i\n\t\tspeed: %.2f\n\t\tstyle: %s\n", ac.first.c_str(), (int)ac.second.overriden, + ret += getFormat("\n\tname: %s\n\t\toverriden: %i\n\t\tbezier: %s\n\t\tenabled: %i\n\t\tspeed: %.2f\n\t\tstyle: %s\n", ac.first.c_str(), (int)ac.second.overridden, ac.second.internalBezier.c_str(), ac.second.internalEnabled, ac.second.internalSpeed, ac.second.internalStyle.c_str()); } @@ -503,13 +503,13 @@ std::string animationsRequest(HyprCtl::eHyprCtlOutputFormat format) { ret += getFormat(R"#( { "name": "%s", - "overriden": %s, + "overridden": %s, "bezier": "%s", "enabled": %s, "speed": %.2f, "style": "%s" },)#", - ac.first.c_str(), ac.second.overriden ? "true" : "false", ac.second.internalBezier.c_str(), ac.second.internalEnabled ? "true" : "false", + ac.first.c_str(), ac.second.overridden ? "true" : "false", ac.second.internalBezier.c_str(), ac.second.internalEnabled ? "true" : "false", ac.second.internalSpeed, ac.second.internalStyle.c_str()); } @@ -933,7 +933,7 @@ std::string dispatchSetProp(std::string request) { } else if (PROP == "forceopaque") { PWINDOW->m_sAdditionalConfigData.forceOpaque.forceSetIgnoreLocked(configStringToInt(VAL), lock); } else if (PROP == "forceopaqueoverriden") { - PWINDOW->m_sAdditionalConfigData.forceOpaqueOverriden.forceSetIgnoreLocked(configStringToInt(VAL), lock); + PWINDOW->m_sAdditionalConfigData.forceOpaqueOverridden.forceSetIgnoreLocked(configStringToInt(VAL), lock); } else if (PROP == "forceallowsinput") { PWINDOW->m_sAdditionalConfigData.forceAllowsInput.forceSetIgnoreLocked(configStringToInt(VAL), lock); } else if (PROP == "forcenoanims") { diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index ad0e416b..ccdb3ef0 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -44,7 +44,7 @@ void Events::listener_change(wl_listener* listener, void* data) { } void Events::listener_newOutput(wl_listener* listener, void* data) { - // new monitor added, let's accomodate for that. + // new monitor added, let's accommodate for that. const auto OUTPUT = (wlr_output*)data; // for warping the cursor on launch diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 8b292a0b..4a0d3dbe 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -67,7 +67,7 @@ void Events::listener_mapWindow(void* owner, void* data) { // Foreign Toplevel PWINDOW->createToplevelHandle(); - // checks if the window wants borders and sets the appriopriate flag + // checks if the window wants borders and sets the appropriate flag g_pXWaylandManager->checkBorders(PWINDOW); // registers the animated vars and stuff @@ -808,7 +808,7 @@ void Events::listener_fullscreenWindow(void* owner, void* data) { } } - // Disable the maximize flag when we recieve a de-fullscreen request + // Disable the maximize flag when we receive a de-fullscreen request PWINDOW->m_bWasMaximized &= REQUESTED->fullscreen; requestedFullState = REQUESTED->fullscreen; diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index d854b25d..ce3bf563 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -385,7 +385,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string& // Should never happen, as we check in the ConfigManager, but oh well if (DISPATCHER == m_mDispatchers.end()) { - Debug::log(ERR, "Inavlid handler in a keybind! (handler %s does not exist)", k.handler.c_str()); + Debug::log(ERR, "Invalid handler in a keybind! (handler %s does not exist)", k.handler.c_str()); } else { // call the dispatcher Debug::log(LOG, "Keybind triggered, calling dispatcher (%d, %s, %d)", modmask, key.c_str(), keysym); @@ -1924,7 +1924,7 @@ void CKeybindManager::toggleOpaque(std::string unused) { return; PWINDOW->m_sAdditionalConfigData.forceOpaque = !PWINDOW->m_sAdditionalConfigData.forceOpaque; - PWINDOW->m_sAdditionalConfigData.forceOpaqueOverriden = true; + PWINDOW->m_sAdditionalConfigData.forceOpaqueOverridden = true; g_pHyprRenderer->damageWindow(PWINDOW); } diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 9a257dce..8bfc2db9 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -309,8 +309,8 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { setCursorIconOnBorder(pFoundWindow); } - // if we're on an input deco, reset cursor. Don't on overriden - // if (!m_bCursorImageOverriden) { + // if we're on an input deco, reset cursor. Don't on overridden + // if (!m_bCursorImageOverridden) { // if (!VECINRECT(m_vLastCursorPosFloored, pFoundWindow->m_vRealPosition.vec().x, pFoundWindow->m_vRealPosition.vec().y, // pFoundWindow->m_vRealPosition.vec().x + pFoundWindow->m_vRealSize.vec().x, pFoundWindow->m_vRealPosition.vec().y + pFoundWindow->m_vRealSize.vec().y)) { // wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor); @@ -405,7 +405,7 @@ void CInputManager::processMouseRequest(wlr_seat_pointer_request_set_cursor_even g_pHyprRenderer->m_bWindowRequestedCursorHide = false; } - if (m_bCursorImageOverriden) { + if (m_bCursorImageOverridden) { return; } @@ -1339,14 +1339,14 @@ void CInputManager::destroySwitch(SSwitchDevice* pDevice) { void CInputManager::setCursorImageUntilUnset(std::string name) { wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, name.c_str(), g_pCompositor->m_sWLRCursor); - m_bCursorImageOverriden = true; + m_bCursorImageOverridden = true; } void CInputManager::unsetCursorImage() { - if (!m_bCursorImageOverriden) + if (!m_bCursorImageOverridden) return; - m_bCursorImageOverriden = false; + m_bCursorImageOverridden = false; if (!g_pHyprRenderer->m_bWindowRequestedCursorHide) wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor); } diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp index fd5edf12..c684dbde 100644 --- a/src/managers/input/InputManager.hpp +++ b/src/managers/input/InputManager.hpp @@ -175,7 +175,7 @@ class CInputManager { bool m_bLastInputTouch = false; private: - bool m_bCursorImageOverriden = false; + bool m_bCursorImageOverridden = false; eBorderIconDirection m_eBorderIconDirection = BORDERICON_NONE; // for click behavior override