hyprwm/hyprland-plugins
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprland-plugins.git synced 2024-11-24 03:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

borders-plus-plus: Add more borders and controls

Browse source 
Adds up to 9 borders, adds an option to modify size of each, adds natural_rounding
This commit is contained in:
Vaxry 2023-10-19 14:43:54 +01:00
parent ef552ecfa9
commit 2ae696398a
4 changed files with 63 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
borders-plus-plus/README.md
View file

@ -4,13 +4,22 @@ Allows you to add one or two additional borders to your windows.
The borders added are static. The borders added are static.
Config: Example Config:
``` ```
plugin { plugin {
borders-plus-plus { borders-plus-plus {
add_borders = 1 # 0 - 2 add_borders = 1 # 0 - 9
col.border_1 = rgb(ffffff) # example col for border 1
col.border_2 = rgb(2222ff) # example col for border 2 # you can add up to 9 borders
col.border_1 = rgb(ffffff)
col.border_2 = rgb(2222ff)
# -1 means "default" as in the one defined in general:border_size
border_size_1 = 10
border_size_2 = -1
# makes outer edges match rounding of the parent. Turn on / off to better understand. Default = on.
natural_rounding = yes
} }
} }
``` ```

81
borders-plus-plus/borderDeco.cpp
View file

@ -18,6 +18,10 @@ SWindowDecorationExtents CBordersPlusPlus::getWindowDecorationExtents() {
return m_seExtents; return m_seExtents;
} }
SWindowDecorationExtents CBordersPlusPlus::getWindowDecorationReservedArea() {
return m_seExtents;
}
void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) { void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
if (!g_pCompositor->windowValidMapped(m_pWindow)) if (!g_pCompositor->windowValidMapped(m_pWindow))
return; return;
@ -25,66 +29,65 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset)
if (!m_pWindow->m_sSpecialRenderData.decorate) if (!m_pWindow->m_sSpecialRenderData.decorate)
return; return;
static auto* const PCOLOR1 = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_1")->intValue; static std::vector<int64_t*> PCOLORS;
static auto* const PCOLOR2 = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_2")->intValue; static std::vector<int64_t*> PSIZES;
static auto* const PBORDERS = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders")->intValue; for (size_t i = 0; i < 9; ++i) {
static auto* const PROUNDING = &HyprlandAPI::getConfigValue(PHANDLE, "decoration:rounding")->intValue; PCOLORS.push_back(&HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_" + std::to_string(i + 1))->intValue);
static auto* const PBORDERSIZE = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue; PSIZES.push_back(&HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:border_size_" + std::to_string(i + 1))->intValue);
}
static auto* const PBORDERS = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders")->intValue;
static auto* const PNATURALROUND = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:natural_rounding")->intValue;
static auto* const PROUNDING = &HyprlandAPI::getConfigValue(PHANDLE, "decoration:rounding")->intValue;
static auto* const PBORDERSIZE = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue;
if (*PBORDERS < 1) if (*PBORDERS < 1)
return; return;
const auto ROUNDING = !m_pWindow->m_sSpecialRenderData.rounding ? auto rounding = m_pWindow->rounding() * pMonitor->scale + *PBORDERSIZE;
0 : const auto ORIGINALROUND = m_pWindow->rounding() * pMonitor->scale + *PBORDERSIZE;
(m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying() == -1 ? *PROUNDING : m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying()); wlr_box fullBox = {(int)m_vLastWindowPos.x, (int)m_vLastWindowPos.y, (int)m_vLastWindowSize.x, (int)m_vLastWindowSize.y};
// draw the border
wlr_box fullBox = {(int)(m_vLastWindowPos.x - *PBORDERSIZE), (int)(m_vLastWindowPos.y - *PBORDERSIZE), (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE),
(int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE)};
fullBox.x -= pMonitor->vecPosition.x; fullBox.x -= pMonitor->vecPosition.x;
fullBox.y -= pMonitor->vecPosition.y; fullBox.y -= pMonitor->vecPosition.y;
m_seExtents = {{m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2},
{fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2,
fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2}};
fullBox.x += offset.x; fullBox.x += offset.x;
fullBox.y += offset.y; fullBox.y += offset.y;
if (fullBox.width < 1 || fullBox.height < 1) double fullThickness = 0;
return; // don't draw invisible shadows
g_pHyprOpenGL->scissor((wlr_box*)nullptr); fullBox.x -= *PBORDERSIZE;
fullBox.y -= *PBORDERSIZE;
fullBox.width += *PBORDERSIZE * 2;
fullBox.height += *PBORDERSIZE * 2;
scaleBox(&fullBox, pMonitor->scale); for (size_t i = 0; i < *PBORDERS; ++i) {
g_pHyprOpenGL->renderBorder(&fullBox, CColor(*PCOLOR1), *PROUNDING == 0 ? 0 : *PROUNDING * pMonitor->scale + *PBORDERSIZE * 2, *PBORDERSIZE, a); const int PREVBORDERSIZE = i == 0 ? 0 : (*PSIZES[i - 1] == -1 ? *PBORDERSIZE : *PSIZES[i - 1]);
const int THISBORDERSIZE = *PSIZES[i] == -1 ? *PBORDERSIZE : *PSIZES[i];
// pass 2 if (i != 0) {
rounding += PREVBORDERSIZE;
fullBox.x -= PREVBORDERSIZE;
fullBox.y -= PREVBORDERSIZE;
fullBox.width += PREVBORDERSIZE * 2;
fullBox.height += PREVBORDERSIZE * 2;
}
if (*PBORDERS < 2) if (fullBox.width < 1 || fullBox.height < 1)
return; break;
fullBox = {(int)(m_vLastWindowPos.x - *PBORDERSIZE * 2), (int)(m_vLastWindowPos.y - *PBORDERSIZE * 2), (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE * 2), g_pHyprOpenGL->scissor((wlr_box*)nullptr);
(int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE * 2)}; wlr_box saveBox = fullBox;
fullBox.x -= pMonitor->vecPosition.x; scaleBox(&fullBox, pMonitor->scale);
fullBox.y -= pMonitor->vecPosition.y;
m_seExtents = {{m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2}, g_pHyprOpenGL->renderBorder(&fullBox, CColor{(uint64_t)*PCOLORS[i]}, *PNATURALROUND ? ORIGINALROUND : rounding, THISBORDERSIZE, a, *PNATURALROUND ? ORIGINALROUND : -1);
{fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2,
fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2}};
fullBox.x += offset.x; fullBox = saveBox;
fullBox.y += offset.y;
if (fullBox.width < 1 || fullBox.height < 1) fullThickness += THISBORDERSIZE;
return; // don't draw invisible shadows }
g_pHyprOpenGL->scissor((wlr_box*)nullptr); m_seExtents = {{fullThickness, fullThickness}, {fullThickness, fullThickness}};
scaleBox(&fullBox, pMonitor->scale);
g_pHyprOpenGL->renderBorder(&fullBox, CColor(*PCOLOR2), *PROUNDING == 0 ? 0 : *PROUNDING * pMonitor->scale + *PBORDERSIZE * 4, *PBORDERSIZE, a);
} }
eDecorationType CBordersPlusPlus::getDecorationType() { eDecorationType CBordersPlusPlus::getDecorationType() {

2
borders-plus-plus/borderDeco.hpp
View file

@ -19,6 +19,8 @@ class CBordersPlusPlus : public IHyprWindowDecoration {
virtual void damageEntire(); virtual void damageEntire();
virtual SWindowDecorationExtents getWindowDecorationReservedArea();
private: private:
SWindowDecorationExtents m_seExtents; SWindowDecorationExtents m_seExtents;

8
borders-plus-plus/main.cpp
View file

@ -34,8 +34,12 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
} }
HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders", SConfigValue{.intValue = 1}); HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders", SConfigValue{.intValue = 1});
HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_1", SConfigValue{.intValue = configStringToInt("rgba(000000ee)")}); HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:natural_rounding", SConfigValue{.intValue = 1});
HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_2", SConfigValue{.intValue = configStringToInt("rgba(000000ee)")});
for (size_t i = 0; i < 9; ++i) {
HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_" + std::to_string(i + 1), SConfigValue{.intValue = configStringToInt("rgba(000000ee)")});
HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:border_size_" + std::to_string(i + 1), SConfigValue{.intValue = -1});
}
HyprlandAPI::registerCallbackDynamic(PHANDLE, "openWindow", [&](void* self, std::any data) { onNewWindow(self, data); }); HyprlandAPI::registerCallbackDynamic(PHANDLE, "openWindow", [&](void* self, std::any data) { onNewWindow(self, data); });