inkletblot/dwmblocks-inkletblot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed flickering/disappearing blocks issue

Browse Source
This commit is contained in:
Solomon Laing 2023-04-25 11:37:39 +09:30
parent a88a0602c3
commit f7b6042f77
1 changed files with 184 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

355
dwmblocks.c
View File

@ -1,33 +1,36 @@
#include<stdlib.h> #include <errno.h>
#include<stdio.h> #include <signal.h>
#include<string.h> #include <stdio.h>
#include<unistd.h> #include <stdlib.h>
#include<signal.h> #include <string.h>
#include<sys/wait.h> #include <sys/wait.h>
#include <time.h>
#include <unistd.h>
#ifndef NO_X #ifndef NO_X
#include<X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
#ifdef __OpenBSD__ #ifdef __OpenBSD__
#define SIGPLUS SIGUSR1+1 #define SIGPLUS SIGUSR1 + 1
#define SIGMINUS SIGUSR1-1 #define SIGMINUS SIGUSR1 - 1
#else #else
#define SIGPLUS SIGRTMIN #define SIGPLUS SIGRTMIN
#define SIGMINUS SIGRTMIN #define SIGMINUS SIGRTMIN
#endif #endif
#define LENGTH(X) (sizeof(X) / sizeof (X[0])) #define LENGTH(X) (sizeof(X) / sizeof(X[0]))
#define CMDLENGTH 50 #define CMDLENGTH 50
#define MIN( a, b ) ( ( a < b) ? a : b ) #define MIN(a, b) ((a < b) ? a : b)
#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1) #define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
typedef struct { typedef struct {
char* icon; char *icon;
char* command; char *command;
unsigned int interval; unsigned int interval;
unsigned int signal; unsigned int signal;
} Block; } Block;
#ifndef __OpenBSD__ #ifndef __OpenBSD__
void dummysighandler(int num); void dummysighandler(int num);
#endif #endif
void remove_all(char *str, char to_remove);
void getcmds(int time); void getcmds(int time);
void getsigcmds(unsigned int signal); void getsigcmds(unsigned int signal);
void setupsignals(); void setupsignals();
@ -39,16 +42,15 @@ void chldhandler();
void pstdout(); void pstdout();
#ifndef NO_X #ifndef NO_X
void setroot(); void setroot();
static void (*writestatus) () = setroot; static void (*writestatus)() = setroot;
static int setupX(); static int setupX();
static Display *dpy; static Display *dpy;
static int screen; static int screen;
static Window root; static Window root;
#else #else
static void (*writestatus) () = pstdout; static void (*writestatus)() = pstdout;
#endif #endif
#include "blocks.h" #include "blocks.h"
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0}; static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
@ -56,192 +58,203 @@ static char statusstr[2][STATUSLENGTH];
static int statusContinue = 1; static int statusContinue = 1;
static int returnStatus = 0; static int returnStatus = 0;
//opens process *cmd and stores output in *output void remove_all(char *str, char to_remove) {
void getcmd(const Block *block, char *output) char *read = str;
{ char *write = str;
if (block->signal)
*output++ = block->signal; do {
strcpy(output, block->icon); while (*read == to_remove)
FILE *cmdf = popen(block->command, "r"); read++;
if (!cmdf) *write++ = *read;
return; read++;
int i = strlen(block->icon); } while (*(read - 1));
fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
i = strlen(output);
if (i == 0) {
//return if block and command output are both empty
pclose(cmdf);
return;
}
//only chop off newline if one is present at the end
i = output[i-1] == '\n' ? i-1 : i;
if (delim[0] != '\0') {
strncpy(output+i, delim, delimLen);
}
else
output[i++] = '\0';
pclose(cmdf);
} }
void getcmds(int time) // opens process *cmd and stores output in *output
{ void getcmd(const Block *block, char *output) {
const Block* current; if (block->signal)
for (unsigned int i = 0; i < LENGTH(blocks); i++) { *output++ = block->signal;
current = blocks + i; FILE *cmdf = popen(block->command, "r");
if ((current->interval != 0 && time % current->interval == 0) || time == -1) if (!cmdf) {
getcmd(current,statusbar[i]); printf("failed to run: %s, %d\n", block->command, errno);
} return;
}
char tmpstr[CMDLENGTH] = "";
char *s;
int e;
do {
s = fgets(tmpstr, CMDLENGTH - (strlen(delim) + 1), cmdf);
e = errno;
} while (!s && e == EINTR);
pclose(cmdf);
int i = strlen(block->icon);
strcpy(output, block->icon);
strcpy(output + i, tmpstr);
remove_all(output, '\n');
i = strlen(output);
if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])) {
strcat(output, delim);
}
i += strlen(delim);
output[i++] = '\0';
} }
void getsigcmds(unsigned int signal) void getcmds(int time) {
{ const Block *current;
const Block *current; for (unsigned int i = 0; i < LENGTH(blocks); i++) {
for (unsigned int i = 0; i < LENGTH(blocks); i++) { current = blocks + i;
current = blocks + i; if ((current->interval != 0 && time % current->interval == 0) || time == -1)
if (current->signal == signal) getcmd(current, statusbar[i]);
getcmd(current,statusbar[i]); }
}
} }
void setupsignals() void getsigcmds(unsigned int signal) {
{ const Block *current;
struct sigaction sa = { .sa_sigaction = sighandler, .sa_flags = SA_SIGINFO }; for (unsigned int i = 0; i < LENGTH(blocks); i++) {
current = blocks + i;
if (current->signal == signal)
getcmd(current, statusbar[i]);
}
}
void setupsignals() {
struct sigaction sa = {.sa_sigaction = sighandler, .sa_flags = SA_SIGINFO};
#ifndef __OpenBSD__ #ifndef __OpenBSD__
/* initialize all real time signals with dummy handler */ /* initialize all real time signals with dummy handler */
for (int i = SIGRTMIN; i <= SIGRTMAX; i++) { for (int i = SIGRTMIN; i <= SIGRTMAX; i++) {
signal(i, dummysighandler); signal(i, dummysighandler);
sigaddset(&sa.sa_mask, i); sigaddset(&sa.sa_mask, i);
} }
#endif #endif
for (unsigned int i = 0; i < LENGTH(blocks); i++) { for (unsigned int i = 0; i < LENGTH(blocks); i++) {
if (blocks[i].signal > 0) if (blocks[i].signal > 0)
sigaction(SIGMINUS+blocks[i].signal, &sa, NULL); sigaction(SIGMINUS + blocks[i].signal, &sa, NULL);
} }
} }
int getstatus(char *str, char *last) int getstatus(char *str, char *last) {
{ strcpy(last, str);
strcpy(last, str); str[0] = '\0';
str[0] = '\0'; for (unsigned int i = 0; i < LENGTH(blocks); i++)
for (unsigned int i = 0; i < LENGTH(blocks); i++) strcat(str, statusbar[i]);
strcat(str, statusbar[i]); str[strlen(str) - strlen(delim)] = '\0';
str[strlen(str)-strlen(delim)] = '\0'; return strcmp(str, last); // 0 if they are the same
return strcmp(str, last);//0 if they are the same
} }
#ifndef NO_X #ifndef NO_X
void setroot() void setroot() {
{ if (!getstatus(statusstr[0],
if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed. statusstr[1])) // Only set root if text has changed.
return; return;
XStoreName(dpy, root, statusstr[0]); XStoreName(dpy, root, statusstr[0]);
XFlush(dpy); XFlush(dpy);
} }
int setupX() int setupX() {
{ dpy = XOpenDisplay(NULL);
dpy = XOpenDisplay(NULL); if (!dpy) {
if (!dpy) { fprintf(stderr, "dwmblocks: Failed to open display\n");
fprintf(stderr, "dwmblocks: Failed to open display\n"); return 0;
return 0; }
} screen = DefaultScreen(dpy);
screen = DefaultScreen(dpy); root = RootWindow(dpy, screen);
root = RootWindow(dpy, screen); return 1;
return 1;
} }
#endif #endif
void pstdout() void pstdout() {
{ if (!getstatus(statusstr[0],
if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed. statusstr[1])) // Only write out if text has changed.
return; return;
printf("%s\n",statusstr[0]); printf("%s\n", statusstr[0]);
fflush(stdout); fflush(stdout);
} }
void statusloop() {
void statusloop() setupsignals();
{ int i = 0;
setupsignals(); int gotscrewed = 0;
int i = 0; struct timespec sleeptime = {1, 0};
getcmds(-1); struct timespec tosleep = sleeptime;
while (1) { getcmds(-1);
getcmds(i++); while (1) {
writestatus(); // sleep for tosleep (should be sleeptime of 1s) and put what was left if
if (!statusContinue) // interrupted back into tosleep
break; gotscrewed = nanosleep(&tosleep, &tosleep);
sleep(1.0); // if interrupted then go back to sleep for remaining time
} if (gotscrewed == -1) {
continue;
}
getcmds(i++);
writestatus();
if (!statusContinue)
break;
tosleep = sleeptime;
}
} }
#ifndef __OpenBSD__ #ifndef __OpenBSD__
/* this signal handler should do nothing */ /* this signal handler should do nothing */
void dummysighandler(int signum) void dummysighandler(int signum) { return; }
{
return;
}
#endif #endif
void sighandler(int signum, siginfo_t *si, void *ucontext) void sighandler(int signum, siginfo_t *si, void *ucontext) {
{ if (si->si_value.sival_int) {
if (si->si_value.sival_int) { pid_t parent = getpid();
pid_t parent = getpid(); if (fork() == 0) {
if (fork() == 0) {
#ifndef NO_X #ifndef NO_X
if (dpy) if (dpy)
close(ConnectionNumber(dpy)); close(ConnectionNumber(dpy));
#endif #endif
int i; int i;
for (i = 0; i < LENGTH(blocks) && blocks[i].signal != signum-SIGRTMIN; i++); for (i = 0; i < LENGTH(blocks) && blocks[i].signal != signum - SIGRTMIN;
i++)
;
char shcmd[1024]; char shcmd[1024];
sprintf(shcmd, "%s; kill -%d %d", blocks[i].command, SIGRTMIN+blocks[i].signal, parent); sprintf(shcmd, "%s; kill -%d %d", blocks[i].command,
char *cmd[] = { "/bin/sh", "-c", shcmd, NULL }; SIGRTMIN + blocks[i].signal, parent);
char button[2] = { '0' + si->si_value.sival_int, '\0' }; char *cmd[] = {"/bin/sh", "-c", shcmd, NULL};
setenv("BUTTON", button, 1); char button[2] = {'0' + si->si_value.sival_int, '\0'};
setsid(); setenv("BUTTON", button, 1);
execvp(cmd[0], cmd); setsid();
perror(cmd[0]); execvp(cmd[0], cmd);
exit(EXIT_SUCCESS); perror(cmd[0]);
} exit(EXIT_SUCCESS);
} else { }
getsigcmds(signum-SIGPLUS); } else {
writestatus(); getsigcmds(signum - SIGPLUS);
} writestatus();
}
} }
void termhandler() void termhandler() { statusContinue = 0; }
{
statusContinue = 0; void chldhandler() {
while (0 < waitpid(-1, NULL, WNOHANG))
;
} }
void chldhandler() int main(int argc, char **argv) {
{ for (int i = 0; i < argc; i++) { // Handle command line arguments
while (0 < waitpid(-1, NULL, WNOHANG)); if (!strcmp("-d", argv[i]))
} strncpy(delim, argv[++i], delimLen);
else if (!strcmp("-p", argv[i]))
int main(int argc, char** argv) writestatus = pstdout;
{ }
for (int i = 0; i < argc; i++) {//Handle command line arguments
if (!strcmp("-d",argv[i]))
strncpy(delim, argv[++i], delimLen);
else if (!strcmp("-p",argv[i]))
writestatus = pstdout;
}
#ifndef NO_X #ifndef NO_X
if (!setupX()) if (!setupX())
return 1; return 1;
#endif #endif
delimLen = MIN(delimLen, strlen(delim)); delimLen = MIN(delimLen, strlen(delim));
delim[delimLen++] = '\0'; delim[delimLen++] = '\0';
signal(SIGTERM, termhandler); signal(SIGTERM, termhandler);
signal(SIGINT, termhandler); signal(SIGINT, termhandler);
signal(SIGCHLD, chldhandler); signal(SIGCHLD, chldhandler);
statusloop(); statusloop();
#ifndef NO_X #ifndef NO_X
XCloseDisplay(dpy); XCloseDisplay(dpy);
#endif #endif
return 0; return 0;
} }