amolinae06/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added patches

Browse source
This commit is contained in:
λmolinae 2025-03-12 08:38:50 -06:00
parent f68f49273e
commit 8c6890f943
13 changed files with 395 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

117
slstatus.c
View file

@ -5,7 +5,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <X11/Xlib.h>
#include "arg.h"
#include "slstatus.h"
@ -15,20 +14,17 @@ struct arg {
const char *(*func)(const char *);
const char *fmt;
const char *args;
unsigned int turn;
int signal;
};
char buf[1024];
static volatile sig_atomic_t done;
static Display *dpy;
static volatile sig_atomic_t done, upsigno;
#include "config.h"
#define MAXLEN CMDLEN * LEN(args)
static void
terminate(const int signo)
{
if (signo != SIGUSR1)
done = 1;
}
static char statuses[LEN(args)][CMDLEN] = {0};
static void
difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
@ -44,26 +40,58 @@ usage(void)
die("usage: %s [-v] [-s] [-1]", argv0);
}
static void
printstatus(unsigned int iter)
{
size_t i;
char status[MAXLEN];
const char *res;
for (i = 0; i < LEN(args); i++) {
if (!((!iter && !upsigno) || upsigno == SIGUSR1 ||
(!upsigno && args[i].turn > 0 && !(iter % args[i].turn)) ||
(args[i].signal >= 0 && upsigno - SIGRTMIN == args[i].signal)))
continue;
if (!(res = args[i].func(args[i].args)))
res = unknown_str;
if (esnprintf(statuses[i], sizeof(statuses[i]), args[i].fmt, res) < 0)
break;
}
status[0] = '\0';
for (i = 0; i < LEN(args); i++)
strcat(status, statuses[i]);
status[strlen(status)] = '\0';
puts(status);
fflush(stdout);
if (ferror(stdout))
die("puts:");
}
static void
sighandler(const int signo)
{
if ((signo <= SIGRTMAX && signo >= SIGRTMIN) || signo == SIGUSR1)
upsigno = signo;
else
done = 1;
}
int
main(int argc, char *argv[])
{
struct sigaction act;
struct timespec start, current, diff, intspec, wait;
size_t i, len;
int sflag, ret;
char status[MAXLEN];
const char *res;
unsigned int iter = 0;
int i, ret;
sflag = 0;
ARGBEGIN {
case 'v':
die("slstatus-"VERSION);
case '1':
done = 1;
/* FALLTHROUGH */
case 's':
sflag = 1;
break;
default:
usage();
} ARGEND
@ -72,41 +100,18 @@ main(int argc, char *argv[])
usage();
memset(&act, 0, sizeof(act));
act.sa_handler = terminate;
act.sa_handler = sighandler;
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
act.sa_flags |= SA_RESTART;
sigaction(SIGUSR1, &act, NULL);
if (!sflag && !(dpy = XOpenDisplay(NULL)))
die("XOpenDisplay: Failed to open display");
for (i = SIGRTMIN; i <= SIGRTMAX; i++)
sigaction(i, &act, NULL);
do {
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)))
res = unknown_str;
if ((ret = esnprintf(status + len, sizeof(status) - len,
args[i].fmt, res)) < 0)
break;
len += ret;
}
if (sflag) {
puts(status);
fflush(stdout);
if (ferror(stdout))
die("puts:");
} else {
if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0)
die("XStoreName: Allocation failed");
XFlush(dpy);
}
printstatus(iter++);
if (!done) {
if (clock_gettime(CLOCK_MONOTONIC, &current) < 0)
@ -117,18 +122,16 @@ main(int argc, char *argv[])
intspec.tv_nsec = (interval % 1000) * 1E6;
difftimespec(&wait, &intspec, &diff);
if (wait.tv_sec >= 0 &&
nanosleep(&wait, NULL) < 0 &&
errno != EINTR)
die("nanosleep:");
while(wait.tv_sec >= 0 &&
(ret = nanosleep(&wait, &wait)) < 0 &&
errno == EINTR && !done) {
printstatus(0);
errno = upsigno = 0;
}
if (ret < 0 && errno != EINTR)
die("nanosleep:");
}
} while (!done);
if (!sflag) {
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
if (XCloseDisplay(dpy) < 0)
die("XCloseDisplay: Failed to close display");
}
return 0;
}