pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: project rename

Browse Source
This commit is contained in:
Michael Carlberg 2016-11-19 06:22:44 +01:00
parent 6a6796160a
commit fd57ab0f3d
172 changed files with 363 additions and 881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.exrc
View File

@ -1,3 +1,3 @@
let &path.='include,src,'
let tag_path='/home/jaagr/.local/src/c++/lemonbuddy/.tags'
set tags+=/home/jaagr/.local/src/c++/lemonbuddy/.tags
let tag_path='/home/jaagr/.local/src/c++/polybar/.tags'
set tags+=/home/jaagr/.local/src/c++/polybar/.tags

3
.travis.yml
View File

@ -104,9 +104,8 @@ script: make
notifications:
irc:
channels:
- "irc.freenode.net#lemonbuddy"
- "irc.freenode.org#polybar"
template:
- "%{author} pushed #%{commit} \"%{commit_subject}\" -> %{repository_name}/%{branch}"
- "Build #%{build_number}: %{result} // Compare at %{compare_url}"
use_notice: true
skip_join: true

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@
#
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
project(lemonbuddy C CXX)
project(polybar C CXX)
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}

36
README.md
View File

@ -1,11 +1,11 @@
# Lemonbuddy
# Polybar
[![Build Status](https://travis-ci.org/jaagr/lemonbuddy.svg?branch=master)](https://travis-ci.org/jaagr/lemonbuddy)
[![MIT License](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000?style=plastic)](https://github.com/jaagr/lemonbuddy/blob/master/LICENSE)
[![Build Status](https://travis-ci.org/jaagr/polybar.svg?branch=master)](https://travis-ci.org/jaagr/polybar)
[![MIT License](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000?style=plastic)](https://github.com/jaagr/polybar/blob/master/LICENSE)
A fast and easy-to-use tool for creating status bars.
**Lemonbuddy** aims to help users build beautiful and highly customizable status bars
**Polybar** aims to help users build beautiful and highly customizable status bars
for their desktop environment, without the need of having a black belt in shell scripting.
Heres a few screenshots showing you what it can look like:
@ -15,7 +15,7 @@ Heres a few screenshots showing you what it can look like:
[![sample screenshot](http://i.imgur.com/TY5a5r9t.png)](http://i.imgur.com/TY5a5r9.png)
Please note that the project still is in early development, so please report any
problems by [creating an issue ticket](https://github.com/jaagr/lemonbuddy/issues/new).
problems by [creating an issue ticket](https://github.com/jaagr/polybar/issues/new).
## Table of Contents
@ -31,7 +31,7 @@ problems by [creating an issue ticket](https://github.com/jaagr/lemonbuddy/issue
## Introduction
The main purpose of **Lemonbuddy** is to help users create awesome status bars.
The main purpose of **Polybar** is to help users create awesome status bars.
It has built-in functionality to generate content for the most commonly used widgets, such as:
- Window title
@ -49,14 +49,14 @@ It has built-in functionality to generate content for the most commonly used wid
- Inter-process messaging
- And more...
[See the wiki for more details](https://github.com/jaagr/lemonbuddy/wiki).
[See the wiki for more details](https://github.com/jaagr/polybar/wiki).
## Getting started
If you are using **Arch Linux**, you can install the AUR package [lemonbuddy-git](https://aur.archlinux.org/packages/lemonbuddy-git/) to get the latest version, or
[lemonbuddy](https://aur.archlinux.org/packages/lemonbuddy/) for the latest stable release. If you are using **Void Linux**
you can install the package [lemonbuddy](https://github.com/voidlinux/void-packages/blob/master/srcpkgs/lemonbuddy/template) available in the official xbps repository.
If you are using **Arch Linux**, you can install the AUR package [polybar-git](https://aur.archlinux.org/packages/polybar-git/) to get the latest version, or
[polybar](https://aur.archlinux.org/packages/polybar/) for the latest stable release. If you are using **Void Linux**
you can install the package [polybar](https://github.com/voidlinux/void-packages/blob/master/srcpkgs/polybar/template) available in the official xbps repository.
If you create a package for any other distribution, please consider contributing the template.
@ -89,12 +89,12 @@ $ apt-get install cmake cmake-data libboost-dev libfreetype6-dev libxcb1-dev lib
### Building from source
Please [report any problems](https://github.com/jaagr/lemonbuddy/issues/new) you run into when building the project.
Please [report any problems](https://github.com/jaagr/polybar/issues/new) you run into when building the project.
~~~ sh
$ git clone --branch 2.2.8 --recursive https://github.com/jaagr/lemonbuddy
$ mkdir lemonbuddy/build
$ cd lemonbuddy/build
$ git clone --branch 2.2.8 --recursive https://github.com/jaagr/polybar
$ mkdir polybar/build
$ cd polybar/build
$ cmake -DCMAKE_BUILD_TYPE=Release ..
$ sudo make install
~~~
@ -108,13 +108,13 @@ There's also a helper script available in the root folder:
### Configuration
Details on how to setup and configure the bar and each module have been moved to [the wiki](https://github.com/jaagr/lemonbuddy/wiki/Configuration).
Details on how to setup and configure the bar and each module have been moved to [the wiki](https://github.com/jaagr/polybar/wiki/Configuration).
~~~ sh
# Install the example configuration
$ make userconfig
# Launch the example bar
$ lemonbuddy example
$ polybar example
~~~
**NOTE:** If the bar output looks odd, it's probably because you're
@ -124,9 +124,9 @@ missing fonts.
### Running
See the wiki page on [how to launch the bar when starting your WM](https://github.com/jaagr/lemonbuddy/wiki/Running-the-app).
See the wiki page on [how to launch the bar when starting your WM](https://github.com/jaagr/polybar/wiki/Running-the-app).
## License
Lemonbuddy is licensed under the MIT license. [See LICENSE for more information](https://github.com/jaagr/lemonbuddy/blob/master/LICENSE).
Polybar is licensed under the MIT license. [See LICENSE for more information](https://github.com/jaagr/polybar/blob/master/LICENSE).

8
bump.sh
View File

@ -18,12 +18,12 @@ tag_prev="${tag_curr%.*}.$((tag_curr_patch-1))"
sed -r "s/${tag_prev}/${tag_curr}/g" -i \
README.md CMakeLists.txt \
contrib/lemonbuddy.aur/PKGBUILD contrib/lemonbuddy.aur/.SRCINFO \
contrib/lemonbuddy-git.aur/PKGBUILD contrib/lemonbuddy-git.aur/.SRCINFO
contrib/polybar.aur/PKGBUILD contrib/polybar.aur/.SRCINFO \
contrib/polybar-git.aur/PKGBUILD contrib/polybar-git.aur/.SRCINFO
git add -u README.md CMakeLists.txt \
contrib/lemonbuddy.aur/PKGBUILD contrib/lemonbuddy.aur/.SRCINFO \
contrib/lemonbuddy-git.aur/PKGBUILD contrib/lemonbuddy-git.aur/.SRCINFO \
contrib/polybar.aur/PKGBUILD contrib/polybar.aur/.SRCINFO \
contrib/polybar-git.aur/PKGBUILD contrib/polybar-git.aur/.SRCINFO \
include/version.hpp
git commit -m "build: Bump version to ${tag_curr}"

2
cmake/build/options.cmake
View File

@ -79,7 +79,7 @@ set(SETTING_PATH_MEMORY_INFO "/proc/meminfo"
CACHE STRING "Path to file containing memory info")
set(SETTING_PATH_TEMPERATURE_INFO "/sys/class/thermal/thermal_zone%zone%/temp"
CACHE STRING "Path to file containing the current temperature")
set(SETTING_PATH_MESSAGING_FIFO "/tmp/lemonbuddy_mqueue.%pid%"
set(SETTING_PATH_MESSAGING_FIFO "/tmp/polybar_mqueue.%pid%"
CACHE STRING "Path to file containing the current temperature")
# }}}

4
cmake/build/targets.cmake
View File

@ -17,11 +17,11 @@ add_custom_target(userconfig COMMAND ${CMAKE_COMMAND}
configure_file(
${PROJECT_SOURCE_DIR}/cmake/templates/uninstall.cmake.in
${PROJECT_BINARY_DIR}/uninstall.cmake
${PROJECT_BINARY_DIR}/cmake/uninstall.cmake
IMMEDIATE @ONLY)
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND}
-P ${PROJECT_BINARY_DIR}/cuninstall.cmake)
-P ${PROJECT_BINARY_DIR}/cmake/uninstall.cmake)
# }}}
# Target: clang-format {{{

2
cmake/templates/userconfig.cmake.in
View File

@ -2,6 +2,6 @@ set(USER_CONFIG_HOME $ENV{XDG_CONFIG_HOME})
if(NOT USER_CONFIG_HOME)
set(USER_CONFIG_HOME $ENV{HOME}/.config)
endif()
set(USER_CONFIG_HOME ${USER_CONFIG_HOME}/lemonbuddy)
set(USER_CONFIG_HOME ${USER_CONFIG_HOME}/polybar)
file(INSTALL @CMAKE_SOURCE_DIR@/examples/config DESTINATION ${USER_CONFIG_HOME})

379
config
View File

@ -1,379 +0,0 @@
;
; this config is written for an unreleased version (lemonbuddy "2.0-beta" branch)
; it might need some tweaking to run on the latest released version... try for yourself
;
[bar/top]
monitor = HDMI-1
width = 100%
height = 27
offset-x = 0
offset-y = 0
background = #ee222222
foreground = #ccfafafa
linecolor = #666
border-bottom = 2
border-bottom-color = #333
spacing = 1
lineheight = 1
padding-left = 0
padding-right = 2
module-margin-left = 1
module-margin-right = 2
font-0 = tamzen:size=9;1
font-1 = unifont:size=6;-1
font-2 = siji:pixelsize=10;0
modules-left = bspwm
modules-center = mpd
modules-right = volume memory cpu date
tray-position = right
wm-restack = bspwm
[bar/bottom]
monitor = HDMI-1
bottom = true
width = 100%
height = ${bar/top.height}
offset-y = 0
background = ${bar/top.background}
foreground = ${bar/top.foreground}
linecolor = ${bar/top.linecolor}
border-top = 2
border-top-color = #333
spacing = ${bar/top.spacing}
lineheight = ${bar/top.lineheight}
padding-right = ${bar/top.padding-right}
module-margin-left = 0
module-margin-right = ${bar/top.module-margin-right}
font-0 = ${bar/top.font-0}
font-1 = ${bar/top.font-1}
font-2 = ${bar/top.font-2}
modules-left = bspwm
modules-right = date powermenu
wm-restack = ${bar/top.wm-restack}
[module/bspwm]
type = internal/bspwm
format = <label-state> <label-mode>
; ws-icon-0 = term;
; ws-icon-1 = web;
; ws-icon-2 = code;
; ws-icon-3 = music;
; ws-icon-4 = irssi;
; ws-icon-default = 
ws-icon-default = x
label-active = o
label-active-background = #ee333333
label-active-underline= #cc333333
label-active-padding = 2
label-occupied = %{O-1}⏺%{O-1}
label-occupied-padding = 2
label-urgent = !
label-urgent-background = #bd2c40
label-urgent-padding = 2
label-empty = x
label-empty-foreground = #444
label-empty-padding = 2
; label-monocle = 
; label-monocle-padding = 2
; label-monocle-background = #171717
; label-monocle-foreground = #e60053
; label-floating = 
; label-floating-padding = 2
; label-floating-background = #171717
; label-floating-foreground = #e60053
[module/cpu]
type = internal/cpu
interval = 2
format = <label> <bar-load>
label = CPU
; ramp-coreload-0 = ▁
; ramp-coreload-0-font = 2
; ramp-coreload-0-foreground = #55aa55
; ramp-coreload-1 = ▂
; ramp-coreload-1-font = 2
; ramp-coreload-1-foreground = #55aa55
; ramp-coreload-2 = ▃
; ramp-coreload-2-font = 2
; ramp-coreload-2-foreground = #55aa55
; ramp-coreload-3 = ▄
; ramp-coreload-3-font = 2
; ramp-coreload-3-foreground = #55aa55
; ramp-coreload-4 = ▅
; ramp-coreload-4-font = 2
; ramp-coreload-4-foreground = #f5a70a
; ramp-coreload-5 = ▆
; ramp-coreload-5-font = 2
; ramp-coreload-5-foreground = #f5a70a
; ramp-coreload-6 = ▇
; ramp-coreload-6-font = 2
; ramp-coreload-6-foreground = #ff5555
; ramp-coreload-7 = █
; ramp-coreload-7-font = 2
; ramp-coreload-7-foreground = #ff5555
bar-load-width = 20
bar-load-foreground-0 = #55aa55
bar-load-foreground-1 = #55aa55
bar-load-foreground-2 = #f5a70a
bar-load-foreground-3 = #ff5555
bar-load-gradient = false
bar-load-indicator = │
bar-load-indicator-font = 2
bar-load-indicator-foreground = #ff
bar-load-fill = ━
bar-load-fill-font = 2
bar-load-empty = ━
bar-load-empty-font = 2
bar-load-empty-foreground = #444444
[module/memory]
type = internal/memory
interval = 2
format = <label> <bar-used>
label = RAM
bar-used-width = 20
bar-used-foreground-0 = #55aa55
bar-used-foreground-1 = #55aa55
bar-used-foreground-2 = #f5a70a
bar-used-foreground-3 = #ff5555
bar-used-gradient = false
bar-used-indicator = │
bar-used-indicator-font = 2
bar-used-indicator-foreground = #ff
bar-used-fill = ━
bar-used-fill-font = 2
bar-used-empty = ━
bar-used-empty-font = 2
bar-used-empty-foreground = #444444
[module/wifi]
type = internal/network
interface = net1
interval = 3.0
;udspeed-minwidth = 3
format-connected = <ramp-signal> <label-connected>
;label-connected = %essid% %{F#66}%local_ip%
;label-connected = %{F#666}%{F#cc} %upspeed% %{F#666}%{F#cc} %downspeed%
label-connected = %{O-6 F#666}%{O2 F#cc}%downspeed%
label-disconnected = %{F#666}%{F#cc} not connected
label-disconnected-foreground = #66
ramp-signal-0 = 
ramp-signal-1 = 
ramp-signal-2 = 
ramp-signal-3 = 
ramp-signal-4 = 
ramp-signal-foreground = #666
[module/wired]
type = internal/network
interface = net0
interval = 3.0
label-connected = %{T3}%local_ip%%{T-}
label-disconnected = %{T3}Not connected%{T-}
label-disconnected-foreground = #66
[module/date]
type = internal/date
date = %%{F#666}%{F#cc} %Y-%m-%d %%{F#e60053}%%{F#cc} %H:%M
date-alt = %%{F#666}%{F#cc} %Y-%m-%d %%{F#e60053}%%{F#cc} %H:%M:%S
interval = 5
[module/backlight]
type = internal/backlight
card = intel_backlight
format = <ramp> <label>
ramp-0 = 
ramp-1 = 
ramp-2 = 
ramp-foreground = #666
[module/volume]
type = internal/volume
speaker-mixer = Speaker
headphone-mixer = Headphone
headphone-id = 9
; format-volume = <ramp-volume> <label-volume>
format-volume = <label-volume> <bar-volume>
label-volume = VOL
label-volume-foreground = ${BAR.foreground}
label-muted = %{F#66} sound muted
;ramp-volume-0 = 
;ramp-volume-1 = 
;ramp-volume-2 = 
;ramp-volume-3 = 
;ramp-volume-foreground = #666
;ramp-headphones-0 = 
;ramp-headphones-1 = 
bar-volume-width = 20
bar-volume-foreground-0 = #55aa55
bar-volume-foreground-1 = #55aa55
bar-volume-foreground-2 = #55aa55
bar-volume-foreground-3 = #55aa55
bar-volume-foreground-4 = #55aa55
bar-volume-foreground-5 = #f5a70a
bar-volume-foreground-6 = #ff5555
bar-volume-gradient = false
bar-volume-indicator = │
bar-volume-indicator-font = 2
bar-volume-indicator-foreground = #ff
bar-volume-fill = ━
bar-volume-fill-font = 2
bar-volume-empty = ━
bar-volume-empty-font = 2
bar-volume-empty-foreground = #444444
[module/battery]
type = internal/battery
full-at = 98
format-charging = <animation-charging> <label-charging>
format-discharging = <ramp-capacity> <label-discharging>
format-full = %{F#666}%{F#cc} <label-full>
ramp-capacity-0 = 
ramp-capacity-1 = 
ramp-capacity-2 = 
ramp-capacity-foreground = #666
animation-charging-0 = 
animation-charging-1 = 
animation-charging-2 = 
animation-charging-foreground = #666
animation-charging-framerate = 750
[module/mpd]
type = internal/mpd
format-online = <label-time> <bar-progress> <label-song> <icon-prev> <icon-seekb> <icon-stop> <toggle> <icon-seekf> <icon-next> <icon-repeat> <icon-random>
format-online-background = #ee333333
format-online-underline = #cc333333
format-online-padding = 3
format-offline = <label-offline>
format-offline-foreground = #66
label-offline = mpd is off
label-song-maxlen = 45
label-song-ellipsis = true
icon-prev = 
icon-seekb = 
icon-stop = 
icon-play = 
icon-pause = 
icon-next = 
icon-seekf = 
; icon-prev = ⏮
; icon-seekb = ⏪
; icon-stop = ⏹
; icon-play = ⏵
; icon-pause = ⏸
; icon-seekf = ⏩
; icon-next = ⏭
icon-random = 
icon-repeat = 
toggle-on-foreground = #e60053
toggle-off-foreground = #66
bar-progress-width = 15
bar-progress-indicator = 
bar-progress-indicator-foreground = #bb
bar-progress-fill = ─
bar-progress-fill-foreground = #bb
bar-progress-fill-font = 3
bar-progress-empty = ─
bar-progress-empty-foreground = #44
bar-progress-empty-font = 3
label-time-foreground = #77
[module/powermenu]
type = custom/menu
label-open = 
label-close = 
label-separator = /
menu-0-0 = Terminate WM
menu-0-0-foreground = #e60053
menu-0-0-exec = bspc quit -1
menu-0-1 = Reboot
menu-0-1-foreground = #e60053
menu-0-1-exec = menu-open-1
menu-0-2 = Power off
menu-0-2-foreground = #e60053
menu-0-2-exec = menu-open-2
menu-1-0 = Cancel
menu-1-0-foreground = #e60053
menu-1-0-exec = menu-open-0
menu-1-1 = Reboot
menu-1-1-foreground = #e60053
menu-1-1-exec = sudo reboot
menu-2-0 = Power off
menu-2-0-foreground = #e60053
menu-2-0-exec = sudo poweroff
menu-2-1 = Cancel
menu-2-1-foreground = #e60053
menu-2-1-exec = menu-open-0
[module/counter]
type = internal/counter
format = <counter>
interval = 0.1
; vim:ft=dosini

27
contrib/lemonbuddy-git.aur/.SRCINFO
View File

@ -1,27 +0,0 @@
pkgbase = lemonbuddy-git
pkgdesc = A fast and easy-to-use status bar
pkgver = 2.2.8
pkgrel = 1
url = https://github.com/jaagr/lemonbuddy
arch = i686
arch = x86_64
license = MIT
makedepends = cmake
makedepends = python2
makedepends = pkg-config
makedepends = boost
depends = libxft
depends = xcb-util-wm
depends = xcb-util-image
optdepends = alsa-lib: volume module support
optdepends = libmpdclient: mpd module support
optdepends = wireless_tools: network module support
optdepends = jsoncpp: i3 module support
optdepends = i3ipc-glib-git: i3 module support
provides = lemonbuddy
conflicts = lemonbuddy
source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git
md5sums = SKIP
pkgname = lemonbuddy-git

47
contrib/lemonbuddy-git.aur/PKGBUILD
View File

@ -1,47 +0,0 @@
# Maintainer: Michael Carlberg <c@rlberg.se>
# Contributor: Michael Carlberg <c@rlberg.se>
_pkgname=lemonbuddy
pkgname="${_pkgname}-git"
pkgver=2.2.8
pkgrel=1
pkgdesc="A fast and easy-to-use tool for Lemonbar"
arch=("i686" "x86_64")
url="https://github.com/jaagr/lemonbuddy"
license=("MIT")
depends=("libxft" "xcb-util-wm" "xcb-util-image")
optdepends=("alsa-lib: volume module support"
"libmpdclient: mpd module support"
"wireless_tools: network module support"
"jsoncpp: i3 module support"
"i3ipc-glib-git: i3 module support")
makedepends=("cmake" "python2" "pkg-config" "boost")
provides=("lemonbuddy")
conflicts=("lemonbuddy")
source=("${_pkgname}::git+${url}.git")
md5sums=("SKIP")
pkgver() {
cd "$_pkgname" || exit
git describe --long --tags | sed "s/-/.r/;s/-/./g"
}
prepare() {
cd "$_pkgname" || exit
git submodule update --init --recursive
mkdir build
}
build() {
cd "${_pkgname}" || exit
[ -x version.sh ] && ./version.sh >/dev/null
cd build || exit
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
cd "${_pkgname}/build" || exit
make DESTDIR="$pkgdir/" install
cd .. || exit
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
}

26
contrib/lemonbuddy.aur/.SRCINFO
View File

@ -1,26 +0,0 @@
pkgbase = lemonbuddy
pkgdesc = A fast and easy-to-use status bar
pkgver = 2.2.8
pkgrel = 1
url = https://github.com/jaagr/lemonbuddy
arch = i686
arch = x86_64
license = MIT
makedepends = cmake
makedepends = python2
makedepends = pkg-config
makedepends = boost
depends = libxft
depends = xcb-util-wm
depends = xcb-util-image
optdepends = alsa-lib: volume module support
optdepends = libmpdclient: mpd module support
optdepends = wireless_tools: network module support
optdepends = jsoncpp: i3 module support
optdepends = i3ipc-glib-git: i3 module support
conflicts = lemonbuddy-git
source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=2.2.8
md5sums = SKIP
pkgname = lemonbuddy

38
contrib/lemonbuddy.aur/PKGBUILD
View File

@ -1,38 +0,0 @@
# Maintainer: Michael Carlberg <c@rlberg.se>
# Contributor: Michael Carlberg <c@rlberg.se>
pkgname=lemonbuddy
pkgver=2.2.8
pkgrel=1
pkgdesc="A fast and easy-to-use tool for Lemonbar"
arch=("i686" "x86_64")
url="https://github.com/jaagr/lemonbuddy"
license=("MIT")
depends=("libxft" "xcb-util-wm" "xcb-util-image")
optdepends=("alsa-lib: volume module support"
"libmpdclient: mpd module support"
"wireless_tools: network module support"
"jsoncpp: i3 module support"
"i3ipc-glib-git: i3 module support")
makedepends=("cmake" "python2" "pkg-config" "boost")
conflicts=("lemonbuddy-git")
source=("${pkgname}::git+${url}.git#tag=${pkgver}")
md5sums=("SKIP")
prepare() {
cd "$pkgname" || exit
git submodule update --init --recursive
mkdir build
}
build() {
cd "${pkgname}/build" || exit
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
cd "${pkgname}/build" || exit
make DESTDIR="${pkgdir}/" install
cd .. || exit
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}

0
contrib/lemonbuddy.xbps/patches/001-musl-poll.patch → contrib/polybar.xbps/patches/001-musl-poll.patch
View File

0
contrib/lemonbuddy.xbps/patches/002-musl-poll.patch → contrib/polybar.xbps/patches/002-musl-poll.patch
View File

0
contrib/lemonbuddy.xbps/patches/003-musl-poll.patch → contrib/polybar.xbps/patches/003-musl-poll.patch
View File

8
contrib/lemonbuddy.xbps/template → contrib/polybar.xbps/template
View File

@ -1,5 +1,5 @@
# Template file for 'lemonbuddy'
pkgname=lemonbuddy
# Template file for 'polybar'
pkgname=polybar
version=2.1.9
revision=1
wrksrc="${pkgname}-${version}"
@ -24,9 +24,9 @@ makedepends="libxcb-devel libXft-devel xcb-util-wm-devel boost-devel
short_desc="A fast and easy-to-use status bar"
maintainer="Michael Carlberg <c@rlberg.se>"
license="MIT"
homepage="https://github.com/jaagr/lemonbuddy"
homepage="https://github.com/jaagr/polybar"
distfiles="
https://github.com/jaagr/lemonbuddy/archive/${version}.tar.gz
https://github.com/jaagr/polybar/archive/${version}.tar.gz
https://github.com/jaagr/xpp/archive/${_xpp_version}.tar.gz
$(vopt_if i3 "https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz")"
checksum="

2
examples/CMakeLists.txt
View File

@ -54,7 +54,7 @@ configure_file(
ESCAPE_QUOTES @ONLY)
install(FILES config
DESTINATION share/examples/lemonbuddy
DESTINATION share/examples/polybar
COMPONENT config)
# }}}

4
examples/config
View File

@ -1,7 +1,7 @@
;=====================================================
;
; To learn more about how to configure Lemonbuddy
; go to https://github.com/jaagr/lemonbuddy
; To learn more about how to configure Polybar
; go to https://github.com/jaagr/polybar
;
; The README contains alot of information
;

4
examples/config.cmake
View File

@ -1,7 +1,7 @@
;=====================================================
;
; To learn more about how to configure Lemonbuddy
; go to https://github.com/jaagr/lemonbuddy
; To learn more about how to configure Polybar
; go to https://github.com/jaagr/polybar
;
; The README contains alot of information
;

4
include/adapters/alsa.hpp
View File

@ -13,7 +13,7 @@
#define MAX_LINEAR_DB_SCALE 24
LEMONBUDDY_NS
POLYBAR_NS
DEFINE_ERROR(alsa_exception);
DEFINE_CHILD_ERROR(alsa_ctl_interface_error, alsa_exception);
@ -85,4 +85,4 @@ class alsa_mixer {
// }}}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/adapters/mpd.hpp
View File

@ -9,7 +9,7 @@
#include "common.hpp"
#include "components/logger.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace mpd {
DEFINE_ERROR(mpd_exception);
@ -168,4 +168,4 @@ namespace mpd {
// }}}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/adapters/net.hpp
View File

@ -11,7 +11,7 @@
#include "common.hpp"
#include "config.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace net {
DEFINE_ERROR(network_error);
@ -118,4 +118,4 @@ namespace net {
using wired_t = unique_ptr<wired_network>;
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

12
include/common.hpp
View File

@ -20,13 +20,13 @@
#include "config.hpp"
#define LEMONBUDDY_NS \
namespace lemonbuddy { \
#define POLYBAR_NS \
namespace polybar { \
inline namespace v2_0_0 {
#define LEMONBUDDY_NS_END \
#define POLYBAR_NS_END \
} \
}
#define LEMONBUDDY_NS_PATH "lemonbuddy::v2_0_0"
#define POLYBAR_NS_PATH "polybar::v2_0_0"
#define PIPE_READ 0
#define PIPE_WRITE 1
@ -35,7 +35,7 @@
#include "debug.hpp"
#endif
LEMONBUDDY_NS
POLYBAR_NS
//==================================================
// Include common types (i.e, unclutter editor!)
@ -142,4 +142,4 @@ auto time_execution(const T& expr) noexcept {
template <typename... Args>
using callback = function<void(Args...)>;
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/bar.hpp
View File

@ -12,7 +12,7 @@
#include "x11/types.hpp"
#include "x11/window.hpp"
LEMONBUDDY_NS
POLYBAR_NS
// fwd
class tray_manager;
@ -132,4 +132,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/builder.hpp
View File

@ -6,7 +6,7 @@
#include "config.hpp"
#include "drawtypes/label.hpp"
LEMONBUDDY_NS
POLYBAR_NS
#define DEFAULT_SPACING -1
@ -94,4 +94,4 @@ class builder {
int m_fontindex = 1;
};
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/command_line.hpp
View File

@ -2,7 +2,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace command_line {
DEFINE_ERROR(argument_error);
@ -80,4 +80,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/config.hpp
View File

@ -9,7 +9,7 @@
#include "utils/string.hpp"
#include "x11/xresources.hpp"
LEMONBUDDY_NS
POLYBAR_NS
#define GET_CONFIG_VALUE(section, var, name) var = m_conf.get<decltype(var)>(section, name, var)
#define REQ_CONFIG_VALUE(section, var, name) var = m_conf.get<decltype(var)>(section, name)
@ -220,4 +220,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/controller.hpp
View File

@ -12,7 +12,7 @@
#include "x11/connection.hpp"
#include "x11/types.hpp"
LEMONBUDDY_NS
POLYBAR_NS
class controller {
public:
@ -90,4 +90,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/eventloop.hpp
View File

@ -6,7 +6,7 @@
#include "components/logger.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
using module_t = unique_ptr<modules::module_interface>;
using modulemap_t = map<alignment, vector<module_t>>;
@ -73,4 +73,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/ipc.hpp
View File

@ -3,7 +3,7 @@
#include "common.hpp"
#include "components/logger.hpp"
LEMONBUDDY_NS
POLYBAR_NS
/**
* Message types
@ -67,4 +67,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

12
include/components/logger.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
enum class loglevel {
NONE = 0,
@ -135,10 +135,10 @@ class logger {
*/
// clang-format off
map<loglevel, string> m_prefixes {
{loglevel::TRACE, "lemonbuddy|trace "},
{loglevel::INFO, "lemonbuddy|info "},
{loglevel::WARNING, "lemonbuddy|warn "},
{loglevel::ERROR, "lemonbuddy|error "},
{loglevel::TRACE, "polybar|trace "},
{loglevel::INFO, "polybar|info "},
{loglevel::WARNING, "polybar|warn "},
{loglevel::ERROR, "polybar|error "},
};
/**
@ -164,4 +164,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/parser.hpp
View File

@ -4,7 +4,7 @@
#include "components/signals.hpp"
#include "components/types.hpp"
LEMONBUDDY_NS
POLYBAR_NS
DEFINE_ERROR(unrecognized_token);
@ -27,4 +27,4 @@ class parser {
vector<int> m_actions;
};
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/components/signals.hpp
View File

@ -3,7 +3,7 @@
#include "common.hpp"
#include "components/types.hpp"
LEMONBUDDY_NS
POLYBAR_NS
/**
* @TODO: Allow multiple signal handlers
@ -35,4 +35,4 @@ namespace g_signals {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

6
include/components/types.hpp
View File

@ -4,7 +4,7 @@
#include "x11/color.hpp"
#include "x11/randr.hpp"
LEMONBUDDY_NS
POLYBAR_NS
enum class border { NONE = 0, TOP, BOTTOM, LEFT, RIGHT, ALL };
enum class alignment { NONE = 0, LEFT, CENTER, RIGHT };
@ -90,7 +90,7 @@ struct bar_settings {
struct border_settings {
border_settings() = default;
lemonbuddy::color color{g_colorblack};
polybar::color color{g_colorblack};
uint16_t size{0};
};
@ -109,4 +109,4 @@ struct action_block {
struct wmsettings_bspwm {};
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/drawtypes/animation.hpp
View File

@ -5,7 +5,7 @@
#include "drawtypes/label.hpp"
#include "utils/mixins.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace drawtypes {
class animation : public non_copyable_mixin<animation> {
@ -38,4 +38,4 @@ namespace drawtypes {
const config& conf, string section, string name = "animation", bool required = true);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/drawtypes/iconset.hpp
View File

@ -4,7 +4,7 @@
#include "drawtypes/label.hpp"
#include "utils/mixins.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace drawtypes {
class iconset : public non_copyable_mixin<iconset> {
@ -21,4 +21,4 @@ namespace drawtypes {
using iconset_t = shared_ptr<iconset>;
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/drawtypes/label.hpp
View File

@ -4,7 +4,7 @@
#include "components/config.hpp"
#include "utils/mixins.hpp"
LEMONBUDDY_NS
POLYBAR_NS
/**
* TODO: Remove icon_t
@ -72,4 +72,4 @@ namespace drawtypes {
icon_t load_optional_icon(const config& conf, string section, string name, string def = "");
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/drawtypes/progressbar.hpp
View File

@ -7,7 +7,7 @@
#include "drawtypes/label.hpp"
#include "utils/mixins.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace drawtypes {
class progressbar : public non_copyable_mixin<progressbar> {
@ -48,4 +48,4 @@ namespace drawtypes {
const bar_settings& bar, const config& conf, string section, string name);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/drawtypes/ramp.hpp
View File

@ -5,7 +5,7 @@
#include "drawtypes/label.hpp"
#include "utils/mixins.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace drawtypes {
class ramp : public non_copyable_mixin<ramp> {
@ -27,4 +27,4 @@ namespace drawtypes {
ramp_t load_ramp(const config& conf, string section, string name, bool required = true);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/backlight.hpp
View File

@ -7,7 +7,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
struct brightness_handle {
@ -43,4 +43,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/battery.hpp
View File

@ -10,7 +10,7 @@
#include "utils/inotify.hpp"
#include "utils/string.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
enum class battery_state { NONE = 0, UNKNOWN, CHARGING, DISCHARGING, FULL };
@ -65,4 +65,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/bspwm.hpp
View File

@ -5,7 +5,7 @@
#include "modules/meta.hpp"
#include "utils/bspwm.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
enum class state_ws {
@ -85,4 +85,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/counter.hpp
View File

@ -2,7 +2,7 @@
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
using namespace drawtypes;
@ -22,4 +22,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/cpu.hpp
View File

@ -8,7 +8,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
struct cpu_time {
@ -52,4 +52,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/date.hpp
View File

@ -2,7 +2,7 @@
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
class date_module : public timer_module<date_module> {
@ -27,4 +27,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/fs.hpp
View File

@ -7,7 +7,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
/**
@ -74,4 +74,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/i3.hpp
View File

@ -10,7 +10,7 @@
#include "utils/i3.hpp"
#include "utils/io.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
// meta types {{{
@ -79,4 +79,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/ipc.hpp
View File

@ -3,7 +3,7 @@
#include "modules/meta.hpp"
#include "utils/command.hpp"
LEMONBUDDY_NS
POLYBAR_NS
struct ipc_hook; // fwd
@ -41,4 +41,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/memory.hpp
View File

@ -7,7 +7,7 @@
#include "drawtypes/progressbar.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
enum class memtype { NONE = 0, TOTAL, USED, FREE, SHARED, BUFFERS, CACHE, AVAILABLE };
@ -32,4 +32,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/menu.hpp
View File

@ -3,7 +3,7 @@
#include "drawtypes/label.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
struct menu_tree_item {
@ -41,4 +41,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/meta.hpp
View File

@ -12,7 +12,7 @@
#include "utils/string.hpp"
#include "utils/threading.hpp"
LEMONBUDDY_NS
POLYBAR_NS
#define DEFAULT_FORMAT "format"
@ -541,4 +541,4 @@ namespace modules {
// }}}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/mpd.hpp
View File

@ -9,7 +9,7 @@
#include "modules/meta.hpp"
#include "utils/threading.hpp"
LEMONBUDDY_NS
POLYBAR_NS
using namespace mpd;
@ -89,4 +89,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/network.hpp
View File

@ -8,7 +8,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
enum class connection_state { NONE = 0, CONNECTED, DISCONNECTED, PACKETLOSS };
@ -59,4 +59,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/script.hpp
View File

@ -3,7 +3,7 @@
#include "modules/meta.hpp"
#include "utils/command.hpp"
LEMONBUDDY_NS
POLYBAR_NS
#define OUTPUT_ACTION(BUTTON) \
if (!m_actions[BUTTON].empty()) \
@ -40,4 +40,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/temperature.hpp
View File

@ -7,7 +7,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
enum class temp_state { NORMAL = 0, WARN };
@ -38,4 +38,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/text.hpp
View File

@ -2,7 +2,7 @@
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
class text_module : public static_module<text_module> {
@ -15,4 +15,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/unsupported.hpp
View File

@ -16,7 +16,7 @@
} \
}
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
#if not ENABLE_I3
@ -33,4 +33,4 @@ namespace modules {
#endif
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/volume.hpp
View File

@ -8,7 +8,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
enum class mixer { NONE = 0, MASTER, SPEAKER, HEADPHONE };
@ -66,4 +66,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/xbacklight.hpp
View File

@ -10,7 +10,7 @@
#include "drawtypes/ramp.hpp"
#include "modules/meta.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
/**
@ -64,4 +64,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/modules/xwindow.hpp
View File

@ -10,7 +10,7 @@
#include "x11/icccm.hpp"
#include "x11/window.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace modules {
/**
@ -87,4 +87,4 @@ namespace modules {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/bspwm.hpp
View File

@ -11,7 +11,7 @@
#include "x11/randr.hpp"
#include "x11/window.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace bspwm_util {
struct payload;
@ -33,4 +33,4 @@ namespace bspwm_util {
connection_t make_subscriber();
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/color.hpp
View File

@ -6,7 +6,7 @@
#include "utils/string.hpp"
#include "x11/xlib.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace color_util {
template <typename T = uint8_t>
@ -92,4 +92,4 @@ namespace color_util {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/command.hpp
View File

@ -4,7 +4,7 @@
#include "components/logger.hpp"
#include "utils/threading.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace command_util {
DEFINE_ERROR(command_error);
@ -83,4 +83,4 @@ namespace command_util {
using command = command_util::command;
using command_t = command_util::command_t;
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/file.hpp
View File

@ -2,7 +2,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace file_util {
/**
@ -34,4 +34,4 @@ namespace file_util {
bool is_fifo(string filename);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/i3.hpp
View File

@ -6,7 +6,7 @@
#include "x11/connection.hpp"
#include "x11/randr.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace i3_util {
using connection_t = i3ipc::connection;
@ -15,4 +15,4 @@ namespace i3_util {
bool restack_above_root(connection& conn, const monitor_t& mon, const xcb_window_t win);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/inotify.hpp
View File

@ -6,7 +6,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
struct inotify_event {
string filename;
@ -41,4 +41,4 @@ namespace inotify_util {
watch_t make_watch(string path);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/io.hpp
View File

@ -2,7 +2,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace io_util {
string read(int read_fd, int bytes_to_read, int& bytes_read_loc, int& status_loc);
@ -23,4 +23,4 @@ namespace io_util {
bool interrupt_read(int write_fd);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/math.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace math_util {
/**
@ -43,4 +43,4 @@ namespace math_util {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/memory.hpp
View File

@ -2,7 +2,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace memory_util {
/**
@ -25,4 +25,4 @@ namespace memory_util {
using malloc_ptr_t = shared_ptr<T>;
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/mixins.hpp
View File

@ -2,7 +2,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
/**
* Base class for non copyable objects
@ -32,4 +32,4 @@ class non_movable_mixin {
non_movable_mixin& operator=(non_movable_mixin&&);
};
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/mtab.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace mtab_util {
/**
@ -33,4 +33,4 @@ namespace mtab_util {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/process.hpp
View File

@ -2,7 +2,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace process_util {
bool in_parent_process(pid_t pid);
@ -22,4 +22,4 @@ namespace process_util {
void unblock_signal(int sig);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/scope.hpp
View File

@ -4,7 +4,7 @@
#include "components/logger.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace scope_util {
template <typename... Args>
@ -38,4 +38,4 @@ namespace scope_util {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/socket.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace socket_util {
class unix_connection {
@ -41,4 +41,4 @@ namespace socket_util {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/string.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace string_util {
/**
@ -34,4 +34,4 @@ namespace string_util {
hash_type hash(string src);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/threading.hpp
View File

@ -5,7 +5,7 @@
#include "common.hpp"
#include "utils/mixins.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace threading_util {
namespace locking_strategy {
@ -59,4 +59,4 @@ namespace threading_util {
};
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/utils/throttle.hpp
View File

@ -5,7 +5,7 @@
#include "common.hpp"
#include "components/logger.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace throttle_util {
using timewindow = chrono::duration<double, std::milli>;
@ -86,4 +86,4 @@ namespace throttle_util {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/color.hpp
View File

@ -5,7 +5,7 @@
#include "common.hpp"
#include "utils/color.hpp"
LEMONBUDDY_NS
POLYBAR_NS
class color {
public:
@ -31,4 +31,4 @@ extern color g_colorempty;
extern color g_colorblack;
extern color g_colorwhite;
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/connection.hpp
View File

@ -13,7 +13,7 @@
#include "x11/types.hpp"
#include "x11/xutils.hpp"
LEMONBUDDY_NS
POLYBAR_NS
using xpp_connection = xpp::connection<
#ifdef ENABLE_DAMAGE_EXT
@ -97,4 +97,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/draw.hpp
View File

@ -3,7 +3,7 @@
#include "common.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace draw_util {
void fill(connection& c, xcb_drawable_t d, xcb_gcontext_t g, int16_t x, int16_t y, uint16_t w,
@ -13,4 +13,4 @@ namespace draw_util {
xcb_gcontext_t gc, int16_t x, int16_t y, uint8_t len, uint16_t* str);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/ewmh.hpp
View File

@ -5,7 +5,7 @@
#include "common.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace ewmh_util {
bool setup(connection& conn, xcb_ewmh_connection_t* dst);
@ -18,4 +18,4 @@ namespace ewmh_util {
string get_reply_string(xcb_ewmh_get_utf8_strings_reply_t* reply);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/fontmanager.hpp
View File

@ -11,7 +11,7 @@
#include "x11/types.hpp"
#include "x11/xlib.hpp"
LEMONBUDDY_NS
POLYBAR_NS
#define XFT_MAXCHARS (1 << 16)
extern array<char, XFT_MAXCHARS> xft_widths;
@ -89,4 +89,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/graphics.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
class connection;
@ -26,4 +26,4 @@ namespace graphics_util {
bool get_root_pixmap(connection& conn, root_pixmap* rpix);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/icccm.hpp
View File

@ -5,11 +5,11 @@
#include "common.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace icccm_util {
string get_wm_name(xcb_connection_t* conn, xcb_window_t win);
string get_reply_string(xcb_icccm_get_text_property_reply_t* reply);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/randr.hpp
View File

@ -10,7 +10,7 @@
#include "utils/memory.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
struct backlight_values {
uint32_t atom = 0;
@ -50,4 +50,4 @@ namespace randr_util {
void get_backlight_value(connection& conn, const monitor_t& mon, backlight_values& dst);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

8
include/x11/tray.hpp
View File

@ -15,10 +15,10 @@
#define SYSTEM_TRAY_BEGIN_MESSAGE 1
#define SYSTEM_TRAY_CANCEL_MESSAGE 2
#define TRAY_WM_NAME "Lemonbuddy tray window"
#define TRAY_WM_CLASS "tray\0Lemonbuddy"
#define TRAY_WM_NAME "Polybar tray window"
#define TRAY_WM_CLASS "tray\0Polybar"
LEMONBUDDY_NS
POLYBAR_NS
// fwd declarations
class connection;
@ -185,4 +185,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/types.hpp
View File

@ -19,7 +19,7 @@
#include "common.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
// xpp types {{{
@ -116,4 +116,4 @@ namespace evt {
#endif
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/window.hpp
View File

@ -4,7 +4,7 @@
#include "x11/connection.hpp"
#include "x11/randr.hpp"
LEMONBUDDY_NS
POLYBAR_NS
using connection_t = connection;
@ -161,4 +161,4 @@ class window : public xpp::window<connection_t&> {
// const xcb_params_cw_t* m_params;
// };
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/wm.hpp
View File

@ -3,7 +3,7 @@
#include "common.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace wm_util {
void set_wmname(connection& conn, xcb_window_t win, string wm_name, string wm_class);
@ -17,4 +17,4 @@ namespace wm_util {
void set_trayvisual(connection& conn, xcb_window_t win, xcb_visualid_t visual);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/xembed.hpp
View File

@ -5,7 +5,7 @@
#include "common.hpp"
#include "x11/connection.hpp"
LEMONBUDDY_NS
POLYBAR_NS
#define XEMBED_VERSION 0
#define XEMBED_MAPPED (1 << 0)
@ -43,4 +43,4 @@ namespace xembed {
void unembed(connection& conn, xcb_window_t win, xcb_window_t root);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/xlib.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace xlib {
extern Display* g_display;
@ -37,4 +37,4 @@ namespace xlib {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/xresources.hpp
View File

@ -4,7 +4,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
class xresource_manager {
public:
@ -33,4 +33,4 @@ namespace {
}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
include/x11/xutils.hpp
View File

@ -5,7 +5,7 @@
#include "common.hpp"
LEMONBUDDY_NS
POLYBAR_NS
class connection;
@ -20,4 +20,4 @@ namespace xutils {
void visibility_notify(connection& conn, const xcb_window_t& win, xcb_visibility_t state);
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

6
man/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(MAN_PAGES_1 lemonbuddy.1)
set(MAN_PAGES_5 lemonbuddy_config.5)
set(MAN_PAGES_1 polybar.1)
# set(MAN_PAGES_5 polybar_config.5)
INSTALL(FILES ${MAN_PAGES_1} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 COMPONENT doc)
INSTALL(FILES ${MAN_PAGES_5} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man5 COMPONENT doc)
# INSTALL(FILES ${MAN_PAGES_5} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man5 COMPONENT doc)

6
man/Makefile
View File

@ -1,7 +1,7 @@
.PHONY: all release update-dates update-versions clean
# Constant declarations
PROGRAM_NAME = lemonbuddy
PROGRAM_NAME = polybar
VERSION = $(shell git describe --tags)
DATE = $(shell date +%Y-%m-%d)
@ -28,10 +28,10 @@ update-dates:
@echo '[GZ] $(notdir $@)'
@gzip -c $< > $@
lemonbuddy: lemonbuddy.1
polybar: polybar.1
mandoc -a $<
lemonbuddy_config: lemonbuddy_config.5
polybar_config: polybar_config.5
mandoc -a $<
clean:

20
man/lemonbuddy.1 → man/polybar.1
View File

@ -1,15 +1,15 @@
.TH lemonbuddy 1 2016-10-18 "lemonbuddy 2.0.0" "User Manual"
.TH polybar 1 2016-10-18 "polybar 2.0.0" "User Manual"
.SH NAME
\fBlemonbuddy\fR \- A fast and easy-to-use tool status bar.
\fBpolybar\fR \- A fast and easy-to-use tool status bar.
.SH SYNOPSIS
.P
lemonbuddy \fIBAR-NAME\fR [\fB\-c\fR \fICONFIG\fR|\fB\-l\fR \fILOG_LEVEL\fR|\fB\-d\fR \fIPARAM\fR|\fB\f-q\fR|\fB\-r\fR|\fB\f-s\fR|\fB\-w\fR]
polybar \fIBAR-NAME\fR [\fB\-c\fR \fICONFIG\fR|\fB\-l\fR \fILOG_LEVEL\fR|\fB\-d\fR \fIPARAM\fR|\fB\f-q\fR|\fB\-r\fR|\fB\f-s\fR|\fB\-w\fR]
.P
lemonbuddy [\fB\-h\fR | \fB\-\-help\fR]
polybar [\fB\-h\fR | \fB\-\-help\fR]
.SH DESCRIPTION
\fBLemonbuddy\fR aims to help users build beautiful and highly customizable status bars without messing with named pipes, MacGyver-like scripting or non-blocking loops lobotomizing your CPU.
\fBPolybar\fR aims to help users build beautiful and highly customizable status bars without messing with named pipes, MacGyver-like scripting or non-blocking loops lobotomizing your CPU.
.P
Please not that the project is still in early development, so please report any anomalies by creating an issue on GitHub (\fIhttps://github.com/jaagr/lemonbuddy\fR).
Please not that the project is still in early development, so please report any anomalies by creating an issue on GitHub (\fIhttps://github.com/jaagr/polybar\fR).
.P
Mandatory arguments to long options are mandatory for short options too.
.TP
@ -20,13 +20,13 @@ Show help and program options.
Print version information.
.TP
\fB\-l\fR, \fB\-\-log\fR=\fILEVEL\fR
Set how verbose \fBlemonbuddy\fR's logging is. \fILEVEL\fR must be one of: `warning` or `info`.
Set how verbose \fBpolybar\fR's logging is. \fILEVEL\fR must be one of: `warning` or `info`.
.TP
\fB\-q\fR, \fB\-\-quiet\fR
Be quiet (will override -l).
.TP
\fB\-c\fR, \fB\-\-config\fR=\fICONFIG\fR
Specify the path to the configuration file. By default, configuration files are read from \fI$XDG_CONFIG_HOME/.config/lemonbuddy\fR. When the \fI$XDG_CONFIG_HOME\fR variable is absent, then \fI~/.config/lemonbuddy\fR directory is used instead.
Specify the path to the configuration file. By default, configuration files are read from \fI$XDG_CONFIG_HOME/.config/polybar\fR. When the \fI$XDG_CONFIG_HOME\fR variable is absent, then \fI~/.config/polybar\fR directory is used instead.
.TP
\fB\-r\fR, \fB\-\-reload\fR
Reload the application when the config file has been modified. (NOTE: Its recommended to only use this when setting up the bar).
@ -41,8 +41,8 @@ Print the generated \fIWM_NAME\fR.
Dump content to stdout instead of rendering an X window.
.SH SEE ALSO
.TP
\fBlemonbuddy_config\fR(5)
\fBpolybar_config\fR(5)
.RE
.SH HOMEPAGE
.sp
https://github.com/jaagr/lemonbuddy
https://github.com/jaagr/polybar

14
man/lemonbuddy_config.5 → man/polybar_config.5
View File

@ -1,12 +1,12 @@
.TH lemonbuddy_config 5 2016-10-18 "lemonbuddy 2.0.0" "User Configuration"
.TH polybar_config 5 2016-10-18 "polybar 2.0.0" "User Configuration"
.SH NAME
.\" This man page will need lots of updating as documentation about lemonbuddy
.\" This man page will need lots of updating as documentation about polybar
.\" configuration improves.
\fBlemonbuddy_config\fR \- Configuration for a \fBlemonbuddy\fR(1) bar.
\fBpolybar_config\fR \- Configuration for a \fBpolybar\fR(1) bar.
.SH SYNOPSIS
.BR $XDG_CONFIG_HOME/.config/lemonbuddy/config
.BR $XDG_CONFIG_HOME/.config/polybar/config
.P
.BR ~/.config/lemonbuddy/config
.BR ~/.config/polybar/config
.SH SYNTAX
.nf
.TP
@ -114,7 +114,7 @@ Specify the number of spaces to add before or after each module.
Here you can specify which fonts you wish to use. You need to set \fIid\fR to be a positive integer. The font should be specified in the following format: `\fIFONT\-NAME\fR:size=\fIFONT\-SIZE\fR;\fIOFFSET\fR`. For example, you could set `font\-0` to be `NotoSans-Regular:size=8;0`.
.TP
.BR wm-name
The value to set \fIWM_NAME\fR to when running. This defaults to `lemonbuddy\-\fIBAR-NAME\fR_\fIMONITOR\fR`.
The value to set \fIWM_NAME\fR to when running. This defaults to `polybar\-\fIBAR-NAME\fR_\fIMONITOR\fR`.
.TP
.BR locale
Which locale to use.
@ -126,4 +126,4 @@ Define which modules to use in the bar.
There are no examples yet.
.SH SEE ALSO
.TP
\fBlemonbuddy\fR(1)
\fBpolybar\fR(1)

4
src/adapters/alsa.cpp
View File

@ -1,6 +1,6 @@
#include "adapters/alsa.hpp"
LEMONBUDDY_NS
POLYBAR_NS
// class : alsa_ctl_interface {{{
@ -264,4 +264,4 @@ bool alsa_mixer::is_muted() {
// }}}
LEMONBUDDY_NS_END
POLYBAR_NS_END

4
src/adapters/mpd.cpp
View File

@ -1,7 +1,7 @@
#include "adapters/mpd.hpp"
#include "utils/math.hpp"
LEMONBUDDY_NS
POLYBAR_NS
namespace mpd {
void check_connection(mpd_connection* conn) {
@ -416,4 +416,4 @@ namespace mpd {
// }}}
}
LEMONBUDDY_NS_END
POLYBAR_NS_END

Some files were not shown because too many files have changed in this diff Show More