From 581d937e51d10e6e74868d2397081b12952eae07 Mon Sep 17 00:00:00 2001 From: planet36 Date: Fri, 28 Oct 2022 10:49:05 -0500 Subject: [PATCH 01/10] entropy: Use Unicode escape sequence in string Signed-off-by: drkhsh --- components/entropy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/entropy.c b/components/entropy.c index 66b2e5a..65010b0 100644 --- a/components/entropy.c +++ b/components/entropy.c @@ -22,7 +22,8 @@ const char * entropy(const char *unused) { + // https://www.unicode.org/charts/PDF/U2200.pdf /* Unicode Character 'INFINITY' (U+221E) */ - return "\xe2\x88\x9e"; + return "\u221E"; } #endif From 1ae616190cb3f88221571343a284fdf9f55b683f Mon Sep 17 00:00:00 2001 From: drkhsh Date: Mon, 19 Dec 2022 02:40:00 +0100 Subject: [PATCH 02/10] Update LICENSE --- LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index 70b9fb3..b7e3aa6 100644 --- a/LICENSE +++ b/LICENSE @@ -27,6 +27,8 @@ Copyright 2020 Alexandre Ratchov Copyright 2020 Mart Lubbers Copyright 2020 Daniel Moch Copyright 2022 NRK +Copyright 2022 Patrick Iacob +Copyright 2021-2022 planet36 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above From 305aa5138add5971456c880219fe859cd4189624 Mon Sep 17 00:00:00 2001 From: drkhsh Date: Mon, 19 Dec 2022 19:26:15 +0100 Subject: [PATCH 03/10] Update LICENSE Real names should be used if possible, as the license is legally binding --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index b7e3aa6..570f450 100644 --- a/LICENSE +++ b/LICENSE @@ -28,7 +28,7 @@ Copyright 2020 Mart Lubbers Copyright 2020 Daniel Moch Copyright 2022 NRK Copyright 2022 Patrick Iacob -Copyright 2021-2022 planet36 +Copyright 2021-2022 Steven Ward Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above From 034c591a95feec885208266a6849c04289a9c4a5 Mon Sep 17 00:00:00 2001 From: drkhsh Date: Mon, 19 Dec 2022 19:26:57 +0100 Subject: [PATCH 04/10] Revert "config.mk: Fix PREFIX assignment" "?=" is not POSIX, packagers should use "make PREFIX=". This reverts commit c225c4315161a992b9e44dd990d083ee57f7f713. --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index 8f06800..ead1859 100644 --- a/config.mk +++ b/config.mk @@ -4,7 +4,7 @@ VERSION = 0 # customize below to fit your system # paths -PREFIX ?= /usr/local +PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man X11INC = /usr/X11R6/include From c919def84fd4f52f501548e5f7705b9d56dd1459 Mon Sep 17 00:00:00 2001 From: drkhsh Date: Mon, 19 Dec 2022 22:03:59 +0100 Subject: [PATCH 05/10] More LICENSE updates Regarding 305aa5138add5971456c880219fe859cd4189624 --- LICENSE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 570f450..8bee9c8 100644 --- a/LICENSE +++ b/LICENSE @@ -9,7 +9,7 @@ Copyright 2016-2018 Ali H. Fardan Copyright 2016 Jody Leonard Copyright 2016-2018 Quentin Rameau Copyright 2016 Mike Coddington -Copyright 2016-2018 parazyd +Copyright 2016-2018 Ivan J. Copyright 2017 Tobias Stoeckmann Copyright 2017-2018 Laslo Hunhold Copyright 2018 Darron Anderson @@ -21,14 +21,14 @@ Copyright 2018 Ian Remmler Copyright 2016-2019 Joerg Jung Copyright 2019 Ryan Kes Copyright 2019 Cem Keylan -Copyright 2019 dsp +Copyright 2019 Dimitris Papastamos Copyright 2019-2022 Ingo Feinerer Copyright 2020 Alexandre Ratchov Copyright 2020 Mart Lubbers Copyright 2020 Daniel Moch -Copyright 2022 NRK +Copyright 2022 Nickolas Raymond Kaczynski Copyright 2022 Patrick Iacob -Copyright 2021-2022 Steven Ward +Copyright 2021-2022 Steven Ward Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above From ee586cfea9c328932255512077882fa8194b50c2 Mon Sep 17 00:00:00 2001 From: drkhsh Date: Sun, 23 Apr 2023 23:43:14 +0200 Subject: [PATCH 06/10] manpage: Quality improvements Adds signals section to the manpage and generally improves contents and wording --- slstatus.1 | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/slstatus.1 b/slstatus.1 index d802037..bea2a8c 100644 --- a/slstatus.1 +++ b/slstatus.1 @@ -1,17 +1,22 @@ -.Dd 2020-06-23 +.Dd 2023-04-23 .Dt SLSTATUS 1 .Os .Sh NAME .Nm slstatus -.Nd suckless status monitor +.Nd suckless status .Sh SYNOPSIS .Nm .Op Fl s .Op Fl 1 .Sh DESCRIPTION .Nm -is a suckless status monitor for window managers that use WM_NAME (e.g. dwm) or -stdin to fill the status bar. +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 By default, .Nm outputs to WM_NAME. @@ -26,3 +31,15 @@ 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 From e0c155e9ab8e8e0cf0ae09dc8cd0a02a460628cf Mon Sep 17 00:00:00 2001 From: drkhsh Date: Sun, 23 Apr 2023 23:48:47 +0200 Subject: [PATCH 07/10] README: Sync description from manpage --- README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README b/README index 7b50895..a65f4cd 100644 --- a/README +++ b/README @@ -1,7 +1,9 @@ slstatus - suckless status ========================== -slstatus is a suckless status monitor for window managers that use WM_NAME -(e.g. dwm) or stdin to fill the status bar. +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. Features From 483169021ba996f59a97b4e3b74cee7e43d6ab6f Mon Sep 17 00:00:00 2001 From: drkhsh Date: Mon, 15 May 2023 19:11:39 +0200 Subject: [PATCH 08/10] Fix release tarball to prepare for release Correctly copies components to sub-directory, adds all required files --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7834257..7a18274 100644 --- a/Makefile +++ b/Makefile @@ -44,14 +44,15 @@ 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) + rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o) slstatus-${VERSION}.tar.gz dist: rm -rf "slstatus-$(VERSION)" mkdir -p "slstatus-$(VERSION)/components" cp -R LICENSE Makefile README config.mk config.def.h \ - arg.h slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \ + arg.h slstatus.h slstatus.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)" From 86c7a84c2397e5bbdcebe2a06bada7ee48f0d480 Mon Sep 17 00:00:00 2001 From: drkhsh Date: Mon, 15 May 2023 19:14:52 +0200 Subject: [PATCH 09/10] Add back version flag to prepare for release --- config.mk | 2 +- slstatus.1 | 2 ++ slstatus.c | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index ead1859..2ba2911 100644 --- a/config.mk +++ b/config.mk @@ -11,7 +11,7 @@ X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib # flags -CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE +CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" CFLAGS = -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter -Os LDFLAGS = -L$(X11LIB) -s # OpenBSD: add -lsndio diff --git a/slstatus.1 b/slstatus.1 index bea2a8c..73e7a60 100644 --- a/slstatus.1 +++ b/slstatus.1 @@ -22,6 +22,8 @@ By default, 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 diff --git a/slstatus.c b/slstatus.c index cb54f29..fd31313 100644 --- a/slstatus.c +++ b/slstatus.c @@ -41,7 +41,7 @@ difftimespec(struct timespec *res, struct timespec *a, struct timespec *b) static void usage(void) { - die("usage: %s [-s] [-1]", argv0); + die("usage: %s [-v] [-s] [-1]", argv0); } int @@ -56,6 +56,8 @@ main(int argc, char *argv[]) sflag = 0; ARGBEGIN { + case 'v': + die("slstatus-"VERSION); case '1': done = 1; /* FALLTHROUGH */ From f68f49273e70b3767b30c549dda04ddd4d25fc91 Mon Sep 17 00:00:00 2001 From: drkhsh Date: Tue, 4 Jul 2023 20:47:18 +0200 Subject: [PATCH 10/10] Release stable 1.0 version --- README | 6 ------ config.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README b/README index a65f4cd..12d38bf 100644 --- a/README +++ b/README @@ -63,9 +63,3 @@ 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 first feature-complete release with official packages for common distributions -will come soon. diff --git a/config.mk b/config.mk index 2ba2911..07af883 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # slstatus version -VERSION = 0 +VERSION = 1.0 # customize below to fit your system