slstatus: update to 20180708.

Closes #2399.
This commit is contained in:
Leah Neukirchen 2018-10-01 14:46:24 +02:00 committed by maxice8
parent 3a060da864
commit 88f0cf185f
2 changed files with 62 additions and 50 deletions

View file

@ -1,53 +1,65 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* interval between updates (in ms) */ /* interval between updates (in ms) */
static const int interval = 1000; const unsigned int interval = 1000;
/* text to show if no value can be retrieved */
static const char unknown_str[] = "n/a";
/* maximum output string length */ /* maximum output string length */
#define MAXLEN 2048 #define MAXLEN 2048
/* alsa sound */ /*
#define ALSA_CHANNEL "Master" * function description argument (example)
*
/* battery */ * battery_perc battery percentage battery name (BAT0)
#define BATTERY_PATH "/sys/class/power_supply/" * NULL on OpenBSD
#define BATTERY_NOW "energy_now" * battery_state battery charging state battery name (BAT0)
#define BATTERY_FULL "energy_full_design" * NULL on OpenBSD
* battery_remaining battery remaining HH:MM battery name (BAT0)
/* how often to update the statusbar (min value == 1) */ * NULL on OpenBSD
#define UPDATE_INTERVAL 1 * cpu_perc cpu usage in percent NULL
* cpu_freq cpu frequency in MHz NULL
/* text to show if no value can be retrieved */ * datetime date and time format string (%F %T)
#define UNKNOWN_STR "n/a" * disk_free free disk space in GB mountpoint path (/)
* disk_perc disk usage in percent mountpoint path (/)
/* statusbar * disk_total total disk space in GB mountpoint path (/")
- battery_perc (battery percentage) [argument: battery name] * disk_used used disk space in GB mountpoint path (/)
- cpu_perc (cpu usage in percent) [argument: NULL] * entropy available entropy NULL
- datetime (date and time) [argument: format] * gid GID of current user NULL
- disk_free (disk usage in percent) [argument: mountpoint] * hostname hostname NULL
- disk_perc (disk usage in percent) [argument: mountpoint] * ipv4 IPv4 address interface name (eth0)
- disk_total (disk usage in percent) [argument: mountpoint] * ipv6 IPv6 address interface name (eth0)
- disk_used (disk usage in percent) [argument: mountpoint] * kernel_release `uname -r` NULL
- entropy (available entropy) [argument: NULL] * keyboard_indicators caps/num lock indicators format string (c?n?)
- gid (gid of current user) [argument: NULL] * see keyboard_indicators.c
- hostname [argument: NULL] * keymap layout (variant) of current NULL
- ip (ip address) [argument: interface] * keymap
- load_avg (load average) [argument: NULL] * load_avg load average NULL
- ram_free (ram usage in percent) [argument: NULL] * netspeed_rx receive network speed interface name (wlan0)
- ram_perc (ram usage in percent) [argument: NULL] * netspeed_tx transfer network speed interface name (wlan0)
- ram_total (ram usage in percent) [argument: NULL] * num_files number of files in a directory path
- ram_used (ram usage in percent) [argument: NULL] * (/home/foo/Inbox/cur)
- run_command (run custom shell command) [argument: command] * ram_free free memory in GB NULL
- temp (temperature in degrees) [argument: temperature file] * ram_perc memory usage in percent NULL
- uid (uid of current user) [argument: NULL] * ram_total total memory size in GB NULL
- uptime (uptime) [argument: NULL] * ram_used used memory in GB NULL
- username (username of current user) [argument: NULL] * run_command custom shell command command (echo foo)
- vol_perc (alsa volume and mute status in percent) [argument: soundcard] * swap_free free swap in GB NULL
- wifi_perc (wifi signal in percent) [argument: wifi card interface name] * swap_perc swap usage in percent NULL
- wifi_essid (wifi essid) [argument: wifi card interface name] */ * swap_total total swap size in GB NULL
* swap_used used swap in GB NULL
* temp temperature in degree celsius sensor file
* (/sys/class/thermal/...)
* NULL on OpenBSD
* uid UID of current user NULL
* uptime system uptime NULL
* username username of current user NULL
* vol_perc OSS/ALSA volume in percent mixer file (/dev/mixer)
* wifi_perc WiFi signal in percent interface name (wlan0)
* wifi_essid WiFi ESSID interface name (wlan0)
*/
static const struct arg args[] = { static const struct arg args[] = {
/* function format argument */ /* function format argument */
{ cpu_perc, "[ CPU %4s ]", NULL }, { datetime, "%s", "%F %T" },
{ ram_perc, "[ Mem %3s ]", NULL },
{ datetime, "[ %s ]", "%F %T" },
}; };

View file

@ -1,22 +1,22 @@
# Template file for 'slstatus' # Template file for 'slstatus'
pkgname=slstatus pkgname=slstatus
version=20180106 version=20180708
revision=1 revision=1
_commit=8bfe4b2e280e4d4b9762d3a93c4ec94c2fc9d754 _commit=dd7f1896aa9883f33b4d28cd192e8088db0cab5a
wrksrc="${pkgname}-${_commit}" wrksrc="${pkgname}-${_commit}"
build_style=gnu-makefile build_style=gnu-makefile
short_desc="Suckless status monitor for dwm" short_desc="Suckless status monitor for dwm"
maintainer="Dom H. <dom@hxy.io>" maintainer="Dom H. <dom@hxy.io>"
license="ISC" license="ISC"
homepage="https://tools.suckless.org/slstatus/" homepage="https://tools.suckless.org/slstatus/"
distfiles="https://git.suckless.org/slstatus/snapshot/${pkgname}-${_commit}.tar.gz" distfiles="https://github.com/drkhsh/slstatus/archive/${_commit}.tar.gz"
makedepends="alsa-lib-devel libX11-devel" makedepends="alsa-lib-devel libX11-devel"
checksum=d6f9d4decd227200eeffb55ac184ee5eeb23443e12a74a1fd00d98a584c060dc checksum=2602a7210decb265b55f1802d4baea652d782ef6c1c8d2f58a7d79bbd2d93d84
pre_build() { pre_build() {
cp ${FILESDIR}/config.h config.h cp ${FILESDIR}/config.h config.h
sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk sed -i -e 's|^CFLAGS *=|override CFLAGS +=|g' \
sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk -e 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk
} }
post_install() { post_install() {