mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
Compare commits
477 Commits
Author | SHA1 | Date | |
---|---|---|---|
b9338c72c9 | |||
8f6273e9d0 | |||
1fd708cda8 | |||
ac3126b6cf | |||
7c4ea39774 | |||
27fbea2b5a | |||
6570aefeec | |||
5c5031fd69 | |||
8e0f3c7ddf | |||
d5bd3be8de | |||
bb2c16386b | |||
ec451b5908 | |||
ae3d4b9d28 | |||
af96150f5c | |||
10b152ac3e | |||
9acf5587fa | |||
c302116e73 | |||
ff36154c4b | |||
d12ad1128e | |||
cb2f5c154c | |||
c3cdd516ef | |||
19743f3085 | |||
5db06d99bb | |||
384200f27e | |||
5e712ca255 | |||
d405f28622 | |||
2f975f870a | |||
4471d4aba1 | |||
3945c77668 | |||
6c27af35e9 | |||
2a7e8f7d94 | |||
dd0144c3cd | |||
03130b7565 | |||
37b1b35035 | |||
190b2dd922 | |||
2d8dc83480 | |||
382cf76503 | |||
9a5f5114c4 | |||
047c2929c1 | |||
9b0660e751 | |||
543589a97b | |||
82d0c87934 | |||
4f8a396692 | |||
6141a26a09 | |||
bb7596045f | |||
16c68ee132 | |||
e0c42ae415 | |||
aae105c998 | |||
b719569243 | |||
e70f8d8730 | |||
e1215a6d17 | |||
119446d538 | |||
d1f427618f | |||
3c268d83c2 | |||
ae6ca36fa7 | |||
83b12fc8a7 | |||
f107aaddc3 | |||
cd2db19267 | |||
4c40f9c635 | |||
84e5b0e8c2 | |||
34a710cce3 | |||
218bb3bc2b | |||
f6b2005687 | |||
ea9591baea | |||
af2528952b | |||
414bf741f3 | |||
527fa982d2 | |||
8e05aab4d9 | |||
e9b0365327 | |||
97554b3532 | |||
1e969a48ae | |||
84b671f6b2 | |||
6e30b7af3c | |||
3130a57622 | |||
a555a72d7f | |||
99dde1aff8 | |||
d5875c468f | |||
9e877d3f57 | |||
f80270519b | |||
8fb3211594 | |||
b9cd51a9cc | |||
569f40de9b | |||
9c8d0865d1 | |||
129713fe1b | |||
e66c3bc965 | |||
75c6e2e7d5 | |||
d294352845 | |||
35f7fdf684 | |||
33798c31d0 | |||
ee0db26021 | |||
abcac464fa | |||
9602360d28 | |||
1d087f96bd | |||
01b8527333 | |||
abeb406166 | |||
443281f0bc | |||
de3be8b2ab | |||
4d7e19ae66 | |||
e8f2bd3ad1 | |||
c41cedd407 | |||
f6864e4a43 | |||
a833c51a28 | |||
1145788ab3 | |||
c0d4867421 | |||
d18ece13f2 | |||
1f379fa5f6 | |||
1125119dc6 | |||
173a7bb8cd | |||
4836333bff | |||
f01ddb9ab3 | |||
2f6a70f34e | |||
def4466953 | |||
db1136d647 | |||
c8821a5e7f | |||
d40cc6f23a | |||
c885be369e | |||
631695ec74 | |||
50275ae529 | |||
35d806b801 | |||
220028051f | |||
7f73a8cd45 | |||
dde700f2c9 | |||
0e87b3938a | |||
d1637d34cf | |||
2277ddd156 | |||
f9543e47dd | |||
4c548a95e8 | |||
6c3cb7c85a | |||
a307042d6b | |||
548589ee5d | |||
b2cec74c04 | |||
6895b3b6b6 | |||
ac8e892cbd | |||
1a05e230b9 | |||
ad08130b52 | |||
a94d5c5ff2 | |||
ecce607afe | |||
73bb42d40c | |||
3bb03852fe | |||
2aaf5510b8 | |||
278f26e597 | |||
03dab1bbdd | |||
0572f75055 | |||
de0a3cb020 | |||
eb4c76f5e4 | |||
502b33b64a | |||
6d5b502bbb | |||
2faf629c88 | |||
c0355a3fd3 | |||
67f6dad717 | |||
7f7ebb5367 | |||
b97ca2ec9b | |||
358426cb1c | |||
5e4fdb1530 | |||
1e82982dbd | |||
048d8d328e | |||
6d5e328928 | |||
97e3226801 | |||
3d1fd4f5ea | |||
3131eb0774 | |||
f4d2ca2736 | |||
b3f9425d70 | |||
211b1c2785 | |||
9e13161385 | |||
bd5a215d2a | |||
247589efbb | |||
1d39ef5c8e | |||
4667afaa98 | |||
bae83ee4e3 | |||
52db1e8e68 | |||
334bc1e52a | |||
e6599d8ed5 | |||
5ee4c54b13 | |||
8830247b9e | |||
db74a46d7b | |||
4b24c19fa7 | |||
ce50249c04 | |||
02811293e0 | |||
5bb6fa384d | |||
b6cb02ce85 | |||
a0a218c6e2 | |||
f152ad9fa9 | |||
05d083726c | |||
a0a3c01e79 | |||
228078d538 | |||
e43b63ff02 | |||
dc93fa8218 | |||
a63bc84918 | |||
060b614eb3 | |||
dfb5ec0c65 | |||
1f84936639 | |||
f9b65baa2e | |||
ec23984c4d | |||
56d9cdc245 | |||
529daedcec | |||
089d1299c4 | |||
36fc8365ee | |||
f2f1c4f9cb | |||
2646390e28 | |||
66f2cbed51 | |||
19d7bd4ecf | |||
2e4de1ae3e | |||
ce909eea0b | |||
0b008154d9 | |||
fe88a3fa81 | |||
02e43a38d2 | |||
f592e3d38b | |||
c6d7a779b8 | |||
ceedc689ec | |||
b314cb16a9 | |||
a257126685 | |||
baaeda0ab7 | |||
e3dff6e0d8 | |||
e8a1e6ae35 | |||
3a86125495 | |||
da43336409 | |||
712424f9a8 | |||
e38df047fd | |||
0b237246f0 | |||
01ad3d96d8 | |||
642fd48af1 | |||
8f9e6c132d | |||
ba5592c86a | |||
2a3f40bc02 | |||
c60b905831 | |||
6536f7adb6 | |||
8134215839 | |||
e6fa37164c | |||
436fc94549 | |||
4f9c3d2413 | |||
c19a63e85e | |||
05e212f67a | |||
e01e3be488 | |||
f380844d61 | |||
7f6e4801eb | |||
ac461f38f4 | |||
30efd28b6a | |||
87392ef653 | |||
db85224d59 | |||
07d6a8e936 | |||
53614ab50c | |||
fba1f5c8af | |||
df83404c8c | |||
dd3da7b6ef | |||
cda9eb683f | |||
f0ad918feb | |||
8696ac77f9 | |||
9484cdff7d | |||
9b9818e95d | |||
cf72dee60c | |||
2e037df045 | |||
798fe1a622 | |||
9d0842db48 | |||
d8b1b0d0af | |||
e9b6380c18 | |||
43beefb00d | |||
12f869ccba | |||
7e9207d75c | |||
7a2dee7377 | |||
21a89ac46d | |||
bb99e6cf5b | |||
0834551161 | |||
ccd1586c65 | |||
617b370104 | |||
d607a4e33f | |||
a6c0bc5a52 | |||
67ad0e69ce | |||
ae88d6bc3c | |||
4f3c38c542 | |||
a6980fca7f | |||
bd5146fdcf | |||
22ddbde394 | |||
c916fe258e | |||
9c8e39c30c | |||
5b270dae0d | |||
c621afb0c4 | |||
bcf4725349 | |||
12b30ca25f | |||
86d6668ed4 | |||
7c85aec8e0 | |||
2c038d1977 | |||
ff9d598c16 | |||
71a9a75aad | |||
05f796158b | |||
1d2dd953e7 | |||
527144a440 | |||
cda6282277 | |||
7f13478396 | |||
90a9c0e25f | |||
340ec7be91 | |||
e7eef6b493 | |||
1b7068e61d | |||
dabe2bebbb | |||
486b5a5d38 | |||
11bbc3b24d | |||
7f74de977c | |||
028b184f7b | |||
564fdcb369 | |||
396f7d4525 | |||
3c9b533997 | |||
ae397c8fa2 | |||
ec75be0bc3 | |||
ed4521d113 | |||
c2e9ed6091 | |||
a37b4687ff | |||
ee29a35aa5 | |||
0be8e200ce | |||
46e5dd93d4 | |||
2ee4a51546 | |||
91996a85c1 | |||
460d25ac45 | |||
648eecdd83 | |||
f04ff38567 | |||
d20a586734 | |||
1962caf144 | |||
9dbf057f58 | |||
918146c16b | |||
0b01b35c76 | |||
f3fb955d75 | |||
fcf2d18a01 | |||
b05d4cd413 | |||
9b89fc6470 | |||
c06725aa69 | |||
5ae5821929 | |||
74e40432e5 | |||
6e69af8967 | |||
be2fa743eb | |||
5fdb122829 | |||
6e73c6db61 | |||
253366baf4 | |||
ecec02c8be | |||
070619fa34 | |||
d4ace4b4d8 | |||
5fd92b3c28 | |||
c0a39f34cd | |||
2a9fa1a4b9 | |||
07147878a9 | |||
ffadd5c1a7 | |||
2b34f3a30f | |||
85d60f95c4 | |||
755d38d4d6 | |||
b673279a43 | |||
9e1200ae32 | |||
e999cca7a6 | |||
d24d85bebf | |||
97bd637f5d | |||
23d4a811db | |||
bf5c00ff2a | |||
14ace24a26 | |||
2fa581c7ea | |||
6ff013e25b | |||
cf3cb4c61f | |||
00ada46dfc | |||
2db81a6107 | |||
3e76984ce7 | |||
48a58cd979 | |||
296b448d06 | |||
7a3febf6a7 | |||
bb4af295bc | |||
cf7663153d | |||
12a251c3a4 | |||
4accdd4524 | |||
032ad925af | |||
50bfe78aed | |||
afd291a566 | |||
316a9be656 | |||
cdb347aaca | |||
ed240ac105 | |||
232073ca17 | |||
5314b74dae | |||
e3879559a2 | |||
0ec8774a08 | |||
071b4928dc | |||
7c4d75d428 | |||
67593b8c0f | |||
cff39bc7cf | |||
f2edc8f965 | |||
7b11283b73 | |||
03e43fb31d | |||
913d0f7ad0 | |||
5feb478611 | |||
6bf64cd04d | |||
5e43b4f587 | |||
e8dd1e2d2c | |||
51be97f9aa | |||
a00f812cd1 | |||
863e0babd8 | |||
8ba3052dd1 | |||
1a76aa0c8c | |||
85f177a213 | |||
6ffc7ee3b3 | |||
ff28de0482 | |||
d5e8a37e63 | |||
67786c32a8 | |||
93a644eec4 | |||
aa385e28b6 | |||
2c1a3d0430 | |||
b31a64ad00 | |||
4865a9ad6c | |||
e70d8aff73 | |||
3e1c77d158 | |||
d34c3a801c | |||
794fb12e8c | |||
f743882baa | |||
9fa0eb7068 | |||
43d724ebad | |||
c862fde986 | |||
0d59f7b7d1 | |||
1e95f5d9b6 | |||
9234be8544 | |||
9d3255fe9f | |||
d2d9db23b5 | |||
d8be72e4b6 | |||
f8a47598ba | |||
cb2d6e1997 | |||
17291dffdf | |||
9a091d7740 | |||
2cb70c7324 | |||
4d4cadb5ae | |||
cddee2626a | |||
d5c1e6f312 | |||
b45dcdf74e | |||
a1ffa7fa9f | |||
4b4b74db0c | |||
8901df9702 | |||
e12766a656 | |||
31f63398dc | |||
0a14e7f3ab | |||
31416ffae6 | |||
fbe19d886a | |||
9c67150884 | |||
f3c467cc46 | |||
a09d2222be | |||
45ebee52a6 | |||
841576497a | |||
e730105950 | |||
963d4f68e4 | |||
7e8eee0571 | |||
37f87be9dd | |||
380fc58f3c | |||
22bf0b161a | |||
5b3402e110 | |||
d209d350fe | |||
0968170074 | |||
362c393b1d | |||
0c3c548bc0 | |||
b54160e02f | |||
db14fac038 | |||
4f1defe6d5 | |||
92967c7c06 | |||
fcb23d3104 | |||
62f8af8a39 | |||
d5a9eccb7b | |||
80e9ea746b | |||
84728f6fab | |||
10a17187a1 | |||
7cdde05568 | |||
e343cf4b00 | |||
e4756cf24e | |||
131dae5818 | |||
4688002f23 | |||
5bf0ca85ac | |||
fd9b34adf8 | |||
8a011e6d90 | |||
5a44c8c6de | |||
74137befba | |||
b75e0bb0d0 | |||
77d9dd06af | |||
e5d5735e9d | |||
dd0ebe117c | |||
5f0a3063d1 | |||
3bac96945c | |||
e158a3e132 | |||
472363a623 | |||
1a024db03c | |||
5623bbecfe | |||
1e871b2353 |
3
.github/FUNDING.yml
vendored
Normal file
3
.github/FUNDING.yml
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# These are supported funding model platforms
|
||||||
|
|
||||||
|
custom: https://paypal.me/ARouillard
|
@ -3,16 +3,21 @@ sudo: false
|
|||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
|
git:
|
||||||
|
submodules: false
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- distro: debian
|
- distro: debian
|
||||||
- distro: archlinux
|
- distro: archlinux
|
||||||
# - distro: opensuse
|
- distro: fedora
|
||||||
|
- distro: alpine
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- docker pull alexays/waybar:${distro}
|
- docker pull alexays/waybar:${distro}
|
||||||
|
- find . -type f \( -name '*.cpp' -o -name '*.h' \) -print0 | xargs -r0 clang-format -i
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- echo FROM alexays/waybar:${distro} > Dockerfile
|
- echo FROM alexays/waybar:${distro} > Dockerfile
|
||||||
- echo ADD . /root >> Dockerfile
|
- echo ADD . /root >> Dockerfile
|
||||||
- docker build -t waybar .
|
- docker build -t waybar .
|
||||||
- docker run waybar /bin/sh -c "cd /root && git clone https://github.com/swaywm/wlroots subprojects/wlroots && meson build && ninja -C build"
|
- docker run waybar /bin/sh -c "cd /root && meson build -Dman-pages=enabled && ninja -C build"
|
||||||
|
5
Dockerfiles/alpine
Normal file
5
Dockerfiles/alpine
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# vim: ft=Dockerfile
|
||||||
|
|
||||||
|
FROM alpine:latest
|
||||||
|
|
||||||
|
RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml libnl3-dev pulseaudio-dev libmpdclient-dev scdoc
|
@ -1,4 +1,6 @@
|
|||||||
|
# vim: ft=Dockerfile
|
||||||
|
|
||||||
FROM archlinux/base:latest
|
FROM archlinux/base:latest
|
||||||
|
|
||||||
RUN pacman -Syu --noconfirm && \
|
RUN pacman -Syu --noconfirm && \
|
||||||
pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp --noconfirm
|
pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc --noconfirm
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
|
# vim: ft=Dockerfile
|
||||||
|
|
||||||
FROM debian:sid
|
FROM debian:sid
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev && \
|
apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc && \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
7
Dockerfiles/fedora
Normal file
7
Dockerfiles/fedora
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# vim: ft=Dockerfile
|
||||||
|
|
||||||
|
FROM fedora:30
|
||||||
|
|
||||||
|
RUN dnf install sway meson git libinput-devel wayland-devel wayland-protocols-devel pugixml-devel egl-wayland-devel mesa-libEGL-devel mesa-libGLES-devel mesa-libgbm-devel libxkbcommon-devel libudev-devel pixman-devel gtkmm30-devel jsoncpp-devel scdoc -y && \
|
||||||
|
dnf group install "C Development Tools and Libraries" -y && \
|
||||||
|
dnf clean all -y
|
@ -1,5 +1,7 @@
|
|||||||
|
# vim: ft=Dockerfile
|
||||||
|
|
||||||
FROM opensuse/tumbleweed:latest
|
FROM opensuse/tumbleweed:latest
|
||||||
|
|
||||||
RUN zypper -n up && \
|
RUN zypper -n up && \
|
||||||
zypper -n install -t pattern devel_C_C++ && \
|
zypper -n install -t pattern devel_C_C++ && \
|
||||||
zypper -n install git meson clang libinput10 libinput-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel
|
zypper -n install git meson clang libinput10 libinput-devel libpugixml1 libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc
|
||||||
|
2
Makefile
2
Makefile
@ -1,6 +1,6 @@
|
|||||||
.PHONY: build build-debug run clean default install
|
.PHONY: build build-debug run clean default install
|
||||||
|
|
||||||
default: run
|
default: build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
meson build
|
meson build
|
||||||
|
32
README.md
32
README.md
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
> Highly customizable Wayland bar for Sway and Wlroots based compositors.<br>
|
> Highly customizable Wayland bar for Sway and Wlroots based compositors.<br>
|
||||||
> Available in Arch [community](https://www.archlinux.org/packages/community/x86_64/waybar/) or
|
> Available in Arch [community](https://www.archlinux.org/packages/community/x86_64/waybar/) or
|
||||||
[AUR](https://aur.archlinux.org/packages/waybar-git/) and [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/waybar)
|
[AUR](https://aur.archlinux.org/packages/waybar-git/), [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/waybar), and [Alpine Linux](https://pkgs.alpinelinux.org/packages?name=waybar)<br>
|
||||||
|
> *Waybar [examples](https://github.com/Alexays/Waybar/wiki/Examples)*
|
||||||
|
|
||||||
**Current features**
|
**Current features**
|
||||||
- Sway (Workspaces, Binding mode, Focused window name)
|
- Sway (Workspaces, Binding mode, Focused window name)
|
||||||
@ -11,6 +12,7 @@
|
|||||||
- Battery
|
- Battery
|
||||||
- Network
|
- Network
|
||||||
- Pulseaudio
|
- Pulseaudio
|
||||||
|
- Disk
|
||||||
- Memory
|
- Memory
|
||||||
- Cpu load average
|
- Cpu load average
|
||||||
- Temperature
|
- Temperature
|
||||||
@ -42,10 +44,14 @@ $ waybar
|
|||||||
gtkmm3
|
gtkmm3
|
||||||
jsoncpp
|
jsoncpp
|
||||||
libinput
|
libinput
|
||||||
|
|
||||||
libsigc++
|
libsigc++
|
||||||
fmt
|
fmt
|
||||||
wayland
|
wayland
|
||||||
wlroots
|
wlroots
|
||||||
|
libgtk-3-dev [gtk-layer-shell]
|
||||||
|
gobject-introspection [gtk-layer-shell]
|
||||||
|
libgirepository1.0-dev [gtk-layer-shell]
|
||||||
libpulse [Pulseaudio module]
|
libpulse [Pulseaudio module]
|
||||||
libnl [Network module]
|
libnl [Network module]
|
||||||
sway [Sway modules]
|
sway [Sway modules]
|
||||||
@ -53,6 +59,30 @@ libdbusmenu-gtk3 [Tray module]
|
|||||||
libmpdclient [MPD module]
|
libmpdclient [MPD module]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
On Ubuntu 19.10 you can install all the relevant dependencies using this command:
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo apt install \
|
||||||
|
clang-tidy \
|
||||||
|
gobject-introspection \
|
||||||
|
libdbusmenu-gtk3-dev \
|
||||||
|
libfmt-dev \
|
||||||
|
libgirepository1.0-dev \
|
||||||
|
libgtk-3-dev \
|
||||||
|
libgtkmm-3.0-dev \
|
||||||
|
libinput-dev \
|
||||||
|
libjsoncpp-dev \
|
||||||
|
libmpdclient-dev \
|
||||||
|
libnl-3-dev \
|
||||||
|
libnl-genl-3-dev \
|
||||||
|
libpulse-dev \
|
||||||
|
libsigc++-2.0-dev \
|
||||||
|
libspdlog-dev \
|
||||||
|
libwayland-dev \
|
||||||
|
scdoc
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
Contributions welcome! - have fun :)<br>
|
Contributions welcome! - have fun :)<br>
|
||||||
The style guidelines is [Google's](https://google.github.io/styleguide/cppguide.html)
|
The style guidelines is [Google's](https://google.github.io/styleguide/cppguide.html)
|
||||||
|
|
||||||
|
@ -1,38 +1,30 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <glibmm/markup.h>
|
#include <glibmm/markup.h>
|
||||||
#include <gtkmm/eventbox.h>
|
|
||||||
#include <gtkmm/label.h>
|
#include <gtkmm/label.h>
|
||||||
#include <json/json.h>
|
#include <json/json.h>
|
||||||
#include "IModule.hpp"
|
#include "AModule.hpp"
|
||||||
|
|
||||||
namespace waybar {
|
namespace waybar {
|
||||||
|
|
||||||
class ALabel : public IModule {
|
class ALabel : public AModule {
|
||||||
public:
|
public:
|
||||||
ALabel(const Json::Value &, const std::string &format, uint16_t interval = 0);
|
ALabel(const Json::Value &, const std::string &, const std::string &, const std::string &format,
|
||||||
virtual ~ALabel();
|
uint16_t interval = 0, bool ellipsize = false);
|
||||||
|
virtual ~ALabel() = default;
|
||||||
virtual auto update() -> void;
|
virtual auto update() -> void;
|
||||||
virtual std::string getIcon(uint16_t, const std::string &alt = "");
|
virtual std::string getIcon(uint16_t, const std::string &alt = "", uint16_t max = 0);
|
||||||
virtual operator Gtk::Widget &();
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool tooltipEnabled();
|
|
||||||
|
|
||||||
Gtk::EventBox event_box_;
|
|
||||||
Gtk::Label label_;
|
Gtk::Label label_;
|
||||||
const Json::Value & config_;
|
|
||||||
std::string format_;
|
std::string format_;
|
||||||
std::mutex mutex_;
|
std::string click_param;
|
||||||
const std::chrono::seconds interval_;
|
const std::chrono::seconds interval_;
|
||||||
bool alt_ = false;
|
bool alt_ = false;
|
||||||
std::string default_format_;
|
std::string default_format_;
|
||||||
|
|
||||||
virtual bool handleToggle(GdkEventButton *const &ev);
|
virtual bool handleToggle(GdkEventButton *const &e);
|
||||||
virtual bool handleScroll(GdkEventScroll *);
|
virtual std::string getState(uint8_t value, bool lesser = false);
|
||||||
|
|
||||||
private:
|
|
||||||
std::vector<int> pid_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar
|
} // namespace waybar
|
||||||
|
39
include/AModule.hpp
Normal file
39
include/AModule.hpp
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <glibmm/dispatcher.h>
|
||||||
|
#include <glibmm/markup.h>
|
||||||
|
#include <gtkmm/eventbox.h>
|
||||||
|
#include <json/json.h>
|
||||||
|
#include "IModule.hpp"
|
||||||
|
|
||||||
|
namespace waybar {
|
||||||
|
|
||||||
|
class AModule : public IModule {
|
||||||
|
public:
|
||||||
|
AModule(const Json::Value &, const std::string &, const std::string &,
|
||||||
|
bool enable_click = false, bool enable_scroll = false);
|
||||||
|
virtual ~AModule();
|
||||||
|
virtual auto update() -> void;
|
||||||
|
virtual operator Gtk::Widget &();
|
||||||
|
|
||||||
|
Glib::Dispatcher dp;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
|
||||||
|
|
||||||
|
SCROLL_DIR getScrollDir(GdkEventScroll *e);
|
||||||
|
bool tooltipEnabled();
|
||||||
|
|
||||||
|
const Json::Value &config_;
|
||||||
|
Gtk::EventBox event_box_;
|
||||||
|
|
||||||
|
virtual bool handleToggle(GdkEventButton *const &ev);
|
||||||
|
virtual bool handleScroll(GdkEventScroll *);
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<int> pid_;
|
||||||
|
gdouble distance_scrolled_y_;
|
||||||
|
gdouble distance_scrolled_x_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace waybar
|
@ -1,7 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <glibmm/dispatcher.h>
|
|
||||||
#include <gtkmm/box.h>
|
|
||||||
#include <gtkmm/widget.h>
|
#include <gtkmm/widget.h>
|
||||||
|
|
||||||
namespace waybar {
|
namespace waybar {
|
||||||
@ -11,7 +9,6 @@ class IModule {
|
|||||||
virtual ~IModule() = default;
|
virtual ~IModule() = default;
|
||||||
virtual auto update() -> void = 0;
|
virtual auto update() -> void = 0;
|
||||||
virtual operator Gtk::Widget &() = 0;
|
virtual operator Gtk::Widget &() = 0;
|
||||||
Glib::Dispatcher dp; // Hmmm Maybe I should create an abstract class ?
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar
|
} // namespace waybar
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <gdkmm/monitor.h>
|
||||||
#include <glibmm/refptr.h>
|
#include <glibmm/refptr.h>
|
||||||
|
#include <gtkmm/box.h>
|
||||||
#include <gtkmm/cssprovider.h>
|
#include <gtkmm/cssprovider.h>
|
||||||
#include <gtkmm/main.h>
|
#include <gtkmm/main.h>
|
||||||
#include <gtkmm/window.h>
|
#include <gtkmm/window.h>
|
||||||
#include <json/json.h>
|
#include <json/json.h>
|
||||||
#include "IModule.hpp"
|
#include "AModule.hpp"
|
||||||
#include "idle-inhibit-unstable-v1-client-protocol.h"
|
#include "idle-inhibit-unstable-v1-client-protocol.h"
|
||||||
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
|
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
|
||||||
#include "xdg-output-unstable-v1-client-protocol.h"
|
#include "xdg-output-unstable-v1-client-protocol.h"
|
||||||
@ -14,58 +16,74 @@ namespace waybar {
|
|||||||
|
|
||||||
class Factory;
|
class Factory;
|
||||||
struct waybar_output {
|
struct waybar_output {
|
||||||
struct wl_output * output;
|
Glib::RefPtr<Gdk::Monitor> monitor;
|
||||||
std::string name;
|
std::string name;
|
||||||
uint32_t wl_name;
|
|
||||||
struct zxdg_output_v1 *xdg_output;
|
std::unique_ptr<struct zxdg_output_v1, decltype(&zxdg_output_v1_destroy)> xdg_output = {
|
||||||
|
nullptr, &zxdg_output_v1_destroy};
|
||||||
};
|
};
|
||||||
|
|
||||||
class Bar {
|
class Bar {
|
||||||
public:
|
public:
|
||||||
Bar(struct waybar_output *w_output, const Json::Value&);
|
Bar(struct waybar_output *w_output, const Json::Value &);
|
||||||
Bar(const Bar &) = delete;
|
Bar(const Bar &) = delete;
|
||||||
~Bar() = default;
|
~Bar() = default;
|
||||||
|
|
||||||
auto toggle() -> void;
|
auto toggle() -> void;
|
||||||
void handleSignal(int);
|
void handleSignal(int);
|
||||||
|
|
||||||
struct waybar_output * output;
|
struct waybar_output *output;
|
||||||
Json::Value config;
|
Json::Value config;
|
||||||
Gtk::Window window;
|
Gtk::Window window;
|
||||||
struct wl_surface * surface;
|
struct wl_surface * surface;
|
||||||
struct zwlr_layer_surface_v1 *layer_surface;
|
bool visible = true;
|
||||||
bool visible = true;
|
bool vertical = false;
|
||||||
bool vertical = false;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static inline const std::string MIN_HEIGHT_MSG =
|
static constexpr const char *MIN_HEIGHT_MSG =
|
||||||
"Requested height: {} exceeds the minimum height: {} required by the modules";
|
"Requested height: {} exceeds the minimum height: {} required by the modules";
|
||||||
static inline const std::string MIN_WIDTH_MSG =
|
static constexpr const char *MIN_WIDTH_MSG =
|
||||||
"Requested width: {} exceeds the minimum width: {} required by the modules";
|
"Requested width: {} exceeds the minimum width: {} required by the modules";
|
||||||
static inline const std::string BAR_SIZE_MSG =
|
static constexpr const char *BAR_SIZE_MSG =
|
||||||
"Bar configured (width: {}, height: {}) for output: {}";
|
"Bar configured (width: {}, height: {}) for output: {}";
|
||||||
static inline const std::string SIZE_DEFINED =
|
static constexpr const char *SIZE_DEFINED =
|
||||||
"{} size is defined in the config file so it will stay like that";
|
"{} size is defined in the config file so it will stay like that";
|
||||||
static void layerSurfaceHandleConfigure(void *, struct zwlr_layer_surface_v1 *, uint32_t,
|
static void layerSurfaceHandleConfigure(void *, struct zwlr_layer_surface_v1 *, uint32_t,
|
||||||
uint32_t, uint32_t);
|
uint32_t, uint32_t);
|
||||||
static void layerSurfaceHandleClosed(void *, struct zwlr_layer_surface_v1 *);
|
static void layerSurfaceHandleClosed(void *, struct zwlr_layer_surface_v1 *);
|
||||||
|
|
||||||
void destroyOutput();
|
#ifdef HAVE_GTK_LAYER_SHELL
|
||||||
void onWindowRealize();
|
void initGtkLayerShell();
|
||||||
|
#endif
|
||||||
|
void onConfigure(GdkEventConfigure *ev);
|
||||||
|
void onRealize();
|
||||||
|
void onMap(GdkEventAny *ev);
|
||||||
|
void setExclusiveZone(uint32_t width, uint32_t height);
|
||||||
|
void setSurfaceSize(uint32_t width, uint32_t height);
|
||||||
auto setupWidgets() -> void;
|
auto setupWidgets() -> void;
|
||||||
void getModules(const Factory &, const std::string &);
|
void getModules(const Factory &, const std::string &);
|
||||||
void setupAltFormatKeyForModule(const std::string &module_name);
|
void setupAltFormatKeyForModule(const std::string &module_name);
|
||||||
void setupAltFormatKeyForModuleList(const char *module_list_name);
|
void setupAltFormatKeyForModuleList(const char *module_list_name);
|
||||||
|
|
||||||
|
struct margins {
|
||||||
|
int top = 0;
|
||||||
|
int right = 0;
|
||||||
|
int bottom = 0;
|
||||||
|
int left = 0;
|
||||||
|
} margins_;
|
||||||
|
struct zwlr_layer_surface_v1 *layer_surface_;
|
||||||
|
// use gtk-layer-shell instead of handling layer surfaces directly
|
||||||
|
bool use_gls_ = false;
|
||||||
uint32_t width_ = 0;
|
uint32_t width_ = 0;
|
||||||
uint32_t height_ = 1;
|
uint32_t height_ = 1;
|
||||||
|
uint8_t anchor_;
|
||||||
Gtk::Box left_;
|
Gtk::Box left_;
|
||||||
Gtk::Box center_;
|
Gtk::Box center_;
|
||||||
Gtk::Box right_;
|
Gtk::Box right_;
|
||||||
Gtk::Box box_;
|
Gtk::Box box_;
|
||||||
std::vector<std::unique_ptr<waybar::IModule>> modules_left_;
|
std::vector<std::unique_ptr<waybar::AModule>> modules_left_;
|
||||||
std::vector<std::unique_ptr<waybar::IModule>> modules_center_;
|
std::vector<std::unique_ptr<waybar::AModule>> modules_center_;
|
||||||
std::vector<std::unique_ptr<waybar::IModule>> modules_right_;
|
std::vector<std::unique_ptr<waybar::AModule>> modules_right_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar
|
} // namespace waybar
|
||||||
|
@ -26,31 +26,28 @@ class Client {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
Client() = default;
|
Client() = default;
|
||||||
void setupConfigs(const std::string &config, const std::string &style);
|
std::tuple<const std::string, const std::string> getConfigs(const std::string &config,
|
||||||
void bindInterfaces();
|
const std::string &style) const;
|
||||||
const std::string getValidPath(const std::vector<std::string> &paths);
|
void bindInterfaces();
|
||||||
void handleOutput(std::unique_ptr<struct waybar_output> &output);
|
const std::string getValidPath(const std::vector<std::string> &paths) const;
|
||||||
bool isValidOutput(const Json::Value &config, std::unique_ptr<struct waybar_output> &output);
|
void handleOutput(struct waybar_output &output);
|
||||||
auto setupConfig() -> void;
|
bool isValidOutput(const Json::Value &config, struct waybar_output &output);
|
||||||
auto setupCss() -> void;
|
auto setupConfig(const std::string &config_file) -> void;
|
||||||
std::unique_ptr<struct waybar_output>& getOutput(uint32_t wl_name);
|
auto setupCss(const std::string &css_file) -> void;
|
||||||
std::vector<Json::Value> getOutputConfigs(std::unique_ptr<struct waybar_output> &output);
|
struct waybar_output &getOutput(void *);
|
||||||
|
std::vector<Json::Value> getOutputConfigs(struct waybar_output &output);
|
||||||
|
|
||||||
static void handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
|
static void handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
|
||||||
const char *interface, uint32_t version);
|
const char *interface, uint32_t version);
|
||||||
static void handleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name);
|
static void handleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name);
|
||||||
static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t, int32_t);
|
static void handleOutputName(void *, struct zxdg_output_v1 *, const char *);
|
||||||
static void handleLogicalSize(void *, struct zxdg_output_v1 *, int32_t, int32_t);
|
void handleMonitorAdded(Glib::RefPtr<Gdk::Monitor> monitor);
|
||||||
static void handleDone(void *, struct zxdg_output_v1 *);
|
void handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor);
|
||||||
static void handleName(void *, struct zxdg_output_v1 *, const char *);
|
|
||||||
static void handleDescription(void *, struct zxdg_output_v1 *, const char *);
|
|
||||||
|
|
||||||
Json::Value config_;
|
Json::Value config_;
|
||||||
std::string css_file_;
|
Glib::RefPtr<Gtk::StyleContext> style_context_;
|
||||||
std::string config_file_;
|
Glib::RefPtr<Gtk::CssProvider> css_provider_;
|
||||||
Glib::RefPtr<Gtk::StyleContext> style_context_;
|
std::list<struct waybar_output> outputs_;
|
||||||
Glib::RefPtr<Gtk::CssProvider> css_provider_;
|
|
||||||
std::vector<std::unique_ptr<struct waybar_output>> outputs_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar
|
} // namespace waybar
|
||||||
|
@ -7,11 +7,14 @@
|
|||||||
#include "modules/sway/window.hpp"
|
#include "modules/sway/window.hpp"
|
||||||
#include "modules/sway/workspaces.hpp"
|
#include "modules/sway/workspaces.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef NO_FILESYSTEM
|
||||||
#include "modules/battery.hpp"
|
#include "modules/battery.hpp"
|
||||||
|
#endif
|
||||||
#include "modules/cpu.hpp"
|
#include "modules/cpu.hpp"
|
||||||
#include "modules/idle_inhibitor.hpp"
|
#include "modules/idle_inhibitor.hpp"
|
||||||
#include "modules/memory.hpp"
|
#include "modules/memory.hpp"
|
||||||
#ifdef HAVE_DBUSMENU
|
#include "modules/disk.hpp"
|
||||||
|
#if defined(HAVE_DBUSMENU) && !defined(NO_FILESYSTEM)
|
||||||
#include "modules/sni/tray.hpp"
|
#include "modules/sni/tray.hpp"
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_LIBNL
|
#ifdef HAVE_LIBNL
|
||||||
@ -35,7 +38,7 @@ namespace waybar {
|
|||||||
class Factory {
|
class Factory {
|
||||||
public:
|
public:
|
||||||
Factory(const Bar& bar, const Json::Value& config);
|
Factory(const Bar& bar, const Json::Value& config);
|
||||||
IModule* makeModule(const std::string& name) const;
|
AModule* makeModule(const std::string& name) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const Bar& bar_;
|
const Bar& bar_;
|
||||||
|
@ -47,7 +47,6 @@ class Backlight : public ALabel {
|
|||||||
template <class ForwardIt, class Inserter>
|
template <class ForwardIt, class Inserter>
|
||||||
static void enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter, udev *udev);
|
static void enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter, udev *udev);
|
||||||
|
|
||||||
const std::string name_;
|
|
||||||
const std::string preferred_device_;
|
const std::string preferred_device_;
|
||||||
static constexpr int EPOLL_MAX_EVENTS = 16;
|
static constexpr int EPOLL_MAX_EVENTS = 16;
|
||||||
|
|
||||||
@ -57,6 +56,6 @@ class Backlight : public ALabel {
|
|||||||
std::mutex udev_thread_mutex_;
|
std::mutex udev_thread_mutex_;
|
||||||
std::vector<BacklightDev> devices_;
|
std::vector<BacklightDev> devices_;
|
||||||
// thread must destruct before shared data
|
// thread must destruct before shared data
|
||||||
waybar::util::SleeperThread udev_thread_;
|
util::SleeperThread udev_thread_;
|
||||||
};
|
};
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -9,7 +9,8 @@
|
|||||||
#include <sys/inotify.h>
|
#include <sys/inotify.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iostream>
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
#include "ALabel.hpp"
|
#include "ALabel.hpp"
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/sleeper_thread.hpp"
|
||||||
|
|
||||||
@ -30,19 +31,20 @@ class Battery : public ALabel {
|
|||||||
private:
|
private:
|
||||||
static inline const fs::path data_dir_ = "/sys/class/power_supply/";
|
static inline const fs::path data_dir_ = "/sys/class/power_supply/";
|
||||||
|
|
||||||
void getBatteries();
|
void getBatteries();
|
||||||
void worker();
|
void worker();
|
||||||
const std::string getAdapterStatus(uint8_t capacity) const;
|
const std::string getAdapterStatus(uint8_t capacity) const;
|
||||||
const std::tuple<uint8_t, std::string> getInfos() const;
|
const std::tuple<uint8_t, float, std::string> getInfos() const;
|
||||||
const std::string getState(uint8_t) const;
|
const std::string formatTimeRemaining(float hoursRemaining);
|
||||||
|
|
||||||
util::SleeperThread thread_;
|
|
||||||
util::SleeperThread thread_timer_;
|
|
||||||
std::vector<fs::path> batteries_;
|
std::vector<fs::path> batteries_;
|
||||||
fs::path adapter_;
|
fs::path adapter_;
|
||||||
int fd_;
|
int fd_;
|
||||||
std::vector<int> wds_;
|
std::vector<int> wds_;
|
||||||
std::string old_status_;
|
std::string old_status_;
|
||||||
|
|
||||||
|
util::SleeperThread thread_;
|
||||||
|
util::SleeperThread thread_timer_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -1,12 +1,22 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
#if FMT_VERSION < 60000
|
||||||
|
#include <fmt/time.h>
|
||||||
|
#else
|
||||||
|
#include <fmt/chrono.h>
|
||||||
|
#endif
|
||||||
|
#include <date/tz.h>
|
||||||
#include "ALabel.hpp"
|
#include "ALabel.hpp"
|
||||||
#include "fmt/time.h"
|
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/sleeper_thread.hpp"
|
||||||
|
|
||||||
namespace waybar::modules {
|
namespace waybar::modules {
|
||||||
|
|
||||||
|
struct waybar_time {
|
||||||
|
std::locale locale;
|
||||||
|
date::zoned_seconds ztime;
|
||||||
|
};
|
||||||
|
|
||||||
class Clock : public ALabel {
|
class Clock : public ALabel {
|
||||||
public:
|
public:
|
||||||
Clock(const std::string&, const Json::Value&);
|
Clock(const std::string&, const Json::Value&);
|
||||||
@ -14,7 +24,16 @@ class Clock : public ALabel {
|
|||||||
auto update() -> void;
|
auto update() -> void;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
waybar::util::SleeperThread thread_;
|
util::SleeperThread thread_;
|
||||||
|
std::locale locale_;
|
||||||
|
const date::time_zone* time_zone_;
|
||||||
|
bool fixed_time_zone_;
|
||||||
|
date::year_month_day cached_calendar_ymd_;
|
||||||
|
std::string cached_calendar_text_;
|
||||||
|
|
||||||
|
auto calendar_text(const waybar_time& wtime) -> std::string;
|
||||||
|
auto weekdays_header(const date::weekday& first_dow, std::ostream& os) -> void;
|
||||||
|
auto first_day_of_week() -> date::weekday;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -2,9 +2,11 @@
|
|||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include <sys/sysinfo.h>
|
#include <sys/sysinfo.h>
|
||||||
|
#include <cstdint>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iostream>
|
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
|
#include <string>
|
||||||
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "ALabel.hpp"
|
#include "ALabel.hpp"
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/sleeper_thread.hpp"
|
||||||
@ -24,7 +26,8 @@ class Cpu : public ALabel {
|
|||||||
std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
|
std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
|
||||||
|
|
||||||
std::vector<std::tuple<size_t, size_t>> prev_times_;
|
std::vector<std::tuple<size_t, size_t>> prev_times_;
|
||||||
waybar::util::SleeperThread thread_;
|
|
||||||
|
util::SleeperThread thread_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <iostream>
|
#include <string>
|
||||||
#include "ALabel.hpp"
|
#include "ALabel.hpp"
|
||||||
#include "util/command.hpp"
|
#include "util/command.hpp"
|
||||||
#include "util/json.hpp"
|
#include "util/json.hpp"
|
||||||
@ -12,7 +12,7 @@ namespace waybar::modules {
|
|||||||
|
|
||||||
class Custom : public ALabel {
|
class Custom : public ALabel {
|
||||||
public:
|
public:
|
||||||
Custom(const std::string&, const Json::Value&);
|
Custom(const std::string&, const std::string&, const Json::Value&);
|
||||||
~Custom();
|
~Custom();
|
||||||
auto update() -> void;
|
auto update() -> void;
|
||||||
void refresh(int /*signal*/);
|
void refresh(int /*signal*/);
|
||||||
@ -22,18 +22,21 @@ class Custom : public ALabel {
|
|||||||
void continuousWorker();
|
void continuousWorker();
|
||||||
void parseOutputRaw();
|
void parseOutputRaw();
|
||||||
void parseOutputJson();
|
void parseOutputJson();
|
||||||
|
bool handleScroll(GdkEventScroll* e);
|
||||||
|
bool handleToggle(GdkEventButton* const& e);
|
||||||
|
|
||||||
const std::string name_;
|
const std::string name_;
|
||||||
std::string text_;
|
std::string text_;
|
||||||
std::string alt_;
|
std::string alt_;
|
||||||
std::string tooltip_;
|
std::string tooltip_;
|
||||||
std::vector<std::string> class_;
|
std::vector<std::string> class_;
|
||||||
int percentage_;
|
int percentage_;
|
||||||
waybar::util::SleeperThread thread_;
|
FILE* fp_;
|
||||||
waybar::util::command::res output_;
|
int pid_;
|
||||||
waybar::util::JsonParser parser_;
|
util::command::res output_;
|
||||||
FILE* fp_;
|
util::JsonParser parser_;
|
||||||
int pid_;
|
|
||||||
|
util::SleeperThread thread_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
23
include/modules/disk.hpp
Normal file
23
include/modules/disk.hpp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <fmt/format.h>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sys/statvfs.h>
|
||||||
|
#include "ALabel.hpp"
|
||||||
|
#include "util/sleeper_thread.hpp"
|
||||||
|
#include "util/format.hpp"
|
||||||
|
|
||||||
|
namespace waybar::modules {
|
||||||
|
|
||||||
|
class Disk : public ALabel {
|
||||||
|
public:
|
||||||
|
Disk(const std::string&, const Json::Value&);
|
||||||
|
~Disk() = default;
|
||||||
|
auto update() -> void;
|
||||||
|
|
||||||
|
private:
|
||||||
|
util::SleeperThread thread_;
|
||||||
|
std::string path_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace waybar::modules
|
@ -15,10 +15,11 @@ class Memory : public ALabel {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
static inline const std::string data_dir_ = "/proc/meminfo";
|
static inline const std::string data_dir_ = "/proc/meminfo";
|
||||||
unsigned long memtotal_;
|
|
||||||
unsigned long memfree_;
|
|
||||||
void parseMeminfo();
|
void parseMeminfo();
|
||||||
waybar::util::SleeperThread thread_;
|
|
||||||
|
std::unordered_map<std::string, unsigned long> meminfo_;
|
||||||
|
|
||||||
|
util::SleeperThread thread_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -36,6 +36,7 @@ class MPD : public ALabel {
|
|||||||
|
|
||||||
bool stopped();
|
bool stopped();
|
||||||
bool playing();
|
bool playing();
|
||||||
|
bool paused();
|
||||||
|
|
||||||
const std::string module_name_;
|
const std::string module_name_;
|
||||||
|
|
||||||
@ -65,6 +66,9 @@ class MPD : public ALabel {
|
|||||||
unique_status status_;
|
unique_status status_;
|
||||||
mpd_state state_;
|
mpd_state state_;
|
||||||
unique_song song_;
|
unique_song song_;
|
||||||
|
|
||||||
|
// To make sure the previous periodic_updater stops before creating a new one
|
||||||
|
std::mutex periodic_lock_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -27,30 +27,39 @@ class Network : public ALabel {
|
|||||||
static int handleEvents(struct nl_msg*, void*);
|
static int handleEvents(struct nl_msg*, void*);
|
||||||
static int handleScan(struct nl_msg*, void*);
|
static int handleScan(struct nl_msg*, void*);
|
||||||
|
|
||||||
void worker();
|
void worker();
|
||||||
void disconnected();
|
void createInfoSocket();
|
||||||
void createInfoSocket();
|
void createEventSocket();
|
||||||
void createEventSocket();
|
int getExternalInterface(int skip_idx = -1) const;
|
||||||
int getExternalInterface();
|
void getInterfaceAddress();
|
||||||
void getInterfaceAddress();
|
int netlinkRequest(void*, uint32_t, uint32_t groups = 0) const;
|
||||||
int netlinkRequest(void*, uint32_t, uint32_t groups = 0);
|
int netlinkResponse(void*, uint32_t, uint32_t groups = 0) const;
|
||||||
int netlinkResponse(void*, uint32_t, uint32_t groups = 0);
|
void parseEssid(struct nlattr**);
|
||||||
void parseEssid(struct nlattr**);
|
void parseSignal(struct nlattr**);
|
||||||
void parseSignal(struct nlattr**);
|
void parseFreq(struct nlattr**);
|
||||||
bool associatedOrJoined(struct nlattr**);
|
bool associatedOrJoined(struct nlattr**);
|
||||||
auto getInfo() -> void;
|
bool checkInterface(struct ifinfomsg* rtif, std::string name);
|
||||||
|
int getPreferredIface(int skip_idx = -1, bool wait = true) const;
|
||||||
|
auto getInfo() -> void;
|
||||||
|
void checkNewInterface(struct ifinfomsg* rtif);
|
||||||
|
const std::string getNetworkState() const;
|
||||||
|
void clearIface();
|
||||||
|
bool wildcardMatch(const std::string& pattern, const std::string& text) const;
|
||||||
|
|
||||||
waybar::util::SleeperThread thread_;
|
int ifid_;
|
||||||
waybar::util::SleeperThread thread_timer_;
|
sa_family_t family_;
|
||||||
int ifid_;
|
struct sockaddr_nl nladdr_ = {0};
|
||||||
sa_family_t family_;
|
struct nl_sock* sock_ = nullptr;
|
||||||
struct sockaddr_nl nladdr_ = {0};
|
struct nl_sock* ev_sock_ = nullptr;
|
||||||
struct nl_sock* sk_ = nullptr;
|
int efd_;
|
||||||
struct nl_sock* info_sock_ = nullptr;
|
int ev_fd_;
|
||||||
int efd_;
|
int nl80211_id_;
|
||||||
int ev_fd_;
|
std::mutex mutex_;
|
||||||
int nl80211_id_;
|
|
||||||
|
|
||||||
|
unsigned long long bandwidth_down_total_;
|
||||||
|
unsigned long long bandwidth_up_total_;
|
||||||
|
|
||||||
|
std::string state_;
|
||||||
std::string essid_;
|
std::string essid_;
|
||||||
std::string ifname_;
|
std::string ifname_;
|
||||||
std::string ipaddr_;
|
std::string ipaddr_;
|
||||||
@ -58,6 +67,10 @@ class Network : public ALabel {
|
|||||||
int cidr_;
|
int cidr_;
|
||||||
int32_t signal_strength_dbm_;
|
int32_t signal_strength_dbm_;
|
||||||
uint8_t signal_strength_;
|
uint8_t signal_strength_;
|
||||||
|
uint32_t frequency_;
|
||||||
|
|
||||||
|
util::SleeperThread thread_;
|
||||||
|
util::SleeperThread thread_timer_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -18,22 +18,33 @@ class Pulseaudio : public ALabel {
|
|||||||
static void subscribeCb(pa_context*, pa_subscription_event_type_t, uint32_t, void*);
|
static void subscribeCb(pa_context*, pa_subscription_event_type_t, uint32_t, void*);
|
||||||
static void contextStateCb(pa_context*, void*);
|
static void contextStateCb(pa_context*, void*);
|
||||||
static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
|
static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
|
||||||
|
static void sourceInfoCb(pa_context*, const pa_source_info* i, int, void* data);
|
||||||
static void serverInfoCb(pa_context*, const pa_server_info*, void*);
|
static void serverInfoCb(pa_context*, const pa_server_info*, void*);
|
||||||
static void volumeModifyCb(pa_context*, int, void*);
|
static void volumeModifyCb(pa_context*, int, void*);
|
||||||
bool handleScroll(GdkEventScroll* e);
|
|
||||||
|
|
||||||
|
bool handleScroll(GdkEventScroll* e);
|
||||||
const std::string getPortIcon() const;
|
const std::string getPortIcon() const;
|
||||||
|
|
||||||
pa_threaded_mainloop* mainloop_;
|
pa_threaded_mainloop* mainloop_;
|
||||||
pa_mainloop_api* mainloop_api_;
|
pa_mainloop_api* mainloop_api_;
|
||||||
pa_context* context_;
|
pa_context* context_;
|
||||||
uint32_t sink_idx_{0};
|
// SINK
|
||||||
uint16_t volume_;
|
uint32_t sink_idx_{0};
|
||||||
pa_cvolume pa_volume_;
|
uint16_t volume_;
|
||||||
bool muted_;
|
pa_cvolume pa_volume_;
|
||||||
std::string port_name_;
|
bool muted_;
|
||||||
std::string desc_;
|
std::string port_name_;
|
||||||
bool scrolling_;
|
std::string form_factor_;
|
||||||
|
std::string desc_;
|
||||||
|
std::string monitor_;
|
||||||
|
std::string default_sink_name_;
|
||||||
|
// SOURCE
|
||||||
|
uint32_t source_idx_{0};
|
||||||
|
uint16_t source_volume_;
|
||||||
|
bool source_muted_;
|
||||||
|
std::string source_port_name_;
|
||||||
|
std::string source_desc_;
|
||||||
|
std::string default_source_name_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -46,7 +46,12 @@ class Item : public sigc::trackable {
|
|||||||
std::string menu;
|
std::string menu;
|
||||||
DbusmenuGtkMenu* dbus_menu = nullptr;
|
DbusmenuGtkMenu* dbus_menu = nullptr;
|
||||||
Gtk::Menu* gtk_menu = nullptr;
|
Gtk::Menu* gtk_menu = nullptr;
|
||||||
bool item_is_menu;
|
/**
|
||||||
|
* ItemIsMenu flag means that the item only supports the context menu.
|
||||||
|
* Default value is true because libappindicator supports neither ItemIsMenu nor Activate method
|
||||||
|
* while compliant SNI implementation would always reset the flag to desired value.
|
||||||
|
*/
|
||||||
|
bool item_is_menu = true;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void proxyReady(Glib::RefPtr<Gio::AsyncResult>& result);
|
void proxyReady(Glib::RefPtr<Gio::AsyncResult>& result);
|
||||||
@ -59,12 +64,12 @@ class Item : public sigc::trackable {
|
|||||||
void updateImage();
|
void updateImage();
|
||||||
Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant* variant);
|
Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant* variant);
|
||||||
Glib::RefPtr<Gdk::Pixbuf> getIconByName(const std::string& name, int size);
|
Glib::RefPtr<Gdk::Pixbuf> getIconByName(const std::string& name, int size);
|
||||||
static void onMenuDestroyed(Item* self);
|
static void onMenuDestroyed(Item* self, GObject* old_menu_pointer);
|
||||||
bool makeMenu(GdkEventButton* const& ev);
|
void makeMenu();
|
||||||
bool handleClick(GdkEventButton* const& /*ev*/);
|
bool handleClick(GdkEventButton* const& /*ev*/);
|
||||||
|
|
||||||
Glib::RefPtr<Gio::Cancellable> cancellable_;
|
|
||||||
Glib::RefPtr<Gio::DBus::Proxy> proxy_;
|
Glib::RefPtr<Gio::DBus::Proxy> proxy_;
|
||||||
|
Glib::RefPtr<Gio::Cancellable> cancellable_;
|
||||||
bool update_pending_;
|
bool update_pending_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include "IModule.hpp"
|
#include "AModule.hpp"
|
||||||
#include "bar.hpp"
|
#include "bar.hpp"
|
||||||
#include "modules/sni/host.hpp"
|
#include "modules/sni/host.hpp"
|
||||||
#include "modules/sni/watcher.hpp"
|
#include "modules/sni/watcher.hpp"
|
||||||
@ -9,21 +9,19 @@
|
|||||||
|
|
||||||
namespace waybar::modules::SNI {
|
namespace waybar::modules::SNI {
|
||||||
|
|
||||||
class Tray : public IModule {
|
class Tray : public AModule {
|
||||||
public:
|
public:
|
||||||
Tray(const std::string&, const Bar&, const Json::Value&);
|
Tray(const std::string&, const Bar&, const Json::Value&);
|
||||||
~Tray() = default;
|
~Tray() = default;
|
||||||
auto update() -> void;
|
auto update() -> void;
|
||||||
operator Gtk::Widget&();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void onAdd(std::unique_ptr<Item>& item);
|
void onAdd(std::unique_ptr<Item>& item);
|
||||||
void onRemove(std::unique_ptr<Item>& item);
|
void onRemove(std::unique_ptr<Item>& item);
|
||||||
|
|
||||||
static inline std::size_t nb_hosts_ = 0;
|
static inline std::size_t nb_hosts_ = 0;
|
||||||
const Json::Value& config_;
|
|
||||||
Gtk::Box box_;
|
Gtk::Box box_;
|
||||||
SNI::Watcher watcher_;
|
SNI::Watcher::singleton watcher_;
|
||||||
SNI::Host host_;
|
SNI::Host host_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -7,10 +7,24 @@
|
|||||||
namespace waybar::modules::SNI {
|
namespace waybar::modules::SNI {
|
||||||
|
|
||||||
class Watcher {
|
class Watcher {
|
||||||
public:
|
private:
|
||||||
Watcher();
|
Watcher();
|
||||||
|
|
||||||
|
public:
|
||||||
~Watcher();
|
~Watcher();
|
||||||
|
|
||||||
|
using singleton = std::shared_ptr<Watcher>;
|
||||||
|
static singleton getInstance() {
|
||||||
|
static std::weak_ptr<Watcher> weak;
|
||||||
|
|
||||||
|
std::shared_ptr<Watcher> strong = weak.lock();
|
||||||
|
if (!strong) {
|
||||||
|
strong = std::shared_ptr<Watcher>(new Watcher());
|
||||||
|
weak = strong;
|
||||||
|
}
|
||||||
|
return strong;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef enum { GF_WATCH_TYPE_HOST, GF_WATCH_TYPE_ITEM } GfWatchType;
|
typedef enum { GF_WATCH_TYPE_HOST, GF_WATCH_TYPE_ITEM } GfWatchType;
|
||||||
|
|
||||||
@ -34,7 +48,6 @@ class Watcher {
|
|||||||
void updateRegisteredItems(SnWatcher *obj);
|
void updateRegisteredItems(SnWatcher *obj);
|
||||||
|
|
||||||
uint32_t bus_name_id_;
|
uint32_t bus_name_id_;
|
||||||
uint32_t watcher_id_;
|
|
||||||
GSList * hosts_ = nullptr;
|
GSList * hosts_ = nullptr;
|
||||||
GSList * items_ = nullptr;
|
GSList * items_ = nullptr;
|
||||||
SnWatcher *watcher_ = nullptr;
|
SnWatcher *watcher_ = nullptr;
|
||||||
|
@ -5,11 +5,10 @@
|
|||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <iostream>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include "ipc.hpp"
|
#include "ipc.hpp"
|
||||||
#include "util/json.hpp"
|
#include "util/sleeper_thread.hpp"
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
@ -21,15 +20,16 @@ class Ipc {
|
|||||||
struct ipc_response {
|
struct ipc_response {
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
uint32_t type;
|
uint32_t type;
|
||||||
Json::Value payload;
|
std::string payload;
|
||||||
};
|
};
|
||||||
|
|
||||||
sigc::signal<void, const struct ipc_response&> signal_event;
|
sigc::signal<void, const struct ipc_response &> signal_event;
|
||||||
sigc::signal<void, const struct ipc_response&> signal_cmd;
|
sigc::signal<void, const struct ipc_response &> signal_cmd;
|
||||||
|
|
||||||
void sendCmd(uint32_t type, const std::string &payload = "");
|
void sendCmd(uint32_t type, const std::string &payload = "");
|
||||||
void subscribe(const std::string &payload);
|
void subscribe(const std::string &payload);
|
||||||
void handleEvent();
|
void handleEvent();
|
||||||
|
void setWorker(std::function<void()> &&func);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static inline const std::string ipc_magic_ = "i3-ipc";
|
static inline const std::string ipc_magic_ = "i3-ipc";
|
||||||
@ -40,12 +40,10 @@ class Ipc {
|
|||||||
struct ipc_response send(int fd, uint32_t type, const std::string &payload = "");
|
struct ipc_response send(int fd, uint32_t type, const std::string &payload = "");
|
||||||
struct ipc_response recv(int fd);
|
struct ipc_response recv(int fd);
|
||||||
|
|
||||||
int fd_;
|
int fd_;
|
||||||
int fd_event_;
|
int fd_event_;
|
||||||
std::mutex mutex_;
|
std::mutex mutex_;
|
||||||
std::mutex mutex_event_;
|
util::SleeperThread thread_;
|
||||||
std::mutex mutex_parser_;
|
|
||||||
util::JsonParser parser_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -5,24 +5,23 @@
|
|||||||
#include "bar.hpp"
|
#include "bar.hpp"
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
#include "modules/sway/ipc/client.hpp"
|
#include "modules/sway/ipc/client.hpp"
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/json.hpp"
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
class Mode : public ALabel {
|
class Mode : public ALabel, public sigc::trackable {
|
||||||
public:
|
public:
|
||||||
Mode(const std::string&, const waybar::Bar&, const Json::Value&);
|
Mode(const std::string&, const Json::Value&);
|
||||||
~Mode() = default;
|
~Mode() = default;
|
||||||
auto update() -> void;
|
auto update() -> void;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void onEvent(const struct Ipc::ipc_response&);
|
void onEvent(const struct Ipc::ipc_response&);
|
||||||
void worker();
|
|
||||||
|
|
||||||
const Bar& bar_;
|
std::string mode_;
|
||||||
waybar::util::SleeperThread thread_;
|
util::JsonParser parser_;
|
||||||
Ipc ipc_;
|
std::mutex mutex_;
|
||||||
std::string mode_;
|
Ipc ipc_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -6,11 +6,11 @@
|
|||||||
#include "bar.hpp"
|
#include "bar.hpp"
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
#include "modules/sway/ipc/client.hpp"
|
#include "modules/sway/ipc/client.hpp"
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/json.hpp"
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
class Window : public ALabel {
|
class Window : public ALabel, public sigc::trackable {
|
||||||
public:
|
public:
|
||||||
Window(const std::string&, const waybar::Bar&, const Json::Value&);
|
Window(const std::string&, const waybar::Bar&, const Json::Value&);
|
||||||
~Window() = default;
|
~Window() = default;
|
||||||
@ -19,16 +19,19 @@ class Window : public ALabel {
|
|||||||
private:
|
private:
|
||||||
void onEvent(const struct Ipc::ipc_response&);
|
void onEvent(const struct Ipc::ipc_response&);
|
||||||
void onCmd(const struct Ipc::ipc_response&);
|
void onCmd(const struct Ipc::ipc_response&);
|
||||||
void worker();
|
std::tuple<std::size_t, int, std::string, std::string> getFocusedNode(const Json::Value& nodes,
|
||||||
std::tuple<std::size_t, int, std::string, std::string> getFocusedNode(const Json::Value& nodes);
|
std::string& output);
|
||||||
void getTree();
|
void getTree();
|
||||||
|
|
||||||
const Bar& bar_;
|
const Bar& bar_;
|
||||||
waybar::util::SleeperThread thread_;
|
std::string window_;
|
||||||
Ipc ipc_;
|
int windowId_;
|
||||||
std::string window_;
|
std::string app_id_;
|
||||||
int windowId_;
|
std::string old_app_id_;
|
||||||
std::string app_id_;
|
std::size_t app_nb_;
|
||||||
|
util::JsonParser parser_;
|
||||||
|
std::mutex mutex_;
|
||||||
|
Ipc ipc_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -1,45 +1,43 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include <gtkmm/button.h>
|
#include <gtkmm/button.h>
|
||||||
#include <gtkmm/label.h>
|
#include <gtkmm/label.h>
|
||||||
#include "IModule.hpp"
|
#include "AModule.hpp"
|
||||||
#include "bar.hpp"
|
#include "bar.hpp"
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
#include "modules/sway/ipc/client.hpp"
|
#include "modules/sway/ipc/client.hpp"
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/json.hpp"
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
class Workspaces : public IModule {
|
class Workspaces : public AModule, public sigc::trackable {
|
||||||
public:
|
public:
|
||||||
Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
|
Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
|
||||||
~Workspaces() = default;
|
~Workspaces() = default;
|
||||||
auto update() -> void;
|
auto update() -> void;
|
||||||
operator Gtk::Widget&();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void onCmd(const struct Ipc::ipc_response&);
|
void onCmd(const struct Ipc::ipc_response&);
|
||||||
void onEvent(const struct Ipc::ipc_response&);
|
void onEvent(const struct Ipc::ipc_response&);
|
||||||
void worker();
|
|
||||||
bool filterButtons();
|
bool filterButtons();
|
||||||
Gtk::Button& addButton(const Json::Value&);
|
Gtk::Button& addButton(const Json::Value&);
|
||||||
void onButtonReady(const Json::Value&, Gtk::Button&);
|
void onButtonReady(const Json::Value&, Gtk::Button&);
|
||||||
std::string getIcon(const std::string&, const Json::Value&);
|
std::string getIcon(const std::string&, const Json::Value&);
|
||||||
bool handleScroll(GdkEventScroll*);
|
|
||||||
const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
|
const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
|
||||||
uint16_t getWorkspaceIndex(const std::string& name) const;
|
uint16_t getWorkspaceIndex(const std::string& name) const;
|
||||||
std::string trimWorkspaceName(std::string);
|
std::string trimWorkspaceName(std::string);
|
||||||
|
bool handleScroll(GdkEventScroll*);
|
||||||
|
|
||||||
const Bar& bar_;
|
const Bar& bar_;
|
||||||
const Json::Value& config_;
|
|
||||||
std::vector<Json::Value> workspaces_;
|
std::vector<Json::Value> workspaces_;
|
||||||
waybar::util::SleeperThread thread_;
|
std::vector<std::string> workspaces_order_;
|
||||||
std::mutex mutex_;
|
|
||||||
Gtk::Box box_;
|
Gtk::Box box_;
|
||||||
Ipc ipc_;
|
util::JsonParser parser_;
|
||||||
bool scrolling_;
|
|
||||||
std::unordered_map<std::string, Gtk::Button> buttons_;
|
std::unordered_map<std::string, Gtk::Button> buttons_;
|
||||||
|
std::mutex mutex_;
|
||||||
|
Ipc ipc_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -4,11 +4,6 @@
|
|||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include "ALabel.hpp"
|
#include "ALabel.hpp"
|
||||||
#include "util/sleeper_thread.hpp"
|
#include "util/sleeper_thread.hpp"
|
||||||
#ifdef FILESYSTEM_EXPERIMENTAL
|
|
||||||
#include <experimental/filesystem>
|
|
||||||
#else
|
|
||||||
#include <filesystem>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace waybar::modules {
|
namespace waybar::modules {
|
||||||
|
|
||||||
@ -22,8 +17,8 @@ class Temperature : public ALabel {
|
|||||||
std::tuple<uint16_t, uint16_t> getTemperature();
|
std::tuple<uint16_t, uint16_t> getTemperature();
|
||||||
bool isCritical(uint16_t);
|
bool isCritical(uint16_t);
|
||||||
|
|
||||||
std::string file_path_;
|
std::string file_path_;
|
||||||
waybar::util::SleeperThread thread_;
|
util::SleeperThread thread_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -33,7 +33,7 @@ inline int close(FILE* fp, pid_t pid) {
|
|||||||
fclose(fp);
|
fclose(fp);
|
||||||
while (waitpid(pid, &stat, 0) == -1) {
|
while (waitpid(pid, &stat, 0) == -1) {
|
||||||
if (errno != EINTR) {
|
if (errno != EINTR) {
|
||||||
stat = -1;
|
stat = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -72,7 +72,10 @@ inline struct res exec(std::string cmd) {
|
|||||||
if (!fp) return {-1, ""};
|
if (!fp) return {-1, ""};
|
||||||
auto output = command::read(fp);
|
auto output = command::read(fp);
|
||||||
auto stat = command::close(fp, pid);
|
auto stat = command::close(fp, pid);
|
||||||
return {WEXITSTATUS(stat), output};
|
if (WIFEXITED(stat)) {
|
||||||
|
return {WEXITSTATUS(stat), output};
|
||||||
|
}
|
||||||
|
return {-1, output};
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int32_t forkExec(std::string cmd) {
|
inline int32_t forkExec(std::string cmd) {
|
||||||
@ -88,8 +91,11 @@ inline int32_t forkExec(std::string cmd) {
|
|||||||
// Child executes the command
|
// Child executes the command
|
||||||
if (!pid) {
|
if (!pid) {
|
||||||
setpgid(pid, pid);
|
setpgid(pid, pid);
|
||||||
|
signal(SIGCHLD, SIG_DFL);
|
||||||
execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
|
execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
|
||||||
exit(0);
|
exit(0);
|
||||||
|
} else {
|
||||||
|
signal(SIGCHLD,SIG_IGN);
|
||||||
}
|
}
|
||||||
|
|
||||||
return pid;
|
return pid;
|
||||||
|
84
include/util/format.hpp
Normal file
84
include/util/format.hpp
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
class pow_format {
|
||||||
|
public:
|
||||||
|
pow_format(long long val, std::string&& unit, bool binary = false):
|
||||||
|
val_(val), unit_(unit), binary_(binary) { };
|
||||||
|
|
||||||
|
long long val_;
|
||||||
|
std::string unit_;
|
||||||
|
bool binary_;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
namespace fmt {
|
||||||
|
template <>
|
||||||
|
struct formatter<pow_format> {
|
||||||
|
char spec = 0;
|
||||||
|
int width = 0;
|
||||||
|
|
||||||
|
template <typename ParseContext>
|
||||||
|
constexpr auto parse(ParseContext& ctx) -> decltype (ctx.begin()) {
|
||||||
|
auto it = ctx.begin(), end = ctx.end();
|
||||||
|
if (it != end && *it == ':') ++it;
|
||||||
|
if (*it == '>' || *it == '<' || *it == '=') {
|
||||||
|
spec = *it;
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
if (it == end || *it == '}') return it;
|
||||||
|
if ('0' <= *it && *it <= '9') {
|
||||||
|
// We ignore it for now, but keep it for compatibility with
|
||||||
|
// existing configs where the format for pow_format'ed numbers was
|
||||||
|
// 'string' and specifications such as {:>9} were valid.
|
||||||
|
// The rationale for ignoring it is that the only reason to specify
|
||||||
|
// an alignment and a with is to get a fixed width bar, and ">" is
|
||||||
|
// sufficient in this implementation.
|
||||||
|
width = parse_nonnegative_int(it, end, ctx);
|
||||||
|
}
|
||||||
|
return it;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class FormatContext>
|
||||||
|
auto format(const pow_format& s, FormatContext &ctx) -> decltype (ctx.out()) {
|
||||||
|
const char* units[] = { "", "k", "M", "G", "T", "P", nullptr};
|
||||||
|
|
||||||
|
auto base = s.binary_ ? 1024ull : 1000ll;
|
||||||
|
auto fraction = (double) s.val_;
|
||||||
|
|
||||||
|
int pow;
|
||||||
|
for (pow = 0; units[pow+1] != nullptr && fraction / base >= 1; ++pow) {
|
||||||
|
fraction /= base;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto max_width = 4 // coeff in {:.3g} format
|
||||||
|
+ 1 // prefix from units array
|
||||||
|
+ s.binary_ // for the 'i' in GiB.
|
||||||
|
+ s.unit_.length();
|
||||||
|
|
||||||
|
const char * format;
|
||||||
|
std::string string;
|
||||||
|
switch (spec) {
|
||||||
|
case '>':
|
||||||
|
return format_to(ctx.out(), "{:>{}}", fmt::format("{}", s), max_width);
|
||||||
|
case '<':
|
||||||
|
return format_to(ctx.out(), "{:<{}}", fmt::format("{}", s), max_width);
|
||||||
|
case '=':
|
||||||
|
format = "{coefficient:<4.3g}{padding}{prefix}{unit}";
|
||||||
|
break;
|
||||||
|
case 0:
|
||||||
|
default:
|
||||||
|
format = "{coefficient:.3g}{prefix}{unit}";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return format_to(ctx.out(), format
|
||||||
|
, fmt::arg("coefficient", fraction)
|
||||||
|
, fmt::arg("prefix", std::string() + units[pow] + ((s.binary_ && pow) ? "i" : ""))
|
||||||
|
, fmt::arg("unit", s.unit_)
|
||||||
|
, fmt::arg("padding", pow ? "" : s.binary_ ? " " : " ")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -5,15 +5,16 @@
|
|||||||
namespace waybar::util {
|
namespace waybar::util {
|
||||||
|
|
||||||
struct JsonParser {
|
struct JsonParser {
|
||||||
JsonParser() : reader_(builder_.newCharReader()) {}
|
JsonParser() {}
|
||||||
|
|
||||||
const Json::Value parse(const std::string& data) const {
|
const Json::Value parse(const std::string& data) const {
|
||||||
Json::Value root(Json::objectValue);
|
Json::Value root(Json::objectValue);
|
||||||
if (data.empty()) {
|
if (data.empty()) {
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
std::string err;
|
std::unique_ptr<Json::CharReader> const reader(builder_.newCharReader());
|
||||||
bool res = reader_->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
|
std::string err;
|
||||||
|
bool res = reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
|
||||||
if (!res) throw std::runtime_error(err);
|
if (!res) throw std::runtime_error(err);
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
@ -21,8 +22,7 @@ struct JsonParser {
|
|||||||
~JsonParser() = default;
|
~JsonParser() = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Json::CharReaderBuilder builder_;
|
Json::CharReaderBuilder builder_;
|
||||||
std::unique_ptr<Json::CharReader> const reader_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::util
|
} // namespace waybar::util
|
||||||
|
@ -14,7 +14,10 @@ class SleeperThread {
|
|||||||
|
|
||||||
SleeperThread(std::function<void()> func)
|
SleeperThread(std::function<void()> func)
|
||||||
: thread_{[this, func] {
|
: thread_{[this, func] {
|
||||||
while (do_run_) func();
|
while (do_run_) {
|
||||||
|
signal_ = false;
|
||||||
|
func();
|
||||||
|
}
|
||||||
}} {}
|
}} {}
|
||||||
|
|
||||||
SleeperThread& operator=(std::function<void()> func) {
|
SleeperThread& operator=(std::function<void()> func) {
|
||||||
@ -42,7 +45,10 @@ class SleeperThread {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto wake_up() {
|
auto wake_up() {
|
||||||
signal_ = true;
|
{
|
||||||
|
std::lock_guard<std::mutex> lck(mutex_);
|
||||||
|
signal_ = true;
|
||||||
|
}
|
||||||
condvar_.notify_all();
|
condvar_.notify_all();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
71
man/waybar-backlight.5.scd
Normal file
71
man/waybar-backlight.5.scd
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
waybar-backlight(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - backlight module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *backlight* module displays the current backlight level.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
*interval* ++
|
||||||
|
typeof: integer ++
|
||||||
|
default: 2 ++
|
||||||
|
The interval in which information gets polled.
|
||||||
|
|
||||||
|
*format* ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {percent}% ++
|
||||||
|
The format, how information should be displayed. On {} data gets inserted.
|
||||||
|
|
||||||
|
*max-length* ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in characters the module should display.
|
||||||
|
|
||||||
|
*rotate* ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*states* ++
|
||||||
|
typeof: array ++
|
||||||
|
A number of backlight states which get activated on certain brightness levels.
|
||||||
|
|
||||||
|
*on-click* ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when the module is clicked.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right* ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when the module is right clicked.
|
||||||
|
|
||||||
|
*on-scroll-up* ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when performing a scroll up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down* ++
|
||||||
|
typeof: string
|
||||||
|
Command to execute when performing a scroll down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold* ++
|
||||||
|
typeof: double
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
# EXAMPLE:
|
||||||
|
|
||||||
|
```
|
||||||
|
"backlight": {
|
||||||
|
"device": "intel_backlight",
|
||||||
|
"format": "{percent}% {icon}",
|
||||||
|
"format-icons": ["", ""]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#backlight*
|
144
man/waybar-battery.5.scd
Normal file
144
man/waybar-battery.5.scd
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
waybar-battery(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - battery module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *battery* module displays the current capacity and state (eg. charging) of your battery.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
*bat* ++
|
||||||
|
typeof: string ++
|
||||||
|
The battery to monitor, as in /sys/class/power_supply/ instead of auto detect.
|
||||||
|
|
||||||
|
*adapter* ++
|
||||||
|
typeof: string ++
|
||||||
|
The adapter to monitor, as in /sys/class/power_supply/ instead of auto detect.
|
||||||
|
|
||||||
|
*full-at* ++
|
||||||
|
typeof: integer ++
|
||||||
|
Define the max percentage of the battery, usefull for an old battery, e.g. 96
|
||||||
|
|
||||||
|
*interval* ++
|
||||||
|
typeof: integer ++
|
||||||
|
default: 60 ++
|
||||||
|
The interval in which the information gets polled.
|
||||||
|
|
||||||
|
*states* ++
|
||||||
|
typeof: array ++
|
||||||
|
A number of battery states which get activated on certain capacity levels. See *waybar-states(5)*.
|
||||||
|
|
||||||
|
*format* ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {capacity}% ++
|
||||||
|
The format, how the time should be displayed.
|
||||||
|
|
||||||
|
*format-time* ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {H} h {M} min ++
|
||||||
|
The format, how the time should be displayed.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array/object ++
|
||||||
|
Based on the current capacity, the corresponding icon gets selected. ++
|
||||||
|
The order is *low* to *high*. Or by the state if it is an object.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right* ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold* ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip* ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{capacity}*: Capacity in percentage
|
||||||
|
|
||||||
|
*{icon}*: Icon, as defined in *format-icons*.
|
||||||
|
|
||||||
|
*{time}*: Estimate of time until full or empty. Note that this is based on the power draw at the last refresh time, not an average.
|
||||||
|
|
||||||
|
# TIME FORMAT
|
||||||
|
|
||||||
|
The *battery* module allows you to define how time should be formatted via *format-time*.
|
||||||
|
|
||||||
|
The two arguments are:
|
||||||
|
*{H}*: Hours
|
||||||
|
*{M}*: Minutes
|
||||||
|
|
||||||
|
# CUSTOM FORMATS
|
||||||
|
|
||||||
|
The *battery* module allows to define custom formats based on up to two factors. The best fitting format will be selected.
|
||||||
|
|
||||||
|
*format-<state>*: With *states*, a custom format can be set depending on the capacity of your battery.
|
||||||
|
|
||||||
|
*format-<status>*: With the status, a custom format can be set depending on the status in /sys/class/power_supply/<bat>/status (in lowercase).
|
||||||
|
|
||||||
|
*format-<status>-<state>*: You can also set a custom format depending on both values.
|
||||||
|
|
||||||
|
# STATES
|
||||||
|
|
||||||
|
- Every entry (*state*) consists of a *<name>* (typeof: *string*) and a *<value>* (typeof: *integer*).
|
||||||
|
- The state can be addressed as a CSS class in the *style.css*. The name of the CSS class is the *<name>* of the state. Each class gets activated when the current capacity is equal or below the configured *<value>*.
|
||||||
|
- Also each state can have its own *format*. Those con be configured via *format-<name>*. Or if you want to differentiate a bit more even as *format-<status>-<state>*. For more information see *custom-formats*.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"battery": {
|
||||||
|
"bat": "BAT2",
|
||||||
|
"interval": 60,
|
||||||
|
"states": {
|
||||||
|
"warning": 30,
|
||||||
|
"critical": 15
|
||||||
|
},
|
||||||
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-icons": ["", "", "", "", ""],
|
||||||
|
"max-length": 25
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#battery*
|
||||||
|
- *#battery.<status>*
|
||||||
|
- *<status>* is the value of /sys/class/power_supply/<bat>/status in lowercase.
|
||||||
|
- *#battery.<state>*
|
||||||
|
- *<state>* can be defined in the *config*. For more information see *states*.
|
||||||
|
- *#battery.<status>.<state>*
|
||||||
|
- Combination of both *<status>* and *<state>*.
|
84
man/waybar-clock.5.scd
Normal file
84
man/waybar-clock.5.scd
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
waybar-clock(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - clock module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *clock* module displays the current date and time.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
default: 60 ++
|
||||||
|
The interval in which the information gets polled.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {:%H:%M} ++
|
||||||
|
The format, how the date and time should be displayed. ++
|
||||||
|
It uses the format of the date library. See https://howardhinnant.github.io/date/date.html#to_stream_formatting for details.
|
||||||
|
|
||||||
|
*timezone*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: inferred local timezone ++
|
||||||
|
The timezone to display the time in, e.g. America/New_York.
|
||||||
|
|
||||||
|
*locale*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: inferred from current locale ++
|
||||||
|
A locale to be used to display the time. Intended to render times in custom timezones with the proper language and format.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
View all valid format options in *strftime(3)*.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{calendar}*: Current month calendar
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"clock": {
|
||||||
|
"interval": 60,
|
||||||
|
"format": "{:%H:%M}",
|
||||||
|
"max-length": 25
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#clock*
|
82
man/waybar-cpu.5.scd
Normal file
82
man/waybar-cpu.5.scd
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
waybar-cpu(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - cpu module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *cpu* module displays the current cpu utilization.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
default: 10 ++
|
||||||
|
The interval in which the information gets polled.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {usage}% ++
|
||||||
|
The format, how information should be displayed. On {} data gets inserted.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*states*: ++
|
||||||
|
typeof: array ++
|
||||||
|
A number of cpu usage states which get activated on certain usage levels. See *waybar-states(5)*.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{load}*: Current cpu load.
|
||||||
|
|
||||||
|
*{usage}*: Current cpu usage.
|
||||||
|
|
||||||
|
# EXAMPLE
|
||||||
|
|
||||||
|
```
|
||||||
|
"cpu": {
|
||||||
|
"interval": 10,
|
||||||
|
"format": "{}% ",
|
||||||
|
"max-length": 10
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#cpu*
|
200
man/waybar-custom.5.scd
Normal file
200
man/waybar-custom.5.scd
Normal file
@ -0,0 +1,200 @@
|
|||||||
|
waybar-custom(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - custom module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *custom* module displays either the output of a script or static text.
|
||||||
|
To display static text, specify only the *format* field.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *custom/<name>*
|
||||||
|
|
||||||
|
*exec*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The path to the script, which should be executed.
|
||||||
|
|
||||||
|
*exec-if*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The path to a script, which determines if the script in *exec* should be executed.
|
||||||
|
*exec* will be executed if the exit code of *exec-if* equals 0.
|
||||||
|
|
||||||
|
*return-type*: ++
|
||||||
|
typeof: string ++
|
||||||
|
See *return-type*
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The interval (in seconds) in which the information gets polled.
|
||||||
|
Use *once* if you want to execute the module only on startup.
|
||||||
|
You can update it manually with a signal. If no *interval* is defined,
|
||||||
|
it is assumed that the out script loops it self.
|
||||||
|
|
||||||
|
*restart-interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The restart interval (in seconds).
|
||||||
|
Can't be used with the *interval* option, so only with continuous scripts.
|
||||||
|
Once the script exit, it'll be re-executed after the *restart-interval*.
|
||||||
|
|
||||||
|
*signal*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The signal number used to update the module.
|
||||||
|
The number is valid between 1 and N, where *SIGRTMIN+N* = *SIGRTMAX*.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {} ++
|
||||||
|
The format, how information should be displayed. On {} data gets inserted.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array ++
|
||||||
|
Based on the set percentage, the corresponding icon gets selected. The order is *low* to *high*.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
*escape*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
Option to enable escaping of script output.
|
||||||
|
|
||||||
|
# RETURN-TYPE
|
||||||
|
|
||||||
|
When *return-type* is set to *json*, Waybar expects the *exec*-script to output its data in JSON format.
|
||||||
|
This should look like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
{"text": "$text", "tooltip": "$tooltip", "class": "$class", "percentage": $percentage }
|
||||||
|
```
|
||||||
|
|
||||||
|
The *class* parameter also accepts an array of strings.
|
||||||
|
|
||||||
|
If nothing or an invalid option is specified, Waybar expects i3blocks style output. Values are *newline* separated.
|
||||||
|
This should look like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
$text\\n$tooltip\\n$class*
|
||||||
|
```
|
||||||
|
|
||||||
|
*class* is a CSS class, to apply different styles in *style.css*
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{}*: Output of the script.
|
||||||
|
|
||||||
|
*{percentage}* Percentage which can be set via a json return-type.
|
||||||
|
|
||||||
|
*{icon}*: An icon from 'format-icons' according to percentage.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
## Spotify:
|
||||||
|
|
||||||
|
```
|
||||||
|
"custom/spotify": {
|
||||||
|
"format": " {}",
|
||||||
|
"max-length": 40,
|
||||||
|
"interval": 30, // Remove this if your script is endless and write in loop
|
||||||
|
"exec": "$HOME/.config/waybar/mediaplayer.sh 2> /dev/null", // Script in resources folder
|
||||||
|
"exec-if": "pgrep spotify"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## mpd:
|
||||||
|
|
||||||
|
```
|
||||||
|
"custom/mpd": {
|
||||||
|
"format": "♪ {}",
|
||||||
|
//"max-length": 15,
|
||||||
|
"interval": 10,
|
||||||
|
"exec": "mpc current",
|
||||||
|
"exec-if": "pgrep mpd",
|
||||||
|
"on-click": "mpc toggle",
|
||||||
|
"on-click-right": "sonata"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## cmus:
|
||||||
|
|
||||||
|
```
|
||||||
|
"custom/cmus": {
|
||||||
|
"format": "♪ {}",
|
||||||
|
//"max-length": 15,
|
||||||
|
"interval": 10,
|
||||||
|
"exec": "cmus-remote -C \"format_print '%a - %t'\"", // artist - title
|
||||||
|
"exec-if": "pgrep cmus",
|
||||||
|
"on-click": "cmus-remote -u", //toggle pause
|
||||||
|
"escape": true //handle markup entities
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Pacman
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
"custom/pacman": {
|
||||||
|
"format": "{} ",
|
||||||
|
"interval": "once",
|
||||||
|
"exec": "pacman_packages",
|
||||||
|
"on-click": "update-system",
|
||||||
|
"signal": 8
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Alternate Pacman
|
||||||
|
|
||||||
|
```
|
||||||
|
"custom/pacman": {
|
||||||
|
"format": "{} ",
|
||||||
|
"interval": 3600, // every hour
|
||||||
|
"exec": "checkupdates | wc -l", // # of updates
|
||||||
|
"exec-if": "exit 0", // always run; consider advanced run conditions
|
||||||
|
"on-click": "termite -e 'sudo pacman -Syu'; pkill -SIGRTMIN+8 waybar", // update system
|
||||||
|
"signal": 8
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
You can use the signal and update the number of available packages with *pkill -RTMIN+8 waybar*.
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#custom-<name>*
|
||||||
|
- *#custom-<name>.<class>*
|
||||||
|
- *<class>* can be set by the script. For more information see *return-type*
|
97
man/waybar-disk.5.scd
Normal file
97
man/waybar-disk.5.scd
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
waybar-disk(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - disk module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *disk* module displays the current disk space used.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *disk*
|
||||||
|
|
||||||
|
*path*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "/" ++
|
||||||
|
Any path residing in the filesystem or mountpoint for which the information should be displayed.
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer++
|
||||||
|
default: 30 ++
|
||||||
|
The interval in which the information gets polled.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "{percentage_used}%" ++
|
||||||
|
The format, how information should be displayed.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
*tooltip-format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "{used} out of {total} used ({percentage_used}%)" ++
|
||||||
|
The format of the information displayed in the tooltip.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{percentage_used}*: Percentage of disk in use.
|
||||||
|
|
||||||
|
*{percentage_free}*: Percentage of free disk space
|
||||||
|
|
||||||
|
*{total}*: Total amount of space on the disk, partition or mountpoint.
|
||||||
|
|
||||||
|
*{used}*: Amount of used disk space.
|
||||||
|
|
||||||
|
*{free}*: Amount of available disk space for normal users.
|
||||||
|
|
||||||
|
*{path}*: The path specified in the configuration.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"disk": {
|
||||||
|
"interval": 30,
|
||||||
|
"format": "{percentage_free}% free on {path}",
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#disk*
|
75
man/waybar-idle-inhibitor.5.scd
Normal file
75
man/waybar-idle-inhibitor.5.scd
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
waybar-idle-inhibitor(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - idle_inhibitor module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *idle_inhibitor* module can inhibiting the idle behavior such as screen blanking, locking, and
|
||||||
|
screensaving, also known as "presentation mode".
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The format, how the state should be displayed.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array ++
|
||||||
|
Based on the current state, the corresponding icon gets selected.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module. A click also toggles the state
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{status}*: status (*activated* or *deactivated*)
|
||||||
|
|
||||||
|
*{icon}*: Icon, as defined in *format-icons*
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"idle_inhibitor": {
|
||||||
|
"format": "{icon}",
|
||||||
|
"format-icons": {
|
||||||
|
"activated": "",
|
||||||
|
"deactivated": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
97
man/waybar-memory.5.scd
Normal file
97
man/waybar-memory.5.scd
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
waybar-memory(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - memory module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *memory* module displays the current memory utilization.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *memory*
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer++
|
||||||
|
default: 30 ++
|
||||||
|
The interval in which the information gets polled.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {percentage}% ++
|
||||||
|
The format, how information should be displayed.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*states*: ++
|
||||||
|
typeof: array ++
|
||||||
|
A number of memory utilization states which get activated on certain percentage thresholds. See *waybar-states(5)*.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{percentage}*: Percentage of memory in use.
|
||||||
|
|
||||||
|
*{total}*: Amount of total memory available in GiB.
|
||||||
|
|
||||||
|
*{used}*: Amount of used memory in GiB.
|
||||||
|
|
||||||
|
*{avail}*: Amount of available memory in GiB.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"memory": {
|
||||||
|
"interval": 30,
|
||||||
|
"format": "{}% ",
|
||||||
|
"max-length": 10
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## FORMATTED MEMORY VALUES
|
||||||
|
|
||||||
|
```
|
||||||
|
"memory": {
|
||||||
|
"interval": 30,
|
||||||
|
"format": "{used:0.1f}G/{total:0.1f}G "
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#memory*
|
208
man/waybar-mpd.5.scd
Normal file
208
man/waybar-mpd.5.scd
Normal file
@ -0,0 +1,208 @@
|
|||||||
|
waybar-mpd(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - mpd module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *mpd* module displays information about a running "Music Player Daemon" instance.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *mpd*
|
||||||
|
|
||||||
|
*server*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The network address or Unix socket path of the MPD server. If empty, connect to the default host.
|
||||||
|
|
||||||
|
*port*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The port MPD listens to. If empty, use the default port.
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer++
|
||||||
|
default: 5 ++
|
||||||
|
The interval in which the connection to the MPD server is retried
|
||||||
|
|
||||||
|
*timeout*: ++
|
||||||
|
typeof: integer++
|
||||||
|
default: 30 ++
|
||||||
|
The timeout for the connection. Change this if your MPD server has a low `connection_timeout` setting
|
||||||
|
|
||||||
|
*unknown-tag*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "N/A" ++
|
||||||
|
The text to display when a tag is not present in the current song, but used in `format`
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "{album} - {artist} - {title}" ++
|
||||||
|
Information displayed when a song is playing.
|
||||||
|
|
||||||
|
*format-stopped*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "stopped" ++
|
||||||
|
Information displayed when the player is stopped.
|
||||||
|
|
||||||
|
*format-paused*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when a song is paused.
|
||||||
|
|
||||||
|
*format-disconnected*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "disconnected" ++
|
||||||
|
Information displayed when the MPD server can't be reached.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
*tooltip-format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "MPD (connected)" ++
|
||||||
|
Tooltip information displayed when connected to MPD.
|
||||||
|
|
||||||
|
*tooltip-format-disconnected*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: "MPD (disconnected)" ++
|
||||||
|
Tooltip information displayed when the MPD server can't be reached.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*state-icons*: ++
|
||||||
|
typeof: object ++
|
||||||
|
default: {} ++
|
||||||
|
Icon to show depending on the play/pause state of the player (*{ "playing": "...", "paused": "..." }*)
|
||||||
|
|
||||||
|
*consume-icons*: ++
|
||||||
|
typeof: object ++
|
||||||
|
default: {} ++
|
||||||
|
Icon to show depending on the "consume" option (*{ "on": "...", "off": "..." }*)
|
||||||
|
|
||||||
|
*random-icons*: ++
|
||||||
|
typeof: object ++
|
||||||
|
default: {} ++
|
||||||
|
Icon to show depending on the "random" option (*{ "on": "...", "off": "..." }*)
|
||||||
|
|
||||||
|
*repeat-icons*: ++
|
||||||
|
typeof: object ++
|
||||||
|
default: {} ++
|
||||||
|
Icon to show depending on the "repeat" option (*{ "on": "...", "off": "..." }*)
|
||||||
|
|
||||||
|
*single-icons*: ++
|
||||||
|
typeof: object ++
|
||||||
|
default: {} ++
|
||||||
|
Icon to show depending on the "single" option (*{ "on": "...", "off": "..." }*)
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
## WHEN PLAYING/PAUSED
|
||||||
|
|
||||||
|
*{artist}*: The artist of the current song
|
||||||
|
|
||||||
|
*{albumArtist}*: The artist of the current album
|
||||||
|
|
||||||
|
*{album}*: The album of the current song
|
||||||
|
|
||||||
|
*{title}*: The title of the current song
|
||||||
|
|
||||||
|
*{date}*: The date of the current song
|
||||||
|
|
||||||
|
*{elapsedTime}*: The current position of the current song. To format as a date/time (see example configuration)
|
||||||
|
|
||||||
|
*{totalTime}*: The length of the current song. To format as a date/time (see example configuration)
|
||||||
|
|
||||||
|
*{stateIcon}*: The icon corresponding the playing or paused status of the player (see *state-icons* option)
|
||||||
|
|
||||||
|
*{consumeIcon}*: The icon corresponding the "consume" option (see *consume-icons* option)
|
||||||
|
|
||||||
|
*{randomIcon}*: The icon corresponding the "random" option (see *random-icons* option)
|
||||||
|
|
||||||
|
*{repeatIcon}*: The icon corresponding the "repeat" option (see *repeat-icons* option)
|
||||||
|
|
||||||
|
*{singleIcon}*: The icon corresponding the "single" option (see *single-icons* option)
|
||||||
|
|
||||||
|
|
||||||
|
## WHEN STOPPED
|
||||||
|
|
||||||
|
*{consumeIcon}*: The icon corresponding the "consume" option (see *consume-icons* option)
|
||||||
|
|
||||||
|
*{randomIcon}*: The icon corresponding the "random" option (see *random-icons* option)
|
||||||
|
|
||||||
|
*{repeatIcon}*: The icon corresponding the "repeat" option (see *repeat-icons* option)
|
||||||
|
|
||||||
|
*{singleIcon}*: The icon corresponding the "single" option (see *single-icons* option)
|
||||||
|
|
||||||
|
## WHEN DISCONNECTED
|
||||||
|
|
||||||
|
Currently, no format replacements when disconnected.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"mpd": {
|
||||||
|
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
|
||||||
|
"format-disconnected": "Disconnected ",
|
||||||
|
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
|
||||||
|
"interval": 2,
|
||||||
|
"consume-icons": {
|
||||||
|
"on": " " // Icon shows only when "consume" is on
|
||||||
|
},
|
||||||
|
"random-icons": {
|
||||||
|
"off": "<span color=\"#f53c3c\"></span> ", // Icon grayed out when "random" is off
|
||||||
|
"on": " "
|
||||||
|
},
|
||||||
|
"repeat-icons": {
|
||||||
|
"on": " "
|
||||||
|
},
|
||||||
|
"single-icons": {
|
||||||
|
"on": "1 "
|
||||||
|
},
|
||||||
|
"state-icons": {
|
||||||
|
"paused": "",
|
||||||
|
"playing": ""
|
||||||
|
},
|
||||||
|
"tooltip-format": "MPD (connected)",
|
||||||
|
"tooltip-format-disconnected": "MPD (disconnected)"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#mpd*
|
||||||
|
- *#mpd.disconnected*
|
||||||
|
- *#mpd.stopped*
|
||||||
|
- *#mpd.playing*
|
||||||
|
- *#mpd.paused*
|
159
man/waybar-network.5.scd
Normal file
159
man/waybar-network.5.scd
Normal file
@ -0,0 +1,159 @@
|
|||||||
|
waybar-network(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - network module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *network* module displays information about the current network connections.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *network*
|
||||||
|
|
||||||
|
*interface*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Use the defined interface instead of auto detection. Accepts wildcard.
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
default: 60 ++
|
||||||
|
The interval in which the network information gets polled (e.g. signal strength).
|
||||||
|
|
||||||
|
*family*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: *ipv4* ++
|
||||||
|
The address family that is used for the format replacement {ipaddr} and to determine if a network connection is present.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: *{ifname}* ++
|
||||||
|
The format, how information should be displayed. This format is used when other formats aren't specified.
|
||||||
|
|
||||||
|
*format-ethernet*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when a ethernet interface is displayed.
|
||||||
|
|
||||||
|
*format-wifi*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when a wireless interface is displayed.
|
||||||
|
|
||||||
|
*format-linked*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when a linked interface with no ip address is displayed.
|
||||||
|
|
||||||
|
*format-disconnected*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when the displayed interface is disconnected.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array/object ++
|
||||||
|
Based on the current signal strength, the corresponding icon gets selected. ++
|
||||||
|
The order is *low* to *high*. Or by the state if it is an object.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: *true* ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
*tooltip-format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The format, how information should be displayed in the tooltip. This format is used when other formats aren't specified.
|
||||||
|
|
||||||
|
*tooltip-format-ethernet*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when a ethernet interface is displayed.
|
||||||
|
|
||||||
|
*tooltip-format-wifi*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when a wireless interface is displayed.
|
||||||
|
|
||||||
|
*tooltip-format-disconnected*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when the displayed interface is disconnected.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{ifname}*: Name of the network interface.
|
||||||
|
|
||||||
|
*{ipaddr}*: The first IP of the interface.
|
||||||
|
|
||||||
|
*{netmask}*: The subnetmask corresponding to the IP.
|
||||||
|
|
||||||
|
*{cidr}*: The subnetmask corresponding to the IP in CIDR notation.
|
||||||
|
|
||||||
|
*{essid}*: Name (SSID) of the wireless network.
|
||||||
|
|
||||||
|
*{signalStrength}*: Signal strength of the wireless network.
|
||||||
|
|
||||||
|
*{signaldBm}*: Signal strength of the wireless network in dBm.
|
||||||
|
|
||||||
|
*{frequency}*: Frequency of the wireless network in MHz.
|
||||||
|
|
||||||
|
*{bandwidthUpBits}*: Instant up speed in bits/seconds.
|
||||||
|
|
||||||
|
*{bandwidthDownBits}*: Instant down speed in bits/seconds.
|
||||||
|
|
||||||
|
*{bandwidthUpOctets}*: Instant up speed in octets/seconds.
|
||||||
|
|
||||||
|
*{bandwidthDownOctets}*: Instant down speed in octets/seconds.
|
||||||
|
|
||||||
|
*{icon}*: Icon, as defined in *format-icons*.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"network": {
|
||||||
|
"interface": "wlp2s0",
|
||||||
|
"format": "{ifname}",
|
||||||
|
"format-wifi": "{essid} ({signalStrength}%) ",
|
||||||
|
"format-ethernet": "{ifname} ",
|
||||||
|
"format-disconnected": "", //An empty format will hide the module.
|
||||||
|
"tooltip-format": "{ifname}",
|
||||||
|
"tooltip-format-wifi": "{essid} ({signalStrength}%) ",
|
||||||
|
"tooltip-format-ethernet": "{ifname} ",
|
||||||
|
"tooltip-format-disconnected": "Disconnected",
|
||||||
|
"max-length": 50
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#network*
|
||||||
|
- *#network.disconnected*
|
||||||
|
- *#network.linked*
|
||||||
|
- *#network.ethernet*
|
||||||
|
- *#network.wifi*
|
139
man/waybar-pulseaudio.5.scd
Normal file
139
man/waybar-pulseaudio.5.scd
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
waybar-pulseaudio(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - pulseaudio module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *pulseaudio* module displays the current volume reported by PulseAudio.
|
||||||
|
|
||||||
|
Additionally you can control the volume by scrolling *up* or *down* while the cursor is over the module.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {volume}% ++
|
||||||
|
The format, how information should be displayed. This format is used when other formats aren't specified.
|
||||||
|
|
||||||
|
*format-bluetooth*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when using bluetooth speakers.
|
||||||
|
|
||||||
|
*format-muted*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when the sound is muted.
|
||||||
|
|
||||||
|
*format-source*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {volume}% ++
|
||||||
|
This format used for the source.
|
||||||
|
|
||||||
|
*format-source-muted*: ++
|
||||||
|
typeof: string ++
|
||||||
|
This format is used when the source is muted.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array ++
|
||||||
|
Based on the current port-name and volume, the corresponding icon gets selected. The order is *low* to *high*. See *Icons*.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*states*: ++
|
||||||
|
typeof: array ++
|
||||||
|
A number of volume states which get activated on certain volume levels. See *waybar-states(5)*
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*scroll-step*: ++
|
||||||
|
typeof: float ++
|
||||||
|
default: 1.0 ++
|
||||||
|
The speed in which to change the volume when scrolling.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module. This replaces the default behaviour of volume control.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module. This replaces the default behaviour of volume control.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{desc}*: Pulseaudio port's description, for bluetooth it'll be the device name.
|
||||||
|
|
||||||
|
*{volume}*: Volume in percentage.
|
||||||
|
|
||||||
|
*{icon}*: Icon, as defined in *format-icons*.
|
||||||
|
|
||||||
|
*{format_source}*: Source format, *format-source*, *format-source-muted*.
|
||||||
|
|
||||||
|
# ICONS:
|
||||||
|
|
||||||
|
The following strings for *format-icons* are supported.
|
||||||
|
If they are found in the current PulseAudio port name, the corresponding icons will be selected.
|
||||||
|
|
||||||
|
- *default* (Shown, when no other port is found)
|
||||||
|
- *headphone*
|
||||||
|
- *speaker*
|
||||||
|
- *hdmi*
|
||||||
|
- *headset*
|
||||||
|
- *hands-free*
|
||||||
|
- *portable*
|
||||||
|
- *car*
|
||||||
|
- *hifi*
|
||||||
|
- *phone*
|
||||||
|
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"pulseaudio": {
|
||||||
|
"format": "{volume}% {icon}",
|
||||||
|
"format-bluetooth": "{volume}% {icon}",
|
||||||
|
"format-muted": "",
|
||||||
|
"format-icons": {
|
||||||
|
"headphones": "",
|
||||||
|
"handsfree": "",
|
||||||
|
"headset": "",
|
||||||
|
"phone": "",
|
||||||
|
"portable": "",
|
||||||
|
"car": "",
|
||||||
|
"default": ["", ""]
|
||||||
|
},
|
||||||
|
"scroll-step": 1,
|
||||||
|
"on-click": "pavucontrol"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#pulseaudio*
|
||||||
|
- *#pulseaudio.bluetooth*
|
||||||
|
- *#pulseaudio.muted*
|
43
man/waybar-states.5.scd
Normal file
43
man/waybar-states.5.scd
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
waybar-states(5)
|
||||||
|
|
||||||
|
# OVERVIEW
|
||||||
|
|
||||||
|
Some modules support 'states' which allows percentage values to be used as styling triggers to
|
||||||
|
apply a class when the value matches the declared state value.
|
||||||
|
|
||||||
|
# STATES
|
||||||
|
|
||||||
|
- Every entry (*state*) consists of a *<name>* (typeof: *string*) and a *<value>* (typeof: *integer*).
|
||||||
|
|
||||||
|
- The state can be addressed as a CSS class in the *style.css*. The name of the CSS class is the *<name>* of the state.
|
||||||
|
Each class gets activated when the current capacity is equal or below the configured *<value>*.
|
||||||
|
|
||||||
|
- Also each state can have its own *format*.
|
||||||
|
Those con be configured via *format-<name>*.
|
||||||
|
Or if you want to differentiate a bit more even as *format-<status>-<state>*.
|
||||||
|
|
||||||
|
# EXAMPLE
|
||||||
|
|
||||||
|
```
|
||||||
|
"battery": {
|
||||||
|
"bat": "BAT2",
|
||||||
|
"interval": 60,
|
||||||
|
"states": {
|
||||||
|
"warning": 30,
|
||||||
|
"critical": 15
|
||||||
|
},
|
||||||
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-icons": ["", "", "", "", ""],
|
||||||
|
"max-length": 25
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLING STATES
|
||||||
|
|
||||||
|
- *#battery.<state>*
|
||||||
|
- *<state>* can be defined in the *config*.
|
||||||
|
|
||||||
|
# EXAMPLE:
|
||||||
|
|
||||||
|
- *#battery.warning: { background: orange; }*
|
||||||
|
- *#battery.critical: { background: red; }*
|
68
man/waybar-sway-mode.5.scd
Normal file
68
man/waybar-sway-mode.5.scd
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
waybar-sway-mode(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - sway mode module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *mode* module displays the current binding mode of Sway
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *sway/mode*
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {} ++
|
||||||
|
The format, how information should be displayed. On {} data gets inserted.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"sway/window": {
|
||||||
|
"format": " {}",
|
||||||
|
"max-length": 50
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#mode*
|
71
man/waybar-sway-window.5.scd
Normal file
71
man/waybar-sway-window.5.scd
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
waybar-sway-window(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - sway window module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *window* module displays the title of the currently focused window in Sway
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *sway/window*
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {} ++
|
||||||
|
The format, how information should be displayed. On {} data gets inserted.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in character the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"sway/window": {
|
||||||
|
"format": "{}",
|
||||||
|
"max-length": 50
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#window*
|
||||||
|
- *window#waybar.empty* When no windows is in the workspace
|
||||||
|
- *window#waybar.solo* When one window is in the workspace
|
||||||
|
- *window#waybar.<app_id>* Where *app_id* is the app_id or *instance* name like (*chromium*) of the only window in the workspace
|
126
man/waybar-sway-workspaces.5.scd
Normal file
126
man/waybar-sway-workspaces.5.scd
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
waybar-sway-workspaces(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - sway workspaces module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *workspaces* module displays the currently used workspaces in Sway.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *sway/workspaces*
|
||||||
|
|
||||||
|
*all-outputs*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
If set to false, workspaces will only be shown on the output they are on. If set to true all workspaces will be shown on every output.
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {value} ++
|
||||||
|
The format, how information should be displayed.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array ++
|
||||||
|
Based on the workspace name and state, the corresponding icon gets selected. See *icons*.
|
||||||
|
|
||||||
|
*disable-scroll*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
If set to false, you can scroll to cycle through workspaces. If set to true this behaviour is disabled.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*disable-scroll-wraparound*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
If set to false, scrolling on the workspace indicator will wrap around to the first workspace when reading the end, and vice versa. If set to true this behavior is disabled.
|
||||||
|
|
||||||
|
*enable-bar-scroll*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
If set to false, you can't scroll to cycle throughout workspaces from the entire bar. If set to true this behaviour is enabled.
|
||||||
|
|
||||||
|
*disable-markup*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
If set to true, button label will escape pango markup.
|
||||||
|
|
||||||
|
*current-only*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: false ++
|
||||||
|
If set to true. Only focused workspaces will be shown.
|
||||||
|
|
||||||
|
*persistent_workspaces*: ++
|
||||||
|
typeof: json (see below) ++
|
||||||
|
default: empty ++
|
||||||
|
Lists workspaces that should always be shown, even when non existent
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{value}*: Name of the workspace, as defined by sway.
|
||||||
|
|
||||||
|
*{name}*: Number stripped from workspace value.
|
||||||
|
|
||||||
|
*{icon}*: Icon, as defined in *format-icons*.
|
||||||
|
|
||||||
|
*{index}*: Index of the workspace.
|
||||||
|
|
||||||
|
# ICONS
|
||||||
|
|
||||||
|
Additional to workspace name matching, the following *format-icons* can be set.
|
||||||
|
|
||||||
|
- *default*: Will be shown, when no string matches is found.
|
||||||
|
- *urgent*: Will be shown, when workspace is flagged as urgent
|
||||||
|
- *focused*: Will be shown, when workspace is focused
|
||||||
|
- *persistent*: Will be shown, when workspace is persistent one.
|
||||||
|
|
||||||
|
# PERSISTENT WORKSPACES
|
||||||
|
|
||||||
|
Each entry of *persistent_workspace* names a workspace that should always be shown.
|
||||||
|
Associated with that value is a list of outputs indicating *where* the workspace should be shown,
|
||||||
|
an empty list denoting all outputs.
|
||||||
|
|
||||||
|
```
|
||||||
|
"sway/workspaces": {
|
||||||
|
"persistent_workspaces": {
|
||||||
|
"3": [], // Always show a workspace with name '3', on all outputs if it does not exists
|
||||||
|
"4": ["eDP-1"], // Always show a workspace with name '4', on output 'eDP-1' if it does not exists
|
||||||
|
"5": ["eDP-1", "DP-2"] // Always show a workspace with name '5', on outputs 'eDP-1' and 'DP-2' if it does not exists
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
n.b.: the list of outputs can be obtained from command line using *swaymsg -t get_outputs*
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"sway/workspaces": {
|
||||||
|
"disable-scroll": true,
|
||||||
|
"all-outputs": true,
|
||||||
|
"format": "{name}: {icon}",
|
||||||
|
"format-icons": {
|
||||||
|
"1": "",
|
||||||
|
"2": "",
|
||||||
|
"3": "",
|
||||||
|
"4": "",
|
||||||
|
"5": "",
|
||||||
|
"urgent": "",
|
||||||
|
"focused": "",
|
||||||
|
"default": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# Style
|
||||||
|
|
||||||
|
- *#workspaces button*
|
||||||
|
- *#workspaces button.visible*
|
||||||
|
- *#workspaces button.focused*
|
||||||
|
- *#workspaces button.urgent*
|
||||||
|
- *#workspaces button.persistent*
|
111
man/waybar-temperature.5.scd
Normal file
111
man/waybar-temperature.5.scd
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
waybar-temperature(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - temperature module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The *temperature* module displays the current temperature from a thermal zone.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *temperature*
|
||||||
|
|
||||||
|
*thermal-zone*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The thermal zone, as in */sys/class/thermal/*.
|
||||||
|
|
||||||
|
*hwmon-path*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The temperature path to use, e.g. */sys/class/hwmon/hwmon2/temp1_input* instead of one in */sys/class/thermal/*.
|
||||||
|
|
||||||
|
*hwmon-path-abs*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The path of the hwmon-directory of the device, e.g. */sys/devices/pci0000:00/0000:00:18.3/hwmon*. (Note that the subdirectory *hwmon/hwmon#*, where *#* is a number is not part of the path!) Has to be used together with *input-filename*.
|
||||||
|
|
||||||
|
*input-filename*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The temperature filename of your *hwmon-path-abs*, e.g. *temp1_input*
|
||||||
|
|
||||||
|
*critical-threshold*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The threshold before it is considered critical (Celsius).
|
||||||
|
|
||||||
|
*interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
default: 10 ++
|
||||||
|
The interval in which the information gets polled.
|
||||||
|
|
||||||
|
*format-critical*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The format to use when temperature is considered critical
|
||||||
|
|
||||||
|
*format*: ++
|
||||||
|
typeof: string ++
|
||||||
|
default: {temperatureC}°C ++
|
||||||
|
The format (Celsius/Fahrenheit) in which the temperature should be displayed.
|
||||||
|
|
||||||
|
*format-icons*: ++
|
||||||
|
typeof: array ++
|
||||||
|
Based on the current temperature (Celsius) and *critical-threshold* if available, the corresponding icon gets selected. The order is *low* to *high*.
|
||||||
|
|
||||||
|
*rotate*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Positive value to rotate the text label.
|
||||||
|
|
||||||
|
*max-length*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The maximum length in characters the module should display.
|
||||||
|
|
||||||
|
*on-click*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you clicked on the module.
|
||||||
|
|
||||||
|
*on-click-middle*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when middle-clicked on the module using mousewheel.
|
||||||
|
|
||||||
|
*on-click-right*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when you right clicked on the module.
|
||||||
|
|
||||||
|
*on-scroll-up*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling up on the module.
|
||||||
|
|
||||||
|
*on-scroll-down*: ++
|
||||||
|
typeof: string ++
|
||||||
|
Command to execute when scrolling down on the module.
|
||||||
|
|
||||||
|
*smooth-scrolling-threshold*: ++
|
||||||
|
typeof: double ++
|
||||||
|
Threshold to be used when scrolling.
|
||||||
|
|
||||||
|
*tooltip*: ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable tooltip on hover.
|
||||||
|
|
||||||
|
# FORMAT REPLACEMENTS
|
||||||
|
|
||||||
|
*{temperatureC}*: Temperature in Celsius.
|
||||||
|
|
||||||
|
*{temperatureF}*: Temperature in Fahrenheit.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"temperature": {
|
||||||
|
// "thermal-zone": 2,
|
||||||
|
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
||||||
|
// "critical-threshold": 80,
|
||||||
|
// "format-critical": "{temperatureC}°C ",
|
||||||
|
"format": "{temperatureC}°C "
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#temperature*
|
||||||
|
- *#temperature.critical*
|
35
man/waybar-tray.5.scd
Normal file
35
man/waybar-tray.5.scd
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
waybar-tray(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - tray module
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
_WARNING_ *tray* is still in beta. There may me bugs. Breaking changes may occur.
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
|
||||||
|
Addressed by *tray*
|
||||||
|
|
||||||
|
*icon-size*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Defines the size of the tray icons.
|
||||||
|
|
||||||
|
*spacing*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
Defines the spacing between the tray icons.
|
||||||
|
|
||||||
|
# EXAMPLES
|
||||||
|
|
||||||
|
```
|
||||||
|
"tray": {
|
||||||
|
"icon-size": 21,
|
||||||
|
"spacing": 10
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
# STYLE
|
||||||
|
|
||||||
|
- *#tray*
|
200
man/waybar.5.scd
Normal file
200
man/waybar.5.scd
Normal file
@ -0,0 +1,200 @@
|
|||||||
|
waybar(5)
|
||||||
|
|
||||||
|
# NAME
|
||||||
|
|
||||||
|
waybar - configuration file
|
||||||
|
|
||||||
|
# DESCRIPTION
|
||||||
|
|
||||||
|
The configuration uses the JSON file format and is named *config*.
|
||||||
|
|
||||||
|
Valid locations for this file are:
|
||||||
|
|
||||||
|
- *$XDG_CONFIG_HOME/waybar/config*
|
||||||
|
- *~/.config/waybar/config*
|
||||||
|
- *~/waybar/config*
|
||||||
|
- */etc/xdg/waybar/config*
|
||||||
|
|
||||||
|
A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config.
|
||||||
|
Also a minimal example configuration can be found on the at the bottom of this man page.
|
||||||
|
|
||||||
|
# BAR CONFIGURATION
|
||||||
|
|
||||||
|
*layer* ++
|
||||||
|
typeof: string ++
|
||||||
|
default: bottom ++
|
||||||
|
Decide if the bar is displayed in front (*top*) of the windows or behind (*bottom*)
|
||||||
|
them.
|
||||||
|
|
||||||
|
*output* ++
|
||||||
|
typeof: string|array ++
|
||||||
|
Specifies on which screen this bar will be displayed.
|
||||||
|
|
||||||
|
*position* ++
|
||||||
|
typeof: string ++
|
||||||
|
default: top ++
|
||||||
|
Bar position, can be *top*, *bottom*, *left*, *right*.
|
||||||
|
|
||||||
|
*height* ++
|
||||||
|
typeof: integer ++
|
||||||
|
Height to be used by the bar if possible. Leave blank for a dynamic value.
|
||||||
|
|
||||||
|
*width* ++
|
||||||
|
typeof: integer ++
|
||||||
|
Width to be used by the bar if possible. Leave blank for a dynamic value.
|
||||||
|
|
||||||
|
*modules-left* ++
|
||||||
|
typeof: array ++
|
||||||
|
Modules that will be displayed on the left.
|
||||||
|
|
||||||
|
*modules-center* ++
|
||||||
|
typeof: array ++
|
||||||
|
Modules that will be displayed in the center.
|
||||||
|
|
||||||
|
*modules-right* ++
|
||||||
|
typeof: array
|
||||||
|
Modules that will be displayed on the right.
|
||||||
|
|
||||||
|
*margin* ++
|
||||||
|
typeof: string ++
|
||||||
|
Margins value using the CSS format without units.
|
||||||
|
|
||||||
|
*margin-<top\|left\|bottom\|right>* ++
|
||||||
|
typeof: integer ++
|
||||||
|
Margins value without units.
|
||||||
|
|
||||||
|
*name* ++
|
||||||
|
typeof: string ++
|
||||||
|
Optional name added as a CSS class, for styling multiple waybars.
|
||||||
|
|
||||||
|
*gtk-layer-shell* ++
|
||||||
|
typeof: bool ++
|
||||||
|
default: true ++
|
||||||
|
Option to disable the use of gtk-layer-shell for popups.
|
||||||
|
Only functional if compiled with gtk-layer-shell support.
|
||||||
|
|
||||||
|
# MODULE FORMAT
|
||||||
|
|
||||||
|
You can use PangoMarkupFormat (See https://developer.gnome.org/pango/stable/PangoMarkupFormat.html#PangoMarkupFormat).
|
||||||
|
|
||||||
|
e.g.
|
||||||
|
|
||||||
|
```
|
||||||
|
"format": "<span style=\"italic\">{}</span>"
|
||||||
|
```
|
||||||
|
# MULTIPLE INSTANCES OF A MODULE
|
||||||
|
|
||||||
|
If you want to have a second instance of a module, you can suffix it by a '#' and a custom name.
|
||||||
|
For example if you want a second battery module, you can add *"battery#bat2"* to your modules.
|
||||||
|
To configure the newly added module, you then also add a module configuration with the same name.
|
||||||
|
|
||||||
|
This could then look something like this *(this is an incomplete example)*:
|
||||||
|
|
||||||
|
```
|
||||||
|
"modules-right": ["battery", "battery#bat2"],
|
||||||
|
"battery": {
|
||||||
|
"bat": "BAT1"
|
||||||
|
},
|
||||||
|
"battery#bat2": {
|
||||||
|
"bat": "BAT2"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# MINIMAL CONFIGURATION
|
||||||
|
|
||||||
|
A minimal *config* file could look like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"layer": "top",
|
||||||
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
|
"modules-center": ["sway/window"],
|
||||||
|
"modules-right": ["battery", "clock"],
|
||||||
|
"sway/window": {
|
||||||
|
"max-length": 50
|
||||||
|
},
|
||||||
|
"battery": {
|
||||||
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-icons": ["", "", "", "", ""]
|
||||||
|
},
|
||||||
|
"clock": {
|
||||||
|
"format-alt": "{:%a, %d. %b %H:%M}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# MULTI OUTPUT CONFIGURATION
|
||||||
|
|
||||||
|
## Limit a configuration to some outputs
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"layer": "top",
|
||||||
|
"output": "eDP-1",
|
||||||
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
|
...
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"layer": "top",
|
||||||
|
"output": ["eDP-1", "VGA"],
|
||||||
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
|
...
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
## Configuration of multiple outputs
|
||||||
|
|
||||||
|
Don't specify an output to create multiple bars on the same screen.
|
||||||
|
|
||||||
|
```
|
||||||
|
[{
|
||||||
|
"layer": "top",
|
||||||
|
"output": "eDP-1",
|
||||||
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
|
...
|
||||||
|
}, {
|
||||||
|
"layer": "top",
|
||||||
|
"output": "VGA",
|
||||||
|
"modules-right": ["clock"],
|
||||||
|
...
|
||||||
|
}]
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
## Rotating modules
|
||||||
|
|
||||||
|
When positioning Waybar on the left or right side of the screen, sometimes it's useful to be able to rotate the contents of a module so the text runs vertically. This can be done using the "rotate" property of the module. Example:
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"clock": {
|
||||||
|
"rotate": 90
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Valid options for the "rotate" property are: 0, 90, 180 and 270.
|
||||||
|
|
||||||
|
# SUPPORTED MODULES
|
||||||
|
|
||||||
|
- *waybar-backlight(5)*
|
||||||
|
- *waybar-battery(5)*
|
||||||
|
- *waybar-clock(5)*
|
||||||
|
- *waybar-cpu(5)*
|
||||||
|
- *waybar-custom(5)*
|
||||||
|
- *waybar-idle-inhibitor(5)*
|
||||||
|
- *waybar-memory(5)*
|
||||||
|
- *waybar-mdp(5)*
|
||||||
|
- *waybar-network(5)*
|
||||||
|
- *waybar-pulseaudio(5)*
|
||||||
|
- *waybar-sway-mode(5)*
|
||||||
|
- *waybar-sway-window(5)*
|
||||||
|
- *waybar-sway-workspaces(5)*
|
||||||
|
- *waybar-temperature(5)*
|
||||||
|
- *waybar-tray(5)*
|
119
meson.build
119
meson.build
@ -1,6 +1,6 @@
|
|||||||
project(
|
project(
|
||||||
'waybar', 'cpp', 'c',
|
'waybar', 'cpp', 'c',
|
||||||
version: '0.6.1',
|
version: '0.9.2',
|
||||||
license: 'MIT',
|
license: 'MIT',
|
||||||
default_options : [
|
default_options : [
|
||||||
'cpp_std=c++17',
|
'cpp_std=c++17',
|
||||||
@ -9,20 +9,23 @@ project(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
compiler = meson.get_compiler('cpp')
|
||||||
|
|
||||||
cpp_args = []
|
cpp_args = []
|
||||||
cpp_link_args = []
|
cpp_link_args = []
|
||||||
|
|
||||||
if false # libc++
|
if get_option('libcxx')
|
||||||
cpp_args += ['-stdlib=libc++']
|
cpp_args += ['-stdlib=libc++']
|
||||||
cpp_link_args += ['-stdlib=libc++', '-lc++abi']
|
cpp_link_args += ['-stdlib=libc++', '-lc++abi']
|
||||||
|
|
||||||
cpp_link_args += ['-lc++fs']
|
if compiler.has_link_argument('-lc++fs')
|
||||||
|
cpp_link_args += ['-lc++fs']
|
||||||
|
endif
|
||||||
else
|
else
|
||||||
cpp_link_args += ['-lstdc++fs']
|
cpp_link_args += ['-lstdc++fs']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
compiler = meson.get_compiler('cpp')
|
git = find_program('git', native: true, required: false)
|
||||||
git = find_program('git', required: false)
|
|
||||||
|
|
||||||
if not git.found()
|
if not git.found()
|
||||||
add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
|
add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
|
||||||
@ -34,7 +37,28 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
if not compiler.has_header('filesystem')
|
if not compiler.has_header('filesystem')
|
||||||
add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
|
if compiler.has_header('experimental/filesystem')
|
||||||
|
add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
|
||||||
|
else
|
||||||
|
add_project_arguments('-DNO_FILESYSTEM', language: 'cpp')
|
||||||
|
warning('No filesystem header found, some modules may not work')
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
code = '''
|
||||||
|
#include <langinfo.h>
|
||||||
|
#include <locale.h>
|
||||||
|
int main(int argc, char** argv) {
|
||||||
|
locale_t locale = newlocale(LC_ALL, "en_US.UTF-8", nullptr);
|
||||||
|
char* str;
|
||||||
|
str = nl_langinfo_l(_NL_TIME_WEEK_1STDAY, locale);
|
||||||
|
str = nl_langinfo_l(_NL_TIME_FIRST_WEEKDAY, locale);
|
||||||
|
freelocale(locale);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
if compiler.links(code, name : 'nl_langinfo with _NL_TIME_WEEK_1STDAY, _NL_TIME_FIRST_WEEKDAY')
|
||||||
|
add_project_arguments('-DHAVE_LANGINFO_1STDAY', language: 'cpp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
add_global_arguments(cpp_args, language : 'cpp')
|
add_global_arguments(cpp_args, language : 'cpp')
|
||||||
@ -43,11 +67,11 @@ add_global_link_arguments(cpp_link_args, language : 'cpp')
|
|||||||
thread_dep = dependency('threads')
|
thread_dep = dependency('threads')
|
||||||
libinput = dependency('libinput')
|
libinput = dependency('libinput')
|
||||||
fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep'])
|
fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep'])
|
||||||
|
spdlog = dependency('spdlog', version : ['>=1.3.1'], fallback : ['spdlog', 'spdlog_dep'])
|
||||||
wayland_client = dependency('wayland-client')
|
wayland_client = dependency('wayland-client')
|
||||||
wayland_cursor = dependency('wayland-cursor')
|
wayland_cursor = dependency('wayland-cursor')
|
||||||
wayland_protos = dependency('wayland-protocols')
|
wayland_protos = dependency('wayland-protocols')
|
||||||
wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
|
gtkmm = dependency('gtkmm-3.0', version : ['>=3.22.0'])
|
||||||
gtkmm = dependency('gtkmm-3.0')
|
|
||||||
dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk'))
|
dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk'))
|
||||||
giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk'))
|
giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk'))
|
||||||
jsoncpp = dependency('jsoncpp')
|
jsoncpp = dependency('jsoncpp')
|
||||||
@ -57,16 +81,38 @@ libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
|
|||||||
libpulse = dependency('libpulse', required: get_option('pulseaudio'))
|
libpulse = dependency('libpulse', required: get_option('pulseaudio'))
|
||||||
libudev = dependency('libudev', required: get_option('libudev'))
|
libudev = dependency('libudev', required: get_option('libudev'))
|
||||||
libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
|
libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
|
||||||
|
gtk_layer_shell = dependency('gtk-layer-shell-0',
|
||||||
|
required: get_option('gtk-layer-shell'),
|
||||||
|
fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep'])
|
||||||
|
systemd = dependency('systemd', required: get_option('systemd'))
|
||||||
|
tz_dep = dependency('date', default_options : [ 'use_system_tzdb=true' ], fallback: [ 'date', 'tz_dep' ])
|
||||||
|
|
||||||
|
prefix = get_option('prefix')
|
||||||
|
conf_data = configuration_data()
|
||||||
|
conf_data.set('prefix', prefix)
|
||||||
|
|
||||||
|
if systemd.found()
|
||||||
|
user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
|
||||||
|
|
||||||
|
configure_file(
|
||||||
|
configuration: conf_data,
|
||||||
|
input: './resources/waybar.service.in',
|
||||||
|
output: '@BASENAME@',
|
||||||
|
install_dir: user_units_dir
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
src_files = files(
|
src_files = files(
|
||||||
'src/factory.cpp',
|
'src/factory.cpp',
|
||||||
|
'src/AModule.cpp',
|
||||||
'src/ALabel.cpp',
|
'src/ALabel.cpp',
|
||||||
'src/modules/memory.cpp',
|
'src/modules/memory.cpp',
|
||||||
'src/modules/battery.cpp',
|
'src/modules/battery.cpp',
|
||||||
'src/modules/clock.cpp',
|
'src/modules/clock.cpp',
|
||||||
'src/modules/custom.cpp',
|
'src/modules/custom.cpp',
|
||||||
'src/modules/cpu.cpp',
|
'src/modules/cpu.cpp',
|
||||||
'src/modules/idle_inhibitor.cpp',
|
'src/modules/disk.cpp',
|
||||||
|
'src/modules/idle_inhibitor.cpp',
|
||||||
'src/modules/temperature.cpp',
|
'src/modules/temperature.cpp',
|
||||||
'src/main.cpp',
|
'src/main.cpp',
|
||||||
'src/bar.cpp',
|
'src/bar.cpp',
|
||||||
@ -113,6 +159,10 @@ if libmpdclient.found()
|
|||||||
src_files += 'src/modules/mpd.cpp'
|
src_files += 'src/modules/mpd.cpp'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if gtk_layer_shell.found()
|
||||||
|
add_project_arguments('-DHAVE_GTK_LAYER_SHELL', language: 'cpp')
|
||||||
|
endif
|
||||||
|
|
||||||
subdir('protocol')
|
subdir('protocol')
|
||||||
|
|
||||||
executable(
|
executable(
|
||||||
@ -120,10 +170,10 @@ executable(
|
|||||||
src_files,
|
src_files,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
thread_dep,
|
thread_dep,
|
||||||
wlroots,
|
|
||||||
client_protos,
|
client_protos,
|
||||||
wayland_client,
|
wayland_client,
|
||||||
fmt,
|
fmt,
|
||||||
|
spdlog,
|
||||||
sigcpp,
|
sigcpp,
|
||||||
jsoncpp,
|
jsoncpp,
|
||||||
libinput,
|
libinput,
|
||||||
@ -135,7 +185,9 @@ executable(
|
|||||||
libnlgen,
|
libnlgen,
|
||||||
libpulse,
|
libpulse,
|
||||||
libudev,
|
libudev,
|
||||||
libmpdclient
|
libmpdclient,
|
||||||
|
gtk_layer_shell,
|
||||||
|
tz_dep
|
||||||
],
|
],
|
||||||
include_directories: [include_directories('include')],
|
include_directories: [include_directories('include')],
|
||||||
install: true,
|
install: true,
|
||||||
@ -147,6 +199,51 @@ install_data(
|
|||||||
install_dir: join_paths(get_option('out'), 'etc/xdg/waybar')
|
install_dir: join_paths(get_option('out'), 'etc/xdg/waybar')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
|
||||||
|
|
||||||
|
if scdoc.found()
|
||||||
|
scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
|
||||||
|
sh = find_program('sh', native: true)
|
||||||
|
mandir = get_option('mandir')
|
||||||
|
man_files = [
|
||||||
|
'waybar.5.scd',
|
||||||
|
'waybar-backlight.5.scd',
|
||||||
|
'waybar-battery.5.scd',
|
||||||
|
'waybar-clock.5.scd',
|
||||||
|
'waybar-cpu.5.scd',
|
||||||
|
'waybar-custom.5.scd',
|
||||||
|
'waybar-disk.5.scd',
|
||||||
|
'waybar-idle-inhibitor.5.scd',
|
||||||
|
'waybar-memory.5.scd',
|
||||||
|
'waybar-mpd.5.scd',
|
||||||
|
'waybar-network.5.scd',
|
||||||
|
'waybar-pulseaudio.5.scd',
|
||||||
|
'waybar-sway-mode.5.scd',
|
||||||
|
'waybar-sway-window.5.scd',
|
||||||
|
'waybar-sway-workspaces.5.scd',
|
||||||
|
'waybar-temperature.5.scd',
|
||||||
|
'waybar-tray.5.scd',
|
||||||
|
'waybar-states.5.scd',
|
||||||
|
]
|
||||||
|
|
||||||
|
foreach filename : man_files
|
||||||
|
topic = filename.split('.')[-3].split('/')[-1]
|
||||||
|
section = filename.split('.')[-2]
|
||||||
|
output = '@0@.@1@'.format(topic, section)
|
||||||
|
|
||||||
|
custom_target(
|
||||||
|
output,
|
||||||
|
input: 'man/@0@'.format(filename),
|
||||||
|
output: output,
|
||||||
|
command: [
|
||||||
|
sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.path(), output)
|
||||||
|
],
|
||||||
|
install: true,
|
||||||
|
install_dir: '@0@/man@1@'.format(mandir, section)
|
||||||
|
)
|
||||||
|
endforeach
|
||||||
|
endif
|
||||||
|
|
||||||
clangtidy = find_program('clang-tidy', required: false)
|
clangtidy = find_program('clang-tidy', required: false)
|
||||||
|
|
||||||
if clangtidy.found()
|
if clangtidy.found()
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
|
option('libcxx', type : 'boolean', value : false, description : 'Build with Clang\'s libc++ instead of libstdc++ on Linux.')
|
||||||
option('libnl', type: 'feature', value: 'auto', description: 'Enable libnl support for network related features')
|
option('libnl', type: 'feature', value: 'auto', description: 'Enable libnl support for network related features')
|
||||||
option('libudev', type: 'feature', value: 'auto', description: 'Enable libudev support for udev related features')
|
option('libudev', type: 'feature', value: 'auto', description: 'Enable libudev support for udev related features')
|
||||||
option('pulseaudio', type: 'feature', value: 'auto', description: 'Enable support for pulseaudio')
|
option('pulseaudio', type: 'feature', value: 'auto', description: 'Enable support for pulseaudio')
|
||||||
|
option('systemd', type: 'feature', value: 'auto', description: 'Install systemd user service unit')
|
||||||
option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray')
|
option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray')
|
||||||
|
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
|
||||||
option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon')
|
option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon')
|
||||||
option('out', type: 'string', value : '/', description: 'output prefix directory')
|
option('out', type: 'string', value : '/', description: 'output prefix directory')
|
||||||
|
option('gtk-layer-shell', type: 'feature', value: 'auto', description: 'Use gtk-layer-shell library for popups support')
|
||||||
|
@ -31,7 +31,9 @@
|
|||||||
<property name='Id' type='s' access='read'/>
|
<property name='Id' type='s' access='read'/>
|
||||||
<property name='Title' type='s' access='read'/>
|
<property name='Title' type='s' access='read'/>
|
||||||
<property name='Status' type='s' access='read'/>
|
<property name='Status' type='s' access='read'/>
|
||||||
|
<!-- See discussion on pull #536
|
||||||
<property name='WindowId' type='u' access='read'/>
|
<property name='WindowId' type='u' access='read'/>
|
||||||
|
-->
|
||||||
<property name='IconThemePath' type='s' access='read'/>
|
<property name='IconThemePath' type='s' access='read'/>
|
||||||
<property name='IconName' type='s' access='read'/>
|
<property name='IconName' type='s' access='read'/>
|
||||||
<property name='IconPixmap' type='a(iiay)' access='read'/>
|
<property name='IconPixmap' type='a(iiay)' access='read'/>
|
||||||
@ -44,4 +46,4 @@
|
|||||||
<property name='Menu' type='o' access='read'/>
|
<property name='Menu' type='o' access='read'/>
|
||||||
<property name='ItemIsMenu' type='b' access='read'/>
|
<property name='ItemIsMenu' type='b' access='read'/>
|
||||||
</interface>
|
</interface>
|
||||||
</node>
|
</node>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"layer": "top", // Waybar at top layer
|
// "layer": "top", // Waybar at top layer
|
||||||
// "position": "bottom", // Waybar position (top|bottom|left|right)
|
// "position": "bottom", // Waybar position (top|bottom|left|right)
|
||||||
"height": 30, // Waybar height (to be removed for auto height)
|
"height": 30, // Waybar height (to be removed for auto height)
|
||||||
// "width": 1280, // Waybar width
|
// "width": 1280, // Waybar width
|
||||||
@ -64,7 +64,8 @@
|
|||||||
"spacing": 10
|
"spacing": 10
|
||||||
},
|
},
|
||||||
"clock": {
|
"clock": {
|
||||||
"tooltip-format": "{:%Y-%m-%d | %H:%M}",
|
// "timezone": "America/New_York",
|
||||||
|
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
||||||
"format-alt": "{:%Y-%m-%d}"
|
"format-alt": "{:%Y-%m-%d}"
|
||||||
},
|
},
|
||||||
"cpu": {
|
"cpu": {
|
||||||
@ -78,8 +79,9 @@
|
|||||||
// "thermal-zone": 2,
|
// "thermal-zone": 2,
|
||||||
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
// "format-critical": "{temperatureC}°C ",
|
// "format-critical": "{temperatureC}°C {icon}",
|
||||||
"format": "{temperatureC}°C "
|
"format": "{temperatureC}°C {icon}",
|
||||||
|
"format-icons": ["", "", ""]
|
||||||
},
|
},
|
||||||
"backlight": {
|
"backlight": {
|
||||||
// "device": "acpi_video1",
|
// "device": "acpi_video1",
|
||||||
@ -93,6 +95,9 @@
|
|||||||
"critical": 15
|
"critical": 15
|
||||||
},
|
},
|
||||||
"format": "{capacity}% {icon}",
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-charging": "{capacity}% ",
|
||||||
|
"format-plugged": "{capacity}% ",
|
||||||
|
"format-alt": "{time} {icon}",
|
||||||
// "format-good": "", // An empty format will hide the module
|
// "format-good": "", // An empty format will hide the module
|
||||||
// "format-full": "",
|
// "format-full": "",
|
||||||
"format-icons": ["", "", "", "", ""]
|
"format-icons": ["", "", "", "", ""]
|
||||||
@ -101,24 +106,29 @@
|
|||||||
"bat": "BAT2"
|
"bat": "BAT2"
|
||||||
},
|
},
|
||||||
"network": {
|
"network": {
|
||||||
// "interface": "wlp2s0", // (Optional) To force the use of this interface
|
// "interface": "wlp2*", // (Optional) To force the use of this interface
|
||||||
"format-wifi": "{essid} ({signalStrength}%) ",
|
"format-wifi": "{essid} ({signalStrength}%) ",
|
||||||
"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
|
"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
|
||||||
"format-disconnected": "Disconnected ⚠"
|
"format-linked": "{ifname} (No IP) ",
|
||||||
|
"format-disconnected": "Disconnected ⚠",
|
||||||
|
"format-alt": "{ifname}: {ipaddr}/{cidr}"
|
||||||
},
|
},
|
||||||
"pulseaudio": {
|
"pulseaudio": {
|
||||||
//"scroll-step": 1,
|
// "scroll-step": 1, // %, can be a float
|
||||||
"format": "{volume}% {icon}",
|
"format": "{volume}% {icon} {format_source}",
|
||||||
"format-bluetooth": "{volume}% {icon}",
|
"format-bluetooth": "{volume}% {icon} {format_source}",
|
||||||
"format-muted": "",
|
"format-bluetooth-muted": " {icon} {format_source}",
|
||||||
|
"format-muted": " {format_source}",
|
||||||
|
"format-source": "{volume}% ",
|
||||||
|
"format-source-muted": "",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"headphones": "",
|
"headphone": "",
|
||||||
"handsfree": "",
|
"hands-free": "",
|
||||||
"headset": "",
|
"headset": "",
|
||||||
"phone": "",
|
"phone": "",
|
||||||
"portable": "",
|
"portable": "",
|
||||||
"car": "",
|
"car": "",
|
||||||
"default": ["", ""]
|
"default": ["", "", ""]
|
||||||
},
|
},
|
||||||
"on-click": "pavucontrol"
|
"on-click": "pavucontrol"
|
||||||
},
|
},
|
||||||
@ -132,5 +142,6 @@
|
|||||||
},
|
},
|
||||||
"escape": true,
|
"escape": true,
|
||||||
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
|
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
|
||||||
|
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,14 +38,16 @@ def on_metadata(player, metadata, manager):
|
|||||||
elif player.get_artist() != '' and player.get_title() != '':
|
elif player.get_artist() != '' and player.get_title() != '':
|
||||||
track_info = '{artist} - {title}'.format(artist=player.get_artist(),
|
track_info = '{artist} - {title}'.format(artist=player.get_artist(),
|
||||||
title=player.get_title())
|
title=player.get_title())
|
||||||
|
else:
|
||||||
|
track_info = player.get_title()
|
||||||
|
|
||||||
if player.props.status != 'Playing':
|
if player.props.status != 'Playing' and track_info:
|
||||||
track_info = ' ' + track_info
|
track_info = ' ' + track_info
|
||||||
write_output(track_info, player)
|
write_output(track_info, player)
|
||||||
|
|
||||||
|
|
||||||
def on_player_appeared(manager, player, selected_player=None):
|
def on_player_appeared(manager, player, selected_player=None):
|
||||||
if player is not None and player.name == selected_player:
|
if player is not None and (selected_player is None or player.name == selected_player):
|
||||||
init_player(manager, player)
|
init_player(manager, player)
|
||||||
else:
|
else:
|
||||||
logger.debug("New player appeared, but it's not the selected player, skipping")
|
logger.debug("New player appeared, but it's not the selected player, skipping")
|
||||||
@ -77,7 +79,7 @@ def signal_handler(sig, frame):
|
|||||||
def parse_arguments():
|
def parse_arguments():
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
|
|
||||||
# Increase verbosity with every occurance of -v
|
# Increase verbosity with every occurence of -v
|
||||||
parser.add_argument('-v', '--verbose', action='count', default=0)
|
parser.add_argument('-v', '--verbose', action='count', default=0)
|
||||||
|
|
||||||
# Define for which player we're listening
|
# Define for which player we're listening
|
||||||
@ -123,4 +125,3 @@ def main():
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
||||||
|
@ -1,16 +1,17 @@
|
|||||||
* {
|
* {
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
|
/* `otf-font-awesome` is required to be installed for icons */
|
||||||
font-family: Roboto, Helvetica, Arial, sans-serif;
|
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar {
|
window#waybar {
|
||||||
background: rgba(43, 48, 59, 0.5);
|
background-color: rgba(43, 48, 59, 0.5);
|
||||||
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
|
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
transition-property: background, background-color;
|
transition-property: background-color;
|
||||||
transition-duration: .5s;
|
transition-duration: .5s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20,10 +21,10 @@ window#waybar.hidden {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
window#waybar.empty {
|
window#waybar.empty {
|
||||||
background: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
window#waybar.solo {
|
window#waybar.solo {
|
||||||
background: #FFFFFF;
|
background-color: #FFFFFF;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -32,30 +33,27 @@ window#waybar.termite {
|
|||||||
}
|
}
|
||||||
|
|
||||||
window#waybar.chromium {
|
window#waybar.chromium {
|
||||||
background-color: #DEE1E6;
|
background-color: #000000;
|
||||||
color: #000000;
|
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
|
||||||
#workspaces button {
|
#workspaces button {
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
background: transparent;
|
background-color: transparent;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-bottom: 3px solid transparent;
|
border-bottom: 3px solid transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar.chromium #workspaces button {
|
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
||||||
color: #3F3F3F;
|
#workspaces button:hover {
|
||||||
}
|
background: rgba(0, 0, 0, 0.2);
|
||||||
|
box-shadow: inherit;
|
||||||
#workspaces button.focused {
|
|
||||||
background: #64727D;
|
|
||||||
border-bottom: 3px solid #ffffff;
|
border-bottom: 3px solid #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar.chromium #workspaces button.focused {
|
#workspaces button.focused {
|
||||||
color: #ffffff;
|
background-color: #64727D;
|
||||||
|
border-bottom: 3px solid #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button.urgent {
|
#workspaces button.urgent {
|
||||||
@ -63,13 +61,25 @@ window#waybar.chromium #workspaces button.focused {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#mode {
|
#mode {
|
||||||
background: #64727D;
|
background-color: #64727D;
|
||||||
border-bottom: 3px solid #ffffff;
|
border-bottom: 3px solid #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
#clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor {
|
#clock,
|
||||||
|
#battery,
|
||||||
|
#cpu,
|
||||||
|
#memory,
|
||||||
|
#temperature,
|
||||||
|
#backlight,
|
||||||
|
#network,
|
||||||
|
#pulseaudio,
|
||||||
|
#custom-media,
|
||||||
|
#tray,
|
||||||
|
#mode,
|
||||||
|
#idle_inhibitor,
|
||||||
|
#mpd {
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
margin: 0 5px;
|
margin: 0 4px;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,7 +105,7 @@ window#waybar.chromium #workspaces button.focused {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#battery.critical:not(.charging) {
|
#battery.critical:not(.charging) {
|
||||||
background: #f53c3c;
|
background-color: #f53c3c;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
animation-name: blink;
|
animation-name: blink;
|
||||||
animation-duration: 0.5s;
|
animation-duration: 0.5s;
|
||||||
@ -109,55 +119,56 @@ label:focus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#cpu {
|
#cpu {
|
||||||
background: #2ecc71;
|
background-color: #2ecc71;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
#memory {
|
#memory {
|
||||||
background: #9b59b6;
|
background-color: #9b59b6;
|
||||||
}
|
}
|
||||||
|
|
||||||
#backlight {
|
#backlight {
|
||||||
background: #90b1b1;
|
background-color: #90b1b1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#network {
|
#network {
|
||||||
background: #2980b9;
|
background-color: #2980b9;
|
||||||
}
|
}
|
||||||
|
|
||||||
#network.disconnected {
|
#network.disconnected {
|
||||||
background: #f53c3c;
|
background-color: #f53c3c;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pulseaudio {
|
#pulseaudio {
|
||||||
background: #f1c40f;
|
background-color: #f1c40f;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pulseaudio.muted {
|
#pulseaudio.muted {
|
||||||
background: #90b1b1;
|
background-color: #90b1b1;
|
||||||
color: #2a5c45;
|
color: #2a5c45;
|
||||||
}
|
}
|
||||||
|
|
||||||
#custom-media {
|
#custom-media {
|
||||||
background: #66cc99;
|
background-color: #66cc99;
|
||||||
color: #2a5c45;
|
color: #2a5c45;
|
||||||
|
min-width: 100px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.custom-spotify {
|
#custom-media.custom-spotify {
|
||||||
background: #66cc99;
|
background-color: #66cc99;
|
||||||
}
|
}
|
||||||
|
|
||||||
.custom-vlc {
|
#custom-media.custom-vlc {
|
||||||
background: #ffa000;
|
background-color: #ffa000;
|
||||||
}
|
}
|
||||||
|
|
||||||
#temperature {
|
#temperature {
|
||||||
background: #f0932b;
|
background-color: #f0932b;
|
||||||
}
|
}
|
||||||
|
|
||||||
#temperature.critical {
|
#temperature.critical {
|
||||||
background: #eb4d4b;
|
background-color: #eb4d4b;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tray {
|
#tray {
|
||||||
@ -174,18 +185,18 @@ label:focus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#mpd {
|
#mpd {
|
||||||
background: #66cc99;
|
background-color: #66cc99;
|
||||||
color: #2a5c45;
|
color: #2a5c45;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mpd.disconnected {
|
#mpd.disconnected {
|
||||||
background: #f53c3c;
|
background-color: #f53c3c;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mpd.stopped {
|
#mpd.stopped {
|
||||||
background: #90b1b1;
|
background-color: #90b1b1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mpd.paused {
|
#mpd.paused {
|
||||||
background: #51a37a;
|
background-color: #51a37a;
|
||||||
}
|
}
|
||||||
|
13
resources/waybar.service.in
Normal file
13
resources/waybar.service.in
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
|
||||||
|
Documentation=https://github.com/Alexays/Waybar/wiki/
|
||||||
|
PartOf=wayland-session.target
|
||||||
|
After=wayland-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=dbus
|
||||||
|
BusName=fr.arouillard.waybar
|
||||||
|
ExecStart=@prefix@/bin/waybar
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=wayland-session.target
|
140
src/ALabel.cpp
140
src/ALabel.cpp
@ -1,109 +1,40 @@
|
|||||||
#include "ALabel.hpp"
|
#include "ALabel.hpp"
|
||||||
|
#include <fmt/format.h>
|
||||||
#include <util/command.hpp>
|
#include <util/command.hpp>
|
||||||
|
|
||||||
#include <iostream>
|
namespace waybar {
|
||||||
|
|
||||||
waybar::ALabel::ALabel(const Json::Value& config, const std::string& format, uint16_t interval)
|
ALabel::ALabel(const Json::Value& config, const std::string& name, const std::string& id,
|
||||||
: config_(config),
|
const std::string& format, uint16_t interval, bool ellipsize)
|
||||||
|
: AModule(config, name, id, config["format-alt"].isString()),
|
||||||
format_(config_["format"].isString() ? config_["format"].asString() : format),
|
format_(config_["format"].isString() ? config_["format"].asString() : format),
|
||||||
interval_(config_["interval"] == "once"
|
interval_(config_["interval"] == "once"
|
||||||
? std::chrono::seconds(100000000)
|
? std::chrono::seconds(100000000)
|
||||||
: std::chrono::seconds(
|
: std::chrono::seconds(
|
||||||
config_["interval"].isUInt() ? config_["interval"].asUInt() : interval)),
|
config_["interval"].isUInt() ? config_["interval"].asUInt() : interval)),
|
||||||
default_format_(format_) {
|
default_format_(format_) {
|
||||||
|
label_.set_name(name);
|
||||||
|
if (!id.empty()) {
|
||||||
|
label_.get_style_context()->add_class(id);
|
||||||
|
}
|
||||||
event_box_.add(label_);
|
event_box_.add(label_);
|
||||||
if (config_["max-length"].isUInt()) {
|
if (config_["max-length"].isUInt()) {
|
||||||
label_.set_max_width_chars(config_["max-length"].asUInt());
|
label_.set_max_width_chars(config_["max-length"].asUInt());
|
||||||
label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
|
label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
|
||||||
|
} else if (ellipsize && label_.get_max_width_chars() == -1) {
|
||||||
|
label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config_["rotate"].isUInt()) {
|
if (config_["rotate"].isUInt()) {
|
||||||
label_.set_angle(config["rotate"].asUInt());
|
label_.set_angle(config["rotate"].asUInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config_["format-alt"].isString()) {
|
|
||||||
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
|
||||||
event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &ALabel::handleToggle));
|
|
||||||
}
|
|
||||||
|
|
||||||
// configure events' user commands
|
|
||||||
if (config_["on-click"].isString() || config_["on-click-right"].isString()) {
|
|
||||||
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
|
||||||
event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &ALabel::handleToggle));
|
|
||||||
}
|
|
||||||
if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) {
|
|
||||||
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
|
||||||
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &ALabel::handleScroll));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
waybar::ALabel::~ALabel() {
|
auto ALabel::update() -> void {
|
||||||
for (const auto& pid : pid_) {
|
|
||||||
if (pid != -1) {
|
|
||||||
kill(-pid, 9);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto waybar::ALabel::update() -> void {
|
|
||||||
// Nothing here
|
// Nothing here
|
||||||
}
|
}
|
||||||
|
|
||||||
bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
|
std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_t max) {
|
||||||
if (config_["on-click"].isString() && e->button == 1) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-click"].asString()));
|
|
||||||
} else if (config_["on-click-middle"].isString() && e->button == 2) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-click-middle"].asString()));
|
|
||||||
} else if (config_["on-click-right"].isString() && e->button == 3) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-click-right"].asString()));
|
|
||||||
} else if (config_["on-click-forward"].isString() && e->button == 8) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-click-backward"].asString()));
|
|
||||||
} else if (config_["on-click-backward"].isString() && e->button == 9) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-click-forward"].asString()));
|
|
||||||
}
|
|
||||||
if (config_["format-alt-click"].isUInt() && e->button == config_["format-alt-click"].asUInt()) {
|
|
||||||
alt_ = !alt_;
|
|
||||||
if (alt_ && config_["format-alt"].isString()) {
|
|
||||||
format_ = config_["format-alt"].asString();
|
|
||||||
} else {
|
|
||||||
format_ = default_format_;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dp.emit();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
|
|
||||||
// Avoid concurrent scroll event
|
|
||||||
std::lock_guard<std::mutex> lock(mutex_);
|
|
||||||
bool direction_up = false;
|
|
||||||
|
|
||||||
if (e->direction == GDK_SCROLL_UP) {
|
|
||||||
direction_up = true;
|
|
||||||
}
|
|
||||||
if (e->direction == GDK_SCROLL_DOWN) {
|
|
||||||
direction_up = false;
|
|
||||||
}
|
|
||||||
if (e->direction == GDK_SCROLL_SMOOTH) {
|
|
||||||
gdouble delta_x, delta_y;
|
|
||||||
gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent*>(e), &delta_x, &delta_y);
|
|
||||||
if (delta_y < 0) {
|
|
||||||
direction_up = true;
|
|
||||||
} else if (delta_y > 0) {
|
|
||||||
direction_up = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (direction_up && config_["on-scroll-up"].isString()) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-scroll-up"].asString()));
|
|
||||||
} else if (config_["on-scroll-down"].isString()) {
|
|
||||||
pid_.push_back(waybar::util::command::forkExec(config_["on-scroll-down"].asString()));
|
|
||||||
}
|
|
||||||
dp.emit();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt) {
|
|
||||||
auto format_icons = config_["format-icons"];
|
auto format_icons = config_["format-icons"];
|
||||||
if (format_icons.isObject()) {
|
if (format_icons.isObject()) {
|
||||||
if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
|
if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
|
||||||
@ -114,7 +45,7 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
|
|||||||
}
|
}
|
||||||
if (format_icons.isArray()) {
|
if (format_icons.isArray()) {
|
||||||
auto size = format_icons.size();
|
auto size = format_icons.size();
|
||||||
auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
|
auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1);
|
||||||
format_icons = format_icons[idx];
|
format_icons = format_icons[idx];
|
||||||
}
|
}
|
||||||
if (format_icons.isString()) {
|
if (format_icons.isString()) {
|
||||||
@ -123,8 +54,45 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
bool waybar::ALabel::tooltipEnabled() {
|
bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
|
||||||
return config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true;
|
if (config_["format-alt-click"].isUInt() && e->button == config_["format-alt-click"].asUInt()) {
|
||||||
|
alt_ = !alt_;
|
||||||
|
if (alt_ && config_["format-alt"].isString()) {
|
||||||
|
format_ = config_["format-alt"].asString();
|
||||||
|
} else {
|
||||||
|
format_ = default_format_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return AModule::handleToggle(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
waybar::ALabel::operator Gtk::Widget&() { return event_box_; }
|
std::string ALabel::getState(uint8_t value, bool lesser) {
|
||||||
|
if (!config_["states"].isObject()) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
// Get current state
|
||||||
|
std::vector<std::pair<std::string, uint8_t>> states;
|
||||||
|
if (config_["states"].isObject()) {
|
||||||
|
for (auto it = config_["states"].begin(); it != config_["states"].end(); ++it) {
|
||||||
|
if (it->isUInt() && it.key().isString()) {
|
||||||
|
states.emplace_back(it.key().asString(), it->asUInt());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Sort states
|
||||||
|
std::sort(states.begin(), states.end(), [&lesser](auto& a, auto& b) {
|
||||||
|
return lesser ? a.second < b.second : a.second > b.second;
|
||||||
|
});
|
||||||
|
std::string valid_state;
|
||||||
|
for (auto const& state : states) {
|
||||||
|
if ((lesser ? value <= state.second : value >= state.second) && valid_state.empty()) {
|
||||||
|
label_.get_style_context()->add_class(state.first);
|
||||||
|
valid_state = state.first;
|
||||||
|
} else {
|
||||||
|
label_.get_style_context()->remove_class(state.first);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return valid_state;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace waybar
|
||||||
|
119
src/AModule.cpp
Normal file
119
src/AModule.cpp
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
#include "AModule.hpp"
|
||||||
|
#include <fmt/format.h>
|
||||||
|
#include <util/command.hpp>
|
||||||
|
|
||||||
|
namespace waybar {
|
||||||
|
|
||||||
|
AModule::AModule(const Json::Value& config, const std::string& name, const std::string& id,
|
||||||
|
bool enable_click, bool enable_scroll)
|
||||||
|
: config_(std::move(config)) {
|
||||||
|
// configure events' user commands
|
||||||
|
if (config_["on-click"].isString() || config_["on-click-middle"].isString() ||
|
||||||
|
config_["on-click-backward"].isString() || config_["on-click-forward"].isString() ||
|
||||||
|
config_["on-click-right"].isString() || enable_click) {
|
||||||
|
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
||||||
|
event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &AModule::handleToggle));
|
||||||
|
}
|
||||||
|
if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString() || enable_scroll) {
|
||||||
|
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
||||||
|
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &AModule::handleScroll));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AModule::~AModule() {
|
||||||
|
for (const auto& pid : pid_) {
|
||||||
|
if (pid != -1) {
|
||||||
|
kill(-pid, 9);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto AModule::update() -> void {
|
||||||
|
// Nothing here
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AModule::handleToggle(GdkEventButton* const& e) {
|
||||||
|
std::string format;
|
||||||
|
if (config_["on-click"].isString() && e->button == 1) {
|
||||||
|
format = config_["on-click"].asString();
|
||||||
|
} else if (config_["on-click-middle"].isString() && e->button == 2) {
|
||||||
|
format = config_["on-click-middle"].asString();
|
||||||
|
} else if (config_["on-click-right"].isString() && e->button == 3) {
|
||||||
|
format = config_["on-click-right"].asString();
|
||||||
|
} else if (config_["on-click-forward"].isString() && e->button == 8) {
|
||||||
|
format = config_["on-click-backward"].asString();
|
||||||
|
} else if (config_["on-click-backward"].isString() && e->button == 9) {
|
||||||
|
format = config_["on-click-forward"].asString();
|
||||||
|
}
|
||||||
|
if (!format.empty()) {
|
||||||
|
pid_.push_back(util::command::forkExec(format));
|
||||||
|
}
|
||||||
|
dp.emit();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) {
|
||||||
|
switch (e -> direction) {
|
||||||
|
case GDK_SCROLL_UP: return SCROLL_DIR::UP;
|
||||||
|
case GDK_SCROLL_DOWN: return SCROLL_DIR::DOWN;
|
||||||
|
case GDK_SCROLL_LEFT: return SCROLL_DIR::LEFT;
|
||||||
|
case GDK_SCROLL_RIGHT: return SCROLL_DIR::RIGHT;
|
||||||
|
case GDK_SCROLL_SMOOTH: {
|
||||||
|
SCROLL_DIR dir{SCROLL_DIR::NONE};
|
||||||
|
|
||||||
|
distance_scrolled_y_ += e->delta_y;
|
||||||
|
distance_scrolled_x_ += e->delta_x;
|
||||||
|
|
||||||
|
gdouble threshold = 0;
|
||||||
|
if (config_["smooth-scrolling-threshold"].isNumeric()) {
|
||||||
|
threshold = config_["smooth-scrolling-threshold"].asDouble();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (distance_scrolled_y_ < -threshold) {
|
||||||
|
dir = SCROLL_DIR::UP;
|
||||||
|
} else if (distance_scrolled_y_ > threshold) {
|
||||||
|
dir = SCROLL_DIR::DOWN;
|
||||||
|
} else if (distance_scrolled_x_ > threshold) {
|
||||||
|
dir = SCROLL_DIR::RIGHT;
|
||||||
|
} else if (distance_scrolled_x_ < -threshold) {
|
||||||
|
dir = SCROLL_DIR::LEFT;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (dir) {
|
||||||
|
case SCROLL_DIR::UP:
|
||||||
|
case SCROLL_DIR::DOWN:
|
||||||
|
distance_scrolled_y_ = 0;
|
||||||
|
break;
|
||||||
|
case SCROLL_DIR::LEFT:
|
||||||
|
case SCROLL_DIR::RIGHT:
|
||||||
|
distance_scrolled_x_ = 0;
|
||||||
|
break;
|
||||||
|
case SCROLL_DIR::NONE:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dir;
|
||||||
|
}
|
||||||
|
// Silence -Wreturn-type:
|
||||||
|
default: return SCROLL_DIR::NONE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AModule::handleScroll(GdkEventScroll* e) {
|
||||||
|
auto dir = getScrollDir(e);
|
||||||
|
if (dir == SCROLL_DIR::UP && config_["on-scroll-up"].isString()) {
|
||||||
|
pid_.push_back(util::command::forkExec(config_["on-scroll-up"].asString()));
|
||||||
|
} else if (dir == SCROLL_DIR::DOWN && config_["on-scroll-down"].isString()) {
|
||||||
|
pid_.push_back(util::command::forkExec(config_["on-scroll-down"].asString()));
|
||||||
|
}
|
||||||
|
dp.emit();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AModule::tooltipEnabled() {
|
||||||
|
return config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true;
|
||||||
|
}
|
||||||
|
|
||||||
|
AModule::operator Gtk::Widget&() { return event_box_; }
|
||||||
|
|
||||||
|
} // namespace waybar
|
338
src/bar.cpp
338
src/bar.cpp
@ -1,13 +1,19 @@
|
|||||||
|
#ifdef HAVE_GTK_LAYER_SHELL
|
||||||
|
#include <gtk-layer-shell.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "bar.hpp"
|
#include "bar.hpp"
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
#include "factory.hpp"
|
#include "factory.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
|
waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
|
||||||
: output(w_output),
|
: output(w_output),
|
||||||
config(w_config),
|
config(w_config),
|
||||||
window{Gtk::WindowType::WINDOW_TOPLEVEL},
|
window{Gtk::WindowType::WINDOW_TOPLEVEL},
|
||||||
surface(nullptr),
|
surface(nullptr),
|
||||||
layer_surface(nullptr),
|
layer_surface_(nullptr),
|
||||||
|
anchor_(ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP),
|
||||||
left_(Gtk::ORIENTATION_HORIZONTAL, 0),
|
left_(Gtk::ORIENTATION_HORIZONTAL, 0),
|
||||||
center_(Gtk::ORIENTATION_HORIZONTAL, 0),
|
center_(Gtk::ORIENTATION_HORIZONTAL, 0),
|
||||||
right_(Gtk::ORIENTATION_HORIZONTAL, 0),
|
right_(Gtk::ORIENTATION_HORIZONTAL, 0),
|
||||||
@ -15,77 +21,30 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
|
|||||||
window.set_title("waybar");
|
window.set_title("waybar");
|
||||||
window.set_name("waybar");
|
window.set_name("waybar");
|
||||||
window.set_decorated(false);
|
window.set_decorated(false);
|
||||||
|
window.get_style_context()->add_class(output->name);
|
||||||
|
window.get_style_context()->add_class(config["name"].asString());
|
||||||
|
window.get_style_context()->add_class(config["position"].asString());
|
||||||
|
|
||||||
if (config["position"] == "right" || config["position"] == "left") {
|
if (config["position"] == "right" || config["position"] == "left") {
|
||||||
height_ = 0;
|
height_ = 0;
|
||||||
width_ = 1;
|
width_ = 1;
|
||||||
}
|
}
|
||||||
window.set_size_request(width_, height_);
|
height_ = config["height"].isUInt() ? config["height"].asUInt() : height_;
|
||||||
|
width_ = config["width"].isUInt() ? config["width"].asUInt() : width_;
|
||||||
|
|
||||||
auto gtk_window = window.gobj();
|
|
||||||
auto gtk_widget = GTK_WIDGET(gtk_window);
|
|
||||||
gtk_widget_realize(gtk_widget);
|
|
||||||
auto gdk_window = window.get_window()->gobj();
|
|
||||||
gdk_wayland_window_set_use_custom_surface(gdk_window);
|
|
||||||
surface = gdk_wayland_window_get_wl_surface(gdk_window);
|
|
||||||
|
|
||||||
std::size_t layer = config["layer"] == "top" ? ZWLR_LAYER_SHELL_V1_LAYER_TOP
|
|
||||||
: ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
|
|
||||||
auto client = waybar::Client::inst();
|
|
||||||
layer_surface = zwlr_layer_shell_v1_get_layer_surface(
|
|
||||||
client->layer_shell, surface, output->output, layer, "waybar");
|
|
||||||
static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
|
|
||||||
.configure = layerSurfaceHandleConfigure,
|
|
||||||
.closed = layerSurfaceHandleClosed,
|
|
||||||
};
|
|
||||||
zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, this);
|
|
||||||
|
|
||||||
auto height = config["height"].isUInt() ? config["height"].asUInt() : height_;
|
|
||||||
auto width = config["width"].isUInt() ? config["width"].asUInt() : width_;
|
|
||||||
|
|
||||||
window.signal_configure_event().connect_notify([&](GdkEventConfigure* ev) {
|
|
||||||
auto tmp_height = height_;
|
|
||||||
auto tmp_width = width_;
|
|
||||||
if (ev->height > static_cast<int>(height_)) {
|
|
||||||
// Default minimal value
|
|
||||||
if (height_ != 1) {
|
|
||||||
std::cout << fmt::format(MIN_HEIGHT_MSG, height_, ev->height) << std::endl;
|
|
||||||
}
|
|
||||||
if (config["height"].isUInt()) {
|
|
||||||
std::cout << fmt::format(SIZE_DEFINED, "Height") << std::endl;
|
|
||||||
} else {
|
|
||||||
tmp_height = ev->height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ev->width > static_cast<int>(width_)) {
|
|
||||||
// Default minimal value
|
|
||||||
if (width_ != 1) {
|
|
||||||
std::cout << fmt::format(MIN_WIDTH_MSG, width_, ev->width) << std::endl;
|
|
||||||
}
|
|
||||||
if (config["width"].isUInt()) {
|
|
||||||
std::cout << fmt::format(SIZE_DEFINED, "Width") << std::endl;
|
|
||||||
} else {
|
|
||||||
tmp_width = ev->width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (tmp_width != width_ || tmp_height != height_) {
|
|
||||||
zwlr_layer_surface_v1_set_size(layer_surface, tmp_width, tmp_height);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
|
|
||||||
if (config["position"] == "bottom") {
|
if (config["position"] == "bottom") {
|
||||||
anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
anchor_ = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
||||||
} else if (config["position"] == "left") {
|
} else if (config["position"] == "left") {
|
||||||
anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
|
anchor_ = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
|
||||||
} else if (config["position"] == "right") {
|
} else if (config["position"] == "right") {
|
||||||
anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
anchor_ = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
||||||
}
|
}
|
||||||
if (anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM || anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) {
|
if (anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM ||
|
||||||
anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) {
|
||||||
} else if (anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT ||
|
anchor_ |= ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
||||||
anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) {
|
} else if (anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT ||
|
||||||
anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) {
|
||||||
|
anchor_ |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
||||||
left_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
|
left_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
|
||||||
center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
|
center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
|
||||||
right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
|
right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
|
||||||
@ -93,14 +52,214 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
|
|||||||
vertical = true;
|
vertical = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
|
if (config["margin-top"].isInt() || config["margin-right"].isInt() ||
|
||||||
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, vertical ? width : height);
|
config["margin-bottom"].isInt() || config["margin-left"].isInt()) {
|
||||||
zwlr_layer_surface_v1_set_size(layer_surface, width, height);
|
margins_ = {
|
||||||
|
config["margin-top"].isInt() ? config["margin-top"].asInt() : 0,
|
||||||
|
config["margin-right"].isInt() ? config["margin-right"].asInt() : 0,
|
||||||
|
config["margin-bottom"].isInt() ? config["margin-bottom"].asInt() : 0,
|
||||||
|
config["margin-left"].isInt() ? config["margin-left"].asInt() : 0,
|
||||||
|
};
|
||||||
|
} else if (config["margin"].isString()) {
|
||||||
|
std::istringstream iss(config["margin"].asString());
|
||||||
|
std::vector<std::string> margins{std::istream_iterator<std::string>(iss), {}};
|
||||||
|
try {
|
||||||
|
if (margins.size() == 1) {
|
||||||
|
auto gaps = std::stoi(margins[0], nullptr, 10);
|
||||||
|
margins_ = {.top = gaps, .right = gaps, .bottom = gaps, .left = gaps};
|
||||||
|
}
|
||||||
|
if (margins.size() == 2) {
|
||||||
|
auto vertical_margins = std::stoi(margins[0], nullptr, 10);
|
||||||
|
auto horizontal_margins = std::stoi(margins[1], nullptr, 10);
|
||||||
|
margins_ = {.top = vertical_margins,
|
||||||
|
.right = horizontal_margins,
|
||||||
|
.bottom = vertical_margins,
|
||||||
|
.left = horizontal_margins};
|
||||||
|
}
|
||||||
|
if (margins.size() == 3) {
|
||||||
|
auto horizontal_margins = std::stoi(margins[1], nullptr, 10);
|
||||||
|
margins_ = {.top = std::stoi(margins[0], nullptr, 10),
|
||||||
|
.right = horizontal_margins,
|
||||||
|
.bottom = std::stoi(margins[2], nullptr, 10),
|
||||||
|
.left = horizontal_margins};
|
||||||
|
}
|
||||||
|
if (margins.size() == 4) {
|
||||||
|
margins_ = {.top = std::stoi(margins[0], nullptr, 10),
|
||||||
|
.right = std::stoi(margins[1], nullptr, 10),
|
||||||
|
.bottom = std::stoi(margins[2], nullptr, 10),
|
||||||
|
.left = std::stoi(margins[3], nullptr, 10)};
|
||||||
|
}
|
||||||
|
} catch (...) {
|
||||||
|
spdlog::warn("Invalid margins: {}", config["margin"].asString());
|
||||||
|
}
|
||||||
|
} else if (config["margin"].isInt()) {
|
||||||
|
auto gaps = config["margin"].asInt();
|
||||||
|
margins_ = {.top = gaps, .right = gaps, .bottom = gaps, .left = gaps};
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_GTK_LAYER_SHELL
|
||||||
|
use_gls_ = config["gtk-layer-shell"].isBool() ? config["gtk-layer-shell"].asBool() : true;
|
||||||
|
if (use_gls_) {
|
||||||
|
initGtkLayerShell();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
window.signal_realize().connect_notify(sigc::mem_fun(*this, &Bar::onRealize));
|
||||||
|
window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap));
|
||||||
|
window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigure));
|
||||||
|
window.set_size_request(width_, height_);
|
||||||
|
setupWidgets();
|
||||||
|
|
||||||
|
if (window.get_realized()) {
|
||||||
|
onRealize();
|
||||||
|
}
|
||||||
|
window.show_all();
|
||||||
|
}
|
||||||
|
|
||||||
|
void waybar::Bar::onConfigure(GdkEventConfigure* ev) {
|
||||||
|
auto tmp_height = height_;
|
||||||
|
auto tmp_width = width_;
|
||||||
|
if (ev->height > static_cast<int>(height_)) {
|
||||||
|
// Default minimal value
|
||||||
|
if (height_ != 1) {
|
||||||
|
spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height);
|
||||||
|
}
|
||||||
|
if (config["height"].isUInt()) {
|
||||||
|
spdlog::info(SIZE_DEFINED, "Height");
|
||||||
|
} else {
|
||||||
|
tmp_height = ev->height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ev->width > static_cast<int>(width_)) {
|
||||||
|
// Default minimal value
|
||||||
|
if (width_ != 1) {
|
||||||
|
spdlog::warn(MIN_WIDTH_MSG, width_, ev->width);
|
||||||
|
}
|
||||||
|
if (config["width"].isUInt()) {
|
||||||
|
spdlog::info(SIZE_DEFINED, "Width");
|
||||||
|
} else {
|
||||||
|
tmp_width = ev->width;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (use_gls_) {
|
||||||
|
width_ = tmp_width;
|
||||||
|
height_ = tmp_height;
|
||||||
|
spdlog::debug("Set surface size {}x{} for output {}", width_, height_, output->name);
|
||||||
|
setExclusiveZone(tmp_width, tmp_height);
|
||||||
|
} else if (tmp_width != width_ || tmp_height != height_) {
|
||||||
|
setSurfaceSize(tmp_width, tmp_height);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_GTK_LAYER_SHELL
|
||||||
|
void waybar::Bar::initGtkLayerShell() {
|
||||||
|
auto gtk_window = window.gobj();
|
||||||
|
// this has to be executed before GtkWindow.realize
|
||||||
|
gtk_layer_init_for_window(gtk_window);
|
||||||
|
gtk_layer_set_keyboard_interactivity(gtk_window, FALSE);
|
||||||
|
auto layer = config["layer"] == "top" ? GTK_LAYER_SHELL_LAYER_TOP : GTK_LAYER_SHELL_LAYER_BOTTOM;
|
||||||
|
gtk_layer_set_layer(gtk_window, layer);
|
||||||
|
gtk_layer_set_monitor(gtk_window, output->monitor->gobj());
|
||||||
|
gtk_layer_set_namespace(gtk_window, "waybar");
|
||||||
|
|
||||||
|
gtk_layer_set_anchor(
|
||||||
|
gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT);
|
||||||
|
gtk_layer_set_anchor(
|
||||||
|
gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT);
|
||||||
|
gtk_layer_set_anchor(
|
||||||
|
gtk_window, GTK_LAYER_SHELL_EDGE_TOP, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP);
|
||||||
|
gtk_layer_set_anchor(
|
||||||
|
gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM);
|
||||||
|
|
||||||
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, margins_.left);
|
||||||
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, margins_.right);
|
||||||
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_TOP, margins_.top);
|
||||||
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, margins_.bottom);
|
||||||
|
|
||||||
|
if (width_ > 1 && height_ > 1) {
|
||||||
|
/* configure events are not emitted if the bar is using initial size */
|
||||||
|
setExclusiveZone(width_, height_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void waybar::Bar::onRealize() {
|
||||||
|
auto gdk_window = window.get_window()->gobj();
|
||||||
|
gdk_wayland_window_set_use_custom_surface(gdk_window);
|
||||||
|
}
|
||||||
|
|
||||||
|
void waybar::Bar::onMap(GdkEventAny* ev) {
|
||||||
|
auto gdk_window = window.get_window()->gobj();
|
||||||
|
surface = gdk_wayland_window_get_wl_surface(gdk_window);
|
||||||
|
|
||||||
|
if (use_gls_) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto client = waybar::Client::inst();
|
||||||
|
// owned by output->monitor; no need to destroy
|
||||||
|
auto wl_output = gdk_wayland_monitor_get_wl_output(output->monitor->gobj());
|
||||||
|
auto layer =
|
||||||
|
config["layer"] == "top" ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
|
||||||
|
layer_surface_ = zwlr_layer_shell_v1_get_layer_surface(
|
||||||
|
client->layer_shell, surface, wl_output, layer, "waybar");
|
||||||
|
|
||||||
|
zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_, false);
|
||||||
|
zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_);
|
||||||
|
zwlr_layer_surface_v1_set_margin(
|
||||||
|
layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left);
|
||||||
|
setSurfaceSize(width_, height_);
|
||||||
|
setExclusiveZone(width_, height_);
|
||||||
|
|
||||||
|
static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
|
||||||
|
.configure = layerSurfaceHandleConfigure,
|
||||||
|
.closed = layerSurfaceHandleClosed,
|
||||||
|
};
|
||||||
|
zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this);
|
||||||
|
|
||||||
wl_surface_commit(surface);
|
wl_surface_commit(surface);
|
||||||
wl_display_roundtrip(client->wl_display);
|
wl_display_roundtrip(client->wl_display);
|
||||||
|
}
|
||||||
|
|
||||||
setupWidgets();
|
void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) {
|
||||||
|
auto zone = 0;
|
||||||
|
if (visible) {
|
||||||
|
// exclusive zone already includes margin for anchored edge,
|
||||||
|
// only opposite margin should be added
|
||||||
|
if (vertical) {
|
||||||
|
zone += width;
|
||||||
|
zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? margins_.right : margins_.left;
|
||||||
|
} else {
|
||||||
|
zone += height;
|
||||||
|
zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? margins_.bottom : margins_.top;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
spdlog::debug("Set exclusive zone {} for output {}", zone, output->name);
|
||||||
|
|
||||||
|
#ifdef HAVE_GTK_LAYER_SHELL
|
||||||
|
if (use_gls_) {
|
||||||
|
gtk_layer_set_exclusive_zone(window.gobj(), zone);
|
||||||
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_, zone);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void waybar::Bar::setSurfaceSize(uint32_t width, uint32_t height) {
|
||||||
|
/* If the client is anchored to two opposite edges, layer_surface.configure will return
|
||||||
|
* size without margins for the axis.
|
||||||
|
* layer_surface.set_size, however, expects size with margins for the anchored axis.
|
||||||
|
* This is not specified by wlr-layer-shell and based on actual behavior of sway.
|
||||||
|
*/
|
||||||
|
if (vertical && height > 1) {
|
||||||
|
height += margins_.top + margins_.bottom;
|
||||||
|
}
|
||||||
|
if (!vertical && width > 1) {
|
||||||
|
width += margins_.right + margins_.left;
|
||||||
|
}
|
||||||
|
spdlog::debug("Set surface size {}x{} for output {}", width, height, output->name);
|
||||||
|
zwlr_layer_surface_v1_set_size(layer_surface_, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Converting string to button code rn as to avoid doing it later
|
// Converting string to button code rn as to avoid doing it later
|
||||||
@ -111,15 +270,13 @@ void waybar::Bar::setupAltFormatKeyForModule(const std::string& module_name) {
|
|||||||
if (module.isMember("format-alt-click")) {
|
if (module.isMember("format-alt-click")) {
|
||||||
Json::Value& click = module["format-alt-click"];
|
Json::Value& click = module["format-alt-click"];
|
||||||
if (click.isString()) {
|
if (click.isString()) {
|
||||||
std::string str_click = click.asString();
|
if (click == "click-right") {
|
||||||
|
|
||||||
if (str_click == "click-right") {
|
|
||||||
module["format-alt-click"] = 3U;
|
module["format-alt-click"] = 3U;
|
||||||
} else if (str_click == "click-middle") {
|
} else if (click == "click-middle") {
|
||||||
module["format-alt-click"] = 2U;
|
module["format-alt-click"] = 2U;
|
||||||
} else if (str_click == "click-backward") {
|
} else if (click == "click-backward") {
|
||||||
module["format-alt-click"] = 8U;
|
module["format-alt-click"] = 8U;
|
||||||
} else if (str_click == "click-forward") {
|
} else if (click == "click-forward") {
|
||||||
module["format-alt-click"] = 9U;
|
module["format-alt-click"] = 9U;
|
||||||
} else {
|
} else {
|
||||||
module["format-alt-click"] = 1U; // default click-left
|
module["format-alt-click"] = 1U; // default click-left
|
||||||
@ -174,13 +331,11 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data, struct zwlr_layer_surf
|
|||||||
o->height_ = height;
|
o->height_ = height;
|
||||||
o->window.set_size_request(o->width_, o->height_);
|
o->window.set_size_request(o->width_, o->height_);
|
||||||
o->window.resize(o->width_, o->height_);
|
o->window.resize(o->width_, o->height_);
|
||||||
zwlr_layer_surface_v1_set_exclusive_zone(o->layer_surface,
|
o->setExclusiveZone(width, height);
|
||||||
o->vertical ? o->width_ : o->height_);
|
spdlog::info(BAR_SIZE_MSG,
|
||||||
std::cout << fmt::format(BAR_SIZE_MSG,
|
o->width_ == 1 ? "auto" : std::to_string(o->width_),
|
||||||
o->width_ == 1 ? "auto" : std::to_string(o->width_),
|
o->height_ == 1 ? "auto" : std::to_string(o->height_),
|
||||||
o->height_ == 1 ? "auto" : std::to_string(o->height_),
|
o->output->name);
|
||||||
o->output->name)
|
|
||||||
<< std::endl;
|
|
||||||
wl_surface_commit(o->surface);
|
wl_surface_commit(o->surface);
|
||||||
}
|
}
|
||||||
zwlr_layer_surface_v1_ack_configure(surface, serial);
|
zwlr_layer_surface_v1_ack_configure(surface, serial);
|
||||||
@ -188,7 +343,10 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data, struct zwlr_layer_surf
|
|||||||
|
|
||||||
void waybar::Bar::layerSurfaceHandleClosed(void* data, struct zwlr_layer_surface_v1* /*surface*/) {
|
void waybar::Bar::layerSurfaceHandleClosed(void* data, struct zwlr_layer_surface_v1* /*surface*/) {
|
||||||
auto o = static_cast<waybar::Bar*>(data);
|
auto o = static_cast<waybar::Bar*>(data);
|
||||||
zwlr_layer_surface_v1_destroy(o->layer_surface);
|
if (o->layer_surface_) {
|
||||||
|
zwlr_layer_surface_v1_destroy(o->layer_surface_);
|
||||||
|
o->layer_surface_ = nullptr;
|
||||||
|
}
|
||||||
o->modules_left_.clear();
|
o->modules_left_.clear();
|
||||||
o->modules_center_.clear();
|
o->modules_center_.clear();
|
||||||
o->modules_right_.clear();
|
o->modules_right_.clear();
|
||||||
@ -196,13 +354,14 @@ void waybar::Bar::layerSurfaceHandleClosed(void* data, struct zwlr_layer_surface
|
|||||||
|
|
||||||
auto waybar::Bar::toggle() -> void {
|
auto waybar::Bar::toggle() -> void {
|
||||||
visible = !visible;
|
visible = !visible;
|
||||||
auto zone = visible ? height_ : 0;
|
|
||||||
if (!visible) {
|
if (!visible) {
|
||||||
window.get_style_context()->add_class("hidden");
|
window.get_style_context()->add_class("hidden");
|
||||||
|
window.set_opacity(0);
|
||||||
} else {
|
} else {
|
||||||
window.get_style_context()->remove_class("hidden");
|
window.get_style_context()->remove_class("hidden");
|
||||||
|
window.set_opacity(1);
|
||||||
}
|
}
|
||||||
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone);
|
setExclusiveZone(width_, height_);
|
||||||
wl_surface_commit(surface);
|
wl_surface_commit(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -224,11 +383,11 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos) {
|
|||||||
try {
|
try {
|
||||||
module->update();
|
module->update();
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << name.asString() + ": " + e.what() << std::endl;
|
spdlog::error("{}: {}", name.asString(), e.what());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << e.what() << std::endl;
|
spdlog::warn("module {}: {}", name.asString(), e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -236,9 +395,9 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos) {
|
|||||||
|
|
||||||
auto waybar::Bar::setupWidgets() -> void {
|
auto waybar::Bar::setupWidgets() -> void {
|
||||||
window.add(box_);
|
window.add(box_);
|
||||||
box_.pack_start(left_, true, true);
|
box_.pack_start(left_, false, false);
|
||||||
box_.set_center_widget(center_);
|
box_.set_center_widget(center_);
|
||||||
box_.pack_end(right_, true, true);
|
box_.pack_end(right_, false, false);
|
||||||
|
|
||||||
// Convert to button code for every module that is used.
|
// Convert to button code for every module that is used.
|
||||||
setupAltFormatKeyForModuleList("modules-left");
|
setupAltFormatKeyForModuleList("modules-left");
|
||||||
@ -250,14 +409,13 @@ auto waybar::Bar::setupWidgets() -> void {
|
|||||||
getModules(factory, "modules-center");
|
getModules(factory, "modules-center");
|
||||||
getModules(factory, "modules-right");
|
getModules(factory, "modules-right");
|
||||||
for (auto const& module : modules_left_) {
|
for (auto const& module : modules_left_) {
|
||||||
left_.pack_start(*module, false, true, 0);
|
left_.pack_start(*module, false, false);
|
||||||
}
|
}
|
||||||
for (auto const& module : modules_center_) {
|
for (auto const& module : modules_center_) {
|
||||||
center_.pack_start(*module, true, true, 0);
|
center_.pack_start(*module, false, false);
|
||||||
}
|
}
|
||||||
std::reverse(modules_right_.begin(), modules_right_.end());
|
std::reverse(modules_right_.begin(), modules_right_.end());
|
||||||
for (auto const& module : modules_right_) {
|
for (auto const& module : modules_right_) {
|
||||||
right_.pack_end(*module, false, false, 0);
|
right_.pack_end(*module, false, false);
|
||||||
}
|
}
|
||||||
window.show_all();
|
|
||||||
}
|
}
|
||||||
|
207
src/client.cpp
207
src/client.cpp
@ -1,4 +1,6 @@
|
|||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
|
#include <fmt/ostream.h>
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "util/clara.hpp"
|
#include "util/clara.hpp"
|
||||||
@ -9,7 +11,7 @@ waybar::Client *waybar::Client::inst() {
|
|||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::string waybar::Client::getValidPath(const std::vector<std::string> &paths) {
|
const std::string waybar::Client::getValidPath(const std::vector<std::string> &paths) const {
|
||||||
wordexp_t p;
|
wordexp_t p;
|
||||||
|
|
||||||
for (const std::string &path : paths) {
|
for (const std::string &path : paths) {
|
||||||
@ -32,11 +34,6 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint
|
|||||||
if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
|
if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
|
||||||
client->layer_shell = static_cast<struct zwlr_layer_shell_v1 *>(
|
client->layer_shell = static_cast<struct zwlr_layer_shell_v1 *>(
|
||||||
wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, version));
|
wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, version));
|
||||||
} else if (strcmp(interface, wl_output_interface.name) == 0) {
|
|
||||||
auto wl_output = static_cast<struct wl_output *>(
|
|
||||||
wl_registry_bind(registry, name, &wl_output_interface, version));
|
|
||||||
client->outputs_.emplace_back(new struct waybar_output({wl_output, "", name, nullptr}));
|
|
||||||
client->handleOutput(client->outputs_.back());
|
|
||||||
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 &&
|
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 &&
|
||||||
version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
|
version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
|
||||||
client->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(wl_registry_bind(
|
client->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(wl_registry_bind(
|
||||||
@ -49,85 +46,51 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint
|
|||||||
|
|
||||||
void waybar::Client::handleGlobalRemove(void * data, struct wl_registry * /*registry*/,
|
void waybar::Client::handleGlobalRemove(void * data, struct wl_registry * /*registry*/,
|
||||||
uint32_t name) {
|
uint32_t name) {
|
||||||
auto client = static_cast<Client *>(data);
|
// Nothing here
|
||||||
for (auto it = client->bars.begin(); it != client->bars.end();) {
|
|
||||||
if ((*it)->output->wl_name == name) {
|
|
||||||
auto output_name = (*it)->output->name;
|
|
||||||
(*it)->window.close();
|
|
||||||
it = client->bars.erase(it);
|
|
||||||
std::cout << "Bar removed from output: " + output_name << std::endl;
|
|
||||||
} else {
|
|
||||||
++it;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
auto it = std::find_if(client->outputs_.begin(),
|
|
||||||
client->outputs_.end(),
|
|
||||||
[&name](const auto &output) { return output->wl_name == name; });
|
|
||||||
if (it != client->outputs_.end()) {
|
|
||||||
zxdg_output_v1_destroy((*it)->xdg_output);
|
|
||||||
wl_output_destroy((*it)->output);
|
|
||||||
client->outputs_.erase(it);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::Client::handleOutput(std::unique_ptr<struct waybar_output> &output) {
|
void waybar::Client::handleOutput(struct waybar_output &output) {
|
||||||
static const struct zxdg_output_v1_listener xdgOutputListener = {
|
static const struct zxdg_output_v1_listener xdgOutputListener = {
|
||||||
.logical_position = handleLogicalPosition,
|
.logical_position = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {},
|
||||||
.logical_size = handleLogicalSize,
|
.logical_size = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {},
|
||||||
.done = handleDone,
|
.done = [](void *, struct zxdg_output_v1 *) {},
|
||||||
.name = handleName,
|
.name = &handleOutputName,
|
||||||
.description = handleDescription,
|
.description = [](void *, struct zxdg_output_v1 *, const char *) {},
|
||||||
};
|
};
|
||||||
output->xdg_output = zxdg_output_manager_v1_get_xdg_output(xdg_output_manager, output->output);
|
// owned by output->monitor; no need to destroy
|
||||||
zxdg_output_v1_add_listener(output->xdg_output, &xdgOutputListener, &output->wl_name);
|
auto wl_output = gdk_wayland_monitor_get_wl_output(output.monitor->gobj());
|
||||||
|
output.xdg_output.reset(zxdg_output_manager_v1_get_xdg_output(xdg_output_manager, wl_output));
|
||||||
|
zxdg_output_v1_add_listener(output.xdg_output.get(), &xdgOutputListener, &output);
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::Client::handleLogicalPosition(void * /*data*/,
|
bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_output &output) {
|
||||||
struct zxdg_output_v1 * /*zxdg_output_v1*/,
|
|
||||||
int32_t /*x*/, int32_t /*y*/) {
|
|
||||||
// Nothing here
|
|
||||||
}
|
|
||||||
|
|
||||||
void waybar::Client::handleLogicalSize(void * /*data*/, struct zxdg_output_v1 * /*zxdg_output_v1*/,
|
|
||||||
int32_t /*width*/, int32_t /*height*/) {
|
|
||||||
// Nothing here
|
|
||||||
}
|
|
||||||
|
|
||||||
void waybar::Client::handleDone(void * /*data*/, struct zxdg_output_v1 * /*zxdg_output_v1*/) {
|
|
||||||
// Nothing here
|
|
||||||
}
|
|
||||||
|
|
||||||
bool waybar::Client::isValidOutput(const Json::Value & config,
|
|
||||||
std::unique_ptr<struct waybar_output> &output) {
|
|
||||||
bool found = true;
|
bool found = true;
|
||||||
if (config["output"].isArray()) {
|
if (config["output"].isArray()) {
|
||||||
bool in_array = false;
|
bool in_array = false;
|
||||||
for (auto const &output_conf : config["output"]) {
|
for (auto const &output_conf : config["output"]) {
|
||||||
if (output_conf.isString() && output_conf.asString() == output->name) {
|
if (output_conf.isString() && output_conf.asString() == output.name) {
|
||||||
in_array = true;
|
in_array = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
found = in_array;
|
found = in_array;
|
||||||
}
|
}
|
||||||
if (config["output"].isString() && config["output"].asString() != output->name) {
|
if (config["output"].isString() && config["output"].asString() != output.name) {
|
||||||
found = false;
|
found = false;
|
||||||
}
|
}
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<struct waybar::waybar_output> &waybar::Client::getOutput(uint32_t wl_name) {
|
struct waybar::waybar_output &waybar::Client::getOutput(void *addr) {
|
||||||
auto it = std::find_if(outputs_.begin(), outputs_.end(), [&wl_name](const auto &output) {
|
auto it = std::find_if(
|
||||||
return output->wl_name == wl_name;
|
outputs_.begin(), outputs_.end(), [&addr](const auto &output) { return &output == addr; });
|
||||||
});
|
|
||||||
if (it == outputs_.end()) {
|
if (it == outputs_.end()) {
|
||||||
throw std::runtime_error("Unable to find valid output");
|
throw std::runtime_error("Unable to find valid output");
|
||||||
}
|
}
|
||||||
return *it;
|
return *it;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<Json::Value> waybar::Client::getOutputConfigs(
|
std::vector<Json::Value> waybar::Client::getOutputConfigs(struct waybar_output &output) {
|
||||||
std::unique_ptr<struct waybar_output> &output) {
|
|
||||||
std::vector<Json::Value> configs;
|
std::vector<Json::Value> configs;
|
||||||
if (config_.isArray()) {
|
if (config_.isArray()) {
|
||||||
for (auto const &config : config_) {
|
for (auto const &config : config_) {
|
||||||
@ -141,20 +104,23 @@ std::vector<Json::Value> waybar::Client::getOutputConfigs(
|
|||||||
return configs;
|
return configs;
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::Client::handleName(void * data, struct zxdg_output_v1 * /*xdg_output*/,
|
void waybar::Client::handleOutputName(void * data, struct zxdg_output_v1 * /*xdg_output*/,
|
||||||
const char *name) {
|
const char *name) {
|
||||||
auto wl_name = *static_cast<uint32_t *>(data);
|
|
||||||
auto client = waybar::Client::inst();
|
auto client = waybar::Client::inst();
|
||||||
try {
|
try {
|
||||||
auto &output = client->getOutput(wl_name);
|
auto &output = client->getOutput(data);
|
||||||
output->name = name;
|
output.name = name;
|
||||||
|
spdlog::debug("Output detected: {} ({} {})",
|
||||||
|
name,
|
||||||
|
output.monitor->get_manufacturer(),
|
||||||
|
output.monitor->get_model());
|
||||||
auto configs = client->getOutputConfigs(output);
|
auto configs = client->getOutputConfigs(output);
|
||||||
if (configs.empty()) {
|
if (configs.empty()) {
|
||||||
wl_output_destroy(output->output);
|
output.xdg_output.reset();
|
||||||
zxdg_output_v1_destroy(output->xdg_output);
|
|
||||||
} else {
|
} else {
|
||||||
|
wl_display_roundtrip(client->wl_display);
|
||||||
for (const auto &config : configs) {
|
for (const auto &config : configs) {
|
||||||
client->bars.emplace_back(std::make_unique<Bar>(output.get(), config));
|
client->bars.emplace_back(std::make_unique<Bar>(&output, config));
|
||||||
Glib::RefPtr<Gdk::Screen> screen = client->bars.back()->window.get_screen();
|
Glib::RefPtr<Gdk::Screen> screen = client->bars.back()->window.get_screen();
|
||||||
client->style_context_->add_provider_for_screen(
|
client->style_context_->add_provider_for_screen(
|
||||||
screen, client->css_provider_, GTK_STYLE_PROVIDER_PRIORITY_USER);
|
screen, client->css_provider_, GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||||
@ -165,36 +131,54 @@ void waybar::Client::handleName(void * data, struct zxdg_output_v1 * /*xdg_
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::Client::handleDescription(void * /*data*/, struct zxdg_output_v1 * /*zxdg_output_v1*/,
|
void waybar::Client::handleMonitorAdded(Glib::RefPtr<Gdk::Monitor> monitor) {
|
||||||
const char * /*description*/) {
|
auto &output = outputs_.emplace_back();
|
||||||
// Nothing here
|
output.monitor = monitor;
|
||||||
|
handleOutput(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::Client::setupConfigs(const std::string &config, const std::string &style) {
|
void waybar::Client::handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor) {
|
||||||
config_file_ = config.empty() ? getValidPath({
|
spdlog::debug("Output removed: {} {}", monitor->get_manufacturer(), monitor->get_model());
|
||||||
"$XDG_CONFIG_HOME/waybar/config",
|
for (auto it = bars.begin(); it != bars.end();) {
|
||||||
"$HOME/.config/waybar/config",
|
if ((*it)->output->monitor == monitor) {
|
||||||
"$HOME/waybar/config",
|
auto output_name = (*it)->output->name;
|
||||||
"/etc/xdg/waybar/config",
|
(*it)->window.close();
|
||||||
"./resources/config",
|
it = bars.erase(it);
|
||||||
|
spdlog::info("Bar removed from output: {}", output_name);
|
||||||
|
} else {
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
outputs_.remove_if([&monitor](const auto &output) { return output.monitor == monitor; });
|
||||||
|
}
|
||||||
|
|
||||||
|
std::tuple<const std::string, const std::string> waybar::Client::getConfigs(
|
||||||
|
const std::string &config, const std::string &style) const {
|
||||||
|
auto config_file = config.empty() ? getValidPath({
|
||||||
|
"$XDG_CONFIG_HOME/waybar/config",
|
||||||
|
"$HOME/.config/waybar/config",
|
||||||
|
"$HOME/waybar/config",
|
||||||
|
"/etc/xdg/waybar/config",
|
||||||
|
"./resources/config",
|
||||||
|
})
|
||||||
|
: config;
|
||||||
|
auto css_file = style.empty() ? getValidPath({
|
||||||
|
"$XDG_CONFIG_HOME/waybar/style.css",
|
||||||
|
"$HOME/.config/waybar/style.css",
|
||||||
|
"$HOME/waybar/style.css",
|
||||||
|
"/etc/xdg/waybar/style.css",
|
||||||
|
"./resources/style.css",
|
||||||
})
|
})
|
||||||
: config;
|
: style;
|
||||||
css_file_ = style.empty() ? getValidPath({
|
if (css_file.empty() || config_file.empty()) {
|
||||||
"$XDG_CONFIG_HOME/waybar/style.css",
|
|
||||||
"$HOME/.config/waybar/style.css",
|
|
||||||
"$HOME/waybar/style.css",
|
|
||||||
"/etc/xdg/waybar/style.css",
|
|
||||||
"./resources/style.css",
|
|
||||||
})
|
|
||||||
: style;
|
|
||||||
if (css_file_.empty() || config_file_.empty()) {
|
|
||||||
throw std::runtime_error("Missing required resources files");
|
throw std::runtime_error("Missing required resources files");
|
||||||
}
|
}
|
||||||
std::cout << "Resources files: " + config_file_ + ", " + css_file_ << std::endl;
|
spdlog::info("Resources files: {}, {}", config_file, css_file);
|
||||||
|
return {config_file, css_file};
|
||||||
}
|
}
|
||||||
|
|
||||||
auto waybar::Client::setupConfig() -> void {
|
auto waybar::Client::setupConfig(const std::string &config_file) -> void {
|
||||||
std::ifstream file(config_file_);
|
std::ifstream file(config_file);
|
||||||
if (!file.is_open()) {
|
if (!file.is_open()) {
|
||||||
throw std::runtime_error("Can't open config file");
|
throw std::runtime_error("Can't open config file");
|
||||||
}
|
}
|
||||||
@ -203,12 +187,12 @@ auto waybar::Client::setupConfig() -> void {
|
|||||||
config_ = parser.parse(str);
|
config_ = parser.parse(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto waybar::Client::setupCss() -> void {
|
auto waybar::Client::setupCss(const std::string &css_file) -> void {
|
||||||
css_provider_ = Gtk::CssProvider::create();
|
css_provider_ = Gtk::CssProvider::create();
|
||||||
style_context_ = Gtk::StyleContext::create();
|
style_context_ = Gtk::StyleContext::create();
|
||||||
|
|
||||||
// Load our css file, wherever that may be hiding
|
// Load our css file, wherever that may be hiding
|
||||||
if (!css_provider_->load_from_path(css_file_)) {
|
if (!css_provider_->load_from_path(css_file)) {
|
||||||
throw std::runtime_error("Can't open style file");
|
throw std::runtime_error("Can't open style file");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -224,31 +208,34 @@ void waybar::Client::bindInterfaces() {
|
|||||||
if (layer_shell == nullptr || xdg_output_manager == nullptr) {
|
if (layer_shell == nullptr || xdg_output_manager == nullptr) {
|
||||||
throw std::runtime_error("Failed to acquire required resources.");
|
throw std::runtime_error("Failed to acquire required resources.");
|
||||||
}
|
}
|
||||||
|
// add existing outputs and subscribe to updates
|
||||||
|
for (auto i = 0; i < gdk_display->get_n_monitors(); ++i) {
|
||||||
|
auto monitor = gdk_display->get_monitor(i);
|
||||||
|
handleMonitorAdded(monitor);
|
||||||
|
}
|
||||||
|
gdk_display->signal_monitor_added().connect(sigc::mem_fun(*this, &Client::handleMonitorAdded));
|
||||||
|
gdk_display->signal_monitor_removed().connect(
|
||||||
|
sigc::mem_fun(*this, &Client::handleMonitorRemoved));
|
||||||
}
|
}
|
||||||
|
|
||||||
int waybar::Client::main(int argc, char *argv[]) {
|
int waybar::Client::main(int argc, char *argv[]) {
|
||||||
gtk_app = Gtk::Application::create(argc, argv, "fr.arouillard.waybar");
|
|
||||||
gdk_display = Gdk::Display::get_default();
|
|
||||||
if (!gdk_display) {
|
|
||||||
throw std::runtime_error("Can't find display");
|
|
||||||
}
|
|
||||||
if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
|
|
||||||
throw std::runtime_error("Bar need to run under Wayland");
|
|
||||||
}
|
|
||||||
wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
|
|
||||||
bool show_help = false;
|
bool show_help = false;
|
||||||
bool show_version = false;
|
bool show_version = false;
|
||||||
std::string config;
|
std::string config;
|
||||||
std::string style;
|
std::string style;
|
||||||
std::string bar_id;
|
std::string bar_id;
|
||||||
|
std::string log_level;
|
||||||
auto cli = clara::detail::Help(show_help) |
|
auto cli = clara::detail::Help(show_help) |
|
||||||
clara::detail::Opt(show_version)["-v"]["--version"]("Show version") |
|
clara::detail::Opt(show_version)["-v"]["--version"]("Show version") |
|
||||||
clara::detail::Opt(config, "config")["-c"]["--config"]("Config path") |
|
clara::detail::Opt(config, "config")["-c"]["--config"]("Config path") |
|
||||||
clara::detail::Opt(style, "style")["-s"]["--style"]("Style path") |
|
clara::detail::Opt(style, "style")["-s"]["--style"]("Style path") |
|
||||||
|
clara::detail::Opt(
|
||||||
|
log_level,
|
||||||
|
"trace|debug|info|warning|error|critical|off")["-l"]["--log-level"]("Log level") |
|
||||||
clara::detail::Opt(bar_id, "id")["-b"]["--bar"]("Bar id");
|
clara::detail::Opt(bar_id, "id")["-b"]["--bar"]("Bar id");
|
||||||
auto res = cli.parse(clara::detail::Args(argc, argv));
|
auto res = cli.parse(clara::detail::Args(argc, argv));
|
||||||
if (!res) {
|
if (!res) {
|
||||||
std::cerr << "Error in command line: " << res.errorMessage() << std::endl;
|
spdlog::error("Error in command line: {}", res.errorMessage());
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (show_help) {
|
if (show_help) {
|
||||||
@ -259,9 +246,21 @@ int waybar::Client::main(int argc, char *argv[]) {
|
|||||||
std::cout << "Waybar v" << VERSION << std::endl;
|
std::cout << "Waybar v" << VERSION << std::endl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
setupConfigs(config, style);
|
if (!log_level.empty()) {
|
||||||
setupConfig();
|
spdlog::set_level(spdlog::level::from_str(log_level));
|
||||||
setupCss();
|
}
|
||||||
|
gtk_app = Gtk::Application::create(argc, argv, "fr.arouillard.waybar");
|
||||||
|
gdk_display = Gdk::Display::get_default();
|
||||||
|
if (!gdk_display) {
|
||||||
|
throw std::runtime_error("Can't find display");
|
||||||
|
}
|
||||||
|
if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
|
||||||
|
throw std::runtime_error("Bar need to run under Wayland");
|
||||||
|
}
|
||||||
|
wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
|
||||||
|
auto [config_file, css_file] = getConfigs(config, style);
|
||||||
|
setupConfig(config_file);
|
||||||
|
setupCss(css_file);
|
||||||
bindInterfaces();
|
bindInterfaces();
|
||||||
gtk_app->hold();
|
gtk_app->hold();
|
||||||
gtk_app->run();
|
gtk_app->run();
|
||||||
|
@ -2,17 +2,19 @@
|
|||||||
|
|
||||||
waybar::Factory::Factory(const Bar& bar, const Json::Value& config) : bar_(bar), config_(config) {}
|
waybar::Factory::Factory(const Bar& bar, const Json::Value& config) : bar_(bar), config_(config) {}
|
||||||
|
|
||||||
waybar::IModule* waybar::Factory::makeModule(const std::string& name) const {
|
waybar::AModule* waybar::Factory::makeModule(const std::string& name) const {
|
||||||
try {
|
try {
|
||||||
auto hash_pos = name.find('#');
|
auto hash_pos = name.find('#');
|
||||||
auto ref = name.substr(0, hash_pos);
|
auto ref = name.substr(0, hash_pos);
|
||||||
auto id = hash_pos != std::string::npos ? name.substr(hash_pos + 1) : "";
|
auto id = hash_pos != std::string::npos ? name.substr(hash_pos + 1) : "";
|
||||||
|
#ifndef NO_FILESYSTEM
|
||||||
if (ref == "battery") {
|
if (ref == "battery") {
|
||||||
return new waybar::modules::Battery(id, config_[name]);
|
return new waybar::modules::Battery(id, config_[name]);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#ifdef HAVE_SWAY
|
#ifdef HAVE_SWAY
|
||||||
if (ref == "sway/mode") {
|
if (ref == "sway/mode") {
|
||||||
return new waybar::modules::sway::Mode(id, bar_, config_[name]);
|
return new waybar::modules::sway::Mode(id, config_[name]);
|
||||||
}
|
}
|
||||||
if (ref == "sway/workspaces") {
|
if (ref == "sway/workspaces") {
|
||||||
return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);
|
return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);
|
||||||
@ -33,7 +35,10 @@ waybar::IModule* waybar::Factory::makeModule(const std::string& name) const {
|
|||||||
if (ref == "clock") {
|
if (ref == "clock") {
|
||||||
return new waybar::modules::Clock(id, config_[name]);
|
return new waybar::modules::Clock(id, config_[name]);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_DBUSMENU
|
if (ref == "disk") {
|
||||||
|
return new waybar::modules::Disk(id, config_[name]);
|
||||||
|
}
|
||||||
|
#if defined(HAVE_DBUSMENU) && !defined(NO_FILESYSTEM)
|
||||||
if (ref == "tray") {
|
if (ref == "tray") {
|
||||||
return new waybar::modules::SNI::Tray(id, bar_, config_[name]);
|
return new waybar::modules::SNI::Tray(id, bar_, config_[name]);
|
||||||
}
|
}
|
||||||
@ -62,7 +67,7 @@ waybar::IModule* waybar::Factory::makeModule(const std::string& name) const {
|
|||||||
return new waybar::modules::Temperature(id, config_[name]);
|
return new waybar::modules::Temperature(id, config_[name]);
|
||||||
}
|
}
|
||||||
if (ref.compare(0, 7, "custom/") == 0 && ref.size() > 7) {
|
if (ref.compare(0, 7, "custom/") == 0 && ref.size() > 7) {
|
||||||
return new waybar::modules::Custom(ref.substr(7), config_[name]);
|
return new waybar::modules::Custom(ref.substr(7), id, config_[name]);
|
||||||
}
|
}
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());
|
auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <iostream>
|
#include <spdlog/spdlog.h>
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
@ -23,10 +23,10 @@ int main(int argc, char* argv[]) {
|
|||||||
delete client;
|
delete client;
|
||||||
return ret;
|
return ret;
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << e.what() << std::endl;
|
spdlog::error("{}", e.what());
|
||||||
return 1;
|
return 1;
|
||||||
} catch (const Glib::Exception& e) {
|
} catch (const Glib::Exception& e) {
|
||||||
std::cerr << e.what().c_str() << std::endl;
|
spdlog::error("{}", static_cast<std::string>(e.what()));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,12 +88,9 @@ int waybar::modules::Backlight::BacklightDev::get_max() const { return max_; }
|
|||||||
|
|
||||||
void waybar::modules::Backlight::BacklightDev::set_max(int max) { max_ = max; }
|
void waybar::modules::Backlight::BacklightDev::set_max(int max) { max_ = max; }
|
||||||
|
|
||||||
waybar::modules::Backlight::Backlight(const std::string &name, const Json::Value &config)
|
waybar::modules::Backlight::Backlight(const std::string &id, const Json::Value &config)
|
||||||
: ALabel(config, "{percent}%", 2),
|
: ALabel(config, "backlight", id, "{percent}%", 2),
|
||||||
name_(name),
|
|
||||||
preferred_device_(config["device"].isString() ? config["device"].asString() : "") {
|
preferred_device_(config["device"].isString() ? config["device"].asString() : "") {
|
||||||
label_.set_name("backlight");
|
|
||||||
|
|
||||||
// Get initial state
|
// Get initial state
|
||||||
{
|
{
|
||||||
std::unique_ptr<udev, UdevDeleter> udev_check{udev_new()};
|
std::unique_ptr<udev, UdevDeleter> udev_check{udev_new()};
|
||||||
@ -181,6 +178,7 @@ auto waybar::modules::Backlight::update() -> void {
|
|||||||
const auto percent = best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max();
|
const auto percent = best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max();
|
||||||
label_.set_markup(fmt::format(
|
label_.set_markup(fmt::format(
|
||||||
format_, fmt::arg("percent", std::to_string(percent)), fmt::arg("icon", getIcon(percent))));
|
format_, fmt::arg("percent", std::to_string(percent)), fmt::arg("icon", getIcon(percent))));
|
||||||
|
getState(percent);
|
||||||
} else {
|
} else {
|
||||||
if (!previous_best_.has_value()) {
|
if (!previous_best_.has_value()) {
|
||||||
return;
|
return;
|
||||||
@ -212,7 +210,10 @@ void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last,
|
|||||||
const char *name = udev_device_get_sysname(dev);
|
const char *name = udev_device_get_sysname(dev);
|
||||||
check_nn(name);
|
check_nn(name);
|
||||||
|
|
||||||
const char *actual = udev_device_get_sysattr_value(dev, "actual_brightness");
|
const char *actual_brightness_attr =
|
||||||
|
strcmp(name, "amdgpu_bl0") == 0 ? "brightness" : "actual_brightness";
|
||||||
|
|
||||||
|
const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr);
|
||||||
check_nn(actual);
|
check_nn(actual);
|
||||||
const int actual_int = std::stoi(actual);
|
const int actual_int = std::stoi(actual);
|
||||||
|
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
#include "modules/battery.hpp"
|
#include "modules/battery.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config)
|
waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{capacity}%", 60) {
|
: ALabel(config, "battery", id, "{capacity}%", 60) {
|
||||||
label_.set_name("battery");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
getBatteries();
|
getBatteries();
|
||||||
fd_ = inotify_init1(IN_CLOEXEC);
|
fd_ = inotify_init1(IN_CLOEXEC);
|
||||||
if (fd_ == -1) {
|
if (fd_ == -1) {
|
||||||
@ -47,21 +44,21 @@ void waybar::modules::Battery::worker() {
|
|||||||
|
|
||||||
void waybar::modules::Battery::getBatteries() {
|
void waybar::modules::Battery::getBatteries() {
|
||||||
try {
|
try {
|
||||||
for (auto const& node : fs::directory_iterator(data_dir_)) {
|
for (auto& node : fs::directory_iterator(data_dir_)) {
|
||||||
if (!fs::is_directory(node)) {
|
if (!fs::is_directory(node)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
auto dir_name = node.path().filename();
|
auto dir_name = node.path().filename();
|
||||||
auto bat_defined = config_["bat"].isString();
|
auto bat_defined = config_["bat"].isString();
|
||||||
if (((bat_defined && dir_name == config_["bat"].asString()) || !bat_defined) &&
|
if (((bat_defined && dir_name == config_["bat"].asString()) || !bat_defined) &&
|
||||||
fs::exists(node / "capacity") && fs::exists(node / "uevent") &&
|
fs::exists(node.path() / "capacity") && fs::exists(node.path() / "uevent") &&
|
||||||
fs::exists(node / "status")) {
|
fs::exists(node.path() / "status")) {
|
||||||
batteries_.push_back(node);
|
batteries_.push_back(node.path());
|
||||||
}
|
}
|
||||||
auto adap_defined = config_["adapter"].isString();
|
auto adap_defined = config_["adapter"].isString();
|
||||||
if (((adap_defined && dir_name == config_["adapter"].asString()) || !adap_defined) &&
|
if (((adap_defined && dir_name == config_["adapter"].asString()) || !adap_defined) &&
|
||||||
fs::exists(node / "online")) {
|
fs::exists(node.path() / "online")) {
|
||||||
adapter_ = node;
|
adapter_ = node.path();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (fs::filesystem_error& e) {
|
} catch (fs::filesystem_error& e) {
|
||||||
@ -75,25 +72,63 @@ void waybar::modules::Battery::getBatteries() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() const {
|
const std::tuple<uint8_t, float, std::string> waybar::modules::Battery::getInfos() const {
|
||||||
try {
|
try {
|
||||||
uint16_t total = 0;
|
uint16_t total = 0;
|
||||||
|
uint32_t total_power = 0; // μW
|
||||||
|
uint32_t total_energy = 0; // μWh
|
||||||
|
uint32_t total_energy_full = 0;
|
||||||
std::string status = "Unknown";
|
std::string status = "Unknown";
|
||||||
for (auto const& bat : batteries_) {
|
for (auto const& bat : batteries_) {
|
||||||
uint16_t capacity;
|
uint16_t capacity;
|
||||||
|
uint32_t power_now;
|
||||||
|
uint32_t energy_full;
|
||||||
|
uint32_t energy_now;
|
||||||
std::string _status;
|
std::string _status;
|
||||||
std::ifstream(bat / "capacity") >> capacity;
|
std::ifstream(bat / "capacity") >> capacity;
|
||||||
std::ifstream(bat / "status") >> _status;
|
std::ifstream(bat / "status") >> _status;
|
||||||
|
auto rate_path = fs::exists(bat / "current_now") ? "current_now" : "power_now";
|
||||||
|
std::ifstream(bat / rate_path) >> power_now;
|
||||||
|
auto now_path = fs::exists(bat / "charge_now") ? "charge_now" : "energy_now";
|
||||||
|
std::ifstream(bat / now_path) >> energy_now;
|
||||||
|
auto full_path = fs::exists(bat / "charge_full") ? "charge_full" : "energy_full";
|
||||||
|
std::ifstream(bat / full_path) >> energy_full;
|
||||||
if (_status != "Unknown") {
|
if (_status != "Unknown") {
|
||||||
status = _status;
|
status = _status;
|
||||||
}
|
}
|
||||||
total += capacity;
|
total += capacity;
|
||||||
|
total_power += power_now;
|
||||||
|
total_energy += energy_now;
|
||||||
|
total_energy_full += energy_full;
|
||||||
|
}
|
||||||
|
if (!adapter_.empty() && status == "Discharging") {
|
||||||
|
bool online;
|
||||||
|
std::ifstream(adapter_ / "online") >> online;
|
||||||
|
if (online) {
|
||||||
|
status = "Plugged";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
float time_remaining = 0;
|
||||||
|
if (status == "Discharging" && total_power != 0) {
|
||||||
|
time_remaining = (float)total_energy / total_power;
|
||||||
|
} else if (status == "Charging" && total_power != 0) {
|
||||||
|
time_remaining = -(float)(total_energy_full - total_energy) / total_power;
|
||||||
}
|
}
|
||||||
uint16_t capacity = total / batteries_.size();
|
uint16_t capacity = total / batteries_.size();
|
||||||
return {capacity, status};
|
// Handle full-at
|
||||||
|
if (config_["full-at"].isUInt()) {
|
||||||
|
auto full_at = config_["full-at"].asUInt();
|
||||||
|
if (full_at < 100) {
|
||||||
|
capacity = static_cast<float>(capacity / full_at) * 100;
|
||||||
|
if (capacity > full_at) {
|
||||||
|
capacity = full_at;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {capacity, time_remaining, status};
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << e.what() << std::endl;
|
spdlog::error("Battery: {}", e.what());
|
||||||
return {0, "Unknown"};
|
return {0, 0, "Unknown"};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -104,47 +139,51 @@ const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) c
|
|||||||
if (capacity == 100) {
|
if (capacity == 100) {
|
||||||
return "Full";
|
return "Full";
|
||||||
}
|
}
|
||||||
return online ? "Charging" : "Discharging";
|
if (online) {
|
||||||
|
return "Plugged";
|
||||||
|
}
|
||||||
|
return "Discharging";
|
||||||
}
|
}
|
||||||
return "Unknown";
|
return "Unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::string waybar::modules::Battery::getState(uint8_t capacity) const {
|
const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemaining) {
|
||||||
// Get current state
|
hoursRemaining = std::fabs(hoursRemaining);
|
||||||
std::vector<std::pair<std::string, uint8_t>> states;
|
uint16_t full_hours = static_cast<uint16_t>(hoursRemaining);
|
||||||
if (config_["states"].isObject()) {
|
uint16_t minutes = static_cast<uint16_t>(60 * (hoursRemaining - full_hours));
|
||||||
for (auto it = config_["states"].begin(); it != config_["states"].end(); ++it) {
|
auto format = std::string("{H} h {M} min");
|
||||||
if (it->isUInt() && it.key().isString()) {
|
if (config_["format-time"].isString()) {
|
||||||
states.emplace_back(it.key().asString(), it->asUInt());
|
format = config_["format-time"].asString();
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// Sort states
|
return fmt::format(format, fmt::arg("H", full_hours), fmt::arg("M", minutes));
|
||||||
std::sort(states.begin(), states.end(), [](auto& a, auto& b) { return a.second < b.second; });
|
|
||||||
std::string valid_state;
|
|
||||||
for (auto const& state : states) {
|
|
||||||
if (capacity <= state.second && valid_state.empty()) {
|
|
||||||
label_.get_style_context()->add_class(state.first);
|
|
||||||
valid_state = state.first;
|
|
||||||
} else {
|
|
||||||
label_.get_style_context()->remove_class(state.first);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return valid_state;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
auto waybar::modules::Battery::update() -> void {
|
auto waybar::modules::Battery::update() -> void {
|
||||||
auto [capacity, status] = getInfos();
|
auto [capacity, time_remaining, status] = getInfos();
|
||||||
if (status == "Unknown") {
|
if (status == "Unknown") {
|
||||||
status = getAdapterStatus(capacity);
|
status = getAdapterStatus(capacity);
|
||||||
}
|
}
|
||||||
if (tooltipEnabled()) {
|
if (tooltipEnabled()) {
|
||||||
label_.set_tooltip_text(status);
|
std::string tooltip_text;
|
||||||
|
if (time_remaining != 0) {
|
||||||
|
std::string time_to = std::string("Time to ") + ((time_remaining > 0) ? "empty" : "full");
|
||||||
|
tooltip_text = time_to + ": " + formatTimeRemaining(time_remaining);
|
||||||
|
} else {
|
||||||
|
tooltip_text = status;
|
||||||
|
}
|
||||||
|
label_.set_tooltip_text(tooltip_text);
|
||||||
}
|
}
|
||||||
|
// Transform to lowercase
|
||||||
std::transform(status.begin(), status.end(), status.begin(), ::tolower);
|
std::transform(status.begin(), status.end(), status.begin(), ::tolower);
|
||||||
|
// Replace space with dash
|
||||||
|
std::transform(status.begin(), status.end(), status.begin(), [](char ch) {
|
||||||
|
return ch == ' ' ? '-' : ch;
|
||||||
|
});
|
||||||
auto format = format_;
|
auto format = format_;
|
||||||
auto state = getState(capacity);
|
auto state = getState(capacity, true);
|
||||||
label_.get_style_context()->remove_class(old_status_);
|
if (!old_status_.empty()) {
|
||||||
|
label_.get_style_context()->remove_class(old_status_);
|
||||||
|
}
|
||||||
label_.get_style_context()->add_class(status);
|
label_.get_style_context()->add_class(status);
|
||||||
old_status_ = status;
|
old_status_ = status;
|
||||||
if (!state.empty() && config_["format-" + status + "-" + state].isString()) {
|
if (!state.empty() && config_["format-" + status + "-" + state].isString()) {
|
||||||
@ -158,7 +197,9 @@ auto waybar::modules::Battery::update() -> void {
|
|||||||
event_box_.hide();
|
event_box_.hide();
|
||||||
} else {
|
} else {
|
||||||
event_box_.show();
|
event_box_.show();
|
||||||
label_.set_markup(
|
label_.set_markup(fmt::format(format,
|
||||||
fmt::format(format, fmt::arg("capacity", capacity), fmt::arg("icon", getIcon(capacity))));
|
fmt::arg("capacity", capacity),
|
||||||
|
fmt::arg("icon", getIcon(capacity, state)),
|
||||||
|
fmt::arg("time", formatTimeRemaining(time_remaining))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,39 +1,145 @@
|
|||||||
#include "modules/clock.hpp"
|
#include "modules/clock.hpp"
|
||||||
|
#include <sstream>
|
||||||
|
#include <type_traits>
|
||||||
|
#ifdef HAVE_LANGINFO_1STDAY
|
||||||
|
#include <langinfo.h>
|
||||||
|
#include <locale.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
using waybar::modules::waybar_time;
|
||||||
|
|
||||||
waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
|
waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{:%H:%M}", 60) {
|
: ALabel(config, "clock", id, "{:%H:%M}", 60)
|
||||||
label_.set_name("clock");
|
, fixed_time_zone_(false)
|
||||||
if (!id.empty()) {
|
{
|
||||||
label_.get_style_context()->add_class(id);
|
if (config_["timezone"].isString()) {
|
||||||
|
time_zone_ = date::locate_zone(config_["timezone"].asString());
|
||||||
|
fixed_time_zone_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (config_["locale"].isString()) {
|
||||||
|
locale_ = std::locale(config_["locale"].asString());
|
||||||
|
} else {
|
||||||
|
locale_ = std::locale("");
|
||||||
|
}
|
||||||
|
|
||||||
thread_ = [this] {
|
thread_ = [this] {
|
||||||
dp.emit();
|
dp.emit();
|
||||||
auto now = std::chrono::system_clock::now();
|
auto now = std::chrono::system_clock::now();
|
||||||
auto timeout = std::chrono::floor<std::chrono::seconds>(now + interval_);
|
auto timeout = std::chrono::floor<std::chrono::seconds>(now + interval_);
|
||||||
auto time_s = std::chrono::time_point_cast<std::chrono::seconds>(timeout);
|
auto diff = std::chrono::seconds(timeout.time_since_epoch().count() % interval_.count());
|
||||||
auto sub_m =
|
thread_.sleep_until(timeout - diff);
|
||||||
std::chrono::duration_cast<std::chrono::seconds>(time_s.time_since_epoch()).count() %
|
|
||||||
interval_.count();
|
|
||||||
if (sub_m > 0) {
|
|
||||||
thread_.sleep_until(timeout - std::chrono::seconds(sub_m - 1));
|
|
||||||
} else {
|
|
||||||
thread_.sleep_until(timeout - std::chrono::seconds(sub_m));
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
auto waybar::modules::Clock::update() -> void {
|
auto waybar::modules::Clock::update() -> void {
|
||||||
auto localtime = fmt::localtime(std::time(nullptr));
|
if (!fixed_time_zone_) {
|
||||||
auto text = fmt::format(format_, localtime);
|
// Time zone can change. Be sure to pick that.
|
||||||
|
time_zone_ = date::current_zone();
|
||||||
|
}
|
||||||
|
auto now = std::chrono::system_clock::now();
|
||||||
|
waybar_time wtime = {locale_,
|
||||||
|
date::make_zoned(time_zone_, date::floor<std::chrono::seconds>(now))};
|
||||||
|
|
||||||
|
auto text = fmt::format(format_, wtime);
|
||||||
label_.set_markup(text);
|
label_.set_markup(text);
|
||||||
|
|
||||||
if (tooltipEnabled()) {
|
if (tooltipEnabled()) {
|
||||||
if (config_["tooltip-format"].isString()) {
|
if (config_["tooltip-format"].isString()) {
|
||||||
|
const auto calendar = calendar_text(wtime);
|
||||||
auto tooltip_format = config_["tooltip-format"].asString();
|
auto tooltip_format = config_["tooltip-format"].asString();
|
||||||
auto tooltip_text = fmt::format(tooltip_format, localtime);
|
auto tooltip_text = fmt::format(tooltip_format, wtime, fmt::arg("calendar", calendar));
|
||||||
label_.set_tooltip_text(tooltip_text);
|
label_.set_tooltip_markup(tooltip_text);
|
||||||
} else {
|
} else {
|
||||||
label_.set_tooltip_text(text);
|
label_.set_tooltip_markup(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::string {
|
||||||
|
const auto daypoint = date::floor<date::days>(wtime.ztime.get_local_time());
|
||||||
|
const auto ymd = date::year_month_day(daypoint);
|
||||||
|
if (cached_calendar_ymd_ == ymd) {
|
||||||
|
return cached_calendar_text_;
|
||||||
|
}
|
||||||
|
|
||||||
|
const date::year_month ym(ymd.year(), ymd.month());
|
||||||
|
const auto curr_day = ymd.day();
|
||||||
|
|
||||||
|
std::stringstream os;
|
||||||
|
const auto first_dow = first_day_of_week();
|
||||||
|
weekdays_header(first_dow, os);
|
||||||
|
|
||||||
|
// First week prefixed with spaces if needed.
|
||||||
|
auto wd = date::weekday(ym/1);
|
||||||
|
auto empty_days = (wd - first_dow).count();
|
||||||
|
if (empty_days > 0) {
|
||||||
|
os << std::string(empty_days * 3 - 1, ' ');
|
||||||
|
}
|
||||||
|
auto last_day = (ym/date::literals::last).day();
|
||||||
|
for (auto d = date::day(1); d <= last_day; ++d, ++wd) {
|
||||||
|
if (wd != first_dow) {
|
||||||
|
os << ' ';
|
||||||
|
} else if (unsigned(d) != 1) {
|
||||||
|
os << '\n';
|
||||||
|
}
|
||||||
|
if (d == curr_day) {
|
||||||
|
os << "<b><u>" << date::format("%e", d) << "</u></b>";
|
||||||
|
} else {
|
||||||
|
os << date::format("%e", d);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto result = os.str();
|
||||||
|
cached_calendar_ymd_ = ymd;
|
||||||
|
cached_calendar_text_ = result;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto waybar::modules::Clock::weekdays_header(const date::weekday& first_dow, std::ostream& os) -> void {
|
||||||
|
auto wd = first_dow;
|
||||||
|
do {
|
||||||
|
if (wd != first_dow) os << ' ';
|
||||||
|
Glib::ustring wd_ustring(date::format(locale_, "%a", wd));
|
||||||
|
auto wd_len = wd_ustring.length();
|
||||||
|
if (wd_len > 2) {
|
||||||
|
wd_ustring = wd_ustring.substr(0, 2);
|
||||||
|
wd_len = 2;
|
||||||
|
}
|
||||||
|
const std::string pad(2 - wd_len, ' ');
|
||||||
|
os << pad << wd_ustring;
|
||||||
|
} while (++wd != first_dow);
|
||||||
|
os << "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_LANGINFO_1STDAY
|
||||||
|
template <auto fn>
|
||||||
|
using deleter_from_fn = std::integral_constant<decltype(fn), fn>;
|
||||||
|
|
||||||
|
template <typename T, auto fn>
|
||||||
|
using deleting_unique_ptr = std::unique_ptr<T, deleter_from_fn<fn>>;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Computations done similarly to Linux cal utility.
|
||||||
|
auto waybar::modules::Clock::first_day_of_week() -> date::weekday {
|
||||||
|
#ifdef HAVE_LANGINFO_1STDAY
|
||||||
|
deleting_unique_ptr<std::remove_pointer<locale_t>::type, freelocale>
|
||||||
|
posix_locale{newlocale(LC_ALL, locale_.name().c_str(), nullptr)};
|
||||||
|
if (posix_locale) {
|
||||||
|
const int i = (std::intptr_t) nl_langinfo_l(_NL_TIME_WEEK_1STDAY, posix_locale.get());
|
||||||
|
auto ymd = date::year(i / 10000)/(i / 100 % 100)/(i % 100);
|
||||||
|
auto wd = date::weekday(ymd);
|
||||||
|
uint8_t j = *nl_langinfo_l(_NL_TIME_FIRST_WEEKDAY, posix_locale.get());
|
||||||
|
return wd + date::days(j - 1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return date::Sunday;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const waybar_time& t, FormatContext& ctx) {
|
||||||
|
return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
#include "modules/cpu.hpp"
|
#include "modules/cpu.hpp"
|
||||||
|
#include <numeric>
|
||||||
|
|
||||||
waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config)
|
waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{usage}%", 10) {
|
: ALabel(config, "cpu", id, "{usage}%", 10) {
|
||||||
label_.set_name("cpu");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
thread_ = [this] {
|
thread_ = [this] {
|
||||||
dp.emit();
|
dp.emit();
|
||||||
thread_.sleep_for(interval_);
|
thread_.sleep_for(interval_);
|
||||||
@ -20,6 +17,7 @@ auto waybar::modules::Cpu::update() -> void {
|
|||||||
label_.set_tooltip_text(tooltip);
|
label_.set_tooltip_text(tooltip);
|
||||||
}
|
}
|
||||||
label_.set_markup(fmt::format(format_, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
|
label_.set_markup(fmt::format(format_, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
|
||||||
|
getState(cpu_usage);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t waybar::modules::Cpu::getCpuLoad() {
|
uint16_t waybar::modules::Cpu::getCpuLoad() {
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
#include "modules/custom.hpp"
|
#include "modules/custom.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
waybar::modules::Custom::Custom(const std::string& name, const Json::Value& config)
|
waybar::modules::Custom::Custom(const std::string& name, const std::string& id,
|
||||||
: ALabel(config, "{}"), name_(name), fp_(nullptr), pid_(-1) {
|
const Json::Value& config)
|
||||||
label_.set_name("custom-" + name_);
|
: ALabel(config, "custom-" + name, id, "{}"), name_(name), fp_(nullptr), pid_(-1) {
|
||||||
if (config_["exec"].isString()) {
|
if (config_["exec"].isString()) {
|
||||||
if (interval_.count() > 0) {
|
if (interval_.count() > 0) {
|
||||||
delayWorker();
|
delayWorker();
|
||||||
@ -24,14 +25,14 @@ void waybar::modules::Custom::delayWorker() {
|
|||||||
thread_ = [this] {
|
thread_ = [this] {
|
||||||
bool can_update = true;
|
bool can_update = true;
|
||||||
if (config_["exec-if"].isString()) {
|
if (config_["exec-if"].isString()) {
|
||||||
auto res = waybar::util::command::exec(config_["exec-if"].asString());
|
auto res = util::command::exec(config_["exec-if"].asString());
|
||||||
if (res.exit_code != 0) {
|
if (res.exit_code != 0) {
|
||||||
can_update = false;
|
can_update = false;
|
||||||
event_box_.hide();
|
event_box_.hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (can_update) {
|
if (can_update) {
|
||||||
output_ = waybar::util::command::exec(config_["exec"].asString());
|
output_ = util::command::exec(config_["exec"].asString());
|
||||||
dp.emit();
|
dp.emit();
|
||||||
}
|
}
|
||||||
thread_.sleep_for(interval_);
|
thread_.sleep_for(interval_);
|
||||||
@ -48,19 +49,24 @@ void waybar::modules::Custom::continuousWorker() {
|
|||||||
thread_ = [&] {
|
thread_ = [&] {
|
||||||
char* buff = nullptr;
|
char* buff = nullptr;
|
||||||
size_t len = 0;
|
size_t len = 0;
|
||||||
|
bool restart = false;
|
||||||
if (getline(&buff, &len, fp_) == -1) {
|
if (getline(&buff, &len, fp_) == -1) {
|
||||||
int exit_code = 1;
|
int exit_code = 1;
|
||||||
if (fp_) {
|
if (fp_) {
|
||||||
exit_code = WEXITSTATUS(util::command::close(fp_, pid_));
|
exit_code = WEXITSTATUS(util::command::close(fp_, pid_));
|
||||||
fp_ = nullptr;
|
fp_ = nullptr;
|
||||||
}
|
}
|
||||||
thread_.stop();
|
|
||||||
if (exit_code != 0) {
|
if (exit_code != 0) {
|
||||||
output_ = {exit_code, ""};
|
output_ = {exit_code, ""};
|
||||||
dp.emit();
|
dp.emit();
|
||||||
std::cerr << name_ + " just stopped unexpectedly, is it endless?" << std::endl;
|
spdlog::error("{} stopped unexpectedly, is it endless?", name_);
|
||||||
|
}
|
||||||
|
if (config_["restart-interval"].isUInt()) {
|
||||||
|
restart = true;
|
||||||
|
} else {
|
||||||
|
thread_.stop();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
std::string output = buff;
|
std::string output = buff;
|
||||||
|
|
||||||
@ -70,15 +76,35 @@ void waybar::modules::Custom::continuousWorker() {
|
|||||||
}
|
}
|
||||||
output_ = {0, output};
|
output_ = {0, output};
|
||||||
dp.emit();
|
dp.emit();
|
||||||
|
if (restart) {
|
||||||
|
pid_ = -1;
|
||||||
|
fp_ = util::command::open(cmd, pid_);
|
||||||
|
if (!fp_) {
|
||||||
|
throw std::runtime_error("Unable to open " + cmd);
|
||||||
|
}
|
||||||
|
thread_.sleep_for(std::chrono::seconds(config_["restart-interval"].asUInt()));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Custom::refresh(int sig /*signal*/) {
|
void waybar::modules::Custom::refresh(int sig) {
|
||||||
if (sig == SIGRTMIN + config_["signal"].asInt()) {
|
if (sig == SIGRTMIN + config_["signal"].asInt()) {
|
||||||
thread_.wake_up();
|
thread_.wake_up();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool waybar::modules::Custom::handleScroll(GdkEventScroll* e) {
|
||||||
|
auto ret = ALabel::handleScroll(e);
|
||||||
|
thread_.wake_up();
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool waybar::modules::Custom::handleToggle(GdkEventButton* const& e) {
|
||||||
|
auto ret = ALabel::handleToggle(e);
|
||||||
|
thread_.wake_up();
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
auto waybar::modules::Custom::update() -> void {
|
auto waybar::modules::Custom::update() -> void {
|
||||||
// Hide label if output is empty
|
// Hide label if output is empty
|
||||||
if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
|
if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
|
||||||
@ -89,29 +115,31 @@ auto waybar::modules::Custom::update() -> void {
|
|||||||
} else {
|
} else {
|
||||||
parseOutputRaw();
|
parseOutputRaw();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto str = fmt::format(format_,
|
auto str = fmt::format(format_,
|
||||||
text_,
|
text_,
|
||||||
fmt::arg("alt", alt_),
|
fmt::arg("alt", alt_),
|
||||||
fmt::arg("icon", getIcon(percentage_, alt_)),
|
fmt::arg("icon", getIcon(percentage_, alt_)),
|
||||||
fmt::arg("percentage", percentage_));
|
fmt::arg("percentage", percentage_));
|
||||||
label_.set_markup(str);
|
if (str.empty()) {
|
||||||
if (tooltipEnabled()) {
|
event_box_.hide();
|
||||||
if (text_ == tooltip_) {
|
} else {
|
||||||
label_.set_tooltip_text(str);
|
label_.set_markup(str);
|
||||||
} else {
|
if (tooltipEnabled()) {
|
||||||
label_.set_tooltip_text(tooltip_);
|
if (text_ == tooltip_) {
|
||||||
|
label_.set_tooltip_text(str);
|
||||||
|
} else {
|
||||||
|
label_.set_tooltip_text(tooltip_);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
auto classes = label_.get_style_context()->list_classes();
|
||||||
|
for (auto const& c : classes) {
|
||||||
|
label_.get_style_context()->remove_class(c);
|
||||||
|
}
|
||||||
|
for (auto const& c : class_) {
|
||||||
|
label_.get_style_context()->add_class(c);
|
||||||
|
}
|
||||||
|
event_box_.show();
|
||||||
}
|
}
|
||||||
auto classes = label_.get_style_context()->list_classes();
|
|
||||||
for (auto const& c : classes) {
|
|
||||||
label_.get_style_context()->remove_class(c);
|
|
||||||
}
|
|
||||||
for (auto const& c : class_) {
|
|
||||||
label_.get_style_context()->add_class(c);
|
|
||||||
}
|
|
||||||
|
|
||||||
event_box_.show();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
76
src/modules/disk.cpp
Normal file
76
src/modules/disk.cpp
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
#include "modules/disk.hpp"
|
||||||
|
|
||||||
|
using namespace waybar::util;
|
||||||
|
|
||||||
|
waybar::modules::Disk::Disk(const std::string& id, const Json::Value& config)
|
||||||
|
: ALabel(config, "disk", id, "{}%", 30)
|
||||||
|
, path_("/")
|
||||||
|
{
|
||||||
|
thread_ = [this] {
|
||||||
|
dp.emit();
|
||||||
|
thread_.sleep_for(interval_);
|
||||||
|
};
|
||||||
|
if (config["path"].isString()) {
|
||||||
|
path_ = config["path"].asString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto waybar::modules::Disk::update() -> void {
|
||||||
|
struct statvfs /* {
|
||||||
|
unsigned long f_bsize; // filesystem block size
|
||||||
|
unsigned long f_frsize; // fragment size
|
||||||
|
fsblkcnt_t f_blocks; // size of fs in f_frsize units
|
||||||
|
fsblkcnt_t f_bfree; // # free blocks
|
||||||
|
fsblkcnt_t f_bavail; // # free blocks for unprivileged users
|
||||||
|
fsfilcnt_t f_files; // # inodes
|
||||||
|
fsfilcnt_t f_ffree; // # free inodes
|
||||||
|
fsfilcnt_t f_favail; // # free inodes for unprivileged users
|
||||||
|
unsigned long f_fsid; // filesystem ID
|
||||||
|
unsigned long f_flag; // mount flags
|
||||||
|
unsigned long f_namemax; // maximum filename length
|
||||||
|
}; */ stats;
|
||||||
|
int err = statvfs(path_.c_str(), &stats);
|
||||||
|
|
||||||
|
/* Conky options
|
||||||
|
fs_bar - Bar that shows how much space is used
|
||||||
|
fs_free - Free space on a file system
|
||||||
|
fs_free_perc - Free percentage of space
|
||||||
|
fs_size - File system size
|
||||||
|
fs_used - File system used space
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (err != 0) {
|
||||||
|
event_box_.hide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto free = pow_format(stats.f_bavail * stats.f_bsize, "B", true);
|
||||||
|
auto used = pow_format((stats.f_blocks - stats.f_bavail) * stats.f_bsize, "B", true);
|
||||||
|
auto total = pow_format(stats.f_blocks * stats.f_bsize, "B", true);
|
||||||
|
|
||||||
|
label_.set_markup(fmt::format(format_
|
||||||
|
, stats.f_bavail * 100 / stats.f_blocks
|
||||||
|
, fmt::arg("free", free)
|
||||||
|
, fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks)
|
||||||
|
, fmt::arg("used", used)
|
||||||
|
, fmt::arg("percentage_used", (stats.f_blocks - stats.f_bavail) * 100 / stats.f_blocks)
|
||||||
|
, fmt::arg("total", total)
|
||||||
|
, fmt::arg("path", path_)
|
||||||
|
));
|
||||||
|
if (tooltipEnabled()) {
|
||||||
|
std::string tooltip_format = "{used} used out of {total} on {path} ({percentage_used}%)";
|
||||||
|
if (config_["tooltip-format"].isString()) {
|
||||||
|
tooltip_format = config_["tooltip-format"].asString();
|
||||||
|
}
|
||||||
|
label_.set_tooltip_text(fmt::format(tooltip_format
|
||||||
|
, stats.f_bavail * 100 / stats.f_blocks
|
||||||
|
, fmt::arg("free", free)
|
||||||
|
, fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks)
|
||||||
|
, fmt::arg("used", used)
|
||||||
|
, fmt::arg("percentage_used", (stats.f_blocks - stats.f_bavail) * 100 / stats.f_blocks)
|
||||||
|
, fmt::arg("total", total)
|
||||||
|
, fmt::arg("path", path_)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
event_box_.show();
|
||||||
|
}
|
@ -3,15 +3,11 @@
|
|||||||
|
|
||||||
waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar,
|
waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar,
|
||||||
const Json::Value& config)
|
const Json::Value& config)
|
||||||
: ALabel(config, "{status}"),
|
: ALabel(config, "idle_inhibitor", id, "{status}"),
|
||||||
bar_(bar),
|
bar_(bar),
|
||||||
status_("deactivated"),
|
status_("deactivated"),
|
||||||
idle_inhibitor_(nullptr),
|
idle_inhibitor_(nullptr),
|
||||||
pid_(-1) {
|
pid_(-1) {
|
||||||
label_.set_name("idle_inhibitor");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
||||||
event_box_.signal_button_press_event().connect(
|
event_box_.signal_button_press_event().connect(
|
||||||
sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
|
sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
|
||||||
@ -50,13 +46,8 @@ bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
|
|||||||
waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
|
waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
|
||||||
status_ = "activated";
|
status_ = "activated";
|
||||||
}
|
}
|
||||||
if (config_["on-click"].isString() && e->button == 1) {
|
click_param = status_;
|
||||||
pid_ = waybar::util::command::forkExec(config_["on-click"].asString());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ALabel::handleToggle(e);
|
|
||||||
}
|
}
|
||||||
|
ALabel::handleToggle(e);
|
||||||
dp.emit();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,7 @@
|
|||||||
#include "modules/memory.hpp"
|
#include "modules/memory.hpp"
|
||||||
|
|
||||||
waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config)
|
waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{}%", 30) {
|
: ALabel(config, "memory", id, "{}%", 30) {
|
||||||
label_.set_name("memory");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
thread_ = [this] {
|
thread_ = [this] {
|
||||||
dp.emit();
|
dp.emit();
|
||||||
thread_.sleep_for(interval_);
|
thread_.sleep_for(interval_);
|
||||||
@ -14,10 +10,31 @@ waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config
|
|||||||
|
|
||||||
auto waybar::modules::Memory::update() -> void {
|
auto waybar::modules::Memory::update() -> void {
|
||||||
parseMeminfo();
|
parseMeminfo();
|
||||||
if (memtotal_ > 0 && memfree_ >= 0) {
|
|
||||||
int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
|
unsigned long memtotal = meminfo_["MemTotal"];
|
||||||
label_.set_markup(fmt::format(format_, used_ram_percentage));
|
unsigned long memfree;
|
||||||
auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2);
|
if (meminfo_.count("MemAvailable")) {
|
||||||
|
// New kernels (3.4+) have an accurate available memory field.
|
||||||
|
memfree = meminfo_["MemAvailable"];
|
||||||
|
} else {
|
||||||
|
// Old kernel; give a best-effort approximation of available memory.
|
||||||
|
memfree = meminfo_["MemFree"] + meminfo_["Buffers"] + meminfo_["Cached"] +
|
||||||
|
meminfo_["SReclaimable"] - meminfo_["Shmem"];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (memtotal > 0 && memfree >= 0) {
|
||||||
|
auto total_ram_gigabytes = memtotal / std::pow(1024, 2);
|
||||||
|
int used_ram_percentage = 100 * (memtotal - memfree) / memtotal;
|
||||||
|
auto used_ram_gigabytes = (memtotal - memfree) / std::pow(1024, 2);
|
||||||
|
auto available_ram_gigabytes = memfree / std::pow(1024, 2);
|
||||||
|
|
||||||
|
getState(used_ram_percentage);
|
||||||
|
label_.set_markup(fmt::format(format_,
|
||||||
|
used_ram_percentage,
|
||||||
|
fmt::arg("total", total_ram_gigabytes),
|
||||||
|
fmt::arg("percentage", used_ram_percentage),
|
||||||
|
fmt::arg("used", used_ram_gigabytes),
|
||||||
|
fmt::arg("avail", available_ram_gigabytes)));
|
||||||
if (tooltipEnabled()) {
|
if (tooltipEnabled()) {
|
||||||
label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
|
label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
|
||||||
}
|
}
|
||||||
@ -28,7 +45,6 @@ auto waybar::modules::Memory::update() -> void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Memory::parseMeminfo() {
|
void waybar::modules::Memory::parseMeminfo() {
|
||||||
int64_t memfree = -1, membuffer = -1, memcache = -1, memavail = -1;
|
|
||||||
std::ifstream info(data_dir_);
|
std::ifstream info(data_dir_);
|
||||||
if (!info.is_open()) {
|
if (!info.is_open()) {
|
||||||
throw std::runtime_error("Can't open " + data_dir_);
|
throw std::runtime_error("Can't open " + data_dir_);
|
||||||
@ -39,23 +55,9 @@ void waybar::modules::Memory::parseMeminfo() {
|
|||||||
if (posDelim == std::string::npos) {
|
if (posDelim == std::string::npos) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string name = line.substr(0, posDelim);
|
std::string name = line.substr(0, posDelim);
|
||||||
int64_t value = std::stol(line.substr(posDelim + 1));
|
int64_t value = std::stol(line.substr(posDelim + 1));
|
||||||
|
meminfo_[name] = value;
|
||||||
if (name.compare("MemTotal") == 0) {
|
|
||||||
memtotal_ = value;
|
|
||||||
} else if (name.compare("MemAvailable") == 0) {
|
|
||||||
memavail = value;
|
|
||||||
} else if (name.compare("MemFree") == 0) {
|
|
||||||
memfree = value;
|
|
||||||
} else if (name.compare("Buffers") == 0) {
|
|
||||||
membuffer = value;
|
|
||||||
} else if (name.compare("Cached") == 0) {
|
|
||||||
memcache = value;
|
|
||||||
}
|
|
||||||
if (memtotal_ > 0 && (memavail >= 0 || (memfree > -1 && membuffer > -1 && memcache > -1))) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
memfree_ = memavail >= 0 ? memavail : memfree + membuffer + memcache;
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
#include "modules/mpd.hpp"
|
#include "modules/mpd.hpp"
|
||||||
|
|
||||||
#include <fmt/chrono.h>
|
#include <fmt/chrono.h>
|
||||||
#include <iostream>
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
|
waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{album} - {artist} - {title}", 5),
|
: ALabel(config, "mpd", id, "{album} - {artist} - {title}", 5),
|
||||||
module_name_(id.empty() ? "mpd" : "mpd#" + id),
|
module_name_(id.empty() ? "mpd" : "mpd#" + id),
|
||||||
server_(nullptr),
|
server_(nullptr),
|
||||||
port_(config_["port"].isUInt() ? config["port"].asUInt() : 0),
|
port_(config_["port"].isUInt() ? config["port"].asUInt() : 0),
|
||||||
@ -14,21 +14,16 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
|
|||||||
status_(nullptr, &mpd_status_free),
|
status_(nullptr, &mpd_status_free),
|
||||||
song_(nullptr, &mpd_song_free) {
|
song_(nullptr, &mpd_song_free) {
|
||||||
if (!config_["port"].isNull() && !config_["port"].isUInt()) {
|
if (!config_["port"].isNull() && !config_["port"].isUInt()) {
|
||||||
std::cerr << module_name_ << ": `port` configuration should be an unsigned int" << std::endl;
|
spdlog::warn("{}: `port` configuration should be an unsigned int", module_name_);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!config_["timeout"].isNull() && !config_["timeout"].isUInt()) {
|
if (!config_["timeout"].isNull() && !config_["timeout"].isUInt()) {
|
||||||
std::cerr << module_name_ << ": `timeout` configuration should be an unsigned int" << std::endl;
|
spdlog::warn("{}: `timeout` configuration should be an unsigned int", module_name_);
|
||||||
}
|
|
||||||
|
|
||||||
label_.set_name("mpd");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!config["server"].isNull()) {
|
if (!config["server"].isNull()) {
|
||||||
if (!config_["server"].isString()) {
|
if (!config_["server"].isString()) {
|
||||||
std::cerr << module_name_ << "`server` configuration should be a string" << std::endl;
|
spdlog::warn("{}:`server` configuration should be a string", module_name_);
|
||||||
}
|
}
|
||||||
server_ = config["server"].asCString();
|
server_ = config["server"].asCString();
|
||||||
}
|
}
|
||||||
@ -46,12 +41,16 @@ auto waybar::modules::MPD::update() -> void {
|
|||||||
if (connection_ != nullptr) {
|
if (connection_ != nullptr) {
|
||||||
try {
|
try {
|
||||||
bool wasPlaying = playing();
|
bool wasPlaying = playing();
|
||||||
|
if(!wasPlaying) {
|
||||||
|
// Wait until the periodic_updater has stopped
|
||||||
|
std::lock_guard periodic_guard(periodic_lock_);
|
||||||
|
}
|
||||||
fetchState();
|
fetchState();
|
||||||
if (!wasPlaying && playing()) {
|
if (!wasPlaying && playing()) {
|
||||||
periodic_updater().detach();
|
periodic_updater().detach();
|
||||||
}
|
}
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << module_name_ + ": " + e.what() << std::endl;
|
spdlog::error("{}: {}", module_name_, e.what());
|
||||||
state_ = MPD_STATE_UNKNOWN;
|
state_ = MPD_STATE_UNKNOWN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -65,14 +64,14 @@ std::thread waybar::modules::MPD::event_listener() {
|
|||||||
try {
|
try {
|
||||||
if (connection_ == nullptr) {
|
if (connection_ == nullptr) {
|
||||||
// Retry periodically if no connection
|
// Retry periodically if no connection
|
||||||
update();
|
dp.emit();
|
||||||
std::this_thread::sleep_for(interval_);
|
std::this_thread::sleep_for(interval_);
|
||||||
} else {
|
} else {
|
||||||
waitForEvent();
|
waitForEvent();
|
||||||
dp.emit();
|
dp.emit();
|
||||||
}
|
}
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << module_name_ + ": " + e.what() << std::endl;
|
spdlog::warn("{}: {}", module_name_, e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -80,6 +79,7 @@ std::thread waybar::modules::MPD::event_listener() {
|
|||||||
|
|
||||||
std::thread waybar::modules::MPD::periodic_updater() {
|
std::thread waybar::modules::MPD::periodic_updater() {
|
||||||
return std::thread([this] {
|
return std::thread([this] {
|
||||||
|
std::lock_guard guard(periodic_lock_);
|
||||||
while (connection_ != nullptr && playing()) {
|
while (connection_ != nullptr && playing()) {
|
||||||
dp.emit();
|
dp.emit();
|
||||||
std::this_thread::sleep_for(std::chrono::seconds(1));
|
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||||
@ -140,7 +140,9 @@ void waybar::modules::MPD::setLabel() {
|
|||||||
if (playing()) {
|
if (playing()) {
|
||||||
label_.get_style_context()->add_class("playing");
|
label_.get_style_context()->add_class("playing");
|
||||||
label_.get_style_context()->remove_class("paused");
|
label_.get_style_context()->remove_class("paused");
|
||||||
} else {
|
} else if (paused()) {
|
||||||
|
format =
|
||||||
|
config_["format-paused"].isString() ? config_["format-paused"].asString() : config_["format"].asString();
|
||||||
label_.get_style_context()->add_class("paused");
|
label_.get_style_context()->add_class("paused");
|
||||||
label_.get_style_context()->remove_class("playing");
|
label_.get_style_context()->remove_class("playing");
|
||||||
}
|
}
|
||||||
@ -206,12 +208,12 @@ std::string waybar::modules::MPD::getStateIcon() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (connection_ == nullptr) {
|
if (connection_ == nullptr) {
|
||||||
std::cerr << module_name_ << ": Trying to fetch state icon while disconnected" << std::endl;
|
spdlog::warn("{}: Trying to fetch state icon while disconnected", module_name_);
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stopped()) {
|
if (stopped()) {
|
||||||
std::cerr << module_name_ << ": Trying to fetch state icon while stopped" << std::endl;
|
spdlog::warn("{}: Trying to fetch state icon while stopped", module_name_);
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -228,7 +230,7 @@ std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool act
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (connection_ == nullptr) {
|
if (connection_ == nullptr) {
|
||||||
std::cerr << module_name_ << ": Trying to fetch option icon while disconnected" << std::endl;
|
spdlog::warn("{}: Trying to fetch option icon while disconnected", module_name_);
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -251,7 +253,7 @@ void waybar::modules::MPD::tryConnect() {
|
|||||||
unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free);
|
unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free);
|
||||||
|
|
||||||
if (connection_ == nullptr || alternate_connection_ == nullptr) {
|
if (connection_ == nullptr || alternate_connection_ == nullptr) {
|
||||||
std::cerr << module_name_ << ": Failed to connect to MPD" << std::endl;
|
spdlog::error("{}: Failed to connect to MPD", module_name_);
|
||||||
connection_.reset();
|
connection_.reset();
|
||||||
alternate_connection_.reset();
|
alternate_connection_.reset();
|
||||||
return;
|
return;
|
||||||
@ -259,9 +261,9 @@ void waybar::modules::MPD::tryConnect() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
checkErrors(connection_.get());
|
checkErrors(connection_.get());
|
||||||
std::cerr << module_name_ << ": Connected to MPD" << std::endl;
|
spdlog::info("{}: Connected to MPD", module_name_);
|
||||||
} catch (std::runtime_error& e) {
|
} catch (std::runtime_error& e) {
|
||||||
std::cerr << module_name_ << ": Failed to connect to MPD: " << e.what() << std::endl;
|
spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what());
|
||||||
connection_.reset();
|
connection_.reset();
|
||||||
alternate_connection_.reset();
|
alternate_connection_.reset();
|
||||||
}
|
}
|
||||||
@ -302,7 +304,7 @@ void waybar::modules::MPD::waitForEvent() {
|
|||||||
// Wait for a player (play/pause), option (random, shuffle, etc.), or playlist
|
// Wait for a player (play/pause), option (random, shuffle, etc.), or playlist
|
||||||
// change
|
// change
|
||||||
if (!mpd_send_idle_mask(
|
if (!mpd_send_idle_mask(
|
||||||
conn, static_cast<mpd_idle>(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_PLAYLIST))) {
|
conn, static_cast<mpd_idle>(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) {
|
||||||
checkErrors(conn);
|
checkErrors(conn);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -311,6 +313,10 @@ void waybar::modules::MPD::waitForEvent() {
|
|||||||
// See issue #277:
|
// See issue #277:
|
||||||
// https://github.com/Alexays/Waybar/issues/277
|
// https://github.com/Alexays/Waybar/issues/277
|
||||||
mpd_recv_idle(conn, /* disable_timeout = */ false);
|
mpd_recv_idle(conn, /* disable_timeout = */ false);
|
||||||
|
// See issue #281:
|
||||||
|
// https://github.com/Alexays/Waybar/issues/281
|
||||||
|
std::lock_guard guard(connection_lock_);
|
||||||
|
|
||||||
checkErrors(conn);
|
checkErrors(conn);
|
||||||
mpd_response_finish(conn);
|
mpd_response_finish(conn);
|
||||||
|
|
||||||
@ -342,3 +348,5 @@ bool waybar::modules::MPD::stopped() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; }
|
bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; }
|
||||||
|
|
||||||
|
bool waybar::modules::MPD::paused() { return connection_ != nullptr && state_ == MPD_STATE_PAUSE; }
|
||||||
|
@ -1,33 +1,115 @@
|
|||||||
#include "modules/network.hpp"
|
#include "modules/network.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
#include <sys/eventfd.h>
|
#include <sys/eventfd.h>
|
||||||
|
#include <fstream>
|
||||||
|
#include <cassert>
|
||||||
|
#include "util/format.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
using namespace waybar::util;
|
||||||
|
|
||||||
|
constexpr const char *NETSTAT_FILE =
|
||||||
|
"/proc/net/netstat"; // std::ifstream does not take std::string_view as param
|
||||||
|
constexpr std::string_view BANDWIDTH_CATEGORY = "IpExt";
|
||||||
|
constexpr std::string_view BANDWIDTH_DOWN_TOTAL_KEY = "InOctets";
|
||||||
|
constexpr std::string_view BANDWIDTH_UP_TOTAL_KEY = "OutOctets";
|
||||||
|
|
||||||
|
std::ifstream netstat(NETSTAT_FILE);
|
||||||
|
std::optional<unsigned long long> read_netstat(std::string_view category, std::string_view key) {
|
||||||
|
if (!netstat) {
|
||||||
|
spdlog::warn("Failed to open netstat file {}", NETSTAT_FILE);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
netstat.seekg(std::ios_base::beg);
|
||||||
|
|
||||||
|
// finding corresponding line (category)
|
||||||
|
// looks into the file for the first line starting by the 'category' string
|
||||||
|
auto starts_with = [](const std::string &str, std::string_view start) {
|
||||||
|
return start == std::string_view{str.data(), std::min(str.size(), start.size())};
|
||||||
|
};
|
||||||
|
|
||||||
|
std::string read;
|
||||||
|
while (std::getline(netstat, read) && !starts_with(read, category))
|
||||||
|
;
|
||||||
|
if (!starts_with(read, category)) {
|
||||||
|
spdlog::warn("Category '{}' not found in netstat file {}", category, NETSTAT_FILE);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// finding corresponding column (key)
|
||||||
|
// looks into the fetched line for the first word (space separated) equal to 'key'
|
||||||
|
int index = 0;
|
||||||
|
auto r_it = read.begin();
|
||||||
|
auto k_it = key.begin();
|
||||||
|
while (k_it != key.end() && r_it != read.end()) {
|
||||||
|
if (*r_it != *k_it) {
|
||||||
|
r_it = std::find(r_it, read.end(), ' ');
|
||||||
|
if (r_it != read.end()) {
|
||||||
|
++r_it;
|
||||||
|
}
|
||||||
|
k_it = key.begin();
|
||||||
|
++index;
|
||||||
|
} else {
|
||||||
|
++r_it;
|
||||||
|
++k_it;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (r_it == read.end() && k_it != key.end()) {
|
||||||
|
spdlog::warn(
|
||||||
|
"Key '{}' not found in category '{}' of netstat file {}", key, category, NETSTAT_FILE);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// finally accessing value
|
||||||
|
// accesses the line right under the fetched one
|
||||||
|
std::getline(netstat, read);
|
||||||
|
assert(starts_with(read, category));
|
||||||
|
std::istringstream iss(read);
|
||||||
|
while (index--) {
|
||||||
|
std::getline(iss, read, ' ');
|
||||||
|
}
|
||||||
|
unsigned long long value;
|
||||||
|
iss >> value;
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
} // namespace
|
||||||
|
|
||||||
waybar::modules::Network::Network(const std::string &id, const Json::Value &config)
|
waybar::modules::Network::Network(const std::string &id, const Json::Value &config)
|
||||||
: ALabel(config, "{ifname}", 60),
|
: ALabel(config, "network", id, "{ifname}", 60),
|
||||||
family_(AF_INET),
|
ifid_(-1),
|
||||||
|
family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET),
|
||||||
efd_(-1),
|
efd_(-1),
|
||||||
ev_fd_(-1),
|
ev_fd_(-1),
|
||||||
cidr_(-1),
|
cidr_(-1),
|
||||||
signal_strength_dbm_(0),
|
signal_strength_dbm_(0),
|
||||||
signal_strength_(0) {
|
signal_strength_(0),
|
||||||
label_.set_name("network");
|
frequency_(0) {
|
||||||
if (!id.empty()) {
|
auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY);
|
||||||
label_.get_style_context()->add_class(id);
|
auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY);
|
||||||
}
|
if (down_octets) {
|
||||||
createInfoSocket();
|
bandwidth_down_total_ = *down_octets;
|
||||||
createEventSocket();
|
|
||||||
if (config_["interface"].isString()) {
|
|
||||||
ifid_ = if_nametoindex(config_["interface"].asCString());
|
|
||||||
ifname_ = config_["interface"].asString();
|
|
||||||
if (ifid_ <= 0) {
|
|
||||||
throw std::runtime_error("Can't found network interface");
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
ifid_ = getExternalInterface();
|
bandwidth_down_total_ = 0;
|
||||||
if (ifid_ > 0) {
|
}
|
||||||
char ifname[IF_NAMESIZE];
|
|
||||||
if_indextoname(ifid_, ifname);
|
if (up_octets) {
|
||||||
ifname_ = ifname;
|
bandwidth_up_total_ = *up_octets;
|
||||||
}
|
} else {
|
||||||
|
bandwidth_up_total_ = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
createEventSocket();
|
||||||
|
createInfoSocket();
|
||||||
|
auto default_iface = getPreferredIface(-1, false);
|
||||||
|
if (default_iface != -1) {
|
||||||
|
ifid_ = default_iface;
|
||||||
|
char ifname[IF_NAMESIZE];
|
||||||
|
if_indextoname(default_iface, ifname);
|
||||||
|
ifname_ = ifname;
|
||||||
|
getInterfaceAddress();
|
||||||
}
|
}
|
||||||
dp.emit();
|
dp.emit();
|
||||||
worker();
|
worker();
|
||||||
@ -42,39 +124,45 @@ waybar::modules::Network::~Network() {
|
|||||||
if (efd_ > -1) {
|
if (efd_ > -1) {
|
||||||
close(efd_);
|
close(efd_);
|
||||||
}
|
}
|
||||||
if (info_sock_ != nullptr) {
|
if (ev_sock_ != nullptr) {
|
||||||
nl_socket_drop_membership(info_sock_, RTMGRP_LINK);
|
nl_socket_drop_membership(ev_sock_, RTNLGRP_LINK);
|
||||||
nl_socket_drop_membership(info_sock_, RTMGRP_IPV4_IFADDR);
|
if (family_ == AF_INET) {
|
||||||
nl_close(info_sock_);
|
nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV4_IFADDR);
|
||||||
nl_socket_free(info_sock_);
|
} else {
|
||||||
|
nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV6_IFADDR);
|
||||||
|
}
|
||||||
|
nl_close(ev_sock_);
|
||||||
|
nl_socket_free(ev_sock_);
|
||||||
}
|
}
|
||||||
if (sk_ != nullptr) {
|
if (sock_ != nullptr) {
|
||||||
nl_close(sk_);
|
nl_close(sock_);
|
||||||
nl_socket_free(sk_);
|
nl_socket_free(sock_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Network::createInfoSocket() {
|
void waybar::modules::Network::createEventSocket() {
|
||||||
info_sock_ = nl_socket_alloc();
|
ev_sock_ = nl_socket_alloc();
|
||||||
if (nl_connect(info_sock_, NETLINK_ROUTE) != 0) {
|
nl_socket_disable_seq_check(ev_sock_);
|
||||||
|
nl_socket_modify_cb(ev_sock_, NL_CB_VALID, NL_CB_CUSTOM, handleEvents, this);
|
||||||
|
auto groups = RTMGRP_LINK | (family_ == AF_INET ? RTMGRP_IPV4_IFADDR : RTMGRP_IPV6_IFADDR);
|
||||||
|
nl_join_groups(ev_sock_, groups); // Deprecated
|
||||||
|
if (nl_connect(ev_sock_, NETLINK_ROUTE) != 0) {
|
||||||
throw std::runtime_error("Can't connect network socket");
|
throw std::runtime_error("Can't connect network socket");
|
||||||
}
|
}
|
||||||
if (nl_socket_add_membership(info_sock_, RTMGRP_LINK) != 0) {
|
nl_socket_add_membership(ev_sock_, RTNLGRP_LINK);
|
||||||
throw std::runtime_error("Can't add membership");
|
if (family_ == AF_INET) {
|
||||||
|
nl_socket_add_membership(ev_sock_, RTNLGRP_IPV4_IFADDR);
|
||||||
|
} else {
|
||||||
|
nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_IFADDR);
|
||||||
}
|
}
|
||||||
if (nl_socket_add_membership(info_sock_, RTMGRP_IPV4_IFADDR) != 0) {
|
|
||||||
throw std::runtime_error("Can't add membership");
|
|
||||||
}
|
|
||||||
nl_socket_disable_seq_check(info_sock_);
|
|
||||||
nl_socket_set_nonblocking(info_sock_);
|
|
||||||
nl_socket_modify_cb(info_sock_, NL_CB_VALID, NL_CB_CUSTOM, handleEvents, this);
|
|
||||||
efd_ = epoll_create1(EPOLL_CLOEXEC);
|
efd_ = epoll_create1(EPOLL_CLOEXEC);
|
||||||
if (efd_ < 0) {
|
if (efd_ < 0) {
|
||||||
throw std::runtime_error("Can't create epoll");
|
throw std::runtime_error("Can't create epoll");
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ev_fd_ = eventfd(0, EFD_NONBLOCK);
|
ev_fd_ = eventfd(0, EFD_NONBLOCK);
|
||||||
struct epoll_event event = {0};
|
struct epoll_event event;
|
||||||
|
memset(&event, 0, sizeof(event));
|
||||||
event.events = EPOLLIN | EPOLLET;
|
event.events = EPOLLIN | EPOLLET;
|
||||||
event.data.fd = ev_fd_;
|
event.data.fd = ev_fd_;
|
||||||
if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) {
|
if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) {
|
||||||
@ -82,8 +170,9 @@ void waybar::modules::Network::createInfoSocket() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
auto fd = nl_socket_get_fd(info_sock_);
|
auto fd = nl_socket_get_fd(ev_sock_);
|
||||||
struct epoll_event event = {0};
|
struct epoll_event event;
|
||||||
|
memset(&event, 0, sizeof(event));
|
||||||
event.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
|
event.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
|
||||||
event.data.fd = fd;
|
event.data.fd = fd;
|
||||||
if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) {
|
if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) {
|
||||||
@ -92,15 +181,15 @@ void waybar::modules::Network::createInfoSocket() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Network::createEventSocket() {
|
void waybar::modules::Network::createInfoSocket() {
|
||||||
sk_ = nl_socket_alloc();
|
sock_ = nl_socket_alloc();
|
||||||
if (genl_connect(sk_) != 0) {
|
if (genl_connect(sock_) != 0) {
|
||||||
throw std::runtime_error("Can't connect to netlink socket");
|
throw std::runtime_error("Can't connect to netlink socket");
|
||||||
}
|
}
|
||||||
if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, handleScan, this) < 0) {
|
if (nl_socket_modify_cb(sock_, NL_CB_VALID, NL_CB_CUSTOM, handleScan, this) < 0) {
|
||||||
throw std::runtime_error("Can't set callback");
|
throw std::runtime_error("Can't set callback");
|
||||||
}
|
}
|
||||||
nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
|
nl80211_id_ = genl_ctrl_resolve(sock_, "nl80211");
|
||||||
if (nl80211_id_ < 0) {
|
if (nl80211_id_ < 0) {
|
||||||
throw std::runtime_error("Can't resolve nl80211 interface");
|
throw std::runtime_error("Can't resolve nl80211 interface");
|
||||||
}
|
}
|
||||||
@ -108,113 +197,128 @@ void waybar::modules::Network::createEventSocket() {
|
|||||||
|
|
||||||
void waybar::modules::Network::worker() {
|
void waybar::modules::Network::worker() {
|
||||||
thread_timer_ = [this] {
|
thread_timer_ = [this] {
|
||||||
if (ifid_ > 0) {
|
{
|
||||||
getInfo();
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
dp.emit();
|
if (ifid_ > 0) {
|
||||||
|
getInfo();
|
||||||
|
dp.emit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
thread_timer_.sleep_for(interval_);
|
thread_timer_.sleep_for(interval_);
|
||||||
};
|
};
|
||||||
std::array<struct epoll_event, EPOLL_MAX> events{};
|
thread_ = [this] {
|
||||||
thread_ = [this, &events] {
|
std::array<struct epoll_event, EPOLL_MAX> events{};
|
||||||
|
|
||||||
int ec = epoll_wait(efd_, events.data(), EPOLL_MAX, -1);
|
int ec = epoll_wait(efd_, events.data(), EPOLL_MAX, -1);
|
||||||
if (ec > 0) {
|
if (ec > 0) {
|
||||||
for (auto i = 0; i < ec; i++) {
|
for (auto i = 0; i < ec; i++) {
|
||||||
if (events[i].data.fd == nl_socket_get_fd(info_sock_)) {
|
if (events[i].data.fd != nl_socket_get_fd(ev_sock_) || nl_recvmsgs_default(ev_sock_) < 0) {
|
||||||
nl_recvmsgs_default(info_sock_);
|
|
||||||
} else {
|
|
||||||
thread_.stop();
|
thread_.stop();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (ec == -1) {
|
|
||||||
thread_.stop();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const std::string waybar::modules::Network::getNetworkState() const {
|
||||||
|
if (ifid_ == -1) return "disconnected";
|
||||||
|
if (ipaddr_.empty()) return "linked";
|
||||||
|
if (essid_.empty()) return "ethernet";
|
||||||
|
return "wifi";
|
||||||
|
}
|
||||||
|
|
||||||
auto waybar::modules::Network::update() -> void {
|
auto waybar::modules::Network::update() -> void {
|
||||||
std::string connectiontype;
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
std::string tooltip_format = "";
|
std::string tooltip_format;
|
||||||
if (config_["tooltip-format"].isString()) {
|
auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY);
|
||||||
tooltip_format = config_["tooltip-format"].asString();
|
auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY);
|
||||||
|
|
||||||
|
unsigned long long bandwidth_down = 0;
|
||||||
|
if (down_octets) {
|
||||||
|
bandwidth_down = *down_octets - bandwidth_down_total_;
|
||||||
|
bandwidth_down_total_ = *down_octets;
|
||||||
}
|
}
|
||||||
if (ifid_ <= 0 || ipaddr_.empty()) {
|
|
||||||
if (config_["format-disconnected"].isString()) {
|
unsigned long long bandwidth_up = 0;
|
||||||
default_format_ = config_["format-disconnected"].asString();
|
if (up_octets) {
|
||||||
}
|
bandwidth_up = *up_octets - bandwidth_up_total_;
|
||||||
if (config_["tooltip-format-disconnected"].isString()) {
|
bandwidth_up_total_ = *up_octets;
|
||||||
tooltip_format = config_["tooltip-format-disconnected"].asString();
|
|
||||||
}
|
|
||||||
label_.get_style_context()->add_class("disconnected");
|
|
||||||
connectiontype = "disconnected";
|
|
||||||
} else {
|
|
||||||
if (essid_.empty()) {
|
|
||||||
if (config_["format-ethernet"].isString()) {
|
|
||||||
default_format_ = config_["format-ethernet"].asString();
|
|
||||||
}
|
|
||||||
if (config_["tooltip-format-ethernet"].isString()) {
|
|
||||||
tooltip_format = config_["tooltip-format-ethernet"].asString();
|
|
||||||
}
|
|
||||||
connectiontype = "ethernet";
|
|
||||||
} else {
|
|
||||||
if (config_["format-wifi"].isString()) {
|
|
||||||
default_format_ = config_["format-wifi"].asString();
|
|
||||||
}
|
|
||||||
if (config_["tooltip-format-wifi"].isString()) {
|
|
||||||
tooltip_format = config_["tooltip-format-wifi"].asString();
|
|
||||||
}
|
|
||||||
connectiontype = "wifi";
|
|
||||||
}
|
|
||||||
label_.get_style_context()->remove_class("disconnected");
|
|
||||||
}
|
}
|
||||||
if (!alt_) {
|
if (!alt_) {
|
||||||
|
auto state = getNetworkState();
|
||||||
|
if (!state_.empty() && label_.get_style_context()->has_class(state_)) {
|
||||||
|
label_.get_style_context()->remove_class(state_);
|
||||||
|
}
|
||||||
|
if (config_["format-" + state].isString()) {
|
||||||
|
default_format_ = config_["format-" + state].asString();
|
||||||
|
}
|
||||||
|
if (config_["tooltip-format-" + state].isString()) {
|
||||||
|
tooltip_format = config_["tooltip-format-" + state].asString();
|
||||||
|
}
|
||||||
|
if (!label_.get_style_context()->has_class(state)) {
|
||||||
|
label_.get_style_context()->add_class(state);
|
||||||
|
}
|
||||||
format_ = default_format_;
|
format_ = default_format_;
|
||||||
|
state_ = state;
|
||||||
}
|
}
|
||||||
auto text = fmt::format(format_,
|
getState(signal_strength_);
|
||||||
fmt::arg("essid", essid_),
|
|
||||||
fmt::arg("signaldBm", signal_strength_dbm_),
|
auto text = fmt::format(
|
||||||
fmt::arg("signalStrength", signal_strength_),
|
format_,
|
||||||
fmt::arg("ifname", ifname_),
|
fmt::arg("essid", essid_),
|
||||||
fmt::arg("netmask", netmask_),
|
fmt::arg("signaldBm", signal_strength_dbm_),
|
||||||
fmt::arg("ipaddr", ipaddr_),
|
fmt::arg("signalStrength", signal_strength_),
|
||||||
fmt::arg("cidr", cidr_),
|
fmt::arg("ifname", ifname_),
|
||||||
fmt::arg("icon", getIcon(signal_strength_, connectiontype)));
|
fmt::arg("netmask", netmask_),
|
||||||
label_.set_markup(text);
|
fmt::arg("ipaddr", ipaddr_),
|
||||||
if (tooltipEnabled()) {
|
fmt::arg("cidr", cidr_),
|
||||||
if (!tooltip_format.empty()) {
|
fmt::arg("frequency", frequency_),
|
||||||
auto tooltip_text = fmt::format(tooltip_format,
|
fmt::arg("icon", getIcon(signal_strength_, state_)),
|
||||||
fmt::arg("essid", essid_),
|
fmt::arg("bandwidthDownBits", pow_format(bandwidth_down * 8ull / interval_.count(), "b/s")),
|
||||||
fmt::arg("signaldBm", signal_strength_dbm_),
|
fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")),
|
||||||
fmt::arg("signalStrength", signal_strength_),
|
fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")),
|
||||||
fmt::arg("ifname", ifname_),
|
fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s")));
|
||||||
fmt::arg("netmask", netmask_),
|
if (text.compare(label_.get_label()) != 0) {
|
||||||
fmt::arg("ipaddr", ipaddr_),
|
label_.set_markup(text);
|
||||||
fmt::arg("cidr", cidr_),
|
if (text.empty()) {
|
||||||
fmt::arg("icon", getIcon(signal_strength_, connectiontype)));
|
event_box_.hide();
|
||||||
label_.set_tooltip_text(tooltip_text);
|
|
||||||
} else {
|
} else {
|
||||||
|
event_box_.show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (tooltipEnabled()) {
|
||||||
|
if (tooltip_format.empty() && config_["tooltip-format"].isString()) {
|
||||||
|
tooltip_format = config_["tooltip-format"].asString();
|
||||||
|
}
|
||||||
|
if (!tooltip_format.empty()) {
|
||||||
|
auto tooltip_text = fmt::format(
|
||||||
|
tooltip_format,
|
||||||
|
fmt::arg("essid", essid_),
|
||||||
|
fmt::arg("signaldBm", signal_strength_dbm_),
|
||||||
|
fmt::arg("signalStrength", signal_strength_),
|
||||||
|
fmt::arg("ifname", ifname_),
|
||||||
|
fmt::arg("netmask", netmask_),
|
||||||
|
fmt::arg("ipaddr", ipaddr_),
|
||||||
|
fmt::arg("cidr", cidr_),
|
||||||
|
fmt::arg("frequency", frequency_),
|
||||||
|
fmt::arg("icon", getIcon(signal_strength_, state_)),
|
||||||
|
fmt::arg("bandwidthDownBits",
|
||||||
|
pow_format(bandwidth_down * 8ull / interval_.count(), "b/s")),
|
||||||
|
fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")),
|
||||||
|
fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")),
|
||||||
|
fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s")));
|
||||||
|
if (label_.get_tooltip_text() != text) {
|
||||||
|
label_.set_tooltip_text(tooltip_text);
|
||||||
|
}
|
||||||
|
} else if (label_.get_tooltip_text() != text) {
|
||||||
label_.set_tooltip_text(text);
|
label_.set_tooltip_text(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Network::disconnected() {
|
|
||||||
essid_.clear();
|
|
||||||
signal_strength_dbm_ = 0;
|
|
||||||
signal_strength_ = 0;
|
|
||||||
ipaddr_.clear();
|
|
||||||
netmask_.clear();
|
|
||||||
cidr_ = 0;
|
|
||||||
if (!config_["interface"].isString()) {
|
|
||||||
ifname_.clear();
|
|
||||||
ifid_ = -1;
|
|
||||||
}
|
|
||||||
// Need to wait otherwise we'll have the same information
|
|
||||||
thread_.sleep_for(std::chrono::seconds(1));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
|
// Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
|
||||||
int waybar::modules::Network::getExternalInterface() {
|
int waybar::modules::Network::getExternalInterface(int skip_idx) const {
|
||||||
static const uint32_t route_buffer_size = 8192;
|
static const uint32_t route_buffer_size = 8192;
|
||||||
struct nlmsghdr * hdr = nullptr;
|
struct nlmsghdr * hdr = nullptr;
|
||||||
struct rtmsg * rt = nullptr;
|
struct rtmsg * rt = nullptr;
|
||||||
@ -324,7 +428,7 @@ int waybar::modules::Network::getExternalInterface() {
|
|||||||
/* If this is the default route, and we know the interface index,
|
/* If this is the default route, and we know the interface index,
|
||||||
* we can stop parsing this message.
|
* we can stop parsing this message.
|
||||||
*/
|
*/
|
||||||
if (has_gateway && !has_destination && temp_idx != -1) {
|
if (has_gateway && !has_destination && temp_idx != -1 && temp_idx != skip_idx) {
|
||||||
ifidx = temp_idx;
|
ifidx = temp_idx;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -336,98 +440,224 @@ out:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Network::getInterfaceAddress() {
|
void waybar::modules::Network::getInterfaceAddress() {
|
||||||
unsigned int cidrRaw;
|
|
||||||
struct ifaddrs *ifaddr, *ifa;
|
struct ifaddrs *ifaddr, *ifa;
|
||||||
ipaddr_.clear();
|
|
||||||
netmask_.clear();
|
|
||||||
cidr_ = 0;
|
cidr_ = 0;
|
||||||
int success = getifaddrs(&ifaddr);
|
int success = getifaddrs(&ifaddr);
|
||||||
if (success == 0) {
|
if (success != 0) {
|
||||||
ifa = ifaddr;
|
return;
|
||||||
while (ifa != nullptr && ipaddr_.empty() && netmask_.empty()) {
|
}
|
||||||
if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_) {
|
ifa = ifaddr;
|
||||||
if (strcmp(ifa->ifa_name, ifname_.c_str()) == 0) {
|
while (ifa != nullptr) {
|
||||||
ipaddr_ = inet_ntoa(((struct sockaddr_in *)ifa->ifa_addr)->sin_addr);
|
if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_ &&
|
||||||
netmask_ = inet_ntoa(((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr);
|
ifa->ifa_name == ifname_) {
|
||||||
cidrRaw = ((struct sockaddr_in *)(ifa->ifa_netmask))->sin_addr.s_addr;
|
char ipaddr[INET6_ADDRSTRLEN];
|
||||||
unsigned int cidr = 0;
|
char netmask[INET6_ADDRSTRLEN];
|
||||||
|
unsigned int cidr = 0;
|
||||||
|
if (family_ == AF_INET) {
|
||||||
|
ipaddr_ = inet_ntop(AF_INET,
|
||||||
|
&reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr)->sin_addr,
|
||||||
|
ipaddr,
|
||||||
|
INET_ADDRSTRLEN);
|
||||||
|
auto net_addr = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_netmask);
|
||||||
|
netmask_ = inet_ntop(AF_INET, &net_addr->sin_addr, netmask, INET_ADDRSTRLEN);
|
||||||
|
unsigned int cidrRaw = net_addr->sin_addr.s_addr;
|
||||||
|
while (cidrRaw) {
|
||||||
|
cidr += cidrRaw & 1;
|
||||||
|
cidrRaw >>= 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ipaddr_ = inet_ntop(AF_INET6,
|
||||||
|
&reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr)->sin6_addr,
|
||||||
|
ipaddr,
|
||||||
|
INET6_ADDRSTRLEN);
|
||||||
|
auto net_addr = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_netmask);
|
||||||
|
netmask_ = inet_ntop(AF_INET6, &net_addr->sin6_addr, netmask, INET6_ADDRSTRLEN);
|
||||||
|
for (size_t i = 0; i < sizeof(net_addr->sin6_addr.s6_addr); ++i) {
|
||||||
|
unsigned char cidrRaw = net_addr->sin6_addr.s6_addr[i];
|
||||||
while (cidrRaw) {
|
while (cidrRaw) {
|
||||||
cidr += cidrRaw & 1;
|
cidr += cidrRaw & 1;
|
||||||
cidrRaw >>= 1;
|
cidrRaw >>= 1;
|
||||||
}
|
}
|
||||||
cidr_ = cidr;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ifa = ifa->ifa_next;
|
cidr_ = cidr;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
freeifaddrs(ifaddr);
|
ifa = ifa->ifa_next;
|
||||||
}
|
}
|
||||||
|
freeifaddrs(ifaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
int waybar::modules::Network::netlinkRequest(void *req, uint32_t reqlen, uint32_t groups) {
|
int waybar::modules::Network::netlinkRequest(void *req, uint32_t reqlen, uint32_t groups) const {
|
||||||
struct sockaddr_nl sa = {};
|
struct sockaddr_nl sa = {};
|
||||||
sa.nl_family = AF_NETLINK;
|
sa.nl_family = AF_NETLINK;
|
||||||
sa.nl_groups = groups;
|
sa.nl_groups = groups;
|
||||||
struct iovec iov = {req, reqlen};
|
struct iovec iov = {req, reqlen};
|
||||||
struct msghdr msg = {&sa, sizeof(sa), &iov, 1, nullptr, 0, 0};
|
struct msghdr msg = {
|
||||||
return sendmsg(nl_socket_get_fd(info_sock_), &msg, 0);
|
.msg_name = &sa,
|
||||||
|
.msg_namelen = sizeof(sa),
|
||||||
|
.msg_iov = &iov,
|
||||||
|
.msg_iovlen = 1,
|
||||||
|
};
|
||||||
|
return sendmsg(nl_socket_get_fd(ev_sock_), &msg, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int waybar::modules::Network::netlinkResponse(void *resp, uint32_t resplen, uint32_t groups) {
|
int waybar::modules::Network::netlinkResponse(void *resp, uint32_t resplen, uint32_t groups) const {
|
||||||
struct sockaddr_nl sa = {};
|
struct sockaddr_nl sa = {};
|
||||||
sa.nl_family = AF_NETLINK;
|
sa.nl_family = AF_NETLINK;
|
||||||
sa.nl_groups = groups;
|
sa.nl_groups = groups;
|
||||||
struct iovec iov = {resp, resplen};
|
struct iovec iov = {resp, resplen};
|
||||||
struct msghdr msg = {&sa, sizeof(sa), &iov, 1, nullptr, 0, 0};
|
struct msghdr msg = {
|
||||||
auto ret = recvmsg(nl_socket_get_fd(info_sock_), &msg, 0);
|
.msg_name = &sa,
|
||||||
|
.msg_namelen = sizeof(sa),
|
||||||
|
.msg_iov = &iov,
|
||||||
|
.msg_iovlen = 1,
|
||||||
|
};
|
||||||
|
auto ret = recvmsg(nl_socket_get_fd(ev_sock_), &msg, 0);
|
||||||
if (msg.msg_flags & MSG_TRUNC) {
|
if (msg.msg_flags & MSG_TRUNC) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
|
bool waybar::modules::Network::checkInterface(struct ifinfomsg *rtif, std::string name) {
|
||||||
int ret = 0;
|
if (config_["interface"].isString()) {
|
||||||
auto net = static_cast<waybar::modules::Network *>(data);
|
return config_["interface"].asString() == name ||
|
||||||
bool need_update = false;
|
wildcardMatch(config_["interface"].asString(), name);
|
||||||
for (nlmsghdr *nh = nlmsg_hdr(msg); NLMSG_OK(nh, ret); nh = NLMSG_NEXT(nh, ret)) {
|
}
|
||||||
if (nh->nlmsg_type == RTM_NEWADDR) {
|
// getExternalInterface may need some delay to detect external interface
|
||||||
need_update = true;
|
for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) {
|
||||||
|
auto external_iface = getExternalInterface();
|
||||||
|
if (external_iface > 0) {
|
||||||
|
return external_iface == rtif->ifi_index;
|
||||||
}
|
}
|
||||||
if (nh->nlmsg_type < RTM_NEWADDR) {
|
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||||
auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
|
}
|
||||||
if (rtif->ifi_index == static_cast<int>(net->ifid_)) {
|
return false;
|
||||||
need_update = true;
|
}
|
||||||
if (!(rtif->ifi_flags & IFF_RUNNING)) {
|
|
||||||
net->disconnected();
|
int waybar::modules::Network::getPreferredIface(int skip_idx, bool wait) const {
|
||||||
net->dp.emit();
|
int ifid = -1;
|
||||||
return NL_SKIP;
|
if (config_["interface"].isString()) {
|
||||||
|
ifid = if_nametoindex(config_["interface"].asCString());
|
||||||
|
if (ifid > 0) {
|
||||||
|
return ifid;
|
||||||
|
} else {
|
||||||
|
// Try with wildcard
|
||||||
|
struct ifaddrs *ifaddr, *ifa;
|
||||||
|
int success = getifaddrs(&ifaddr);
|
||||||
|
if (success != 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
ifa = ifaddr;
|
||||||
|
ifid = -1;
|
||||||
|
while (ifa != nullptr) {
|
||||||
|
if (wildcardMatch(config_["interface"].asString(), ifa->ifa_name)) {
|
||||||
|
ifid = if_nametoindex(ifa->ifa_name);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
ifa = ifa->ifa_next;
|
||||||
}
|
}
|
||||||
|
freeifaddrs(ifaddr);
|
||||||
|
return ifid;
|
||||||
}
|
}
|
||||||
if (need_update) break;
|
|
||||||
}
|
}
|
||||||
if (net->ifid_ <= 0 && !net->config_["interface"].isString()) {
|
// getExternalInterface may need some delay to detect external interface
|
||||||
for (uint8_t i = 0; i < MAX_RETRY; i += 1) {
|
for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) {
|
||||||
net->ifid_ = net->getExternalInterface();
|
ifid = getExternalInterface(skip_idx);
|
||||||
if (net->ifid_ > 0) {
|
if (ifid > 0) {
|
||||||
break;
|
return ifid;
|
||||||
}
|
|
||||||
// Need to wait before get external interface
|
|
||||||
net->thread_.sleep_for(std::chrono::seconds(1));
|
|
||||||
}
|
}
|
||||||
if (net->ifid_ > 0) {
|
if (wait) {
|
||||||
char ifname[IF_NAMESIZE];
|
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||||
if_indextoname(net->ifid_, ifname);
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void waybar::modules::Network::clearIface() {
|
||||||
|
essid_.clear();
|
||||||
|
ipaddr_.clear();
|
||||||
|
netmask_.clear();
|
||||||
|
cidr_ = 0;
|
||||||
|
signal_strength_dbm_ = 0;
|
||||||
|
signal_strength_ = 0;
|
||||||
|
frequency_ = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void waybar::modules::Network::checkNewInterface(struct ifinfomsg *rtif) {
|
||||||
|
auto new_iface = getPreferredIface(rtif->ifi_index);
|
||||||
|
if (new_iface != -1) {
|
||||||
|
ifid_ = new_iface;
|
||||||
|
char ifname[IF_NAMESIZE];
|
||||||
|
if_indextoname(new_iface, ifname);
|
||||||
|
ifname_ = ifname;
|
||||||
|
getInterfaceAddress();
|
||||||
|
thread_timer_.wake_up();
|
||||||
|
} else {
|
||||||
|
ifid_ = -1;
|
||||||
|
dp.emit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
|
||||||
|
auto net = static_cast<waybar::modules::Network *>(data);
|
||||||
|
std::lock_guard<std::mutex> lock(net->mutex_);
|
||||||
|
auto nh = nlmsg_hdr(msg);
|
||||||
|
auto ifi = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
|
||||||
|
if (nh->nlmsg_type == RTM_DELADDR) {
|
||||||
|
// Check for valid interface
|
||||||
|
if (ifi->ifi_index == net->ifid_) {
|
||||||
|
net->ipaddr_.clear();
|
||||||
|
net->netmask_.clear();
|
||||||
|
net->cidr_ = 0;
|
||||||
|
if (!(ifi->ifi_flags & IFF_RUNNING)) {
|
||||||
|
net->clearIface();
|
||||||
|
// Check for a new interface and get info
|
||||||
|
net->checkNewInterface(ifi);
|
||||||
|
} else {
|
||||||
|
net->dp.emit();
|
||||||
|
}
|
||||||
|
return NL_OK;
|
||||||
|
}
|
||||||
|
} else if (nh->nlmsg_type == RTM_NEWLINK || nh->nlmsg_type == RTM_DELLINK) {
|
||||||
|
char ifname[IF_NAMESIZE];
|
||||||
|
if_indextoname(ifi->ifi_index, ifname);
|
||||||
|
// Check for valid interface
|
||||||
|
if (ifi->ifi_index != net->ifid_ && net->checkInterface(ifi, ifname)) {
|
||||||
net->ifname_ = ifname;
|
net->ifname_ = ifname;
|
||||||
need_update = true;
|
net->ifid_ = ifi->ifi_index;
|
||||||
|
// Get Iface and WIFI info
|
||||||
|
net->getInterfaceAddress();
|
||||||
|
net->thread_timer_.wake_up();
|
||||||
|
return NL_OK;
|
||||||
|
} else if (ifi->ifi_index == net->ifid_ &&
|
||||||
|
(!(ifi->ifi_flags & IFF_RUNNING) || !(ifi->ifi_flags & IFF_UP) ||
|
||||||
|
!net->checkInterface(ifi, ifname))) {
|
||||||
|
net->clearIface();
|
||||||
|
// Check for a new interface and get info
|
||||||
|
net->checkNewInterface(ifi);
|
||||||
|
return NL_OK;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
if (need_update) {
|
char ifname[IF_NAMESIZE];
|
||||||
if (net->ifid_ > 0) {
|
if_indextoname(ifi->ifi_index, ifname);
|
||||||
net->getInfo();
|
// Auto detected network can also be assigned here
|
||||||
|
if (ifi->ifi_index != net->ifid_ && net->checkInterface(ifi, ifname)) {
|
||||||
|
// If iface is different, clear data
|
||||||
|
if (ifi->ifi_index != net->ifid_) {
|
||||||
|
net->clearIface();
|
||||||
|
}
|
||||||
|
net->ifname_ = ifname;
|
||||||
|
net->ifid_ = ifi->ifi_index;
|
||||||
|
}
|
||||||
|
// Check for valid interface
|
||||||
|
if (ifi->ifi_index == net->ifid_) {
|
||||||
|
// Get Iface and WIFI info
|
||||||
|
net->getInterfaceAddress();
|
||||||
|
net->thread_timer_.wake_up();
|
||||||
|
return NL_OK;
|
||||||
}
|
}
|
||||||
net->dp.emit();
|
|
||||||
}
|
}
|
||||||
return NL_SKIP;
|
return NL_SKIP;
|
||||||
}
|
}
|
||||||
@ -463,12 +693,11 @@ int waybar::modules::Network::handleScan(struct nl_msg *msg, void *data) {
|
|||||||
}
|
}
|
||||||
net->parseEssid(bss);
|
net->parseEssid(bss);
|
||||||
net->parseSignal(bss);
|
net->parseSignal(bss);
|
||||||
// TODO(someone): parse quality
|
net->parseFreq(bss);
|
||||||
return NL_SKIP;
|
return NL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Network::parseEssid(struct nlattr **bss) {
|
void waybar::modules::Network::parseEssid(struct nlattr **bss) {
|
||||||
essid_.clear();
|
|
||||||
if (bss[NL80211_BSS_INFORMATION_ELEMENTS] != nullptr) {
|
if (bss[NL80211_BSS_INFORMATION_ELEMENTS] != nullptr) {
|
||||||
auto ies = static_cast<char *>(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]));
|
auto ies = static_cast<char *>(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]));
|
||||||
auto ies_len = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
|
auto ies_len = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
|
||||||
@ -495,14 +724,22 @@ void waybar::modules::Network::parseSignal(struct nlattr **bss) {
|
|||||||
// WiFi-hardware usually operates in the range -90 to -20dBm.
|
// WiFi-hardware usually operates in the range -90 to -20dBm.
|
||||||
const int hardwareMax = -20;
|
const int hardwareMax = -20;
|
||||||
const int hardwareMin = -90;
|
const int hardwareMin = -90;
|
||||||
signal_strength_ =
|
const int strength =
|
||||||
((signal_strength_dbm_ - hardwareMin) / double{hardwareMax - hardwareMin}) * 100;
|
((signal_strength_dbm_ - hardwareMin) / double{hardwareMax - hardwareMin}) * 100;
|
||||||
|
signal_strength_ = std::clamp(strength, 0, 100);
|
||||||
}
|
}
|
||||||
if (bss[NL80211_BSS_SIGNAL_UNSPEC] != nullptr) {
|
if (bss[NL80211_BSS_SIGNAL_UNSPEC] != nullptr) {
|
||||||
signal_strength_ = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
|
signal_strength_ = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void waybar::modules::Network::parseFreq(struct nlattr **bss) {
|
||||||
|
if (bss[NL80211_BSS_FREQUENCY] != nullptr) {
|
||||||
|
// in MHz
|
||||||
|
frequency_ = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool waybar::modules::Network::associatedOrJoined(struct nlattr **bss) {
|
bool waybar::modules::Network::associatedOrJoined(struct nlattr **bss) {
|
||||||
if (bss[NL80211_BSS_STATUS] == nullptr) {
|
if (bss[NL80211_BSS_STATUS] == nullptr) {
|
||||||
return false;
|
return false;
|
||||||
@ -519,7 +756,6 @@ bool waybar::modules::Network::associatedOrJoined(struct nlattr **bss) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto waybar::modules::Network::getInfo() -> void {
|
auto waybar::modules::Network::getInfo() -> void {
|
||||||
getInterfaceAddress();
|
|
||||||
struct nl_msg *nl_msg = nlmsg_alloc();
|
struct nl_msg *nl_msg = nlmsg_alloc();
|
||||||
if (nl_msg == nullptr) {
|
if (nl_msg == nullptr) {
|
||||||
return;
|
return;
|
||||||
@ -531,5 +767,45 @@ auto waybar::modules::Network::getInfo() -> void {
|
|||||||
nlmsg_free(nl_msg);
|
nlmsg_free(nl_msg);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
nl_send_sync(sk_, nl_msg);
|
nl_send_sync(sock_, nl_msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
// https://gist.github.com/rressi/92af77630faf055934c723ce93ae2495
|
||||||
|
bool waybar::modules::Network::wildcardMatch(const std::string &pattern,
|
||||||
|
const std::string &text) const {
|
||||||
|
auto P = int(pattern.size());
|
||||||
|
auto T = int(text.size());
|
||||||
|
|
||||||
|
auto p = 0, fallback_p = -1;
|
||||||
|
auto t = 0, fallback_t = -1;
|
||||||
|
|
||||||
|
while (t < T) {
|
||||||
|
// Wildcard match:
|
||||||
|
if (p < P && pattern[p] == '*') {
|
||||||
|
fallback_p = p++; // starting point after failures
|
||||||
|
fallback_t = t; // starting point after failures
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simple match:
|
||||||
|
else if (p < P && (pattern[p] == '?' || pattern[p] == text[t])) {
|
||||||
|
p++;
|
||||||
|
t++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Failure, fall back just after last matched '*':
|
||||||
|
else if (fallback_p >= 0) {
|
||||||
|
p = fallback_p + 1; // position just after last matched '*"
|
||||||
|
t = ++fallback_t; // re-try to match text from here
|
||||||
|
}
|
||||||
|
|
||||||
|
// There were no '*' before, so we fail here:
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consume all '*' at the end of pattern:
|
||||||
|
while (p < P && pattern[p] == '*') p++;
|
||||||
|
|
||||||
|
return p == P;
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,16 @@
|
|||||||
#include "modules/pulseaudio.hpp"
|
#include "modules/pulseaudio.hpp"
|
||||||
#include <array>
|
|
||||||
|
|
||||||
waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value &config)
|
waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value &config)
|
||||||
: ALabel(config, "{volume}%"),
|
: ALabel(config, "pulseaudio", id, "{volume}%"),
|
||||||
mainloop_(nullptr),
|
mainloop_(nullptr),
|
||||||
mainloop_api_(nullptr),
|
mainloop_api_(nullptr),
|
||||||
context_(nullptr),
|
context_(nullptr),
|
||||||
sink_idx_(0),
|
sink_idx_(0),
|
||||||
volume_(0),
|
volume_(0),
|
||||||
muted_(false),
|
muted_(false),
|
||||||
scrolling_(false) {
|
source_idx_(0),
|
||||||
label_.set_name("pulseaudio");
|
source_volume_(0),
|
||||||
if (!id.empty()) {
|
source_muted_(false) {
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
mainloop_ = pa_threaded_mainloop_new();
|
mainloop_ = pa_threaded_mainloop_new();
|
||||||
if (mainloop_ == nullptr) {
|
if (mainloop_ == nullptr) {
|
||||||
throw std::runtime_error("pa_mainloop_new() failed.");
|
throw std::runtime_error("pa_mainloop_new() failed.");
|
||||||
@ -24,7 +21,7 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value
|
|||||||
if (context_ == nullptr) {
|
if (context_ == nullptr) {
|
||||||
throw std::runtime_error("pa_context_new() failed.");
|
throw std::runtime_error("pa_context_new() failed.");
|
||||||
}
|
}
|
||||||
if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOAUTOSPAWN, nullptr) < 0) {
|
if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOFAIL, nullptr) < 0) {
|
||||||
auto err =
|
auto err =
|
||||||
fmt::format("pa_context_connect() failed: {}", pa_strerror(pa_context_errno(context_)));
|
fmt::format("pa_context_connect() failed: {}", pa_strerror(pa_context_errno(context_)));
|
||||||
throw std::runtime_error(err);
|
throw std::runtime_error(err);
|
||||||
@ -34,13 +31,8 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value
|
|||||||
throw std::runtime_error("pa_mainloop_run() failed.");
|
throw std::runtime_error("pa_mainloop_run() failed.");
|
||||||
}
|
}
|
||||||
pa_threaded_mainloop_unlock(mainloop_);
|
pa_threaded_mainloop_unlock(mainloop_);
|
||||||
|
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
||||||
// define the pulse scroll events only when no user provided
|
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Pulseaudio::handleScroll));
|
||||||
// events are configured
|
|
||||||
if (!config["on-scroll-up"].isString() && !config["on-scroll-down"].isString()) {
|
|
||||||
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
|
||||||
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Pulseaudio::handleScroll));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
waybar::modules::Pulseaudio::~Pulseaudio() {
|
waybar::modules::Pulseaudio::~Pulseaudio() {
|
||||||
@ -58,7 +50,13 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data) {
|
|||||||
case PA_CONTEXT_READY:
|
case PA_CONTEXT_READY:
|
||||||
pa_context_get_server_info(c, serverInfoCb, data);
|
pa_context_get_server_info(c, serverInfoCb, data);
|
||||||
pa_context_set_subscribe_callback(c, subscribeCb, data);
|
pa_context_set_subscribe_callback(c, subscribeCb, data);
|
||||||
pa_context_subscribe(c, PA_SUBSCRIPTION_MASK_SINK, nullptr, nullptr);
|
pa_context_subscribe(
|
||||||
|
c,
|
||||||
|
static_cast<enum pa_subscription_mask>(static_cast<int>(PA_SUBSCRIPTION_MASK_SERVER) |
|
||||||
|
static_cast<int>(PA_SUBSCRIPTION_MASK_SINK) |
|
||||||
|
static_cast<int>(PA_SUBSCRIPTION_MASK_SOURCE)),
|
||||||
|
nullptr,
|
||||||
|
nullptr);
|
||||||
break;
|
break;
|
||||||
case PA_CONTEXT_FAILED:
|
case PA_CONTEXT_FAILED:
|
||||||
pa->mainloop_api_->quit(pa->mainloop_api_, 1);
|
pa->mainloop_api_->quit(pa->mainloop_api_, 1);
|
||||||
@ -72,44 +70,32 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
|
bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
|
||||||
// Avoid concurrent scroll event
|
// change the pulse volume only when no user provided
|
||||||
bool direction_up = false;
|
// events are configured
|
||||||
uint16_t change = config_["scroll-step"].isUInt() ? config_["scroll-step"].asUInt() * 100 : 100;
|
if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) {
|
||||||
pa_cvolume pa_volume = pa_volume_;
|
return AModule::handleScroll(e);
|
||||||
|
|
||||||
if (scrolling_) {
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
scrolling_ = true;
|
auto dir = AModule::getScrollDir(e);
|
||||||
if (e->direction == GDK_SCROLL_UP) {
|
if (dir == SCROLL_DIR::NONE) {
|
||||||
direction_up = true;
|
return true;
|
||||||
}
|
}
|
||||||
if (e->direction == GDK_SCROLL_DOWN) {
|
double volume_tick = static_cast<double>(PA_VOLUME_NORM) / 100;
|
||||||
direction_up = false;
|
pa_volume_t change = volume_tick;
|
||||||
|
pa_cvolume pa_volume = pa_volume_;
|
||||||
|
// isDouble returns true for integers as well, just in case
|
||||||
|
if (config_["scroll-step"].isDouble()) {
|
||||||
|
change = round(config_["scroll-step"].asDouble() * volume_tick);
|
||||||
}
|
}
|
||||||
|
if (dir == SCROLL_DIR::UP) {
|
||||||
if (e->direction == GDK_SCROLL_SMOOTH) {
|
if (volume_ + 1 <= 100) {
|
||||||
gdouble delta_x, delta_y;
|
|
||||||
gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent *>(e), &delta_x, &delta_y);
|
|
||||||
if (delta_y < 0) {
|
|
||||||
direction_up = true;
|
|
||||||
} else if (delta_y > 0) {
|
|
||||||
direction_up = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (direction_up) {
|
|
||||||
if (volume_ + 1 < 100) {
|
|
||||||
pa_cvolume_inc(&pa_volume, change);
|
pa_cvolume_inc(&pa_volume, change);
|
||||||
}
|
}
|
||||||
} else {
|
} else if (dir == SCROLL_DIR::DOWN) {
|
||||||
if (volume_ - 1 > 0) {
|
if (volume_ - 1 >= 0) {
|
||||||
pa_cvolume_dec(&pa_volume, change);
|
pa_cvolume_dec(&pa_volume, change);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pa_context_set_sink_volume_by_index(context_, sink_idx_, &pa_volume, volumeModifyCb, this);
|
pa_context_set_sink_volume_by_index(context_, sink_idx_, &pa_volume, volumeModifyCb, this);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,8 +106,16 @@ void waybar::modules::Pulseaudio::subscribeCb(pa_context * conte
|
|||||||
pa_subscription_event_type_t type, uint32_t idx,
|
pa_subscription_event_type_t type, uint32_t idx,
|
||||||
void *data) {
|
void *data) {
|
||||||
unsigned facility = type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
|
unsigned facility = type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
|
||||||
if (facility == PA_SUBSCRIPTION_EVENT_SINK) {
|
unsigned operation = type & PA_SUBSCRIPTION_EVENT_TYPE_MASK;
|
||||||
|
if (operation != PA_SUBSCRIPTION_EVENT_CHANGE) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (facility == PA_SUBSCRIPTION_EVENT_SERVER) {
|
||||||
|
pa_context_get_server_info(context, serverInfoCb, data);
|
||||||
|
} else if (facility == PA_SUBSCRIPTION_EVENT_SINK) {
|
||||||
pa_context_get_sink_info_by_index(context, idx, sinkInfoCb, data);
|
pa_context_get_sink_info_by_index(context, idx, sinkInfoCb, data);
|
||||||
|
} else if (facility == PA_SUBSCRIPTION_EVENT_SOURCE) {
|
||||||
|
pa_context_get_source_info_by_index(context, idx, sourceInfoCb, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,20 +129,41 @@ void waybar::modules::Pulseaudio::volumeModifyCb(pa_context *c, int success, voi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Called when the requested source information is ready.
|
||||||
|
*/
|
||||||
|
void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const pa_source_info *i,
|
||||||
|
int /*eol*/, void *data) {
|
||||||
|
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
||||||
|
if (i != nullptr && pa->default_source_name_ == i->name) {
|
||||||
|
auto source_volume = static_cast<float>(pa_cvolume_avg(&(i->volume))) / float{PA_VOLUME_NORM};
|
||||||
|
pa->source_volume_ = std::round(source_volume * 100.0F);
|
||||||
|
pa->source_idx_ = i->index;
|
||||||
|
pa->source_muted_ = i->mute != 0;
|
||||||
|
pa->source_desc_ = i->description;
|
||||||
|
pa->source_port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
|
||||||
|
pa->dp.emit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Called when the requested sink information is ready.
|
* Called when the requested sink information is ready.
|
||||||
*/
|
*/
|
||||||
void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i,
|
void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i,
|
||||||
int /*eol*/, void * data) {
|
int /*eol*/, void *data) {
|
||||||
if (i != nullptr) {
|
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
||||||
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
if (i != nullptr && pa->default_sink_name_ == i->name) {
|
||||||
pa->pa_volume_ = i->volume;
|
pa->pa_volume_ = i->volume;
|
||||||
float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) / float{PA_VOLUME_NORM};
|
float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) / float{PA_VOLUME_NORM};
|
||||||
pa->sink_idx_ = i->index;
|
pa->sink_idx_ = i->index;
|
||||||
pa->volume_ = std::round(volume * 100.0F);
|
pa->volume_ = std::round(volume * 100.0F);
|
||||||
pa->muted_ = i->mute != 0;
|
pa->muted_ = i->mute != 0;
|
||||||
pa->desc_ = i->description;
|
pa->desc_ = i->description;
|
||||||
|
pa->monitor_ = i->monitor_source_name;
|
||||||
pa->port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
|
pa->port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
|
||||||
|
if (auto ff = pa_proplist_gets(i->proplist, PA_PROP_DEVICE_FORM_FACTOR)) {
|
||||||
|
pa->form_factor_ = ff;
|
||||||
|
}
|
||||||
pa->dp.emit();
|
pa->dp.emit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -159,15 +174,20 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_
|
|||||||
*/
|
*/
|
||||||
void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i,
|
void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i,
|
||||||
void *data) {
|
void *data) {
|
||||||
|
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
||||||
|
pa->default_sink_name_ = i->default_sink_name;
|
||||||
|
pa->default_source_name_ = i->default_source_name;
|
||||||
|
|
||||||
pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data);
|
pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data);
|
||||||
|
pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const std::array<std::string, 9> ports = {
|
static const std::array<std::string, 9> ports = {
|
||||||
"headphones",
|
"headphone",
|
||||||
"speaker",
|
"speaker",
|
||||||
"hdmi",
|
"hdmi",
|
||||||
"headset",
|
"headset",
|
||||||
"handsfree",
|
"hands-free",
|
||||||
"portable",
|
"portable",
|
||||||
"car",
|
"car",
|
||||||
"hifi",
|
"hifi",
|
||||||
@ -175,7 +195,7 @@ static const std::array<std::string, 9> ports = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const std::string waybar::modules::Pulseaudio::getPortIcon() const {
|
const std::string waybar::modules::Pulseaudio::getPortIcon() const {
|
||||||
std::string nameLC = port_name_;
|
std::string nameLC = port_name_ + form_factor_;
|
||||||
std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
|
std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
|
||||||
for (auto const &port : ports) {
|
for (auto const &port : ports) {
|
||||||
if (nameLC.find(port) != std::string::npos) {
|
if (nameLC.find(port) != std::string::npos) {
|
||||||
@ -187,25 +207,42 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const {
|
|||||||
|
|
||||||
auto waybar::modules::Pulseaudio::update() -> void {
|
auto waybar::modules::Pulseaudio::update() -> void {
|
||||||
auto format = format_;
|
auto format = format_;
|
||||||
if (muted_) {
|
if (!alt_) {
|
||||||
format = config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
|
std::string format_name = "format";
|
||||||
label_.get_style_context()->add_class("muted");
|
if (monitor_.find("a2dp_sink") != std::string::npos) {
|
||||||
} else {
|
format_name = format_name + "-bluetooth";
|
||||||
label_.get_style_context()->remove_class("muted");
|
|
||||||
if (port_name_.find("a2dp_sink") != std::string::npos) {
|
|
||||||
format =
|
|
||||||
config_["format-bluetooth"].isString() ? config_["format-bluetooth"].asString() : format;
|
|
||||||
label_.get_style_context()->add_class("bluetooth");
|
label_.get_style_context()->add_class("bluetooth");
|
||||||
} else {
|
} else {
|
||||||
label_.get_style_context()->remove_class("bluetooth");
|
label_.get_style_context()->remove_class("bluetooth");
|
||||||
}
|
}
|
||||||
|
if (muted_) {
|
||||||
|
// Check muted bluetooth format exist, otherwise fallback to default muted format
|
||||||
|
if (format_name != "format" && !config_[format_name + "-muted"].isString()) {
|
||||||
|
format_name = "format";
|
||||||
|
}
|
||||||
|
format_name = format_name + "-muted";
|
||||||
|
label_.get_style_context()->add_class("muted");
|
||||||
|
} else {
|
||||||
|
label_.get_style_context()->remove_class("muted");
|
||||||
|
}
|
||||||
|
format =
|
||||||
|
config_[format_name].isString() ? config_[format_name].asString() : format;
|
||||||
}
|
}
|
||||||
label_.set_markup(fmt::format(
|
// TODO: find a better way to split source/sink
|
||||||
format, fmt::arg("volume", volume_), fmt::arg("icon", getIcon(volume_, getPortIcon()))));
|
std::string format_source = "{volume}%";
|
||||||
|
if (source_muted_ && config_["format-source-muted"].isString()) {
|
||||||
|
format_source = config_["format-source-muted"].asString();
|
||||||
|
} else if (!source_muted_ && config_["format-source"].isString()) {
|
||||||
|
format_source = config_["format-source"].asString();
|
||||||
|
}
|
||||||
|
format_source = fmt::format(format_source, fmt::arg("volume", source_volume_));
|
||||||
|
label_.set_markup(fmt::format(format,
|
||||||
|
fmt::arg("desc", desc_),
|
||||||
|
fmt::arg("volume", volume_),
|
||||||
|
fmt::arg("format_source", format_source),
|
||||||
|
fmt::arg("icon", getIcon(volume_, getPortIcon()))));
|
||||||
|
getState(volume_);
|
||||||
if (tooltipEnabled()) {
|
if (tooltipEnabled()) {
|
||||||
label_.set_tooltip_text(desc_);
|
label_.set_tooltip_text(desc_);
|
||||||
}
|
}
|
||||||
if (scrolling_) {
|
|
||||||
scrolling_ = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "modules/sni/host.hpp"
|
#include "modules/sni/host.hpp"
|
||||||
#include <iostream>
|
#include <fmt/ostream.h>
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
namespace waybar::modules::SNI {
|
namespace waybar::modules::SNI {
|
||||||
|
|
||||||
@ -63,14 +64,14 @@ void Host::proxyReady(GObject* src, GAsyncResult* res, gpointer data) {
|
|||||||
GError* error = nullptr;
|
GError* error = nullptr;
|
||||||
SnWatcher* watcher = sn_watcher_proxy_new_finish(res, &error);
|
SnWatcher* watcher = sn_watcher_proxy_new_finish(res, &error);
|
||||||
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
|
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
|
||||||
std::cerr << error->message << std::endl;
|
spdlog::error("Host: {}", error->message);
|
||||||
g_error_free(error);
|
g_error_free(error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
auto host = static_cast<SNI::Host*>(data);
|
auto host = static_cast<SNI::Host*>(data);
|
||||||
host->watcher_ = watcher;
|
host->watcher_ = watcher;
|
||||||
if (error != nullptr) {
|
if (error != nullptr) {
|
||||||
std::cerr << error->message << std::endl;
|
spdlog::error("Host: {}", error->message);
|
||||||
g_error_free(error);
|
g_error_free(error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -82,13 +83,13 @@ void Host::registerHost(GObject* src, GAsyncResult* res, gpointer data) {
|
|||||||
GError* error = nullptr;
|
GError* error = nullptr;
|
||||||
sn_watcher_call_register_host_finish(SN_WATCHER(src), res, &error);
|
sn_watcher_call_register_host_finish(SN_WATCHER(src), res, &error);
|
||||||
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
|
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
|
||||||
std::cerr << error->message << std::endl;
|
spdlog::error("Host: {}", error->message);
|
||||||
g_error_free(error);
|
g_error_free(error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
auto host = static_cast<SNI::Host*>(data);
|
auto host = static_cast<SNI::Host*>(data);
|
||||||
if (error != nullptr) {
|
if (error != nullptr) {
|
||||||
std::cerr << error->message << std::endl;
|
spdlog::error("Host: {}", error->message);
|
||||||
g_error_free(error);
|
g_error_free(error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -129,9 +130,15 @@ std::tuple<std::string, std::string> Host::getBusNameAndObjectPath(const std::st
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Host::addRegisteredItem(std::string service) {
|
void Host::addRegisteredItem(std::string service) {
|
||||||
auto [bus_name, object_path] = getBusNameAndObjectPath(service);
|
std::string bus_name, object_path;
|
||||||
items_.emplace_back(new Item(bus_name, object_path, config_));
|
std::tie(bus_name, object_path) = getBusNameAndObjectPath(service);
|
||||||
on_add_(items_.back());
|
auto it = std::find_if(items_.begin(), items_.end(), [&bus_name, &object_path](const auto& item) {
|
||||||
|
return bus_name == item->bus_name && object_path == item->object_path;
|
||||||
|
});
|
||||||
|
if (it == items_.end()) {
|
||||||
|
items_.emplace_back(new Item(bus_name, object_path, config_));
|
||||||
|
on_add_(items_.back());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace waybar::modules::SNI
|
||||||
|
@ -1,6 +1,32 @@
|
|||||||
#include "modules/sni/item.hpp"
|
#include "modules/sni/item.hpp"
|
||||||
#include <glibmm/main.h>
|
#include <glibmm/main.h>
|
||||||
#include <iostream>
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct fmt::formatter<Glib::ustring> : formatter<std::string> {
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const Glib::ustring& value, FormatContext& ctx) {
|
||||||
|
return formatter<std::string>::format(value, ctx);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct fmt::formatter<Glib::VariantBase> : formatter<std::string> {
|
||||||
|
bool is_printable(const Glib::VariantBase& value) {
|
||||||
|
auto type = value.get_type_string();
|
||||||
|
/* Print only primitive (single character excluding 'v') and short complex types */
|
||||||
|
return (type.length() == 1 && islower(type[0]) && type[0] != 'v') || value.get_size() <= 32;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const Glib::VariantBase& value, FormatContext& ctx) {
|
||||||
|
if (is_printable(value)) {
|
||||||
|
return formatter<std::string>::format(value.print(), ctx);
|
||||||
|
} else {
|
||||||
|
return formatter<std::string>::format(value.get_type_string(), ctx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
namespace waybar::modules::SNI {
|
namespace waybar::modules::SNI {
|
||||||
|
|
||||||
@ -47,23 +73,16 @@ void Item::proxyReady(Glib::RefPtr<Gio::AsyncResult>& result) {
|
|||||||
this->proxy_->signal_signal().connect(sigc::mem_fun(*this, &Item::onSignal));
|
this->proxy_->signal_signal().connect(sigc::mem_fun(*this, &Item::onSignal));
|
||||||
|
|
||||||
if (this->id.empty() || this->category.empty() || this->status.empty()) {
|
if (this->id.empty() || this->category.empty() || this->status.empty()) {
|
||||||
std::cerr << "Invalid Status Notifier Item: " + this->bus_name + "," + this->object_path
|
spdlog::error("Invalid Status Notifier Item: {}, {}", bus_name, object_path);
|
||||||
<< std::endl;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this->updateImage();
|
this->updateImage();
|
||||||
// this->event_box.set_tooltip_text(this->title);
|
// this->event_box.set_tooltip_text(this->title);
|
||||||
|
|
||||||
} catch (const Glib::Error& err) {
|
} catch (const Glib::Error& err) {
|
||||||
g_error("Failed to create DBus Proxy for %s %s: %s",
|
spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what());
|
||||||
bus_name.c_str(),
|
|
||||||
object_path.c_str(),
|
|
||||||
err.what().c_str());
|
|
||||||
} catch (const std::exception& err) {
|
} catch (const std::exception& err) {
|
||||||
g_error("Failed to create DBus Proxy for %s %s: %s",
|
spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what());
|
||||||
bus_name.c_str(),
|
|
||||||
object_path.c_str(),
|
|
||||||
err.what());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,41 +92,58 @@ T get_variant(Glib::VariantBase& value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) {
|
void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) {
|
||||||
if (name == "Category") {
|
try {
|
||||||
category = get_variant<std::string>(value);
|
spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, value);
|
||||||
} else if (name == "Id") {
|
|
||||||
id = get_variant<std::string>(value);
|
if (name == "Category") {
|
||||||
} else if (name == "Title") {
|
category = get_variant<std::string>(value);
|
||||||
title = get_variant<std::string>(value);
|
} else if (name == "Id") {
|
||||||
} else if (name == "Status") {
|
id = get_variant<std::string>(value);
|
||||||
status = get_variant<std::string>(value);
|
} else if (name == "Title") {
|
||||||
} else if (name == "WindowId") {
|
title = get_variant<std::string>(value);
|
||||||
window_id = get_variant<int32_t>(value);
|
} else if (name == "Status") {
|
||||||
} else if (name == "IconName") {
|
status = get_variant<std::string>(value);
|
||||||
icon_name = get_variant<std::string>(value);
|
} else if (name == "WindowId") {
|
||||||
} else if (name == "IconPixmap") {
|
window_id = get_variant<int32_t>(value);
|
||||||
icon_pixmap = this->extractPixBuf(value.gobj());
|
} else if (name == "IconName") {
|
||||||
} else if (name == "OverlayIconName") {
|
icon_name = get_variant<std::string>(value);
|
||||||
overlay_icon_name = get_variant<std::string>(value);
|
} else if (name == "IconPixmap") {
|
||||||
} else if (name == "OverlayIconPixmap") {
|
icon_pixmap = this->extractPixBuf(value.gobj());
|
||||||
// TODO: overlay_icon_pixmap
|
} else if (name == "OverlayIconName") {
|
||||||
} else if (name == "AttentionIconName") {
|
overlay_icon_name = get_variant<std::string>(value);
|
||||||
attention_icon_name = get_variant<std::string>(value);
|
} else if (name == "OverlayIconPixmap") {
|
||||||
} else if (name == "AttentionIconPixmap") {
|
// TODO: overlay_icon_pixmap
|
||||||
// TODO: attention_icon_pixmap
|
} else if (name == "AttentionIconName") {
|
||||||
} else if (name == "AttentionMovieName") {
|
attention_icon_name = get_variant<std::string>(value);
|
||||||
attention_movie_name = get_variant<std::string>(value);
|
} else if (name == "AttentionIconPixmap") {
|
||||||
} else if (name == "ToolTip") {
|
// TODO: attention_icon_pixmap
|
||||||
// TODO: tooltip
|
} else if (name == "AttentionMovieName") {
|
||||||
} else if (name == "IconThemePath") {
|
attention_movie_name = get_variant<std::string>(value);
|
||||||
icon_theme_path = get_variant<std::string>(value);
|
} else if (name == "ToolTip") {
|
||||||
if (!icon_theme_path.empty()) {
|
// TODO: tooltip
|
||||||
icon_theme->set_search_path({icon_theme_path});
|
} else if (name == "IconThemePath") {
|
||||||
|
icon_theme_path = get_variant<std::string>(value);
|
||||||
|
if (!icon_theme_path.empty()) {
|
||||||
|
icon_theme->set_search_path({icon_theme_path});
|
||||||
|
}
|
||||||
|
} else if (name == "Menu") {
|
||||||
|
menu = get_variant<std::string>(value);
|
||||||
|
makeMenu();
|
||||||
|
} else if (name == "ItemIsMenu") {
|
||||||
|
item_is_menu = get_variant<bool>(value);
|
||||||
}
|
}
|
||||||
} else if (name == "Menu") {
|
} catch (const Glib::Error& err) {
|
||||||
menu = get_variant<std::string>(value);
|
spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}",
|
||||||
} else if (name == "ItemIsMenu") {
|
id.empty() ? bus_name : id,
|
||||||
item_is_menu = get_variant<bool>(value);
|
name,
|
||||||
|
value,
|
||||||
|
err.what());
|
||||||
|
} catch (const std::exception& err) {
|
||||||
|
spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}",
|
||||||
|
id.empty() ? bus_name : id,
|
||||||
|
name,
|
||||||
|
value,
|
||||||
|
err.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -132,7 +168,7 @@ void Item::processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& _result) {
|
|||||||
for (const auto& [name, value] : properties) {
|
for (const auto& [name, value] : properties) {
|
||||||
Glib::VariantBase old_value;
|
Glib::VariantBase old_value;
|
||||||
proxy_->get_cached_property(old_value, name);
|
proxy_->get_cached_property(old_value, name);
|
||||||
if (!value.equal(old_value)) {
|
if (!old_value || !value.equal(old_value)) {
|
||||||
proxy_->set_cached_property(name, value);
|
proxy_->set_cached_property(name, value);
|
||||||
setProperty(name, const_cast<Glib::VariantBase&>(value));
|
setProperty(name, const_cast<Glib::VariantBase&>(value));
|
||||||
}
|
}
|
||||||
@ -141,14 +177,15 @@ void Item::processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& _result) {
|
|||||||
this->updateImage();
|
this->updateImage();
|
||||||
// this->event_box.set_tooltip_text(this->title);
|
// this->event_box.set_tooltip_text(this->title);
|
||||||
} catch (const Glib::Error& err) {
|
} catch (const Glib::Error& err) {
|
||||||
g_warning("Failed to update properties: %s", err.what().c_str());
|
spdlog::warn("Failed to update properties: {}", err.what());
|
||||||
} catch (const std::exception& err) {
|
} catch (const std::exception& err) {
|
||||||
g_warning("Failed to update properties: %s", err.what());
|
spdlog::warn("Failed to update properties: {}", err.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
|
void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
|
||||||
const Glib::VariantContainerBase& arguments) {
|
const Glib::VariantContainerBase& arguments) {
|
||||||
|
spdlog::trace("Tray item '{}' got signal {}", id, signal_name);
|
||||||
if (!update_pending_ && signal_name.compare(0, 3, "New") == 0) {
|
if (!update_pending_ && signal_name.compare(0, 3, "New") == 0) {
|
||||||
/* Debounce signals and schedule update of all properties.
|
/* Debounce signals and schedule update of all properties.
|
||||||
* Based on behavior of Plasma dataengine for StatusNotifierItem.
|
* Based on behavior of Plasma dataengine for StatusNotifierItem.
|
||||||
@ -228,14 +265,18 @@ void Item::updateImage() {
|
|||||||
if (pixbuf->gobj() != nullptr) {
|
if (pixbuf->gobj() != nullptr) {
|
||||||
// An icon specified by path and filename may be the wrong size for
|
// An icon specified by path and filename may be the wrong size for
|
||||||
// the tray
|
// the tray
|
||||||
pixbuf = pixbuf->scale_simple(icon_size, icon_size, Gdk::InterpType::INTERP_BILINEAR);
|
// Keep the aspect ratio and scale to make the height equal to icon_size
|
||||||
|
// If people have non square icons, assume they want it to grow in width not height
|
||||||
|
int width = icon_size * pixbuf->get_width() / pixbuf->get_height();
|
||||||
|
|
||||||
|
pixbuf = pixbuf->scale_simple(width, icon_size, Gdk::InterpType::INTERP_BILINEAR);
|
||||||
image.set(pixbuf);
|
image.set(pixbuf);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
image.set(getIconByName(icon_name, icon_size));
|
image.set(getIconByName(icon_name, icon_size));
|
||||||
}
|
}
|
||||||
} catch (Glib::Error& e) {
|
} catch (Glib::Error& e) {
|
||||||
std::cerr << "Exception: " << e.what() << std::endl;
|
spdlog::error("Item '{}': {}", id, static_cast<std::string>(e.what()));
|
||||||
}
|
}
|
||||||
} else if (icon_pixmap) {
|
} else if (icon_pixmap) {
|
||||||
// An icon extracted may be the wrong size for the tray
|
// An icon extracted may be the wrong size for the tray
|
||||||
@ -276,39 +317,38 @@ Glib::RefPtr<Gdk::Pixbuf> Item::getIconByName(const std::string& name, int reque
|
|||||||
name.c_str(), tmp_size, Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
|
name.c_str(), tmp_size, Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Item::onMenuDestroyed(Item* self) {
|
void Item::onMenuDestroyed(Item* self, GObject* old_menu_pointer) {
|
||||||
self->gtk_menu = nullptr;
|
if (old_menu_pointer == reinterpret_cast<GObject*>(self->dbus_menu)) {
|
||||||
self->dbus_menu = nullptr;
|
self->gtk_menu = nullptr;
|
||||||
|
self->dbus_menu = nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Item::makeMenu(GdkEventButton* const& ev) {
|
void Item::makeMenu() {
|
||||||
if (gtk_menu == nullptr) {
|
if (gtk_menu == nullptr && !menu.empty()) {
|
||||||
if (!menu.empty()) {
|
dbus_menu = dbusmenu_gtkmenu_new(bus_name.data(), menu.data());
|
||||||
dbus_menu = dbusmenu_gtkmenu_new(bus_name.data(), menu.data());
|
if (dbus_menu != nullptr) {
|
||||||
if (dbus_menu != nullptr) {
|
g_object_ref_sink(G_OBJECT(dbus_menu));
|
||||||
g_object_ref_sink(G_OBJECT(dbus_menu));
|
g_object_weak_ref(G_OBJECT(dbus_menu), (GWeakNotify)onMenuDestroyed, this);
|
||||||
g_object_weak_ref(G_OBJECT(dbus_menu), (GWeakNotify)onMenuDestroyed, this);
|
gtk_menu = Glib::wrap(GTK_MENU(dbus_menu));
|
||||||
gtk_menu = Glib::wrap(GTK_MENU(dbus_menu));
|
gtk_menu->attach_to_widget(event_box);
|
||||||
gtk_menu->attach_to_widget(event_box);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (gtk_menu != nullptr) {
|
|
||||||
#if GTK_CHECK_VERSION(3, 22, 0)
|
|
||||||
gtk_menu->popup_at_pointer(reinterpret_cast<GdkEvent*>(ev));
|
|
||||||
#else
|
|
||||||
gtk_menu->popup(ev->button, ev->time);
|
|
||||||
#endif
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Item::handleClick(GdkEventButton* const& ev) {
|
bool Item::handleClick(GdkEventButton* const& ev) {
|
||||||
auto parameters = Glib::VariantContainerBase::create_tuple(
|
auto parameters = Glib::VariantContainerBase::create_tuple(
|
||||||
{Glib::Variant<int>::create(ev->x), Glib::Variant<int>::create(ev->y)});
|
{Glib::Variant<int>::create(ev->x), Glib::Variant<int>::create(ev->y)});
|
||||||
if ((ev->button == 1 && item_is_menu) || ev->button == 3) {
|
if ((ev->button == 1 && item_is_menu) || ev->button == 3) {
|
||||||
if (!makeMenu(ev)) {
|
makeMenu();
|
||||||
|
if (gtk_menu != nullptr) {
|
||||||
|
#if GTK_CHECK_VERSION(3, 22, 0)
|
||||||
|
gtk_menu->popup_at_pointer(reinterpret_cast<GdkEvent*>(ev));
|
||||||
|
#else
|
||||||
|
gtk_menu->popup(ev->button, ev->time);
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
proxy_->call("ContextMenu", parameters);
|
proxy_->call("ContextMenu", parameters);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -322,4 +362,4 @@ bool Item::handleClick(GdkEventButton* const& ev) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace waybar::modules::SNI
|
} // namespace waybar::modules::SNI
|
||||||
|
@ -1,14 +1,19 @@
|
|||||||
#include "modules/sni/tray.hpp"
|
#include "modules/sni/tray.hpp"
|
||||||
#include <iostream>
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
namespace waybar::modules::SNI {
|
namespace waybar::modules::SNI {
|
||||||
|
|
||||||
Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config)
|
Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config)
|
||||||
: config_(config),
|
: AModule(config, "tray", id),
|
||||||
box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
|
box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
|
||||||
|
watcher_(SNI::Watcher::getInstance()),
|
||||||
host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1),
|
host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1),
|
||||||
std::bind(&Tray::onRemove, this, std::placeholders::_1)) {
|
std::bind(&Tray::onRemove, this, std::placeholders::_1)) {
|
||||||
|
spdlog::warn(
|
||||||
|
"For a functional tray you must have libappindicator-* installed and export "
|
||||||
|
"XDG_CURRENT_DESKTOP=Unity");
|
||||||
box_.set_name("tray");
|
box_.set_name("tray");
|
||||||
|
event_box_.add(box_);
|
||||||
if (!id.empty()) {
|
if (!id.empty()) {
|
||||||
box_.get_style_context()->add_class(id);
|
box_.get_style_context()->add_class(id);
|
||||||
}
|
}
|
||||||
@ -37,6 +42,4 @@ auto Tray::update() -> void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Tray::operator Gtk::Widget&() { return box_; }
|
} // namespace waybar::modules::SNI
|
||||||
|
|
||||||
}
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include "modules/sni/watcher.hpp"
|
#include "modules/sni/watcher.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
using namespace waybar::modules::SNI;
|
using namespace waybar::modules::SNI;
|
||||||
|
|
||||||
@ -14,11 +13,6 @@ Watcher::Watcher()
|
|||||||
watcher_(sn_watcher_skeleton_new()) {}
|
watcher_(sn_watcher_skeleton_new()) {}
|
||||||
|
|
||||||
Watcher::~Watcher() {
|
Watcher::~Watcher() {
|
||||||
if (bus_name_id_ > 0) {
|
|
||||||
g_bus_unown_name(bus_name_id_);
|
|
||||||
bus_name_id_ = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hosts_ != nullptr) {
|
if (hosts_ != nullptr) {
|
||||||
g_slist_free_full(hosts_, gfWatchFree);
|
g_slist_free_full(hosts_, gfWatchFree);
|
||||||
hosts_ = nullptr;
|
hosts_ = nullptr;
|
||||||
@ -28,7 +22,9 @@ Watcher::~Watcher() {
|
|||||||
g_slist_free_full(items_, gfWatchFree);
|
g_slist_free_full(items_, gfWatchFree);
|
||||||
items_ = nullptr;
|
items_ = nullptr;
|
||||||
}
|
}
|
||||||
g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(watcher_));
|
Gio::DBus::unown_name(bus_name_id_);
|
||||||
|
auto iface = G_DBUS_INTERFACE_SKELETON(watcher_);
|
||||||
|
g_dbus_interface_skeleton_unexport(iface);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Watcher::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name) {
|
void Watcher::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name) {
|
||||||
@ -36,7 +32,10 @@ void Watcher::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib:
|
|||||||
g_dbus_interface_skeleton_export(
|
g_dbus_interface_skeleton_export(
|
||||||
G_DBUS_INTERFACE_SKELETON(watcher_), conn->gobj(), "/StatusNotifierWatcher", &error);
|
G_DBUS_INTERFACE_SKELETON(watcher_), conn->gobj(), "/StatusNotifierWatcher", &error);
|
||||||
if (error != nullptr) {
|
if (error != nullptr) {
|
||||||
std::cerr << error->message << std::endl;
|
// Don't print an error when a watcher is already present
|
||||||
|
if (error->code != 2) {
|
||||||
|
spdlog::error("Watcher: {}", error->message);
|
||||||
|
}
|
||||||
g_error_free(error);
|
g_error_free(error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -194,4 +193,4 @@ void Watcher::updateRegisteredItems(SnWatcher* obj) {
|
|||||||
sn_watcher_set_registered_items(obj, items);
|
sn_watcher_set_registered_items(obj, items);
|
||||||
g_variant_unref(variant);
|
g_variant_unref(variant);
|
||||||
g_free(items);
|
g_free(items);
|
||||||
}
|
}
|
||||||
|
@ -10,19 +10,23 @@ Ipc::Ipc() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Ipc::~Ipc() {
|
Ipc::~Ipc() {
|
||||||
// To fail the IPC header
|
thread_.stop();
|
||||||
write(fd_, "close-sway-ipc", 14);
|
|
||||||
write(fd_event_, "close-sway-ipc", 14);
|
|
||||||
if (fd_ > 0) {
|
if (fd_ > 0) {
|
||||||
|
// To fail the IPC header
|
||||||
|
write(fd_, "close-sway-ipc", 14);
|
||||||
close(fd_);
|
close(fd_);
|
||||||
fd_ = -1;
|
fd_ = -1;
|
||||||
}
|
}
|
||||||
if (fd_event_ > 0) {
|
if (fd_event_ > 0) {
|
||||||
|
write(fd_event_, "close-sway-ipc", 14);
|
||||||
close(fd_event_);
|
close(fd_event_);
|
||||||
fd_event_ = -1;
|
fd_event_ = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Ipc::setWorker(std::function<void()>&& func) { thread_ = func; }
|
||||||
|
|
||||||
const std::string Ipc::getSocketPath() const {
|
const std::string Ipc::getSocketPath() const {
|
||||||
const char* env = getenv("SWAYSOCK");
|
const char* env = getenv("SWAYSOCK");
|
||||||
if (env != nullptr) {
|
if (env != nullptr) {
|
||||||
@ -104,9 +108,7 @@ struct Ipc::ipc_response Ipc::recv(int fd) {
|
|||||||
}
|
}
|
||||||
total += res;
|
total += res;
|
||||||
}
|
}
|
||||||
std::lock_guard<std::mutex> lock(mutex_parser_);
|
return {data32[0], data32[1], &payload.front()};
|
||||||
auto parsed = parser_.parse(&payload.front());
|
|
||||||
return {data32[0], data32[1], parsed};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Ipc::ipc_response Ipc::send(int fd, uint32_t type, const std::string& payload) {
|
struct Ipc::ipc_response Ipc::send(int fd, uint32_t type, const std::string& payload) {
|
||||||
@ -133,17 +135,15 @@ void Ipc::sendCmd(uint32_t type, const std::string& payload) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Ipc::subscribe(const std::string& payload) {
|
void Ipc::subscribe(const std::string& payload) {
|
||||||
std::lock_guard<std::mutex> lock(mutex_event_);
|
|
||||||
auto res = Ipc::send(fd_event_, IPC_SUBSCRIBE, payload);
|
auto res = Ipc::send(fd_event_, IPC_SUBSCRIBE, payload);
|
||||||
if (!res.payload["success"].asBool()) {
|
if (res.payload != "{\"success\": true}") {
|
||||||
throw std::runtime_error("Unable to subscribe ipc event");
|
throw std::runtime_error("Unable to subscribe ipc event");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Ipc::handleEvent() {
|
void Ipc::handleEvent() {
|
||||||
std::lock_guard<std::mutex> lock(mutex_event_);
|
|
||||||
const auto res = Ipc::recv(fd_event_);
|
const auto res = Ipc::recv(fd_event_);
|
||||||
signal_event.emit(res);
|
signal_event.emit(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -1,37 +1,40 @@
|
|||||||
#include "modules/sway/mode.hpp"
|
#include "modules/sway/mode.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
Mode::Mode(const std::string& id, const Bar& bar, const Json::Value& config)
|
Mode::Mode(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{}"), bar_(bar) {
|
: ALabel(config, "mode", id, "{}", 0, true) {
|
||||||
label_.set_name("mode");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
ipc_.subscribe(R"(["mode"])");
|
ipc_.subscribe(R"(["mode"])");
|
||||||
ipc_.signal_event.connect(sigc::mem_fun(*this, &Mode::onEvent));
|
ipc_.signal_event.connect(sigc::mem_fun(*this, &Mode::onEvent));
|
||||||
// Launch worker
|
// Launch worker
|
||||||
worker();
|
ipc_.setWorker([this] {
|
||||||
dp.emit();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Mode::onEvent(const struct Ipc::ipc_response &res) {
|
|
||||||
if (res.payload["change"] != "default") {
|
|
||||||
mode_ = res.payload["change"].asString();
|
|
||||||
} else {
|
|
||||||
mode_.clear();
|
|
||||||
}
|
|
||||||
dp.emit();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Mode::worker() {
|
|
||||||
thread_ = [this] {
|
|
||||||
try {
|
try {
|
||||||
ipc_.handleEvent();
|
ipc_.handleEvent();
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << "Mode: " << e.what() << std::endl;
|
spdlog::error("Mode: {}", e.what());
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
dp.emit();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Mode::onEvent(const struct Ipc::ipc_response& res) {
|
||||||
|
try {
|
||||||
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
|
auto payload = parser_.parse(res.payload);
|
||||||
|
if (payload["change"] != "default") {
|
||||||
|
if (payload["pango_markup"].asBool()) {
|
||||||
|
mode_ = payload["change"].asString();
|
||||||
|
} else {
|
||||||
|
mode_ = Glib::Markup::escape_text(payload["change"].asString());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mode_.clear();
|
||||||
|
}
|
||||||
|
dp.emit();
|
||||||
|
} catch (const std::exception& e) {
|
||||||
|
spdlog::error("Mode: {}", e.what());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto Mode::update() -> void {
|
auto Mode::update() -> void {
|
||||||
@ -46,4 +49,4 @@ auto Mode::update() -> void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -1,81 +1,61 @@
|
|||||||
#include "modules/sway/window.hpp"
|
#include "modules/sway/window.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
|
Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
|
||||||
: ALabel(config, "{}"), bar_(bar), windowId_(-1) {
|
: ALabel(config, "window", id, "{}", 0, true), bar_(bar), windowId_(-1) {
|
||||||
label_.set_name("window");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
if (label_.get_max_width_chars() == -1) {
|
|
||||||
label_.set_hexpand(true);
|
|
||||||
label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
|
|
||||||
}
|
|
||||||
ipc_.subscribe(R"(["window","workspace"])");
|
ipc_.subscribe(R"(["window","workspace"])");
|
||||||
ipc_.signal_event.connect(sigc::mem_fun(*this, &Window::onEvent));
|
ipc_.signal_event.connect(sigc::mem_fun(*this, &Window::onEvent));
|
||||||
ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Window::onCmd));
|
ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Window::onCmd));
|
||||||
// Get Initial focused window
|
// Get Initial focused window
|
||||||
getTree();
|
getTree();
|
||||||
// Launch worker
|
// Launch worker
|
||||||
worker();
|
ipc_.setWorker([this] {
|
||||||
|
try {
|
||||||
|
ipc_.handleEvent();
|
||||||
|
} catch (const std::exception& e) {
|
||||||
|
spdlog::error("Window: {}", e.what());
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void Window::onEvent(const struct Ipc::ipc_response& res) {
|
void Window::onEvent(const struct Ipc::ipc_response& res) { getTree(); }
|
||||||
auto data = res.payload;
|
|
||||||
// Check for waybar prevents flicker when hovering window module
|
|
||||||
if ((data["change"] == "focus" || data["change"] == "title") &&
|
|
||||||
data["container"]["focused"].asBool() && data["container"]["name"].asString() != "waybar") {
|
|
||||||
window_ = Glib::Markup::escape_text(data["container"]["name"].asString());
|
|
||||||
windowId_ = data["container"]["id"].asInt();
|
|
||||||
dp.emit();
|
|
||||||
getTree();
|
|
||||||
} else if ((data["change"] == "close" && data["container"]["focused"].asBool() &&
|
|
||||||
windowId_ == data["container"]["id"].asInt()) ||
|
|
||||||
(data["change"] == "focus" && data["current"]["focus"].isArray() &&
|
|
||||||
data["current"]["focus"].empty())) {
|
|
||||||
window_.clear();
|
|
||||||
windowId_ = -1;
|
|
||||||
dp.emit();
|
|
||||||
getTree();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Window::onCmd(const struct Ipc::ipc_response& res) {
|
void Window::onCmd(const struct Ipc::ipc_response& res) {
|
||||||
auto [nb, id, name, app_id] = getFocusedNode(res.payload);
|
try {
|
||||||
if (!app_id_.empty()) {
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
bar_.window.get_style_context()->remove_class(app_id_);
|
auto payload = parser_.parse(res.payload);
|
||||||
|
auto output = payload["output"].isString() ? payload["output"].asString() : "";
|
||||||
|
std::tie(app_nb_, windowId_, window_, app_id_) = getFocusedNode(payload["nodes"], output);
|
||||||
|
dp.emit();
|
||||||
|
} catch (const std::exception& e) {
|
||||||
|
spdlog::error("Window: {}", e.what());
|
||||||
}
|
}
|
||||||
if (nb == 0) {
|
}
|
||||||
bar_.window.get_style_context()->add_class("empty");
|
|
||||||
} else if (nb == 1) {
|
auto Window::update() -> void {
|
||||||
bar_.window.get_style_context()->add_class("solo");
|
if (!old_app_id_.empty()) {
|
||||||
if (!app_id.empty()) {
|
bar_.window.get_style_context()->remove_class(old_app_id_);
|
||||||
bar_.window.get_style_context()->add_class(app_id);
|
}
|
||||||
|
if (app_nb_ == 0) {
|
||||||
|
bar_.window.get_style_context()->remove_class("solo");
|
||||||
|
if (!bar_.window.get_style_context()->has_class("empty")) {
|
||||||
|
bar_.window.get_style_context()->add_class("empty");
|
||||||
|
}
|
||||||
|
} else if (app_nb_ == 1) {
|
||||||
|
bar_.window.get_style_context()->remove_class("empty");
|
||||||
|
if (!bar_.window.get_style_context()->has_class("solo")) {
|
||||||
|
bar_.window.get_style_context()->add_class("solo");
|
||||||
|
}
|
||||||
|
if (!app_id_.empty() && !bar_.window.get_style_context()->has_class(app_id_)) {
|
||||||
|
bar_.window.get_style_context()->add_class(app_id_);
|
||||||
|
old_app_id_ = app_id_;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
bar_.window.get_style_context()->remove_class("solo");
|
bar_.window.get_style_context()->remove_class("solo");
|
||||||
bar_.window.get_style_context()->remove_class("empty");
|
bar_.window.get_style_context()->remove_class("empty");
|
||||||
}
|
}
|
||||||
app_id_ = app_id;
|
|
||||||
if (windowId_ != id || window_ != name) {
|
|
||||||
windowId_ = id;
|
|
||||||
window_ = name;
|
|
||||||
dp.emit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Window::worker() {
|
|
||||||
thread_ = [this] {
|
|
||||||
try {
|
|
||||||
ipc_.handleEvent();
|
|
||||||
} catch (const std::exception& e) {
|
|
||||||
std::cerr << "Window: " << e.what() << std::endl;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
auto Window::update() -> void {
|
|
||||||
label_.set_markup(fmt::format(format_, window_));
|
label_.set_markup(fmt::format(format_, window_));
|
||||||
if (tooltipEnabled()) {
|
if (tooltipEnabled()) {
|
||||||
label_.set_tooltip_text(window_);
|
label_.set_tooltip_text(window_);
|
||||||
@ -83,20 +63,28 @@ auto Window::update() -> void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
|
std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
|
||||||
const Json::Value& nodes) {
|
const Json::Value& nodes, std::string& output) {
|
||||||
for (auto const& node : nodes["nodes"]) {
|
for (auto const& node : nodes) {
|
||||||
if (node["focused"].asBool() && node["type"] == "con") {
|
if (node["output"].isString()) {
|
||||||
if ((!config_["all-outputs"].asBool() && nodes["output"] == bar_.output->name) ||
|
output = node["output"].asString();
|
||||||
|
}
|
||||||
|
if (node["focused"].asBool() && (node["type"] == "con" || node["type"] == "floating_con")) {
|
||||||
|
if ((!config_["all-outputs"].asBool() && output == bar_.output->name) ||
|
||||||
config_["all-outputs"].asBool()) {
|
config_["all-outputs"].asBool()) {
|
||||||
auto app_id = node["app_id"].isString() ? node["app_id"].asString()
|
auto app_id = node["app_id"].isString() ? node["app_id"].asString()
|
||||||
: node["window_properties"]["instance"].asString();
|
: node["window_properties"]["instance"].asString();
|
||||||
return {nodes["nodes"].size(),
|
return {nodes.size(),
|
||||||
node["id"].asInt(),
|
node["id"].asInt(),
|
||||||
Glib::Markup::escape_text(node["name"].asString()),
|
Glib::Markup::escape_text(node["name"].asString()),
|
||||||
app_id};
|
app_id};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
auto [nb, id, name, app_id] = getFocusedNode(node);
|
auto [nb, id, name, app_id] = getFocusedNode(node["nodes"], output);
|
||||||
|
if (id > -1 && !name.empty()) {
|
||||||
|
return {nb, id, name, app_id};
|
||||||
|
}
|
||||||
|
// Search for floating node
|
||||||
|
std::tie(nb, id, name, app_id) = getFocusedNode(node["floating_nodes"], output);
|
||||||
if (id > -1 && !name.empty()) {
|
if (id > -1 && !name.empty()) {
|
||||||
return {nb, id, name, app_id};
|
return {nb, id, name, app_id};
|
||||||
}
|
}
|
||||||
@ -108,8 +96,8 @@ void Window::getTree() {
|
|||||||
try {
|
try {
|
||||||
ipc_.sendCmd(IPC_GET_TREE);
|
ipc_.sendCmd(IPC_GET_TREE);
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
std::cerr << e.what() << std::endl;
|
spdlog::error("Window: {}", e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
} // namespace waybar::modules::sway
|
||||||
|
@ -1,56 +1,111 @@
|
|||||||
#include "modules/sway/workspaces.hpp"
|
#include "modules/sway/workspaces.hpp"
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config)
|
Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config)
|
||||||
: bar_(bar),
|
: AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()),
|
||||||
config_(config),
|
bar_(bar),
|
||||||
box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
|
box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) {
|
||||||
scrolling_(false) {
|
|
||||||
box_.set_name("workspaces");
|
box_.set_name("workspaces");
|
||||||
if (!id.empty()) {
|
if (!id.empty()) {
|
||||||
box_.get_style_context()->add_class(id);
|
box_.get_style_context()->add_class(id);
|
||||||
}
|
}
|
||||||
|
event_box_.add(box_);
|
||||||
ipc_.subscribe(R"(["workspace"])");
|
ipc_.subscribe(R"(["workspace"])");
|
||||||
ipc_.signal_event.connect(sigc::mem_fun(*this, &Workspaces::onEvent));
|
ipc_.signal_event.connect(sigc::mem_fun(*this, &Workspaces::onEvent));
|
||||||
ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Workspaces::onCmd));
|
ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Workspaces::onCmd));
|
||||||
ipc_.sendCmd(IPC_GET_WORKSPACES);
|
ipc_.sendCmd(IPC_GET_WORKSPACES);
|
||||||
// Launch worker
|
if (config["enable-bar-scroll"].asBool()) {
|
||||||
worker();
|
auto &window = const_cast<Bar &>(bar_).window;
|
||||||
}
|
window.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
||||||
|
window.signal_scroll_event().connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
|
||||||
void Workspaces::onEvent(const struct Ipc::ipc_response &res) { ipc_.sendCmd(IPC_GET_WORKSPACES); }
|
|
||||||
|
|
||||||
void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
|
|
||||||
if (res.type == IPC_GET_WORKSPACES) {
|
|
||||||
if (res.payload.isArray()) {
|
|
||||||
std::lock_guard<std::mutex> lock(mutex_);
|
|
||||||
workspaces_.clear();
|
|
||||||
std::copy_if(res.payload.begin(),
|
|
||||||
res.payload.end(),
|
|
||||||
std::back_inserter(workspaces_),
|
|
||||||
[&](const auto &workspace) {
|
|
||||||
return !config_["all-outputs"].asBool()
|
|
||||||
? workspace["output"].asString() == bar_.output->name
|
|
||||||
: true;
|
|
||||||
});
|
|
||||||
dp.emit();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (scrolling_) {
|
|
||||||
scrolling_ = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
// Launch worker
|
||||||
|
ipc_.setWorker([this] {
|
||||||
void Workspaces::worker() {
|
|
||||||
thread_ = [this] {
|
|
||||||
try {
|
try {
|
||||||
ipc_.handleEvent();
|
ipc_.handleEvent();
|
||||||
} catch (const std::exception &e) {
|
} catch (const std::exception &e) {
|
||||||
std::cerr << "Workspaces: " << e.what() << std::endl;
|
spdlog::error("Workspaces: {}", e.what());
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void Workspaces::onEvent(const struct Ipc::ipc_response &res) {
|
||||||
|
try {
|
||||||
|
ipc_.sendCmd(IPC_GET_WORKSPACES);
|
||||||
|
} catch (const std::exception &e) {
|
||||||
|
spdlog::error("Workspaces: {}", e.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
|
||||||
|
if (res.type == IPC_GET_WORKSPACES) {
|
||||||
|
try {
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
|
auto payload = parser_.parse(res.payload);
|
||||||
|
workspaces_.clear();
|
||||||
|
std::copy_if(payload.begin(),
|
||||||
|
payload.end(),
|
||||||
|
std::back_inserter(workspaces_),
|
||||||
|
[&](const auto &workspace) {
|
||||||
|
return !config_["all-outputs"].asBool()
|
||||||
|
? workspace["output"].asString() == bar_.output->name
|
||||||
|
: true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// adding persistent workspaces (as per the config file)
|
||||||
|
if (config_["persistent_workspaces"].isObject()) {
|
||||||
|
const Json::Value & p_workspaces = config_["persistent_workspaces"];
|
||||||
|
const std::vector<std::string> p_workspaces_names = p_workspaces.getMemberNames();
|
||||||
|
|
||||||
|
for (const std::string &p_w_name : p_workspaces_names) {
|
||||||
|
const Json::Value &p_w = p_workspaces[p_w_name];
|
||||||
|
auto it =
|
||||||
|
std::find_if(payload.begin(), payload.end(), [&p_w_name](const Json::Value &node) {
|
||||||
|
return node["name"].asString() == p_w_name;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (it != payload.end()) {
|
||||||
|
continue; // already displayed by some bar
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p_w.isArray() && !p_w.empty()) {
|
||||||
|
// Adding to target outputs
|
||||||
|
for (const Json::Value &output : p_w) {
|
||||||
|
if (output.asString() == bar_.output->name) {
|
||||||
|
Json::Value v;
|
||||||
|
v["name"] = p_w_name;
|
||||||
|
v["target_output"] = bar_.output->name;
|
||||||
|
workspaces_.emplace_back(std::move(v));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Adding to all outputs
|
||||||
|
Json::Value v;
|
||||||
|
v["name"] = p_w_name;
|
||||||
|
v["target_output"] = "";
|
||||||
|
workspaces_.emplace_back(std::move(v));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::sort(workspaces_.begin(),
|
||||||
|
workspaces_.end(),
|
||||||
|
[](const Json::Value &lhs, const Json::Value &rhs) {
|
||||||
|
if (lhs["name"].isInt() && rhs["name"].isInt()) {
|
||||||
|
return lhs["name"].asInt() < rhs["name"].asInt();
|
||||||
|
}
|
||||||
|
return lhs["name"].asString() < rhs["name"].asString();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dp.emit();
|
||||||
|
} catch (const std::exception &e) {
|
||||||
|
spdlog::error("Workspaces: {}", e.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Workspaces::filterButtons() {
|
bool Workspaces::filterButtons() {
|
||||||
@ -94,15 +149,21 @@ auto Workspaces::update() -> void {
|
|||||||
} else {
|
} else {
|
||||||
button.get_style_context()->remove_class("urgent");
|
button.get_style_context()->remove_class("urgent");
|
||||||
}
|
}
|
||||||
|
if ((*it)["target_output"].isString()) {
|
||||||
|
button.get_style_context()->add_class("persistent");
|
||||||
|
} else {
|
||||||
|
button.get_style_context()->remove_class("persistent");
|
||||||
|
}
|
||||||
if (needReorder) {
|
if (needReorder) {
|
||||||
box_.reorder_child(button, it - workspaces_.begin());
|
box_.reorder_child(button, it - workspaces_.begin());
|
||||||
}
|
}
|
||||||
std::string output = getIcon((*it)["name"].asString(), *it);
|
std::string output = (*it)["name"].asString();
|
||||||
if (config_["format"].isString()) {
|
if (config_["format"].isString()) {
|
||||||
auto format = config_["format"].asString();
|
auto format = config_["format"].asString();
|
||||||
output = fmt::format(format,
|
output = fmt::format(format,
|
||||||
fmt::arg("icon", output),
|
fmt::arg("icon", getIcon(output, *it)),
|
||||||
fmt::arg("name", trimWorkspaceName((*it)["name"].asString())),
|
fmt::arg("value", output),
|
||||||
|
fmt::arg("name", trimWorkspaceName(output)),
|
||||||
fmt::arg("index", (*it)["num"].asString()));
|
fmt::arg("index", (*it)["num"].asString()));
|
||||||
}
|
}
|
||||||
if (!config_["disable-markup"].asBool()) {
|
if (!config_["disable-markup"].asBool()) {
|
||||||
@ -115,21 +176,26 @@ auto Workspaces::update() -> void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Gtk::Button &Workspaces::addButton(const Json::Value &node) {
|
Gtk::Button &Workspaces::addButton(const Json::Value &node) {
|
||||||
auto pair = buttons_.emplace(node["name"].asString(), node["name"].asString());
|
auto pair = buttons_.emplace(node["name"].asString(), node["name"].asString());
|
||||||
auto &button = pair.first->second;
|
auto &&button = pair.first->second;
|
||||||
box_.pack_start(button, false, false, 0);
|
box_.pack_start(button, false, false, 0);
|
||||||
button.set_relief(Gtk::RELIEF_NONE);
|
button.set_relief(Gtk::RELIEF_NONE);
|
||||||
button.signal_clicked().connect([this, pair] {
|
button.signal_clicked().connect([this, node] {
|
||||||
try {
|
try {
|
||||||
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", pair.first->first));
|
if (node["target_output"].isString()) {
|
||||||
|
ipc_.sendCmd(
|
||||||
|
IPC_COMMAND,
|
||||||
|
fmt::format("workspace \"{}\"; move workspace to output \"{}\"; workspace \"{}\"",
|
||||||
|
node["name"].asString(),
|
||||||
|
node["target_output"].asString(),
|
||||||
|
node["name"].asString()));
|
||||||
|
} else {
|
||||||
|
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", node["name"].asString()));
|
||||||
|
}
|
||||||
} catch (const std::exception &e) {
|
} catch (const std::exception &e) {
|
||||||
std::cerr << e.what() << std::endl;
|
spdlog::error("Workspaces: {}", e.what());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (!config_["disable-scroll"].asBool()) {
|
|
||||||
button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
|
||||||
button.signal_scroll_event().connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
|
|
||||||
}
|
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,6 +206,8 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
|
|||||||
if (config_["format-icons"][key].isString() && node[key].asBool()) {
|
if (config_["format-icons"][key].isString() && node[key].asBool()) {
|
||||||
return config_["format-icons"][key].asString();
|
return config_["format-icons"][key].asString();
|
||||||
}
|
}
|
||||||
|
} else if (config_["format_icons"]["persistent"].isString() && node["target_output"].isString()) {
|
||||||
|
return config_["format-icons"]["persistent"].asString();
|
||||||
} else if (config_["format-icons"][key].isString()) {
|
} else if (config_["format-icons"][key].isString()) {
|
||||||
return config_["format-icons"][key].asString();
|
return config_["format-icons"][key].asString();
|
||||||
}
|
}
|
||||||
@ -148,54 +216,41 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool Workspaces::handleScroll(GdkEventScroll *e) {
|
bool Workspaces::handleScroll(GdkEventScroll *e) {
|
||||||
// Avoid concurrent scroll event
|
auto dir = AModule::getScrollDir(e);
|
||||||
if (scrolling_) {
|
if (dir == SCROLL_DIR::NONE) {
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
std::string name;
|
std::string name;
|
||||||
scrolling_ = true;
|
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(mutex_);
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
auto it = std::find_if(workspaces_.begin(), workspaces_.end(), [](const auto &workspace) {
|
auto it = std::find_if(workspaces_.begin(), workspaces_.end(), [](const auto &workspace) {
|
||||||
return workspace["focused"].asBool();
|
return workspace["focused"].asBool();
|
||||||
});
|
});
|
||||||
if (it == workspaces_.end()) {
|
if (it == workspaces_.end()) {
|
||||||
scrolling_ = false;
|
return true;
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
switch (e->direction) {
|
if (dir == SCROLL_DIR::DOWN || dir == SCROLL_DIR::RIGHT) {
|
||||||
case GDK_SCROLL_DOWN:
|
name = getCycleWorkspace(it, false);
|
||||||
case GDK_SCROLL_RIGHT:
|
} else if (dir == SCROLL_DIR::UP || dir == SCROLL_DIR::LEFT) {
|
||||||
name = getCycleWorkspace(it, false);
|
name = getCycleWorkspace(it, true);
|
||||||
break;
|
} else {
|
||||||
case GDK_SCROLL_UP:
|
return true;
|
||||||
case GDK_SCROLL_LEFT:
|
|
||||||
name = getCycleWorkspace(it, true);
|
|
||||||
break;
|
|
||||||
case GDK_SCROLL_SMOOTH:
|
|
||||||
gdouble delta_x, delta_y;
|
|
||||||
gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent *>(e), &delta_x, &delta_y);
|
|
||||||
if (delta_y < 0) {
|
|
||||||
name = getCycleWorkspace(it, true);
|
|
||||||
} else if (delta_y > 0) {
|
|
||||||
name = getCycleWorkspace(it, false);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
if (name.empty() || name == (*it)["name"].asString()) {
|
if (name == (*it)["name"].asString()) {
|
||||||
scrolling_ = false;
|
return true;
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
|
try {
|
||||||
|
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
|
||||||
|
} catch (const std::exception &e) {
|
||||||
|
spdlog::error("Workspaces: {}", e.what());
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::string Workspaces::getCycleWorkspace(std::vector<Json::Value>::iterator it,
|
const std::string Workspaces::getCycleWorkspace(std::vector<Json::Value>::iterator it,
|
||||||
bool prev) const {
|
bool prev) const {
|
||||||
if (prev && it == workspaces_.begin()) {
|
if (prev && it == workspaces_.begin() && !config_["disable-scroll-wraparound"].asBool()) {
|
||||||
return (*(--workspaces_.end()))["name"].asString();
|
return (*(--workspaces_.end()))["name"].asString();
|
||||||
}
|
}
|
||||||
if (prev && it != workspaces_.begin())
|
if (prev && it != workspaces_.begin())
|
||||||
@ -203,7 +258,11 @@ const std::string Workspaces::getCycleWorkspace(std::vector<Json::Value>::iterat
|
|||||||
else if (!prev && it != workspaces_.end())
|
else if (!prev && it != workspaces_.end())
|
||||||
++it;
|
++it;
|
||||||
if (!prev && it == workspaces_.end()) {
|
if (!prev && it == workspaces_.end()) {
|
||||||
return (*(++workspaces_.begin()))["name"].asString();
|
if (config_["disable-scroll-wraparound"].asBool()) {
|
||||||
|
--it;
|
||||||
|
} else {
|
||||||
|
return (*(workspaces_.begin()))["name"].asString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return (*it)["name"].asString();
|
return (*it)["name"].asString();
|
||||||
}
|
}
|
||||||
@ -228,6 +287,4 @@ void Workspaces::onButtonReady(const Json::Value &node, Gtk::Button &button) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Workspaces::operator Gtk::Widget &() { return box_; }
|
} // namespace waybar::modules::sway
|
||||||
|
|
||||||
} // namespace waybar::modules::sway
|
|
||||||
|
@ -1,24 +1,20 @@
|
|||||||
#include "modules/temperature.hpp"
|
#include "modules/temperature.hpp"
|
||||||
|
#include <filesystem>
|
||||||
|
|
||||||
waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
|
waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "{temperatureC}°C", 10) {
|
: ALabel(config, "temperature", id, "{temperatureC}°C", 10) {
|
||||||
if (config_["hwmon-path"].isString()) {
|
if (config_["hwmon-path"].isString()) {
|
||||||
file_path_ = config_["hwmon-path"].asString();
|
file_path_ = config_["hwmon-path"].asString();
|
||||||
|
} else if (config_["hwmon-path-abs"].isString() && config_["input-filename"].isString()) {
|
||||||
|
file_path_ = (*std::filesystem::directory_iterator(config_["hwmon-path-abs"].asString())).path().u8string() + "/" + config_["input-filename"].asString();
|
||||||
} else {
|
} else {
|
||||||
auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
|
auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
|
||||||
file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
|
file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
|
||||||
}
|
}
|
||||||
#ifdef FILESYSTEM_EXPERIMENTAL
|
std::ifstream temp(file_path_);
|
||||||
if (!std::experimental::filesystem::exists(file_path_)) {
|
if (!temp.is_open()) {
|
||||||
#else
|
|
||||||
if (!std::filesystem::exists(file_path_)) {
|
|
||||||
#endif
|
|
||||||
throw std::runtime_error("Can't open " + file_path_);
|
throw std::runtime_error("Can't open " + file_path_);
|
||||||
}
|
}
|
||||||
label_.set_name("temperature");
|
|
||||||
if (!id.empty()) {
|
|
||||||
label_.get_style_context()->add_class(id);
|
|
||||||
}
|
|
||||||
thread_ = [this] {
|
thread_ = [this] {
|
||||||
dp.emit();
|
dp.emit();
|
||||||
thread_.sleep_for(interval_);
|
thread_.sleep_for(interval_);
|
||||||
@ -35,8 +31,11 @@ auto waybar::modules::Temperature::update() -> void {
|
|||||||
} else {
|
} else {
|
||||||
label_.get_style_context()->remove_class("critical");
|
label_.get_style_context()->remove_class("critical");
|
||||||
}
|
}
|
||||||
label_.set_markup(fmt::format(
|
auto max_temp = config_["critical-threshold"].isInt() ? config_["critical-threshold"].asInt() : 0;
|
||||||
format, fmt::arg("temperatureC", temperature_c), fmt::arg("temperatureF", temperature_f)));
|
label_.set_markup(fmt::format(format,
|
||||||
|
fmt::arg("temperatureC", temperature_c),
|
||||||
|
fmt::arg("temperatureF", temperature_f),
|
||||||
|
fmt::arg("icon", getIcon(temperature_c, "", max_temp))));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() {
|
std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() {
|
||||||
@ -58,4 +57,4 @@ std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() {
|
|||||||
bool waybar::modules::Temperature::isCritical(uint16_t temperature_c) {
|
bool waybar::modules::Temperature::isCritical(uint16_t temperature_c) {
|
||||||
return config_["critical-threshold"].isInt() &&
|
return config_["critical-threshold"].isInt() &&
|
||||||
temperature_c >= config_["critical-threshold"].asInt();
|
temperature_c >= config_["critical-threshold"].asInt();
|
||||||
}
|
}
|
||||||
|
9
subprojects/date.wrap
Normal file
9
subprojects/date.wrap
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[wrap-file]
|
||||||
|
source_url=https://github.com/HowardHinnant/date/archive/v2.4.1.tar.gz
|
||||||
|
source_filename=date-2.4.1.tar.gz
|
||||||
|
source_hash=98907d243397483bd7ad889bf6c66746db0d7d2a39cc9aacc041834c40b65b98
|
||||||
|
directory=date-2.4.1
|
||||||
|
|
||||||
|
patch_url = https://github.com/mesonbuild/hinnant-date/releases/download/2.4.1-1/hinnant-date.zip
|
||||||
|
patch_filename = hinnant-date-2.4.1-1-wrap.zip
|
||||||
|
patch_hash = 2061673a6f8e6d63c3a40df4da58fa2b3de2835fd9b3e74649e8279599f3a8f6
|
@ -5,6 +5,6 @@ source_url = https://github.com/fmtlib/fmt/archive/5.3.0.tar.gz
|
|||||||
source_filename = fmt-5.3.0.tar.gz
|
source_filename = fmt-5.3.0.tar.gz
|
||||||
source_hash = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
|
source_hash = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
|
||||||
|
|
||||||
patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/5.3.0/1/get_zip
|
patch_url = https://github.com/mesonbuild/fmt/releases/download/5.3.0-1/fmt.zip
|
||||||
patch_filename = fmt-5.3.0-1-wrap.zip
|
patch_filename = fmt-5.3.0-1-wrap.zip
|
||||||
patch_hash = 18f21a3b8833949c35d4ac88a7059577d5fa24b98786e4b1b2d3d81bb811440f
|
patch_hash = 18f21a3b8833949c35d4ac88a7059577d5fa24b98786e4b1b2d3d81bb811440f
|
5
subprojects/gtk-layer-shell.wrap
Normal file
5
subprojects/gtk-layer-shell.wrap
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
[wrap-file]
|
||||||
|
directory = gtk-layer-shell-0.1.0
|
||||||
|
source_filename = gtk-layer-shell-0.1.0.tar.gz
|
||||||
|
source_hash = f7569e27ae30b1a94c3ad6c955cf56240d6bc272b760d9d266ce2ccdb94a5cf0
|
||||||
|
source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.1.0/gtk-layer-shell-0.1.0.tar.gz
|
10
subprojects/spdlog.wrap
Normal file
10
subprojects/spdlog.wrap
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
[wrap-file]
|
||||||
|
directory = spdlog-1.3.1
|
||||||
|
|
||||||
|
source_url = https://github.com/gabime/spdlog/archive/v1.3.1.tar.gz
|
||||||
|
source_filename = v1.3.1.tar.gz
|
||||||
|
source_hash = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70
|
||||||
|
|
||||||
|
patch_url = https://github.com/mesonbuild/spdlog/releases/download/1.3.1-1/spdlog.zip
|
||||||
|
patch_filename = spdlog-1.3.1-1-wrap.zip
|
||||||
|
patch_hash = 715a0229781019b853d409cc0bf891ee4b9d3a17bec0cf87f4ad30b28bbecc87
|
Reference in New Issue
Block a user