jacob.eva
/
somebar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.sr.ht/~raphi/somebar

This commit is contained in:
jacobeva 2023-01-08 12:49:43 +00:00
parent 96c119d7bf 624e92927b
commit 4d88266b46
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
11 changed files with 367 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.md Normal file
View File

@ -0,0 +1,19 @@
## [1.0.3] - 2022-12-11
### Added
- New patches: markup-in-status-messages, show-status-on-selected-monitor (benc)
### Fixed
- Fixed crash when an output disappears
## [1.0.2] - 2022-11-27
### Fixed
- Fixed bug where hidden bar could not be shown anymore
## [1.0.1] - 2022-11-25
### Added
- Manpage
- New patches: indicator-size-props, hide-vacant-tags, colorless-status (medanisjbara)
### Fixed
- Remove spaces from title and layout symbol (benc)
## [1.0.0] - 2022-04-23
Initial release

4
README.md
View File

@ -83,6 +83,10 @@ If you apply the IPC patch to somebar, then
**dwl must have the [wayland-ipc patch](https://git.sr.ht/~raphi/dwl/blob/master/patches/wayland-ipc.patch) applied too**,
since dwl must implement the wayland extension too.
## Other patches
Like all suckless software, somebar can be customized via patches. You can find some patches in the contrib folder with descriptions written in them.
## License
somebar - dwm-like bar for dwl

15
contrib/colorless-status.patch Normal file
View File

@ -0,0 +1,15 @@
From: medanisjbara anis2834133766619@gmail.com
Date: Mon, 14 Nov 2022 10:28:00
Description: sets the color of status component to inactive
diff --git a/src/bar.cpp b/src/bar.cpp
index fab5a8f..aebe28b 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -266,6 +266,7 @@ void Bar::renderStatus()
cairo_fill(_painter);
_x = start;
+ setColorScheme(colorInactive);
renderComponent(_statusCmp);
}

34
contrib/dwm-like-tag-indicator.patch Normal file
View File

@ -0,0 +1,34 @@
From: Henrique Possatto <henriquempossatto@gmail.com>
Date: Mon, 26 Dec 2022 18:01:35 -0300
Subject: [PATCH somebar] patch to show square tag indicator like dwm
diff --git a/src/bar.cpp b/src/bar.cpp
index 507ce62..4fda8b0 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -245,12 +245,17 @@ void Bar::renderTags()
tag.state & TagState::Active ? colorActive : colorInactive,
tag.state & TagState::Urgent);
renderComponent(tag.component);
- auto indicators = std::min(tag.numClients, static_cast<int>(_bufs->height/2));
- for (auto ind = 0; ind < indicators; ind++) {
- auto w = ind == tag.focusedClient ? 7 : 1;
- cairo_move_to(_painter, tag.component.x, ind*2+0.5);
- cairo_rel_line_to(_painter, w, 0);
- cairo_close_path(_painter);
+
+ if(!tag.numClients)
+ continue;
+
+ int s = barfont.height / 9;
+ int w = barfont.height / 6 + 2;
+ if (tag.focusedClient != -1) {
+ cairo_rectangle(_painter, tag.component.x + s, s, w, w);
+ cairo_fill(_painter);
+ } else {
+ cairo_rectangle(_painter, (double)(tag.component.x + s) + 0.5, (double)(s) + 0.5, w, w);
cairo_set_line_width(_painter, 1);
cairo_stroke(_painter);
}
--
2.39.0

54
contrib/hide-vacant-tags.patch Normal file
View File

@ -0,0 +1,54 @@
From: medanisjbara anis2834133766619@gmail.com
Date: Mon, 14 Nov 2022 22:52:00
Description: somebar equivalent of https://dwm.suckless.org/patches/hide_vacant_tags
diff --git a/src/bar.cpp b/src/bar.cpp
index fab5a8f..38e7b5f 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -240,13 +240,36 @@ void Bar::render()
void Bar::renderTags()
{
+ // Check if all tags are active (Mod+0)
+ bool allActive = true;
for (auto &tag : _tags) {
+ if (tag.state & TagState::Active){
+ if (!allActive){
+ allActive = true;
+ break;
+ }
+ allActive = false;
+ }
+ }
+
+ bool renderThis;
+ for (auto &tag : _tags) {
+ renderThis = false;
setColorScheme(
tag.state & TagState::Active ? colorActive : colorInactive,
tag.state & TagState::Urgent);
- renderComponent(tag.component);
+ // Reder active tag if it's the only one active
+ if (!allActive && tag.state & TagState::Active)
+ renderThis = true;
auto indicators = std::min(tag.numClients, static_cast<int>(_bufs->height/2));
for (auto ind = 0; ind < indicators; ind++) {
+ // render tags having indicators
+ if (tag.focusedClient == -1)
+ renderThis = true;
+ // render tags having the focused client
+ if (tag.focusedClient == 0){
+ renderThis = true;
+ }
auto w = ind == tag.focusedClient ? 7 : 1;
cairo_move_to(_painter, tag.component.x, ind*2+0.5);
cairo_rel_line_to(_painter, w, 0);
@@ -254,6 +277,8 @@ void Bar::renderTags()
cairo_set_line_width(_painter, 1);
cairo_stroke(_painter);
}
+ if (renderThis)
+ renderComponent(tag.component);
}
}

54
contrib/indicator-size-props.patch Normal file
View File

@ -0,0 +1,54 @@
From: medanisjbara anis2834133766619@gmail.com
Date: Mon, 15 Nov 2022 08:16:00
Description: lets config.h customize indicators sizes
diff --git a/src/bar.cpp b/src/bar.cpp
index fab5a8f..c0e070c 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -247,11 +247,11 @@ void Bar::renderTags()
renderComponent(tag.component);
auto indicators = std::min(tag.numClients, static_cast<int>(_bufs->height/2));
for (auto ind = 0; ind < indicators; ind++) {
- auto w = ind == tag.focusedClient ? 7 : 1;
+ auto w = ind == tag.focusedClient ? indprops.focused_width : indprops.width;
cairo_move_to(_painter, tag.component.x, ind*2+0.5);
cairo_rel_line_to(_painter, w, 0);
cairo_close_path(_painter);
- cairo_set_line_width(_painter, 1);
+ cairo_set_line_width(_painter, ind == tag.focusedClient ? indprops.focused_height : indprops.height);
cairo_stroke(_painter);
}
}
diff --git a/src/common.hpp b/src/common.hpp
index aed4480..acdca1b 100644
--- a/src/common.hpp
+++ b/src/common.hpp
@@ -34,6 +34,13 @@ struct Button {
const Arg arg;
};
+struct IndicatorProps {
+ int width;
+ int height;
+ int focused_width;
+ int focused_height;
+};
+
extern wl_display* display;
extern wl_compositor* compositor;
extern wl_shm* shm;
diff --git a/src/config.def.hpp b/src/config.def.hpp
index 40a8c95..d51fee8 100644
--- a/src/config.def.hpp
+++ b/src/config.def.hpp
@@ -25,3 +25,10 @@ static std::vector<std::string> tagNames = {
constexpr Button buttons[] = {
{ ClkStatusText, BTN_RIGHT, spawn, {.v = termcmd} },
};
+
+constexpr IndicatorProps indprops = {
+ 5, /* unfocused indicator width */
+ 5, /* unfocused indicator height */
+ 7, /* focused indicator width */
+ 1 /* focused indicator height */
+};

65
contrib/markup-in-status-messages.patch Normal file
View File

@ -0,0 +1,65 @@
From: Ben Collerson <benc@benc.cc>
Date: Tue, 29 Nov 2022 11:29:15 +1000
Subject: [PATCH] markup in status messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Allows pango markup to be used in status messages which allow colours to
be used to highlight parts of status bar messages. eg:
battery: full <span color="#ffff00">🔇0</span> Tue 11-20 20:10
---
src/bar.cpp | 16 +++++++++++++++-
src/bar.hpp | 1 +
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/bar.cpp b/src/bar.cpp
index 507ce62..a96c547 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -81,6 +81,11 @@ void BarComponent::setText(const std::string& text)
pango_layout_set_text(pangoLayout.get(), _text->c_str(), _text->size());
}
+void BarComponent::setAttributes(PangoAttrList *attrs)
+{
+ pango_layout_set_attributes(pangoLayout.get(), attrs);
+}
+
Bar::Bar()
{
_pangoContext.reset(pango_font_map_create_context(pango_cairo_font_map_get_default()));
@@ -156,7 +161,16 @@ void Bar::setTitle(const std::string& title)
}
void Bar::setStatus(const std::string& status)
{
- _statusCmp.setText(status);
+ char *buf;
+ GError *error = NULL;
+ PangoAttrList *attrs;
+ if (pango_parse_markup(status.c_str(), -1, 0, &attrs, &buf, NULL, &error)) {
+ _statusCmp.setText(buf);
+ _statusCmp.setAttributes(attrs);
+ }
+ else {
+ _statusCmp.setText(error->message);
+ }
}
void Bar::invalidate()
diff --git a/src/bar.hpp b/src/bar.hpp
index 176a1bc..dfc2043 100644
--- a/src/bar.hpp
+++ b/src/bar.hpp
@@ -17,6 +17,7 @@ public:
explicit BarComponent(wl_unique_ptr<PangoLayout> layout);
int width() const;
void setText(const std::string& text);
+ void setAttributes(PangoAttrList *attrs);
wl_unique_ptr<PangoLayout> pangoLayout;
int x {0};
};
--
2.38.1

43
contrib/show-status-on-selected-monitor.patch Normal file
View File

@ -0,0 +1,43 @@
From 1ca4603b79e888980fb46d5dc6aa0d6f8afa2b3c Mon Sep 17 00:00:00 2001
From: Ben Collerson <benc@benc.cc>
Date: Mon, 28 Nov 2022 13:22:16 +1000
Subject: [PATCH] show status on selected monitor
---
src/bar.cpp | 7 ++++++-
src/main.cpp | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/bar.cpp b/src/bar.cpp
index 507ce62..f962927 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -156,7 +156,12 @@ void Bar::setTitle(const std::string& title)
}
void Bar::setStatus(const std::string& status)
{
- _statusCmp.setText(status);
+ if (_selected) {
+ _statusCmp.setText(status);
+ }
+ else {
+ _statusCmp.setText("");
+ }
}
void Bar::invalidate()
diff --git a/src/main.cpp b/src/main.cpp
index 6274959..c6fd401 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -307,6 +307,7 @@ static void handleStdin(const std::string& line)
uint32_t selected;
stream >> selected;
mon->bar.setSelected(selected);
+ mon->bar.setStatus(lastStatus);
if (selected) {
selmon = &*mon;
} else if (selmon == &*mon) {
--
2.38.1

2
src/bar.cpp
View File

@ -200,7 +200,7 @@ void Bar::click(Monitor* mon, int x, int, int btn)
void Bar::layerSurfaceConfigure(uint32_t serial, uint32_t width, uint32_t height)
{
zwlr_layer_surface_v1_ack_configure(_layerSurface.get(), serial);
if (width == _bufs->width && height == _bufs->height) {
if (_bufs && width == _bufs->width && height == _bufs->height) {
return;
}
_bufs.emplace(width, height, WL_SHM_FORMAT_XRGB8888);

8
src/common.hpp
View File

@ -62,8 +62,14 @@ struct WlDeleter;
template<typename T>
using wl_unique_ptr = std::unique_ptr<T, WlDeleter<T>>;
inline void wl_output_release_checked(wl_output* output) {
if (wl_output_get_version(output) >= WL_OUTPUT_RELEASE_SINCE_VERSION) {
wl_output_release(output);
}
}
WL_DELETER(wl_buffer, wl_buffer_destroy);
WL_DELETER(wl_output, wl_output_release);
WL_DELETER(wl_output, wl_output_release_checked);
WL_DELETER(wl_pointer, wl_pointer_release);
WL_DELETER(wl_seat, wl_seat_release);
WL_DELETER(wl_surface, wl_surface_destroy);

71
src/main.cpp
View File

@ -3,6 +3,7 @@
#include <algorithm>
#include <cstdio>
#include <sstream>
#include <list>
#include <optional>
#include <utility>
@ -22,6 +23,7 @@
#include "xdg-shell-client-protocol.h"
#include "net-tapesoftware-dwl-wm-unstable-v1-client-protocol.h"
#include "common.hpp"
#include "config.hpp"
#include "bar.hpp"
#include "line_buffer.hpp"
@ -54,6 +56,8 @@ static void updatemon(Monitor &mon);
static void onReady();
static void setupStatusFifo();
static void onStatus();
static void onStdin();
static void handleStdin(const std::string& line);
static void updateVisibility(const std::string& name, bool(*updater)(bool));
static void onGlobalAdd(void*, wl_registry* registry, uint32_t name, const char* interface, uint32_t version);
static void onGlobalRemove(void*, wl_registry* registry, uint32_t name);
@ -299,6 +303,7 @@ void onReady()
for (auto output : uninitializedOutputs) {
setupMonitor(output.first, output.second);
}
wl_display_roundtrip(display); // wait for xdg_output names before we read stdin
}
bool createFifo(std::string path)
@ -345,6 +350,66 @@ void setupStatusFifo()
}
}
static LineBuffer<512> stdinBuffer;
static void onStdin()
{
auto res = stdinBuffer.readLines(
[](void* p, size_t size) { return read(0, p, size); },
[](char* p, size_t size) { handleStdin({p, size}); });
if (res == 0) {
quitting = true;
}
}
static void handleStdin(const std::string& line)
{
// this parses the lines that dwl sends in printstatus()
std::string monName, command;
auto stream = std::istringstream {line};
stream >> monName >> command;
if (!stream.good()) {
return;
}
auto mon = std::find_if(begin(monitors), end(monitors), [&](const Monitor& mon) {
return mon.xdgName == monName;
});
if (mon == end(monitors))
return;
if (command == "title") {
auto title = std::string {};
std::getline(stream, title);
mon->bar.setTitle(title);
} else if (command == "selmon") {
uint32_t selected;
stream >> selected;
mon->bar.setSelected(selected);
if (selected) {
selmon = &*mon;
} else if (selmon == &*mon) {
selmon = nullptr;
}
} else if (command == "tags") {
uint32_t occupied, tags, clientTags, urgent;
stream >> occupied >> tags >> clientTags >> urgent;
for (auto i=0u; i<tagNames.size(); i++) {
auto tagMask = 1 << i;
int state = TagState::None;
if (tags & tagMask)
state |= TagState::Active;
if (urgent & tagMask)
state |= TagState::Urgent;
mon->bar.setTag(i, state, occupied & tagMask ? 1 : 0, clientTags & tagMask ? 0 : -1);
}
mon->tags = tags;
} else if (command == "layout") {
auto layout = std::string {};
std::getline(stream, layout);
mon->bar.setLayout(layout);
}
mon->hasData = true;
updatemon(*mon);
}
const std::string prefixStatus = "status ";
const std::string prefixShow = "show ";
const std::string prefixHide = "hide ";
@ -536,6 +601,10 @@ int main(int argc, char* argv[])
.fd = displayFd,
.events = POLLIN,
});
pollfds.push_back({
.fd = STDIN_FILENO,
.events = POLLIN,
});
if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) < 0) {
diesys("fcntl F_SETFL");
}
@ -560,6 +629,8 @@ int main(int argc, char* argv[])
ev.events = POLLIN;
waylandFlush();
}
} else if (ev.fd == STDIN_FILENO && (ev.revents & POLLIN)) {
onStdin();
} else if (ev.fd == statusFifoFd && (ev.revents & POLLIN)) {
onStatus();
} else if (ev.fd == signalSelfPipe[0] && (ev.revents & POLLIN)) {