sheldonmlee/slstatus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sheldonmlee:master
Branches Tags
sheldonmlee:master
sheldonmlee:laptop
..
compare: sheldonmlee:laptop
Branches Tags
sheldonmlee:master
sheldonmlee:laptop

1 Commits
master ... laptop

Author SHA1 Message Date
Sheldon Lee
fe65a9cc87 Added battery status for laptop. 2021-09-11 23:58:56 +08:00
35 changed files with 422 additions and 427 deletions
Show Stats Expand all files Collapse all files

13
LICENSE
View File

@ -1,6 +1,6 @@
ISC License
Copyright 2016-2022 Aaron Marcher <me@drkhsh.at>
Copyright 2016-2020 Aaron Marcher <me@drkhsh.at>
Copyright 2016 Roy Freytag <rfreytag@hs-mittweida.de>
Copyright 2016 Vincent Loupmon <vincentloupmon@gmail.com>
@ -9,26 +9,23 @@ Copyright 2016-2018 Ali H. Fardan <raiz@firemail.cc>
Copyright 2016 Jody Leonard <me@jodyleonard.com>
Copyright 2016-2018 Quentin Rameau <quinq@fifth.space>
Copyright 2016 Mike Coddington <mike@coddington.us>
Copyright 2016-2018 Ivan J. <parazyd@dyne.org>
Copyright 2016-2018 parazyd <parazyd@dyne.org>
Copyright 2017 Tobias Stoeckmann <tobias@stoeckmann.org>
Copyright 2017-2018 Laslo Hunhold <dev@frign.de>
Copyright 2018 Darron Anderson <darronanderson@protonmail.com>
Copyright 2018 Josuah Demangeon <mail@josuah.net>
Copyright 2018 Tobias Tschinkowitz <tobias@he4d.net>
Copyright 2018 David Demelier <markand@malikania.fr>
Copyright 2018-2012 Michael Buch <michaelbuch12@gmail.com>
Copyright 2018-2019 Michael Buch <michaelbuch12@gmail.com>
Copyright 2018 Ian Remmler <ian@remmler.org>
Copyright 2016-2019 Joerg Jung <jung@openbsd.org>
Copyright 2019 Ryan Kes <alrayyes@gmail.com>
Copyright 2019 Cem Keylan <cem@ckyln.com>
Copyright 2019 Dimitris Papastamos <dsp@2f30.org>
Copyright 2019-2022 Ingo Feinerer <feinerer@logic.at>
Copyright 2019 dsp <dsp@2f30.org>
Copyright 2019-2020 Ingo Feinerer <feinerer@logic.at>
Copyright 2020 Alexandre Ratchov <alex@caoua.org>
Copyright 2020 Mart Lubbers <mart@martlubbers.net>
Copyright 2020 Daniel Moch <daniel@danielmoch.com>
Copyright 2022 Nickolas Raymond Kaczynski <nrk@disroot.org>
Copyright 2022 Patrick Iacob <iacobp@oregonstate.edu>
Copyright 2021-2022 Steven Ward <planet36@gmail.com>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above

9
Makefile
View File

@ -7,7 +7,6 @@ include config.mk
REQ = util
COM =\
components/battery\
components/cat\
components/cpu\
components/datetime\
components/disk\
@ -22,6 +21,7 @@ COM =\
components/num_files\
components/ram\
components/run_command\
components/separator\
components/swap\
components/temperature\
components/uptime\
@ -31,7 +31,7 @@ COM =\
all: slstatus
$(COM:=.o): config.mk $(REQ:=.h) slstatus.h
$(COM:=.o): config.mk $(REQ:=.h)
slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h)
.c.o:
@ -44,15 +44,14 @@ slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
$(CC) -o $@ $(LDFLAGS) $(COM:=.o) $(REQ:=.o) slstatus.o $(LDLIBS)
clean:
rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o) slstatus-${VERSION}.tar.gz
rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
dist:
rm -rf "slstatus-$(VERSION)"
mkdir -p "slstatus-$(VERSION)/components"
cp -R LICENSE Makefile README config.mk config.def.h \
arg.h slstatus.h slstatus.c $(REQ:=.c) $(REQ:=.h) \
arg.h slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
slstatus.1 "slstatus-$(VERSION)"
cp -R $(COM:=.c) "slstatus-$(VERSION)/components"
tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz"
rm -rf "slstatus-$(VERSION)"

18
README
View File

@ -1,15 +1,12 @@
slstatus - suckless status
==========================
slstatus is a small tool for providing system status information to other
programs over the EWMH property of the root window (used by dwm(1)) or
standard input/output. It is designed to be as efficient as possible by
only issuing the minimum of system calls required.
slstatus is a suckless status monitor for window managers that use WM_NAME
(e.g. dwm) or stdin to fill the status bar.
Features
--------
- Battery percentage/state/time left
- Cat (read file)
- CPU usage
- CPU frequency
- Custom shell commands
@ -38,10 +35,6 @@ Requirements
Currently slstatus works on FreeBSD, Linux and OpenBSD.
In order to build slstatus you need the Xlib header files.
- For volume percentage on Linux the kernel module `snd-mixer-oss` must be
loaded.
- For volume percentage on FreeBSD, `sndio` must be installed.
Installation
------------
@ -63,3 +56,10 @@ Configuration
-------------
slstatus can be customized by creating a custom config.h and (re)compiling the
source code. This keeps it fast, secure and simple.
Upcoming
--------
A release (v1.0) will come soon... ;)
After a long phase of inactivity, development has been continued!

2
arg.h
View File

@ -13,7 +13,7 @@ extern char *argv0;
break; \
} \
for (i_ = 1, argused_ = 0; (*argv)[i_]; i_++) { \
switch ((*argv)[i_])
switch((*argv)[i_])
#define ARGEND if (argused_) { \
if ((*argv)[i_ + 1]) { \
break; \

107
components/battery.c
View File

@ -2,35 +2,26 @@
#include <stdio.h>
#include <string.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(__linux__)
/*
* https://www.kernel.org/doc/html/latest/power/power_supply_class.html
*/
#include <limits.h>
#include <stdint.h>
#include <unistd.h>
#define POWER_SUPPLY_CAPACITY "/sys/class/power_supply/%s/capacity"
#define POWER_SUPPLY_STATUS "/sys/class/power_supply/%s/status"
#define POWER_SUPPLY_CHARGE "/sys/class/power_supply/%s/charge_now"
#define POWER_SUPPLY_ENERGY "/sys/class/power_supply/%s/energy_now"
#define POWER_SUPPLY_CURRENT "/sys/class/power_supply/%s/current_now"
#define POWER_SUPPLY_POWER "/sys/class/power_supply/%s/power_now"
static const char *
pick(const char *bat, const char *f1, const char *f2, char *path,
size_t length)
{
if (esnprintf(path, length, f1, bat) > 0 &&
access(path, R_OK) == 0)
access(path, R_OK) == 0) {
return f1;
}
if (esnprintf(path, length, f2, bat) > 0 &&
access(path, R_OK) == 0)
access(path, R_OK) == 0) {
return f2;
}
return NULL;
}
@ -38,15 +29,18 @@
const char *
battery_perc(const char *bat)
{
int cap_perc;
int perc;
char path[PATH_MAX];
if (esnprintf(path, sizeof(path), POWER_SUPPLY_CAPACITY, bat) < 0)
if (esnprintf(path, sizeof(path),
"/sys/class/power_supply/%s/capacity", bat) < 0) {
return NULL;
if (pscanf(path, "%d", &cap_perc) != 1)
}
if (pscanf(path, "%d", &perc) != 1) {
return NULL;
}
return bprintf("%d", cap_perc);
return bprintf("%d", perc);
}
const char *
@ -59,20 +53,23 @@
{ "Charging", "+" },
{ "Discharging", "-" },
{ "Full", "o" },
{ "Not charging", "o" },
};
size_t i;
char path[PATH_MAX], state[12];
if (esnprintf(path, sizeof(path), POWER_SUPPLY_STATUS, bat) < 0)
if (esnprintf(path, sizeof(path),
"/sys/class/power_supply/%s/status", bat) < 0) {
return NULL;
if (pscanf(path, "%12[a-zA-Z ]", state) != 1)
}
if (pscanf(path, "%12s", state) != 1) {
return NULL;
}
for (i = 0; i < LEN(map); i++)
if (!strcmp(map[i].state, state))
for (i = 0; i < LEN(map); i++) {
if (!strcmp(map[i].state, state)) {
break;
}
}
return (i == LEN(map)) ? "?" : map[i].symbol;
}
@ -83,24 +80,32 @@
double timeleft;
char path[PATH_MAX], state[12];
if (esnprintf(path, sizeof(path), POWER_SUPPLY_STATUS, bat) < 0)
if (esnprintf(path, sizeof(path),
"/sys/class/power_supply/%s/status", bat) < 0) {
return NULL;
if (pscanf(path, "%12[a-zA-Z ]", state) != 1)
}
if (pscanf(path, "%12s", state) != 1) {
return NULL;
}
if (!pick(bat, POWER_SUPPLY_CHARGE, POWER_SUPPLY_ENERGY, path,
if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
"/sys/class/power_supply/%s/energy_now", path,
sizeof(path)) ||
pscanf(path, "%ju", &charge_now) < 0)
pscanf(path, "%ju", &charge_now) < 0) {
return NULL;
}
if (!strcmp(state, "Discharging")) {
if (!pick(bat, POWER_SUPPLY_CURRENT, POWER_SUPPLY_POWER, path,
if (!pick(bat, "/sys/class/power_supply/%s/current_now",
"/sys/class/power_supply/%s/power_now", path,
sizeof(path)) ||
pscanf(path, "%ju", &current_now) < 0)
pscanf(path, "%ju", &current_now) < 0) {
return NULL;
}
if (current_now == 0)
if (current_now == 0) {
return NULL;
}
timeleft = (double)charge_now / (double)current_now;
h = timeleft;
@ -142,8 +147,9 @@
{
struct apm_power_info apm_info;
if (load_apm_power_info(&apm_info))
if (load_apm_power_info(&apm_info)) {
return bprintf("%d", apm_info.battery_life);
}
return NULL;
}
@ -162,10 +168,11 @@
size_t i;
if (load_apm_power_info(&apm_info)) {
for (i = 0; i < LEN(map); i++)
if (map[i].state == apm_info.ac_state)
for (i = 0; i < LEN(map); i++) {
if (map[i].state == apm_info.ac_state) {
break;
}
}
return (i == LEN(map)) ? "?" : map[i].symbol;
}
@ -176,13 +183,12 @@
battery_remaining(const char *unused)
{
struct apm_power_info apm_info;
unsigned int h, m;
if (load_apm_power_info(&apm_info)) {
if (apm_info.ac_state != APM_AC_ON) {
h = apm_info.minutes_left / 60;
m = apm_info.minutes_left % 60;
return bprintf("%uh %02um", h, m);
return bprintf("%uh %02um",
apm_info.minutes_left / 60,
apm_info.minutes_left % 60);
} else {
return "";
}
@ -193,21 +199,18 @@
#elif defined(__FreeBSD__)
#include <sys/sysctl.h>
#define BATTERY_LIFE "hw.acpi.battery.life"
#define BATTERY_STATE "hw.acpi.battery.state"
#define BATTERY_TIME "hw.acpi.battery.time"
const char *
battery_perc(const char *unused)
{
int cap_perc;
int cap;
size_t len;
len = sizeof(cap_perc);
if (sysctlbyname(BATTERY_LIFE, &cap_perc, &len, NULL, 0) < 0 || !len)
len = sizeof(cap);
if (sysctlbyname("hw.acpi.battery.life", &cap, &len, NULL, 0) == -1
|| !len)
return NULL;
return bprintf("%d", cap_perc);
return bprintf("%d", cap);
}
const char *
@ -217,11 +220,12 @@
size_t len;
len = sizeof(state);
if (sysctlbyname(BATTERY_STATE, &state, &len, NULL, 0) < 0 || !len)
if (sysctlbyname("hw.acpi.battery.state", &state, &len, NULL, 0) == -1
|| !len)
return NULL;
switch (state) {
case 0: /* FALLTHROUGH */
switch(state) {
case 0:
case 2:
return "+";
case 1:
@ -238,8 +242,9 @@
size_t len;
len = sizeof(rem);
if (sysctlbyname(BATTERY_TIME, &rem, &len, NULL, 0) < 0 || !len
|| rem < 0)
if (sysctlbyname("hw.acpi.battery.time", &rem, &len, NULL, 0) == -1
|| !len
|| rem == -1)
return NULL;
return bprintf("%uh %02um", rem / 60, rem % 60);

32
components/cat.c
View File

@ -1,32 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <string.h>
#include "../slstatus.h"
#include "../util.h"
const char *
cat(const char *path)
{
char *f;
FILE *fp;
if (!(fp = fopen(path, "r"))) {
warn("fopen '%s':", path);
return NULL;
}
f = fgets(buf, sizeof(buf) - 1, fp);
if (fclose(fp) < 0) {
warn("fclose '%s':", path);
return NULL;
}
if (!f)
return NULL;
if ((f = strrchr(buf, '\n')))
f[0] = '\0';
return buf[0] ? buf : NULL;
}

49
components/cpu.c
View File

@ -3,26 +3,25 @@
#include <stdio.h>
#include <string.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(__linux__)
#define CPU_FREQ "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
const char *
cpu_freq(const char *unused)
cpu_freq(void)
{
uintmax_t freq;
/* in kHz */
if (pscanf(CPU_FREQ, "%ju", &freq) != 1)
if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/"
"scaling_cur_freq", "%ju", &freq) != 1) {
return NULL;
}
return fmt_human(freq * 1000, 1000);
}
const char *
cpu_perc(const char *unused)
cpu_perc(void)
{
static long double a[7];
long double b[7], sum;
@ -31,17 +30,19 @@
/* cpu user nice system idle iowait irq softirq */
if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf",
&a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6])
!= 7)
!= 7) {
return NULL;
if (b[0] == 0)
}
if (b[0] == 0) {
return NULL;
}
sum = (b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) -
(a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6]);
if (sum == 0)
if (sum == 0) {
return NULL;
}
return bprintf("%d", (int)(100 *
((b[0] + b[1] + b[2] + b[5] + b[6]) -
@ -53,7 +54,7 @@
#include <sys/sysctl.h>
const char *
cpu_freq(const char *unused)
cpu_freq(void)
{
int freq, mib[2];
size_t size;
@ -73,7 +74,7 @@
}
const char *
cpu_perc(const char *unused)
cpu_perc(void)
{
int mib[2];
static uintmax_t a[CPUSTATES];
@ -90,14 +91,16 @@
warn("sysctl 'KERN_CPTIME':");
return NULL;
}
if (b[0] == 0)
if (b[0] == 0) {
return NULL;
}
sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
if (sum == 0)
if (sum == 0) {
return NULL;
}
return bprintf("%d", 100 *
((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
@ -106,19 +109,20 @@
b[CP_INTR])) / sum);
}
#elif defined(__FreeBSD__)
#include <devstat.h>
#include <sys/param.h>
#include <sys/sysctl.h>
#include <devstat.h>
const char *
cpu_freq(const char *unused)
cpu_freq(void)
{
int freq;
size_t size;
size = sizeof(freq);
/* in MHz */
if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) < 0 || !size) {
if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) == -1
|| !size) {
warn("sysctlbyname 'hw.clockrate':");
return NULL;
}
@ -127,7 +131,7 @@
}
const char *
cpu_perc(const char *unused)
cpu_perc(void)
{
size_t size;
static long a[CPUSTATES];
@ -135,18 +139,21 @@
size = sizeof(a);
memcpy(b, a, sizeof(b));
if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) < 0 || !size) {
if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) == -1
|| !size) {
warn("sysctlbyname 'kern.cp_time':");
return NULL;
}
if (b[0] == 0)
if (b[0] == 0) {
return NULL;
}
sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
if (sum == 0)
if (sum == 0) {
return NULL;
}
return bprintf("%d", 100 *
((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +

1
components/datetime.c
View File

@ -2,7 +2,6 @@
#include <stdio.h>
#include <time.h>
#include "../slstatus.h"
#include "../util.h"
const char *

3
components/disk.c
View File

@ -2,7 +2,6 @@
#include <stdio.h>
#include <sys/statvfs.h>
#include "../slstatus.h"
#include "../util.h"
const char *
@ -29,7 +28,7 @@ disk_perc(const char *path)
}
return bprintf("%d", (int)(100 *
(1 - ((double)fs.f_bavail / (double)fs.f_blocks))));
(1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));
}
const char *

14
components/entropy.c
View File

@ -1,29 +1,27 @@
/* See LICENSE file for copyright and license details. */
#include "../slstatus.h"
#if defined(__linux__)
#include <stdint.h>
#include <stdio.h>
#include "../util.h"
#define ENTROPY_AVAIL "/proc/sys/kernel/random/entropy_avail"
const char *
entropy(const char *unused)
entropy(void)
{
uintmax_t num;
if (pscanf(ENTROPY_AVAIL, "%ju", &num) != 1)
if (pscanf("/proc/sys/kernel/random/entropy_avail", "%ju", &num)
!= 1) {
return NULL;
}
return bprintf("%ju", num);
}
#elif defined(__OpenBSD__) | defined(__FreeBSD__)
const char *
entropy(const char *unused)
entropy(void)
{
// https://www.unicode.org/charts/PDF/U2200.pdf
/* Unicode Character 'INFINITY' (U+221E) */
return "\u221E";
return "\xe2\x88\x9e";
}
#endif

3
components/hostname.c
View File

@ -2,11 +2,10 @@
#include <stdio.h>
#include <unistd.h>
#include "../slstatus.h"
#include "../util.h"
const char *
hostname(const char *unused)
hostname(void)
{
if (gethostname(buf, sizeof(buf)) < 0) {
warn("gethostbyname:");

7
components/ip.c
View File

@ -4,14 +4,13 @@
#include <stdio.h>
#include <string.h>
#if defined(__OpenBSD__)
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/socket.h>
#elif defined(__FreeBSD__)
#include <netinet/in.h>
#include <sys/socket.h>
#endif
#include "../slstatus.h"
#include "../util.h"
static const char *
@ -27,9 +26,9 @@ ip(const char *interface, unsigned short sa_family)
}
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
if (!ifa->ifa_addr)
if (!ifa->ifa_addr) {
continue;
}
s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6),
host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
if (!strcmp(ifa->ifa_name, interface) &&

5
components/kernel_release.c
View File

@ -1,12 +1,11 @@
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <sys/utsname.h>
#include <stdio.h>
#include "../slstatus.h"
#include "../util.h"
const char *
kernel_release(const char *unused)
kernel_release(void)
{
struct utsname udata;

12
components/keyboard_indicators.c
View File

@ -4,7 +4,6 @@
#include <string.h>
#include <X11/Xlib.h>
#include "../slstatus.h"
#include "../util.h"
/*
@ -33,18 +32,17 @@ keyboard_indicators(const char *fmt)
fmtlen = strnlen(fmt, 4);
for (i = n = 0; i < fmtlen; i++) {
key = tolower(fmt[i]);
if (key != 'c' && key != 'n')
if (key != 'c' && key != 'n') {
continue;
}
togglecase = (i + 1 >= fmtlen || fmt[i + 1] != '?');
isset = (state.led_mask & (1 << (key == 'n')));
if (togglecase)
if (togglecase) {
buf[n++] = isset ? toupper(key) : key;
else if (isset)
} else if (isset) {
buf[n++] = fmt[i];
}
}
buf[n] = 0;
return buf;
}

17
components/keymap.c
View File

@ -5,7 +5,6 @@
#include <X11/XKBlib.h>
#include <X11/Xlib.h>
#include "../slstatus.h"
#include "../util.h"
static int
@ -15,9 +14,11 @@ valid_layout_or_variant(char *sym)
/* invalid symbols from xkb rules config */
static const char *invalid[] = { "evdev", "inet", "pc", "base" };
for (i = 0; i < LEN(invalid); i++)
if (!strncmp(sym, invalid[i], strlen(invalid[i])))
for (i = 0; i < LEN(invalid); i++) {
if (!strncmp(sym, invalid[i], strlen(invalid[i]))) {
return 0;
}
}
return 1;
}
@ -45,13 +46,12 @@ get_layout(char *syms, int grp_num)
}
const char *
keymap(const char *unused)
keymap(void)
{
Display *dpy;
XkbDescRec *desc;
XkbStateRec state;
char *symbols;
const char *layout;
char *symbols, *layout;
layout = NULL;
@ -75,12 +75,13 @@ keymap(const char *unused)
warn("XGetAtomName: Failed to get atom name");
goto end;
}
layout = bprintf("%s", get_layout(symbols, state.group));
layout = (char *)bprintf("%s", get_layout(symbols, state.group));
XFree(symbols);
end:
XkbFreeKeyboard(desc, XkbSymbolsNameMask, 1);
if (XCloseDisplay(dpy))
if (XCloseDisplay(dpy)) {
warn("XCloseDisplay: Failed to close display");
}
return layout;
}

3
components/load_avg.c
View File

@ -2,11 +2,10 @@
#include <stdio.h>
#include <stdlib.h>
#include "../slstatus.h"
#include "../util.h"
const char *
load_avg(const char *unused)
load_avg(void)
{
double avgs[3];

56
components/netspeeds.c
View File

@ -1,16 +1,12 @@
/* See LICENSE file for copyright and license details. */
#include <limits.h>
#include <stdio.h>
#include <limits.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(__linux__)
#include <stdint.h>
#define NET_RX_BYTES "/sys/class/net/%s/statistics/rx_bytes"
#define NET_TX_BYTES "/sys/class/net/%s/statistics/tx_bytes"
const char *
netspeed_rx(const char *interface)
{
@ -21,12 +17,17 @@
oldrxbytes = rxbytes;
if (esnprintf(path, sizeof(path), NET_RX_BYTES, interface) < 0)
if (esnprintf(path, sizeof(path),
"/sys/class/net/%s/statistics/rx_bytes",
interface) < 0) {
return NULL;
if (pscanf(path, "%ju", &rxbytes) != 1)
}
if (pscanf(path, "%ju", &rxbytes) != 1) {
return NULL;
if (oldrxbytes == 0)
}
if (oldrxbytes == 0) {
return NULL;
}
return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
1024);
@ -42,22 +43,27 @@
oldtxbytes = txbytes;
if (esnprintf(path, sizeof(path), NET_TX_BYTES, interface) < 0)
if (esnprintf(path, sizeof(path),
"/sys/class/net/%s/statistics/tx_bytes",
interface) < 0) {
return NULL;
if (pscanf(path, "%ju", &txbytes) != 1)
}
if (pscanf(path, "%ju", &txbytes) != 1) {
return NULL;
if (oldtxbytes == 0)
}
if (oldtxbytes == 0) {
return NULL;
}
return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
1024);
}
#elif defined(__OpenBSD__) | defined(__FreeBSD__)
#include <ifaddrs.h>
#include <net/if.h>
#include <string.h>
#include <ifaddrs.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
const char *
netspeed_rx(const char *interface)
@ -71,23 +77,25 @@
oldrxbytes = rxbytes;
if (getifaddrs(&ifal) < 0) {
if (getifaddrs(&ifal) == -1) {
warn("getifaddrs failed");
return NULL;
}
rxbytes = 0;
for (ifa = ifal; ifa; ifa = ifa->ifa_next)
for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
if (!strcmp(ifa->ifa_name, interface) &&
(ifd = (struct if_data *)ifa->ifa_data))
(ifd = (struct if_data *)ifa->ifa_data)) {
rxbytes += ifd->ifi_ibytes, if_ok = 1;
}
}
freeifaddrs(ifal);
if (!if_ok) {
warn("reading 'if_data' failed");
return NULL;
}
if (oldrxbytes == 0)
if (oldrxbytes == 0) {
return NULL;
}
return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
1024);
@ -105,23 +113,25 @@
oldtxbytes = txbytes;
if (getifaddrs(&ifal) < 0) {
if (getifaddrs(&ifal) == -1) {
warn("getifaddrs failed");
return NULL;
}
txbytes = 0;
for (ifa = ifal; ifa; ifa = ifa->ifa_next)
for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
if (!strcmp(ifa->ifa_name, interface) &&
(ifd = (struct if_data *)ifa->ifa_data))
(ifd = (struct if_data *)ifa->ifa_data)) {
txbytes += ifd->ifi_obytes, if_ok = 1;
}
}
freeifaddrs(ifal);
if (!if_ok) {
warn("reading 'if_data' failed");
return NULL;
}
if (oldtxbytes == 0)
if (oldtxbytes == 0) {
return NULL;
}
return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
1024);

13
components/num_files.c
View File

@ -3,30 +3,29 @@
#include <stdio.h>
#include <string.h>
#include "../slstatus.h"
#include "../util.h"
const char *
num_files(const char *path)
{
struct dirent *dp;
DIR *dir;
DIR *fd;
int num;
if (!(dir = opendir(path))) {
if (!(fd = opendir(path))) {
warn("opendir '%s':", path);
return NULL;
}
num = 0;
while ((dp = readdir(dir))) {
if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
while ((dp = readdir(fd))) {
if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
continue; /* skip self and parent */
}
num++;
}
closedir(dir);
closedir(fd);
return bprintf("%d", num);
}

120
components/ram.c
View File

@ -1,14 +1,13 @@
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(__linux__)
#include <stdint.h>
const char *
ram_free(const char *unused)
ram_free(void)
{
uintmax_t free;
@ -16,17 +15,17 @@
"MemTotal: %ju kB\n"
"MemFree: %ju kB\n"
"MemAvailable: %ju kB\n",
&free, &free, &free) != 3)
&free, &free, &free) != 3) {
return NULL;
}
return fmt_human(free * 1024, 1024);
}
const char *
ram_perc(const char *unused)
ram_perc(void)
{
uintmax_t total, free, buffers, cached;
int percent;
if (pscanf("/proc/meminfo",
"MemTotal: %ju kB\n"
@ -34,32 +33,35 @@
"MemAvailable: %ju kB\n"
"Buffers: %ju kB\n"
"Cached: %ju kB\n",
&total, &free, &buffers, &buffers, &cached) != 5)
&total, &free, &buffers, &buffers, &cached) != 5) {
return NULL;
}
if (total == 0)
if (total == 0) {
return NULL;
}
percent = 100 * ((total - free) - (buffers + cached)) / total;
return bprintf("%d", percent);
return bprintf("%d", 100 * ((total - free) - (buffers + cached))
/ total);
}
const char *
ram_total(const char *unused)
ram_total(void)
{
uintmax_t total;
if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
!= 1)
!= 1) {
return NULL;
}
return fmt_human(total * 1024, 1024);
}
const char *
ram_used(const char *unused)
ram_used(void)
{
uintmax_t total, free, buffers, cached, used;
uintmax_t total, free, buffers, cached;
if (pscanf("/proc/meminfo",
"MemTotal: %ju kB\n"
@ -67,11 +69,12 @@
"MemAvailable: %ju kB\n"
"Buffers: %ju kB\n"
"Cached: %ju kB\n",
&total, &free, &buffers, &buffers, &cached) != 5)
&total, &free, &buffers, &buffers, &cached) != 5) {
return NULL;
}
used = (total - free - buffers - cached);
return fmt_human(used * 1024, 1024);
return fmt_human((total - free - buffers - cached) * 1024,
1024);
}
#elif defined(__OpenBSD__)
#include <stdlib.h>
@ -90,61 +93,68 @@
size = sizeof(*uvmexp);
if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0)
if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0) {
return 1;
}
return 0;
}
const char *
ram_free(const char *unused)
ram_free(void)
{
struct uvmexp uvmexp;
int free_pages;
if (!load_uvmexp(&uvmexp))
return NULL;
if (load_uvmexp(&uvmexp)) {
free_pages = uvmexp.npages - uvmexp.active;
return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
1024, 1024);
}
return NULL;
}
const char *
ram_perc(const char *unused)
ram_perc(void)
{
struct uvmexp uvmexp;
int percent;
if (!load_uvmexp(&uvmexp))
return NULL;
if (load_uvmexp(&uvmexp)) {
percent = uvmexp.active * 100 / uvmexp.npages;
return bprintf("%d", percent);
}
const char *
ram_total(const char *unused)
{
struct uvmexp uvmexp;
if (!load_uvmexp(&uvmexp))
return NULL;
return fmt_human(pagetok(uvmexp.npages,
uvmexp.pageshift) * 1024, 1024);
}
const char *
ram_used(const char *unused)
ram_total(void)
{
struct uvmexp uvmexp;
if (!load_uvmexp(&uvmexp))
return NULL;
if (load_uvmexp(&uvmexp)) {
return fmt_human(pagetok(uvmexp.npages,
uvmexp.pageshift) * 1024,
1024);
}
return NULL;
}
const char *
ram_used(void)
{
struct uvmexp uvmexp;
if (load_uvmexp(&uvmexp)) {
return fmt_human(pagetok(uvmexp.active,
uvmexp.pageshift) * 1024, 1024);
uvmexp.pageshift) * 1024,
1024);
}
return NULL;
}
#elif defined(__FreeBSD__)
#include <sys/sysctl.h>
@ -153,13 +163,13 @@
#include <vm/vm_param.h>
const char *
ram_free(const char *unused) {
ram_free(void) {
struct vmtotal vm_stats;
int mib[] = {CTL_VM, VM_TOTAL};
size_t len;
len = sizeof(struct vmtotal);
if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) < 0
if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) == -1
|| !len)
return NULL;
@ -167,44 +177,44 @@
}
const char *
ram_total(const char *unused) {
unsigned int npages;
ram_total(void) {
long npages;
size_t len;
len = sizeof(npages);
if (sysctlbyname("vm.stats.vm.v_page_count",
&npages, &len, NULL, 0) < 0 || !len)
if (sysctlbyname("vm.stats.vm.v_page_count", &npages, &len, NULL, 0) == -1
|| !len)
return NULL;
return fmt_human(npages * getpagesize(), 1024);
}
const char *
ram_perc(const char *unused) {
unsigned int npages;
unsigned int active;
ram_perc(void) {
long npages;
long active;
size_t len;
len = sizeof(npages);
if (sysctlbyname("vm.stats.vm.v_page_count",
&npages, &len, NULL, 0) < 0 || !len)
if (sysctlbyname("vm.stats.vm.v_page_count", &npages, &len, NULL, 0) == -1
|| !len)
return NULL;
if (sysctlbyname("vm.stats.vm.v_active_count",
&active, &len, NULL, 0) < 0 || !len)
if (sysctlbyname("vm.stats.vm.v_active_count", &active, &len, NULL, 0) == -1
|| !len)
return NULL;
return bprintf("%d", active * 100 / npages);
}
const char *
ram_used(const char *unused) {
unsigned int active;
ram_used(void) {
long active;
size_t len;
len = sizeof(active);
if (sysctlbyname("vm.stats.vm.v_active_count",
&active, &len, NULL, 0) < 0 || !len)
if (sysctlbyname("vm.stats.vm.v_active_count", &active, &len, NULL, 0) == -1
|| !len)
return NULL;
return fmt_human(active * getpagesize(), 1024);

9
components/run_command.c
View File

@ -2,7 +2,6 @@
#include <stdio.h>
#include <string.h>
#include "../slstatus.h"
#include "../util.h"
const char *
@ -15,17 +14,17 @@ run_command(const char *cmd)
warn("popen '%s':", cmd);
return NULL;
}
p = fgets(buf, sizeof(buf) - 1, fp);
if (pclose(fp) < 0) {
warn("pclose '%s':", cmd);
return NULL;
}
if (!p)
if (!p) {
return NULL;
if ((p = strrchr(buf, '\n')))
}
if ((p = strrchr(buf, '\n'))) {
p[0] = '\0';
}
return buf[0] ? buf : NULL;
}

10
components/separator.c Normal file
View File

@ -0,0 +1,10 @@
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include "../util.h"
const char *
separator(const char *separator)
{
return separator;
}

74
components/swap.c
View File

@ -4,7 +4,6 @@
#include <stdlib.h>
#include <string.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(__linux__)
@ -25,9 +24,11 @@
char *line = NULL;
/* get number of fields we want to extract */
for (i = 0, left = 0; i < LEN(ent); i++)
if (ent[i].var)
for (i = 0, left = 0; i < LEN(ent); i++) {
if (ent[i].var) {
left++;
}
}
if (!(fp = fopen("/proc/meminfo", "r"))) {
warn("fopen '/proc/meminfo':");
@ -57,45 +58,49 @@
}
const char *
swap_free(const char *unused)
swap_free(void)
{
long free;
if (get_swap_info(NULL, &free, NULL))
if (get_swap_info(NULL, &free, NULL)) {
return NULL;
}
return fmt_human(free * 1024, 1024);
}
const char *
swap_perc(const char *unused)
swap_perc(void)
{
long total, free, cached;
if (get_swap_info(&total, &free, &cached) || total == 0)
if (get_swap_info(&total, &free, &cached) || total == 0) {
return NULL;
}
return bprintf("%d", 100 * (total - free - cached) / total);
}
const char *
swap_total(const char *unused)
swap_total(void)
{
long total;
if (get_swap_info(&total, NULL, NULL))
if (get_swap_info(&total, NULL, NULL)) {
return NULL;
}
return fmt_human(total * 1024, 1024);
}
const char *
swap_used(const char *unused)
swap_used(void)
{
long total, free, cached;
if (get_swap_info(&total, &free, &cached))
if (get_swap_info(&total, &free, &cached)) {
return NULL;
}
return fmt_human((total - free - cached) * 1024, 1024);
}
@ -142,69 +147,74 @@
}
const char *
swap_free(const char *unused)
swap_free(void)
{
int total, used;
if (getstats(&total, &used))
if (getstats(&total, &used)) {
return NULL;
}
return fmt_human((total - used) * 1024, 1024);
}
const char *
swap_perc(const char *unused)
swap_perc(void)
{
int total, used;
if (getstats(&total, &used))
if (getstats(&total, &used)) {
return NULL;
}
if (total == 0)
if (total == 0) {
return NULL;
}
return bprintf("%d", 100 * used / total);
}
const char *
swap_total(const char *unused)
swap_total(void)
{
int total, used;
if (getstats(&total, &used))
if (getstats(&total, &used)) {
return NULL;
}
return fmt_human(total * 1024, 1024);
}
const char *
swap_used(const char *unused)
swap_used(void)
{
int total, used;
if (getstats(&total, &used))
if (getstats(&total, &used)) {
return NULL;
}
return fmt_human(used * 1024, 1024);
}
#elif defined(__FreeBSD__)
#include <fcntl.h>
#include <kvm.h>
#include <stdlib.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <kvm.h>
static int getswapinfo(struct kvm_swap *swap_info, size_t size)
{
kvm_t *kd;
kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, NULL);
if (kd == NULL) {
if(kd == NULL) {
warn("kvm_openfiles '/dev/null':");
return 0;
}
if (kvm_getswapinfo(kd, swap_info, size, 0 /* Unused flags */) < 0) {
if(kvm_getswapinfo(kd, swap_info, size, 0 /* Unused flags */) == -1) {
warn("kvm_getswapinfo:");
kvm_close(kd);
return 0;
@ -215,12 +225,12 @@
}
const char *
swap_free(const char *unused)
swap_free(void)
{
struct kvm_swap swap_info[1];
long used, total;
if (!getswapinfo(swap_info, 1))
if(!getswapinfo(swap_info, 1))
return NULL;
total = swap_info[0].ksw_total;
@ -230,12 +240,12 @@
}
const char *
swap_perc(const char *unused)
swap_perc(void)
{
struct kvm_swap swap_info[1];
long used, total;
if (!getswapinfo(swap_info, 1))
if(!getswapinfo(swap_info, 1))
return NULL;
total = swap_info[0].ksw_total;
@ -245,12 +255,12 @@
}
const char *
swap_total(const char *unused)
swap_total(void)
{
struct kvm_swap swap_info[1];
long total;
if (!getswapinfo(swap_info, 1))
if(!getswapinfo(swap_info, 1))
return NULL;
total = swap_info[0].ksw_total;
@ -259,12 +269,12 @@
}
const char *
swap_used(const char *unused)
swap_used(void)
{
struct kvm_swap swap_info[1];
long used;
if (!getswapinfo(swap_info, 1))
if(!getswapinfo(swap_info, 1))
return NULL;
used = swap_info[0].ksw_used;

10
components/temperature.c
View File

@ -1,7 +1,6 @@
/* See LICENSE file for copyright and license details. */
#include <stddef.h>
#include "../slstatus.h"
#include "../util.h"
@ -13,8 +12,9 @@
{
uintmax_t temp;
if (pscanf(file, "%ju", &temp) != 1)
if (pscanf(file, "%ju", &temp) != 1) {
return NULL;
}
return bprintf("%ju", temp / 1000);
}
@ -52,8 +52,6 @@
#include <stdlib.h>
#include <sys/sysctl.h>
#define ACPI_TEMP "hw.acpi.thermal.%s.temperature"
const char *
temp(const char *zone)
{
@ -62,8 +60,8 @@
size_t len;
len = sizeof(temp);
snprintf(buf, sizeof(buf), ACPI_TEMP, zone);
if (sysctlbyname(buf, &temp, &len, NULL, 0) < 0
snprintf(buf, sizeof(buf), "hw.acpi.thermal.%s.temperature", zone);
if (sysctlbyname(buf, &temp, &len, NULL, 0) == -1
|| !len)
return NULL;

5
components/uptime.c
View File

@ -3,7 +3,6 @@
#include <stdio.h>
#include <time.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(CLOCK_BOOTTIME)
@ -15,14 +14,14 @@
#endif
const char *
uptime(const char *unused)
uptime(void)
{
char warn_buf[256];
uintmax_t h, m;
struct timespec uptime;
if (clock_gettime(UPTIME_FLAG, &uptime) < 0) {
snprintf(warn_buf, sizeof(warn_buf), "clock_gettime %d", UPTIME_FLAG);
snprintf(warn_buf, 256, "clock_gettime %d", UPTIME_FLAG);
warn(warn_buf);
return NULL;
}

7
components/user.c
View File

@ -4,17 +4,16 @@
#include <sys/types.h>
#include <unistd.h>
#include "../slstatus.h"
#include "../util.h"
const char *
gid(const char *unused)
gid(void)
{
return bprintf("%d", getgid());
}
const char *
username(const char *unused)
username(void)
{
struct passwd *pw;
@ -27,7 +26,7 @@ username(const char *unused)
}
const char *
uid(const char *unused)
uid(void)
{
return bprintf("%d", geteuid());
}

6
components/volume.c
View File

@ -5,14 +5,13 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include "../slstatus.h"
#include "../util.h"
#if defined(__OpenBSD__) | defined(__FreeBSD__)
#if defined(__OpenBSD__)
#include <sys/queue.h>
#include <poll.h>
#include <sndio.h>
#include <stdlib.h>
#include <sys/queue.h>
struct control {
LIST_ENTRY(control) next;
@ -162,7 +161,6 @@
if (sioctl_revents(hdl, pfds) & POLLHUP) {
warn("sndio: disconnected");
cleanup();
initialized = 0;
return NULL;
}
}

37
components/wifi.c
View File

@ -6,7 +6,6 @@
#include <sys/socket.h>
#include <unistd.h>
#include "../slstatus.h"
#include "../util.h"
#define RSSI_TO_PERC(rssi) \
@ -18,8 +17,6 @@
#include <limits.h>
#include <linux/wireless.h>
#define NET_OPERSTATE "/sys/class/net/%s/operstate"
const char *
wifi_perc(const char *interface)
{
@ -30,32 +27,37 @@
char status[5];
FILE *fp;
if (esnprintf(path, sizeof(path), NET_OPERSTATE, interface) < 0)
if (esnprintf(path, sizeof(path), "/sys/class/net/%s/operstate",
interface) < 0) {
return NULL;
}
if (!(fp = fopen(path, "r"))) {
warn("fopen '%s':", path);
return NULL;
}
p = fgets(status, 5, fp);
fclose(fp);
if (!p || strcmp(status, "up\n") != 0)
if (!p || strcmp(status, "up\n") != 0) {
return NULL;
}
if (!(fp = fopen("/proc/net/wireless", "r"))) {
warn("fopen '/proc/net/wireless':");
return NULL;
}
for (i = 0; i < 3; i++)
for (i = 0; i < 3; i++) {
if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
break;
}
fclose(fp);
if (i < 2 || !p)
if (i < 2 || !p) {
return NULL;
}
if (!(datastart = strstr(buf, interface)))
if (!(datastart = strstr(buf, interface))) {
return NULL;
}
datastart = (datastart+(strlen(interface)+1));
sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t "
@ -75,8 +77,9 @@
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s",
interface) < 0)
interface) < 0) {
return NULL;
}
if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
warn("socket 'AF_INET':");
@ -91,8 +94,9 @@
close(sockfd);
if (!strcmp(id, ""))
if (!strcmp(id, "")) {
return NULL;
}
return id;
}
@ -148,11 +152,11 @@
int q;
if (load_ieee80211_nodereq(interface, &nr)) {
if (nr.nr_max_rssi)
if (nr.nr_max_rssi) {
q = IEEE80211_NODEREQ_RSSI(&nr);
else
} else {
q = RSSI_TO_PERC(nr.nr_rssi);
}
return bprintf("%d", q);
}
@ -164,8 +168,9 @@
{
struct ieee80211_nodereq nr;
if (load_ieee80211_nodereq(interface, &nr))
if (load_ieee80211_nodereq(interface, &nr)) {
return bprintf("%s", nr.nr_nwid);
}
return NULL;
}
@ -251,7 +256,7 @@
fmt = NULL;
len = sizeof(ssid);
memset(&ssid, 0, len);
if (load_ieee80211req(sockfd, interface, &ssid, IEEE80211_IOC_SSID, &len)) {
if (load_ieee80211req(sockfd, interface, &ssid, IEEE80211_IOC_SSID, &len )) {
if (len < sizeof(ssid))
len += 1;
else

14
config.def.h
View File

@ -14,17 +14,16 @@ static const char unknown_str[] = "n/a";
*
* battery_perc battery percentage battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* battery_remaining battery remaining HH:MM battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* battery_state battery charging state battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* cat read arbitrary file path
* cpu_freq cpu frequency in MHz NULL
* battery_remaining battery remaining HH:MM battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* cpu_perc cpu usage in percent NULL
* cpu_freq cpu frequency in MHz NULL
* datetime date and time format string (%F %T)
* disk_free free disk space in GB mountpoint path (/)
* disk_perc disk usage in percent mountpoint path (/)
* disk_total total disk space in GB mountpoint path (/)
* disk_total total disk space in GB mountpoint path (/")
* disk_used used disk space in GB mountpoint path (/)
* entropy available entropy NULL
* gid GID of current user NULL
@ -46,6 +45,7 @@ static const char unknown_str[] = "n/a";
* ram_total total memory size in GB NULL
* ram_used used memory in GB NULL
* run_command custom shell command command (echo foo)
* separator string to echo NULL
* swap_free free swap in GB NULL
* swap_perc swap usage in percent NULL
* swap_total total swap size in GB NULL
@ -59,9 +59,9 @@ static const char unknown_str[] = "n/a";
* uptime system uptime NULL
* username username of current user NULL
* vol_perc OSS/ALSA volume in percent mixer file (/dev/mixer)
* NULL on OpenBSD/FreeBSD
* wifi_essid WiFi ESSID interface name (wlan0)
* NULL on OpenBSD
* wifi_perc WiFi signal in percent interface name (wlan0)
* wifi_essid WiFi ESSID interface name (wlan0)
*/
static const struct arg args[] = {
/* function format argument */

20
config.h
View File

@ -14,17 +14,16 @@ static const char unknown_str[] = "n/a";
*
* battery_perc battery percentage battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* battery_remaining battery remaining HH:MM battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* battery_state battery charging state battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* cat read arbitrary file path
* cpu_freq cpu frequency in MHz NULL
* battery_remaining battery remaining HH:MM battery name (BAT0)
* NULL on OpenBSD/FreeBSD
* cpu_perc cpu usage in percent NULL
* cpu_freq cpu frequency in MHz NULL
* datetime date and time format string (%F %T)
* disk_free free disk space in GB mountpoint path (/)
* disk_perc disk usage in percent mountpoint path (/)
* disk_total total disk space in GB mountpoint path (/)
* disk_total total disk space in GB mountpoint path (/")
* disk_used used disk space in GB mountpoint path (/)
* entropy available entropy NULL
* gid GID of current user NULL
@ -46,6 +45,7 @@ static const char unknown_str[] = "n/a";
* ram_total total memory size in GB NULL
* ram_used used memory in GB NULL
* run_command custom shell command command (echo foo)
* separator string to echo NULL
* swap_free free swap in GB NULL
* swap_perc swap usage in percent NULL
* swap_total total swap size in GB NULL
@ -59,16 +59,14 @@ static const char unknown_str[] = "n/a";
* uptime system uptime NULL
* username username of current user NULL
* vol_perc OSS/ALSA volume in percent mixer file (/dev/mixer)
* NULL on OpenBSD/FreeBSD
* wifi_essid WiFi ESSID interface name (wlan0)
* NULL on OpenBSD
* wifi_perc WiFi signal in percent interface name (wlan0)
* wifi_essid WiFi ESSID interface name (wlan0)
*/
static const struct arg args[] = {
/* function format argument */
{ cpu_perc, " CPU: %s% | ", NULL },
{ ram_perc, "RAM: %s%, ", NULL },
{ ram_used, "%s | ", NULL },
{ netspeed_rx, "NET r:%s, ", "eno2" },
{ netspeed_tx, "t:%s | ", "eno2" },
{ ram_perc, "RAM: %s% | ", NULL },
{ battery_perc, "BAT: %s% | ", "BAT0" },
{ datetime, "%s ", "%F %T" },
};

8
config.mk
View File

@ -1,5 +1,5 @@
# slstatus version
VERSION = 1.0
VERSION = 0
# customize below to fit your system
@ -11,11 +11,11 @@ X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
# flags
CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
CFLAGS = -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter -Os
CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE
CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os
LDFLAGS = -L$(X11LIB) -s
# OpenBSD: add -lsndio
# FreeBSD: add -lkvm -lsndio
# FreeBSD: add -lkvm
LDLIBS = -lX11
# compiler and linker

27
slstatus.1
View File

@ -1,29 +1,22 @@
.Dd 2023-04-23
.Dd 2020-06-23
.Dt SLSTATUS 1
.Os
.Sh NAME
.Nm slstatus
.Nd suckless status
.Nd suckless status monitor
.Sh SYNOPSIS
.Nm
.Op Fl s
.Op Fl 1
.Sh DESCRIPTION
.Nm
is a small tool for providing system status information to other programs
over the EWMH
.Em WM_NAME
property of the root window (used by
.Xr dwm 1 ) or standard input/output. It is designed to be as efficient as possible by
only issuing the minimum of system calls required.
.P
is a suckless status monitor for window managers that use WM_NAME (e.g. dwm) or
stdin to fill the status bar.
By default,
.Nm
outputs to WM_NAME.
.Sh OPTIONS
.Bl -tag -width Ds
.It Fl v
Print version information to stderr, then exit.
.It Fl s
Write to stdout instead of WM_NAME.
.It Fl 1
@ -33,15 +26,3 @@ Write once to stdout and quit.
.Nm
can be customized by creating a custom config.h and (re)compiling the source
code. This keeps it fast, secure and simple.
.Sh SIGNALS
.Nm
responds to the following signals:
.Pp
.Bl -tag -width TERM -compact
.It USR1
Triggers an instant redraw.
.El
.Sh AUTHORS
See the LICENSE file for the authors.
.Sh SEE ALSO
.Xr dwm 1

43
slstatus.c
View File

@ -12,7 +12,7 @@
#include "util.h"
struct arg {
const char *(*func)(const char *);
const char *(*func)();
const char *fmt;
const char *args;
};
@ -41,7 +41,7 @@ difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
static void
usage(void)
{
die("usage: %s [-v] [-s] [-1]", argv0);
die("usage: %s [-s] [-1]", argv0);
}
int
@ -56,11 +56,9 @@ main(int argc, char *argv[])
sflag = 0;
ARGBEGIN {
case 'v':
die("slstatus-"VERSION);
case '1':
done = 1;
/* FALLTHROUGH */
/* fallthrough */
case 's':
sflag = 1;
break;
@ -68,8 +66,9 @@ main(int argc, char *argv[])
usage();
} ARGEND
if (argc)
if (argc) {
usage();
}
memset(&act, 0, sizeof(act));
act.sa_handler = terminate;
@ -78,22 +77,24 @@ main(int argc, char *argv[])
act.sa_flags |= SA_RESTART;
sigaction(SIGUSR1, &act, NULL);
if (!sflag && !(dpy = XOpenDisplay(NULL)))
if (!sflag && !(dpy = XOpenDisplay(NULL))) {
die("XOpenDisplay: Failed to open display");
}
do {
if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
die("clock_gettime:");
}
status[0] = '\0';
for (i = len = 0; i < LEN(args); i++) {
if (!(res = args[i].func(args[i].args)))
if (!(res = args[i].func(args[i].args))) {
res = unknown_str;
}
if ((ret = esnprintf(status + len, sizeof(status) - len,
args[i].fmt, res)) < 0)
args[i].fmt, res)) < 0) {
break;
}
len += ret;
}
@ -103,32 +104,38 @@ main(int argc, char *argv[])
if (ferror(stdout))
die("puts:");
} else {
if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0)
if (XStoreName(dpy, DefaultRootWindow(dpy), status)
< 0) {
die("XStoreName: Allocation failed");
}
XFlush(dpy);
}
if (!done) {
if (clock_gettime(CLOCK_MONOTONIC, &current) < 0)
if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
die("clock_gettime:");
}
difftimespec(&diff, &current, &start);
intspec.tv_sec = interval / 1000;
intspec.tv_nsec = (interval % 1000) * 1E6;
difftimespec(&wait, &intspec, &diff);
if (wait.tv_sec >= 0 &&
nanosleep(&wait, NULL) < 0 &&
errno != EINTR)
if (wait.tv_sec >= 0) {
if (nanosleep(&wait, NULL) < 0 &&
errno != EINTR) {
die("nanosleep:");
}
}
}
} while (!done);
if (!sflag) {
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
if (XCloseDisplay(dpy) < 0)
if (XCloseDisplay(dpy) < 0) {
die("XCloseDisplay: Failed to close display");
}
}
return 0;
}

50
slstatus.h
View File

@ -2,15 +2,12 @@
/* battery */
const char *battery_perc(const char *);
const char *battery_remaining(const char *);
const char *battery_state(const char *);
/* cat */
const char *cat(const char *path);
const char *battery_remaining(const char *);
/* cpu */
const char *cpu_freq(const char *unused);
const char *cpu_perc(const char *unused);
const char *cpu_freq(void);
const char *cpu_perc(void);
/* datetime */
const char *datetime(const char *fmt);
@ -22,26 +19,26 @@ const char *disk_total(const char *path);
const char *disk_used(const char *path);
/* entropy */
const char *entropy(const char *unused);
const char *entropy(void);
/* hostname */
const char *hostname(const char *unused);
const char *hostname(void);
/* ip */
const char *ipv4(const char *interface);
const char *ipv6(const char *interface);
/* kernel_release */
const char *kernel_release(const char *unused);
const char *kernel_release(void);
/* keyboard_indicators */
const char *keyboard_indicators(const char *fmt);
const char *keyboard_indicators(void);
/* keymap */
const char *keymap(const char *unused);
const char *keymap(void);
/* load_avg */
const char *load_avg(const char *unused);
const char *load_avg(void);
/* netspeeds */
const char *netspeed_rx(const char *interface);
@ -51,34 +48,37 @@ const char *netspeed_tx(const char *interface);
const char *num_files(const char *path);
/* ram */
const char *ram_free(const char *unused);
const char *ram_perc(const char *unused);
const char *ram_total(const char *unused);
const char *ram_used(const char *unused);
const char *ram_free(void);
const char *ram_perc(void);
const char *ram_total(void);
const char *ram_used(void);
/* run_command */
const char *run_command(const char *cmd);
/* separator */
const char *separator(const char *separator);
/* swap */
const char *swap_free(const char *unused);
const char *swap_perc(const char *unused);
const char *swap_total(const char *unused);
const char *swap_used(const char *unused);
const char *swap_free(void);
const char *swap_perc(void);
const char *swap_total(void);
const char *swap_used(void);
/* temperature */
const char *temp(const char *);
/* uptime */
const char *uptime(const char *unused);
const char *uptime(void);
/* user */
const char *gid(const char *unused);
const char *uid(const char *unused);
const char *username(const char *unused);
const char *gid(void);
const char *username(void);
const char *uid(void);
/* volume */
const char *vol_perc(const char *card);
/* wifi */
const char *wifi_essid(const char *interface);
const char *wifi_perc(const char *interface);
const char *wifi_essid(const char *interface);

7
util.c
View File

@ -13,6 +13,10 @@ char *argv0;
static void
verr(const char *fmt, va_list ap)
{
if (argv0 && strncmp(fmt, "usage", sizeof("usage") - 1)) {
fprintf(stderr, "%s: ", argv0);
}
vfprintf(stderr, fmt, ap);
if (fmt[0] && fmt[strlen(fmt) - 1] == ':') {
@ -115,8 +119,9 @@ fmt_human(uintmax_t num, int base)
}
scaled = num;
for (i = 0; i < prefixlen && scaled >= base; i++)
for (i = 0; i < prefixlen && scaled >= base; i++) {
scaled /= base;
}
return bprintf("%.1f %s", scaled, prefix[i]);
}

2
util.h
View File

@ -3,7 +3,7 @@
extern char buf[1024];
#define LEN(x) (sizeof(x) / sizeof((x)[0]))
#define LEN(x) (sizeof (x) / sizeof *(x))
extern char *argv0;