snailed
/
dwmblocks-custom
2
0
Fork 0
Code Pull Requests 3 Actions Activity

Fix #12 and refactor code

This commit is contained in:
Utkarsh Verma 2022-01-16 16:30:39 +05:30
parent 7df6de59b5
commit 0bc49aa703
No known key found for this signature in database
GPG Key ID: 817656CF818EFCCC
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.c
View File

@ -12,6 +12,7 @@
#define POLL_INTERVAL 50 #define POLL_INTERVAL 50
#define LEN(arr) (sizeof(arr) / sizeof(arr[0])) #define LEN(arr) (sizeof(arr) / sizeof(arr[0]))
#define MAX(a, b) (a > b ? a : b)
#define BLOCK(cmd, interval, signal) \ #define BLOCK(cmd, interval, signal) \
{ "echo \"$(" cmd ")\"", interval, signal } { "echo \"$(" cmd ")\"", interval, signal }
typedef const struct { typedef const struct {
@ -75,7 +76,7 @@ void execBlock(int i, const char* button) {
} }
} }
void execBlocks(unsigned long long int time) { void execBlocks(unsigned int time) {
for (int i = 0; i < LEN(blocks); i++) for (int i = 0; i < LEN(blocks); i++)
if (time == 0 || (blocks[i].interval != 0 && time % blocks[i].interval == 0)) if (time == 0 || (blocks[i].interval != 0 && time % blocks[i].interval == 0))
execBlock(i, NULL); execBlock(i, NULL);
@ -205,8 +206,6 @@ void setupSignals() {
} }
void statusLoop() { void statusLoop() {
execBlocks(0);
while (statusContinue) { while (statusContinue) {
int eventCount = epoll_wait(epollFD, events, LEN(events), POLL_INTERVAL / 10); int eventCount = epoll_wait(epollFD, events, LEN(events), POLL_INTERVAL / 10);
@ -235,12 +234,15 @@ void statusLoop() {
void timerLoop() { void timerLoop() {
close(timerPipe[0]); close(timerPipe[0]);
unsigned int sleepInterval = -1; unsigned int sleepInterval = 0;
unsigned int maxInterval = 0;
for (int i = 0; i < LEN(blocks); i++) for (int i = 0; i < LEN(blocks); i++)
if (blocks[i].interval) if (blocks[i].interval) {
maxInterval = MAX(blocks[i].interval, maxInterval);
sleepInterval = gcd(blocks[i].interval, sleepInterval); sleepInterval = gcd(blocks[i].interval, sleepInterval);
}
unsigned long long int i = 0; unsigned int i = 0;
struct timespec sleepTime = {sleepInterval, 0}; struct timespec sleepTime = {sleepInterval, 0};
struct timespec toSleep = sleepTime; struct timespec toSleep = sleepTime;
@ -254,7 +256,9 @@ void timerLoop() {
// After sleep, reset timer and update counter // After sleep, reset timer and update counter
toSleep = sleepTime; toSleep = sleepTime;
i += sleepInterval;
// Wrap `i` to the interval [1, maxInterval]
i = (i + sleepInterval - 1) % maxInterval + 1;
} }
close(timerPipe[1]); close(timerPipe[1]);
@ -285,10 +289,10 @@ int main(const int argc, const char* argv[]) {
init(); init();
if (fork() == 0) if (fork())
timerLoop();
else
statusLoop(); statusLoop();
else
timerLoop();
close(epollFD); close(epollFD);
close(signalFD); close(signalFD);