Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Alexays:master' into master

Browse Source
This commit is contained in:
Sonter
2025-06-20 18:30:56 +00:00
committed by GitHub
parent 2f6f9620d2 dfbf1ff2a0
commit 8f35dc17b8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/debian
View File

@ -1,6 +1,6 @@
# vim: ft=Dockerfile # vim: ft=Dockerfile
FROM debian:sid FROM debian:sid-slim
RUN apt update && \ RUN apt update && \
apt install --no-install-recommends --no-install-suggests -y \ apt install --no-install-recommends --no-install-suggests -y \

2
resources/waybar.service.in
View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=Highly customizable Wayland bar for Sway and Wlroots based compositors. Description=Highly customizable Wayland bar for Sway and Wlroots based compositors
Documentation=https://github.com/Alexays/Waybar/wiki/ Documentation=https://github.com/Alexays/Waybar/wiki/
PartOf=graphical-session.target PartOf=graphical-session.target
After=graphical-session.target After=graphical-session.target

12
src/client.cpp
View File

@ -86,7 +86,7 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_
} }
} }
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << e.what() << '\n'; spdlog::warn("caught exception in zxdg_output_v1_listener::done: {}", e.what());
} }
} }
@ -97,7 +97,7 @@ void waybar::Client::handleOutputName(void *data, struct zxdg_output_v1 * /*xdg_
auto &output = client->getOutput(data); auto &output = client->getOutput(data);
output.name = name; output.name = name;
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << e.what() << '\n'; spdlog::warn("caught exception in zxdg_output_v1_listener::name: {}", e.what());
} }
} }
@ -106,13 +106,13 @@ void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 *
auto *client = waybar::Client::inst(); auto *client = waybar::Client::inst();
try { try {
auto &output = client->getOutput(data); auto &output = client->getOutput(data);
const char *open_paren = strrchr(description, '(');
// Description format: "identifier (name)" // Description format: "identifier (name)"
size_t identifier_length = open_paren - description; auto s = std::string(description);
output.identifier = std::string(description, identifier_length - 1); auto pos = s.find(" (");
output.identifier = pos != std::string::npos ? s.substr(0, pos) : s;
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << e.what() << '\n'; spdlog::warn("caught exception in zxdg_output_v1_listener::description: {}", e.what());
} }
} }

4
src/modules/network.cpp
View File

@ -223,8 +223,8 @@ void waybar::modules::Network::worker() {
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
if (ifid_ > 0) { if (ifid_ > 0) {
getInfo(); getInfo();
dp.emit();
} }
dp.emit();
} }
thread_timer_.sleep_for(interval_); thread_timer_.sleep_for(interval_);
}; };
@ -271,10 +271,10 @@ void waybar::modules::Network::worker() {
} }
const std::string waybar::modules::Network::getNetworkState() const { const std::string waybar::modules::Network::getNetworkState() const {
if (ifid_ == -1) {
#ifdef WANT_RFKILL #ifdef WANT_RFKILL
if (rfkill_.getState()) return "disabled"; if (rfkill_.getState()) return "disabled";
#endif #endif
if (ifid_ == -1) {
return "disconnected"; return "disconnected";
} }
if (!carrier_) return "disconnected"; if (!carrier_) return "disconnected";