Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hyprbars: add bar_color & title_color windowrules #192

Merged
merged 3 commits into from
Aug 8, 2024
Merged

hyprbars: add bar_color & title_color windowrules #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eb37e0
hyprbars: add bar_color & title_color windowrules
Misterio77 Jun 25, 2024
34c312e
hyprbars: fix if formatting
Misterio77 Jul 3, 2024
af06a7b
hyprbars: format
Misterio77 Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hyprbars/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,6 @@ hyprbars-button = color, size, icon, on-click

Hyprbars supports the following _dynamic_ window rules:

`plugin:hyprbars:nobar` -> disables the bar on matching windows.
`plugin:hyprbars:nobar` -> disables the bar on matching windows.
`plugin:hyprbars:bar_color` -> sets the bar background color on matching windows.
`plugin:hyprbars:title_color` -> sets the bar title color on matching windows.
41 changes: 32 additions & 9 deletions hyprbars/barDeco.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CHyprBar::CHyprBar(PHLWINDOW pWindow) : IHyprWindowDecoration(pWindow) {
m_pMouseMoveCallback =
HyprlandAPI::registerCallbackDynamic(PHANDLE, "mouseMove", [&](void* self, SCallbackInfo& info, std::any param) { onMouseMove(std::any_cast<Vector2D>(param)); });

m_pTextTex = makeShared<CTexture>();
m_pTextTex = makeShared<CTexture>();
m_pButtonsTex = makeShared<CTexture>();
}

Expand Down Expand Up @@ -220,7 +220,7 @@ void CHyprBar::renderBarTitle(const Vector2D& bufferSize, const float scale) {
const auto scaledButtonsPad = **PBARBUTTONPADDING * scale;
const auto scaledBarPadding = **PBARPADDING * scale;

const CColor COLOR = **PCOLOR;
const CColor COLOR = m_bForcedTitleColor.value_or(**PCOLOR);

const auto CAIROSURFACE = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, bufferSize.x, bufferSize.y);
const auto CAIRO = cairo_create(CAIROSURFACE);
Expand Down Expand Up @@ -412,7 +412,7 @@ void CHyprBar::draw(CMonitor* pMonitor, float a) {

const auto scaledRounding = ROUNDING > 0 ? ROUNDING * pMonitor->scale - 2 /* idk why but otherwise it looks bad due to the gaps */ : 0;

CColor color = **PCOLOR;
CColor color = m_bForcedBarColor.value_or(**PCOLOR);
color.a *= a;

m_seExtents = {{0, **PHEIGHT}, {}};
Expand Down Expand Up @@ -461,7 +461,7 @@ void CHyprBar::draw(CMonitor* pMonitor, float a) {
g_pHyprOpenGL->renderRect(&titleBarBox, color, scaledRounding);

// render title
if (**PENABLETITLE && (m_szLastTitle != PWINDOW->m_szTitle || m_bWindowSizeChanged || m_pTextTex->m_iTexID == 0)) {
if (**PENABLETITLE && (m_szLastTitle != PWINDOW->m_szTitle || m_bWindowSizeChanged || m_pTextTex->m_iTexID == 0 || m_bTitleColorChanged)) {
m_szLastTitle = PWINDOW->m_szTitle;
renderBarTitle(BARBUF, pMonitor->scale);
}
Expand Down Expand Up @@ -491,6 +491,7 @@ void CHyprBar::draw(CMonitor* pMonitor, float a) {
renderBarButtonsText(&textBox, pMonitor->scale, a);

m_bWindowSizeChanged = false;
m_bTitleColorChanged = false;

// dynamic updates change the extents
if (m_iLastHeight != **PHEIGHT) {
Expand Down Expand Up @@ -540,11 +541,33 @@ PHLWINDOW CHyprBar::getOwner() {
return m_pWindow.lock();
}

void CHyprBar::setHidden(bool hidden) {
if (m_bHidden == hidden)
return;
void CHyprBar::updateRules() {
const auto PWINDOW = m_pWindow.lock();
auto rules = PWINDOW->m_vMatchedRules;
auto prev_m_bHidden = m_bHidden;
auto prev_m_bForcedTitleColor = m_bForcedTitleColor;

m_bForcedBarColor = std::nullopt;
m_bForcedTitleColor = std::nullopt;
m_bHidden = false;

for (auto& r : rules) {
applyRule(r);
}

if (prev_m_bHidden != m_bHidden)
g_pDecorationPositioner->repositionDeco(this);
if (prev_m_bForcedTitleColor != m_bForcedTitleColor)
m_bTitleColorChanged = true;
}

m_bHidden = hidden;
void CHyprBar::applyRule(const SWindowRule& r) {
auto arg = r.szRule.substr(r.szRule.find_first_of(' ') + 1);

g_pDecorationPositioner->repositionDeco(this);
if (r.szRule == "plugin:hyprbars:nobar")
m_bHidden = true;
else if (r.szRule.starts_with("plugin:hyprbars:bar_color"))
m_bForcedBarColor = CColor(configStringToInt(arg));
else if (r.szRule.starts_with("plugin:hyprbars:title_color"))
m_bForcedTitleColor = CColor(configStringToInt(arg));
}
48 changes: 26 additions & 22 deletions hyprbars/barDeco.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,39 +34,43 @@ class CHyprBar : public IHyprWindowDecoration {

PHLWINDOW getOwner();

void setHidden(bool hidden);
void updateRules();
void applyRule(const SWindowRule&);

private:
SBoxExtents m_seExtents;
SBoxExtents m_seExtents;

PHLWINDOWREF m_pWindow;
PHLWINDOWREF m_pWindow;

CBox m_bAssignedBox;
CBox m_bAssignedBox;

SP<CTexture> m_pTextTex;
SP<CTexture> m_pButtonsTex;
SP<CTexture> m_pTextTex;
SP<CTexture> m_pButtonsTex;

bool m_bWindowSizeChanged = false;
bool m_bHidden = false;
bool m_bWindowSizeChanged = false;
bool m_bHidden = false;
bool m_bTitleColorChanged = false;
std::optional<CColor> m_bForcedBarColor;
std::optional<CColor> m_bForcedTitleColor;

Vector2D cursorRelativeToBar();
Vector2D cursorRelativeToBar();

void renderBarTitle(const Vector2D& bufferSize, const float scale);
void renderText(SP<CTexture> out, const std::string& text, const CColor& color, const Vector2D& bufferSize, const float scale, const int fontSize);
void renderBarButtons(const Vector2D& bufferSize, const float scale);
void renderBarButtonsText(CBox* barBox, const float scale, const float a);
void onMouseDown(SCallbackInfo& info, IPointer::SButtonEvent e);
void onMouseMove(Vector2D coords);
CBox assignedBoxGlobal();
void renderBarTitle(const Vector2D& bufferSize, const float scale);
void renderText(SP<CTexture> out, const std::string& text, const CColor& color, const Vector2D& bufferSize, const float scale, const int fontSize);
void renderBarButtons(const Vector2D& bufferSize, const float scale);
void renderBarButtonsText(CBox* barBox, const float scale, const float a);
void onMouseDown(SCallbackInfo& info, IPointer::SButtonEvent e);
void onMouseMove(Vector2D coords);
CBox assignedBoxGlobal();

SP<HOOK_CALLBACK_FN> m_pMouseButtonCallback;
SP<HOOK_CALLBACK_FN> m_pMouseMoveCallback;
SP<HOOK_CALLBACK_FN> m_pMouseButtonCallback;
SP<HOOK_CALLBACK_FN> m_pMouseMoveCallback;

std::string m_szLastTitle;
std::string m_szLastTitle;

bool m_bDraggingThis = false;
bool m_bDragPending = false;
bool m_bCancelledDown = false;
bool m_bDraggingThis = false;
bool m_bDragPending = false;
bool m_bCancelledDown = false;

// for dynamic updates
int m_iLastHeight = 0;
Expand Down
5 changes: 2 additions & 3 deletions hyprbars/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ static void onUpdateWindowRules(PHLWINDOW window) {
if (BARIT == g_pGlobalState->bars.end())
return;

const auto HASNOBAR = std::find_if(window->m_vMatchedRules.begin(), window->m_vMatchedRules.end(), [](const auto& rule) { return rule.szRule == "plugin:hyprbars:nobar"; }) != window->m_vMatchedRules.end();

(*BARIT)->setHidden(HASNOBAR);
(*BARIT)->updateRules();
window->updateWindowDecos();
}

Hyprlang::CParseResult onNewButton(const char* K, const char* V) {
Expand Down
Loading