finally actually fixed the blocks dissappearing problem completely
This commit is contained in:
parent
1697346729
commit
d45328c444
2 changed files with 64 additions and 41 deletions
9
config.h
9
config.h
|
@ -10,7 +10,16 @@ static const Block blocks[] = {
|
||||||
/* {"", "volume", 0, 10}, */
|
/* {"", "volume", 0, 10}, */
|
||||||
/* {"", "internet", 5, 4}, */
|
/* {"", "internet", 5, 4}, */
|
||||||
{"", "stalonetray.sh", 0, 27},
|
{"", "stalonetray.sh", 0, 27},
|
||||||
|
/* {"?", "sleep 2s && date", 1, 8}, */
|
||||||
{"", "cpupercent.sh", 1, 19},
|
{"", "cpupercent.sh", 1, 19},
|
||||||
{"", "battery", 5, 3},
|
{"", "battery", 5, 3},
|
||||||
{"", "clock", 1, 1},
|
{"", "clock", 1, 1},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//Sets delimiter between status commands. NULL character ('\0') means no delimiter.
|
||||||
|
static char *delim = "|";
|
||||||
|
|
||||||
|
// Have dwmblocks automatically recompile and run when you edit this file in
|
||||||
|
// vim with the following line in your vimrc/init.vim:
|
||||||
|
|
||||||
|
// autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid dwmblocks & }
|
||||||
|
|
88
dwmblocks.c
88
dwmblocks.c
|
@ -1,10 +1,11 @@
|
||||||
#include<stdlib.h>
|
#include <stdlib.h>
|
||||||
#include<stdio.h>
|
#include <stdio.h>
|
||||||
#include<string.h>
|
#include <string.h>
|
||||||
#include<unistd.h>
|
#include <unistd.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include<signal.h>
|
#include <signal.h>
|
||||||
#include<X11/Xlib.h>
|
#include <errno.h>
|
||||||
|
#include <X11/Xlib.h>
|
||||||
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
|
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
|
||||||
#define CMDLENGTH 50
|
#define CMDLENGTH 50
|
||||||
|
|
||||||
|
@ -42,23 +43,21 @@ static void (*writestatus) () = setroot;
|
||||||
|
|
||||||
void replace(char *str, char old, char new)
|
void replace(char *str, char old, char new)
|
||||||
{
|
{
|
||||||
int N = strlen(str);
|
for(char * c = str; *c; c++)
|
||||||
for(int i = 0; i < N; i++)
|
if(*c == old)
|
||||||
if(str[i] == old)
|
*c = new;
|
||||||
str[i] = new;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// the previous function looked nice but unfortunately it didnt work if to_remove was in any position other than the last character
|
||||||
|
// theres probably still a better way of doing this
|
||||||
void remove_all(char *str, char to_remove) {
|
void remove_all(char *str, char to_remove) {
|
||||||
char *read = str;
|
char *read = str;
|
||||||
char *write = str;
|
char *write = str;
|
||||||
while (*read) {
|
do {
|
||||||
if (*read == to_remove) {
|
while (*read == to_remove) read++;
|
||||||
|
*write++ = *read;
|
||||||
read++;
|
read++;
|
||||||
*write = *read;
|
} while (*(read-1));
|
||||||
}
|
|
||||||
read++;
|
|
||||||
write++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//opens process *cmd and stores output in *output
|
//opens process *cmd and stores output in *output
|
||||||
|
@ -69,21 +68,38 @@ void getcmd(const Block *block, char *output)
|
||||||
output[0] = block->signal;
|
output[0] = block->signal;
|
||||||
output++;
|
output++;
|
||||||
}
|
}
|
||||||
strcpy(output, block->icon);
|
|
||||||
char *cmd = block->command;
|
char *cmd = block->command;
|
||||||
FILE *cmdf = popen(cmd,"r");
|
FILE *cmdf = popen(cmd,"r");
|
||||||
if (!cmdf)
|
if (!cmdf){
|
||||||
|
//printf("failed to run: %s, %d\n", block->command, errno);
|
||||||
return;
|
return;
|
||||||
char c;
|
}
|
||||||
|
char tmpstr[CMDLENGTH] = "";
|
||||||
|
// TODO decide whether its better to use the last value till next time or just keep trying while the error was the interrupt
|
||||||
|
// this keeps trying to read if it got nothing and the error was and interrupt
|
||||||
|
// could also just read to a separate buffer and not move the data over if interrupted
|
||||||
|
// this way will take longer trying to complete 1 thing but will get it done
|
||||||
|
// the other way will move on to keep going with everything and the part that failed to read will be wrong till its updated again
|
||||||
|
// either way you have to save the data to a temp buffer because when it fails it writes nothing and then then it gets displayed before this finishes
|
||||||
|
char * s;
|
||||||
|
int e;
|
||||||
|
do {
|
||||||
|
s = fgets(tmpstr, CMDLENGTH-(strlen(delim)+1), cmdf);
|
||||||
|
e = errno;
|
||||||
|
} while (!s && e == EINTR);
|
||||||
|
// this is equivalent but less readable and stuff
|
||||||
|
//while(!fgets(tmpstr, CMDLENGTH-(strlen(delim)+1), cmdf) && errno == EINTR);
|
||||||
|
pclose(cmdf);
|
||||||
int i = strlen(block->icon);
|
int i = strlen(block->icon);
|
||||||
fgets(output+i, CMDLENGTH-(strlen(delim)+1), cmdf);
|
strcpy(output, block->icon);
|
||||||
|
strcpy(output+i, tmpstr);
|
||||||
remove_all(output, '\n');
|
remove_all(output, '\n');
|
||||||
i = strlen(output);
|
i = strlen(output);
|
||||||
if ((i > 0 && block != &blocks[LENGTH(blocks) - 1]))
|
if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])){
|
||||||
strcat(output, delim);
|
strcat(output, delim);
|
||||||
|
}
|
||||||
i+=strlen(delim);
|
i+=strlen(delim);
|
||||||
output[i++] = '\0';
|
output[i++] = '\0';
|
||||||
pclose(cmdf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void getcmds(int time)
|
void getcmds(int time)
|
||||||
|
@ -179,28 +195,26 @@ void statusloop()
|
||||||
#ifndef __OpenBSD__
|
#ifndef __OpenBSD__
|
||||||
setupsignals();
|
setupsignals();
|
||||||
#endif
|
#endif
|
||||||
int i = 0;
|
unsigned int i = 0;
|
||||||
int previ = -1;
|
|
||||||
int gotscrewed = 0;
|
int gotscrewed = 0;
|
||||||
struct timespec sleeptime = {1, 0};
|
struct timespec sleeptime = {1, 0};
|
||||||
struct timespec left;
|
struct timespec tosleep = sleeptime;
|
||||||
getcmds(-1);
|
getcmds(-1);
|
||||||
while(statusContinue)
|
while(statusContinue)
|
||||||
{
|
{
|
||||||
if(i != previ){
|
// sleep for tosleep (should be a sleeptime of 1s) and put what was left if interrupted back into tosleep
|
||||||
|
gotscrewed = nanosleep(&tosleep, &tosleep);
|
||||||
|
// if interrupted then just go sleep again for the remaining time
|
||||||
|
if(gotscrewed == -1){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// if not interrupted then do the calling and writing
|
||||||
getcmds(i);
|
getcmds(i);
|
||||||
writestatus();
|
writestatus();
|
||||||
}
|
// then increment since its actually been a second (plus the time it took the commands to run)
|
||||||
gotscrewed = nanosleep(&sleeptime, &left);
|
|
||||||
previ = i;
|
|
||||||
/* long diff = (left.tv_sec + (left.tv_nsec + 500000000l) / 1000000000l); */
|
|
||||||
/* i += 1 - diff; */
|
|
||||||
if(gotscrewed != -1){
|
|
||||||
i++;
|
i++;
|
||||||
/* }else{ */
|
// set the time to sleep back to the sleeptime of 1s
|
||||||
/* printf("sec and nanosec left: %d, %d", left.tv_sec, left.tv_nsec); */
|
tosleep = sleeptime;
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue