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

151
dwmblocks.c
View File

@ -1,9 +1,11 @@
#include<stdlib.h> #include <errno.h>
#include<stdio.h>
#include<string.h>
#include<unistd.h>
#include <signal.h> #include <signal.h>
#include <stdio.h>
#include <stdlib.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
@ -28,6 +30,7 @@ typedef struct {
#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();
@ -48,7 +51,6 @@ static Window root;
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,35 +58,48 @@ 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) {
if (block->signal)
*output++ = block->signal;
FILE *cmdf = popen(block->command, "r");
if (!cmdf) {
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 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;
@ -93,8 +108,7 @@ void getcmds(int time)
} }
} }
void getsigcmds(unsigned int signal) void getsigcmds(unsigned int signal) {
{
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;
@ -103,8 +117,7 @@ void getsigcmds(unsigned int signal)
} }
} }
void setupsignals() void setupsignals() {
{
struct sigaction sa = {.sa_sigaction = sighandler, .sa_flags = SA_SIGINFO}; 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 */
@ -118,11 +131,9 @@ void setupsignals()
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++)
@ -132,16 +143,15 @@ int getstatus(char *str, char *last)
} }
#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");
@ -153,39 +163,43 @@ int setupX()
} }
#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(); setupsignals();
int i = 0; int i = 0;
int gotscrewed = 0;
struct timespec sleeptime = {1, 0};
struct timespec tosleep = sleeptime;
getcmds(-1); getcmds(-1);
while (1) { while (1) {
// sleep for tosleep (should be sleeptime of 1s) and put what was left if
// interrupted back into tosleep
gotscrewed = nanosleep(&tosleep, &tosleep);
// if interrupted then go back to sleep for remaining time
if (gotscrewed == -1) {
continue;
}
getcmds(i++); getcmds(i++);
writestatus(); writestatus();
if (!statusContinue) if (!statusContinue)
break; break;
sleep(1.0); 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) {
@ -194,10 +208,13 @@ void sighandler(int signum, siginfo_t *si, void *ucontext)
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,
SIGRTMIN + blocks[i].signal, parent);
char *cmd[] = {"/bin/sh", "-c", shcmd, NULL}; char *cmd[] = {"/bin/sh", "-c", shcmd, NULL};
char button[2] = {'0' + si->si_value.sival_int, '\0'}; char button[2] = {'0' + si->si_value.sival_int, '\0'};
setenv("BUTTON", button, 1); setenv("BUTTON", button, 1);
@ -212,18 +229,14 @@ void sighandler(int signum, siginfo_t *si, void *ucontext)
} }
} }
void termhandler() void termhandler() { statusContinue = 0; }
{
statusContinue = 0; void chldhandler() {
while (0 < waitpid(-1, NULL, WNOHANG))
;
} }
void chldhandler() int main(int argc, char **argv) {
{
while (0 < waitpid(-1, NULL, WNOHANG));
}
int main(int argc, char** argv)
{
for (int i = 0; i < argc; i++) { // Handle command line arguments for (int i = 0; i < argc; i++) { // Handle command line arguments
if (!strcmp("-d", argv[i])) if (!strcmp("-d", argv[i]))
strncpy(delim, argv[++i], delimLen); strncpy(delim, argv[++i], delimLen);