From 3388351d2af672f89b907404668c6076336270e9 Mon Sep 17 00:00:00 2001 From: zooeywm Date: Wed, 20 Nov 2024 15:39:10 +0800 Subject: [PATCH 1/5] Chase hyprland --- easymotionDeco.cpp | 6 +++--- easymotionDeco.hpp | 2 +- main.cpp | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/easymotionDeco.cpp b/easymotionDeco.cpp index 0e40cfd..85df59c 100644 --- a/easymotionDeco.cpp +++ b/easymotionDeco.cpp @@ -108,7 +108,7 @@ void CHyprEasyLabel::renderMotionString(Vector2D& bufferSize, const float scale) } -void CHyprEasyLabel::draw(PHLMONITOR pMonitor, float a) { +void CHyprEasyLabel::draw(PHLMONITOR pMonitor, float const &a) { if (!validMapped(m_pWindow)) return; @@ -134,7 +134,7 @@ void CHyprEasyLabel::draw(PHLMONITOR pMonitor, float a) { if (!m_tTextTex.get()) { renderMotionString(TEXTBUF, pMonitor->scale); } - CBox motionBox = {DECOBOX.x, DECOBOX.y, layoutWidth, layoutHeight}; + CBox motionBox = {DECOBOX.x, DECOBOX.y, static_cast(layoutWidth), static_cast(layoutHeight)}; motionBox.translate(pMonitor->vecPosition*-1).scale(pMonitor->scale).round(); if (motionBox.w < 1 || motionBox.h < 1) @@ -143,7 +143,7 @@ void CHyprEasyLabel::draw(PHLMONITOR pMonitor, float a) { g_pHyprOpenGL->renderRect(&motionBox, m_cBackgroundColor, scaledRounding); if (m_iBorderSize) { - CBox borderBox = {DECOBOX.x, DECOBOX.y, layoutWidth, layoutHeight}; + CBox borderBox = {DECOBOX.x, DECOBOX.y, static_cast(layoutWidth), static_cast(layoutHeight)}; borderBox.translate(pMonitor->vecPosition*-1).scale(pMonitor->scale).round(); if (borderBox.w >= 1 && borderBox.h >= 1) { g_pHyprOpenGL->renderBorder(&borderBox, m_cBorderGradient, scaledRounding, m_iBorderSize * pMonitor->scale, a); diff --git a/easymotionDeco.hpp b/easymotionDeco.hpp index 52aa8e5..23926f7 100644 --- a/easymotionDeco.hpp +++ b/easymotionDeco.hpp @@ -17,7 +17,7 @@ class CHyprEasyLabel : public IHyprWindowDecoration { virtual void onPositioningReply(const SDecorationPositioningReply& reply); - virtual void draw(PHLMONITOR, float a); + virtual void draw(PHLMONITOR, float const &a); virtual eDecorationType getDecorationType(); diff --git a/main.cpp b/main.cpp index 1508190..4f13f3e 100644 --- a/main.cpp +++ b/main.cpp @@ -130,7 +130,7 @@ void easymotionDispatch(std::string args) actionDesc.motionKeys = *MOTIONKEYS; - for(int i = 0; i < emargs.size(); i++) + for(size_t i = 0; i < emargs.size(); i++) { CVarList kv(emargs[i], 2, ':'); @@ -171,8 +171,10 @@ void easymotionDispatch(std::string args) if (w->m_pWorkspace == m->activeWorkspace || m->activeSpecialWorkspace == w->m_pWorkspace) { if (w->isHidden() || !w->m_bIsMapped || w->m_bFadingOut) continue; - if (w->m_pWorkspace->m_bHasFullscreenWindow && g_pCompositor->getFullscreenWindowOnWorkspace(w->workspaceID()) != w) - continue; + if (w->m_pWorkspace->m_bHasFullscreenWindow && + g_pCompositor->getFullscreenWindowOnWorkspace(w->workspaceID()) != w) { + continue; + } std::string lstr = actionDesc.motionKeys.substr(key_idx++, 1); addLabelToWindow(w, &actionDesc, lstr); } From 12b1f9a222302f87410010673d558ec55725db04 Mon Sep 17 00:00:00 2001 From: Zakk Date: Thu, 21 Nov 2024 13:32:01 -0500 Subject: [PATCH 2/5] Chase hyprland --- main.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main.cpp b/main.cpp index 4f13f3e..aa276dc 100644 --- a/main.cpp +++ b/main.cpp @@ -85,7 +85,7 @@ static bool parseBorderGradient(std::string VALUE, CGradientValueData *DATA) { } try { - DATA->m_vColors.push_back(CColor(configStringToInt(var))); + DATA->m_vColors.push_back(CColor(configStringToInt(var).value_or(0))); } catch (std::exception& e) { Debug::log(WARN, "Error parsing gradient {}", V); } @@ -137,20 +137,20 @@ void easymotionDispatch(std::string args) if (kv[0] == "action") { actionDesc.commandString = kv[1]; } else if (kv[0] == "textsize") { - actionDesc.textSize = configStringToInt(kv[1]); + actionDesc.textSize = configStringToInt(kv[1]).value_or(15); } else if (kv[0] == "textcolor") { - actionDesc.textColor = CColor(configStringToInt(kv[1])); + actionDesc.textColor = CColor(configStringToInt(kv[1]).value_or(0xffffffff)); } else if (kv[0] == "bgcolor") { - actionDesc.backgroundColor = CColor(configStringToInt(kv[1])); + actionDesc.backgroundColor = CColor(configStringToInt(kv[1]).value_or(0)); } else if (kv[0] == "textfont") { actionDesc.textFont = kv[1]; } else if (kv[0] == "textpadding") { CVarList padVars = CVarList(kv[1], 0, 's'); actionDesc.boxPadding.parseGapData(padVars); } else if (kv[0] == "rounding") { - actionDesc.rounding = configStringToInt(kv[1]); + actionDesc.rounding = configStringToInt(kv[1]).value_or(0); } else if (kv[0] == "bordersize") { - actionDesc.borderSize = configStringToInt(kv[1]); + actionDesc.borderSize = configStringToInt(kv[1]).value_or(0); } else if (kv[0] == "bordercolor") { CVarList varlist(kv[1], 0, 's'); actionDesc.borderColor.m_vColors.clear(); @@ -221,8 +221,8 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) { HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textsize", Hyprlang::INT{15}); - HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textcolor", Hyprlang::INT{configStringToInt("rgba(ffffffff)")}); - HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:bgcolor", Hyprlang::INT{configStringToInt("rgba(000000ff)")}); + HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textcolor", Hyprlang::INT{configStringToInt("rgba(ffffffff)").value_or(0xffffffff)}); + HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:bgcolor", Hyprlang::INT{configStringToInt("rgba(000000ff)").value_or(0xff)}); HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textfont", Hyprlang::STRING{"Sans"}); HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textpadding", Hyprlang::STRING{"0"}); HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:bordersize", Hyprlang::INT{0}); From fd9e695c167188df4ba3dfe01e8a379adf5bae35 Mon Sep 17 00:00:00 2001 From: Zakk Date: Thu, 21 Nov 2024 13:35:18 -0500 Subject: [PATCH 3/5] Update pins --- hyprpm.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hyprpm.toml b/hyprpm.toml index b2f9812..2aa7c53 100644 --- a/hyprpm.toml +++ b/hyprpm.toml @@ -6,6 +6,8 @@ commit_pins = [ ["cba1ade848feac44b2eda677503900639581c3f4", "b96fc643b4b262b76515e8a40cdf35b07adc8686"], ["0c7a7e2d569eeed9d6025f3eef4ea0690d90845d", "abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"], ["4520b30d498daca8079365bdb909a8dea38e8d55","abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"] + ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "3388351d2af672f89b907404668c6076336270e9"], + ["500d2a3580388afc8b620b0a3624147faa34f98b", "3388351d2af672f89b907404668c6076336270e9"] ] [hyprEasymotion] description = "Easymotion" From 0b12be28588b60f2bb9f7ac8ea1fb6c490a2c33c Mon Sep 17 00:00:00 2001 From: Zakk Date: Thu, 21 Nov 2024 13:36:48 -0500 Subject: [PATCH 4/5] Fixed toml format typo --- hyprpm.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyprpm.toml b/hyprpm.toml index 2aa7c53..f9da5e1 100644 --- a/hyprpm.toml +++ b/hyprpm.toml @@ -5,7 +5,7 @@ commit_pins = [ ["e93fbd7c4f991cb8ef03e433ccc4d43587923e15", "3226c48a18a88790711c9bf04af3c08ae989f370"], ["cba1ade848feac44b2eda677503900639581c3f4", "b96fc643b4b262b76515e8a40cdf35b07adc8686"], ["0c7a7e2d569eeed9d6025f3eef4ea0690d90845d", "abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"], - ["4520b30d498daca8079365bdb909a8dea38e8d55","abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"] + ["4520b30d498daca8079365bdb909a8dea38e8d55", "abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"], ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "3388351d2af672f89b907404668c6076336270e9"], ["500d2a3580388afc8b620b0a3624147faa34f98b", "3388351d2af672f89b907404668c6076336270e9"] ] From 80ff3f12fbfcef1f65890d302a5ecc3236bdb8d2 Mon Sep 17 00:00:00 2001 From: Zakk Date: Fri, 29 Nov 2024 10:20:24 -0500 Subject: [PATCH 5/5] Chase hyprland --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index aa276dc..447f2b4 100644 --- a/main.cpp +++ b/main.cpp @@ -172,7 +172,7 @@ void easymotionDispatch(std::string args) if (w->isHidden() || !w->m_bIsMapped || w->m_bFadingOut) continue; if (w->m_pWorkspace->m_bHasFullscreenWindow && - g_pCompositor->getFullscreenWindowOnWorkspace(w->workspaceID()) != w) { + w->m_pWorkspace->getFullscreenWindow() != w) { continue; } std::string lstr = actionDesc.motionKeys.substr(key_idx++, 1);