pinosaur
/
dwmblocks.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed call to redundant call to exit()
[dwmblocks.git]
/
dwmblocks.c
diff --git
a/dwmblocks.c
b/dwmblocks.c
index
71760aa
..
0de8630
100644
(file)
--- a/
dwmblocks.c
+++ b/
dwmblocks.c
@@
-4,7
+4,16
@@
#include<unistd.h>
#include<signal.h>
#include<X11/Xlib.h>
#include<unistd.h>
#include<signal.h>
#include<X11/Xlib.h>
+#ifdef __OpenBSD__
+#define SIGPLUS SIGUSR1+1
+#define SIGMINUS SIGUSR1-1
+#else
+#define SIGPLUS SIGRTMIN
+#define SIGMINUS SIGRTMIN
+#endif
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
+#define CMDLENGTH 50
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
typedef struct {
char* icon;
typedef struct {
char* icon;
@@
-12,16
+21,17
@@
typedef struct {
unsigned int interval;
unsigned int signal;
} Block;
unsigned int interval;
unsigned int signal;
} Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
void sighandler(int num);
void sighandler(int num);
-void replace(char *str, char old, char new);
void getcmds(int time);
void getsigcmds(int signal);
void setupsignals();
void getcmds(int time);
void getsigcmds(int signal);
void setupsignals();
+void sighandler(int signum);
int getstatus(char *str, char *last);
void setroot();
void statusloop();
int getstatus(char *str, char *last);
void setroot();
void statusloop();
-void statusinit();
-void sighandler(int signum);
void termhandler(int signum);
void termhandler(int signum);
@@
-30,17
+40,10
@@
void termhandler(int signum);
static Display *dpy;
static int screen;
static Window root;
static Display *dpy;
static int screen;
static Window root;
-static char statusbar[LENGTH(blocks)][
50
] = {0};
-static char statusstr[2][
256
];
+static char statusbar[LENGTH(blocks)][
CMDLENGTH
] = {0};
+static char statusstr[2][
STATUSLENGTH
];
static int statusContinue = 1;
static int statusContinue = 1;
-
-void replace(char *str, char old, char new)
-{
- int N = strlen(str);
- for(int i = 0; i < N; i++)
- if(str[i] == old)
- str[i] = new;
-}
+static void (*writestatus) () = setroot;
//opens process *cmd and stores output in *output
void getcmd(const Block *block, char *output)
//opens process *cmd and stores output in *output
void getcmd(const Block *block, char *output)
@@
-50,11
+53,10
@@
void getcmd(const Block *block, char *output)
FILE *cmdf = popen(cmd,"r");
if (!cmdf)
return;
FILE *cmdf = popen(cmd,"r");
if (!cmdf)
return;
- //int N = strlen(output);
char c;
int i = strlen(block->icon);
char c;
int i = strlen(block->icon);
- while((c = fgetc(cmdf)) != EOF)
-
output[i++] = c
;
+ fgets(output+i, CMDLENGTH-i, cmdf);
+
i = strlen(output)
;
if (delim != '\0' && --i)
output[i++] = delim;
output[i++] = '\0';
if (delim != '\0' && --i)
output[i++] = delim;
output[i++] = '\0';
@@
-65,7
+67,7
@@
void getcmds(int time)
{
const Block* current;
for(int i = 0; i < LENGTH(blocks); i++)
{
const Block* current;
for(int i = 0; i < LENGTH(blocks); i++)
- {
+ {
current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
getcmd(current,statusbar[i]);
current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
getcmd(current,statusbar[i]);
@@
-85,10
+87,16
@@
void getsigcmds(int signal)
void setupsignals()
{
void setupsignals()
{
+#ifndef __OpenBSD__
+ /* initialize all real time signals with dummy handler */
+ for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+ signal(i, dummysighandler);
+#endif
+
for(int i = 0; i < LENGTH(blocks); i++)
for(int i = 0; i < LENGTH(blocks); i++)
- {
+ {
if (blocks[i].signal > 0)
if (blocks[i].signal > 0)
- signal(SIG
RTMIN
+blocks[i].signal, sighandler);
+ signal(SIG
MINUS
+blocks[i].signal, sighandler);
}
}
}
}
@@
-96,12
+104,10
@@
void setupsignals()
int getstatus(char *str, char *last)
{
strcpy(last, str);
int getstatus(char *str, char *last)
{
strcpy(last, str);
- int j = 0;
- for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
- {
- strcpy(str + j, statusbar[i]);
- }
- str[--j] = '\0';
+ str[0] = '\0';
+ for(int i = 0; i < LENGTH(blocks); i++)
+ strcat(str, statusbar[i]);
+ str[strlen(str)-1] = '\0';
return strcmp(str, last);//0 if they are the same
}
return strcmp(str, last);//0 if they are the same
}
@@
-119,6
+125,14
@@
void setroot()
XCloseDisplay(dpy);
}
XCloseDisplay(dpy);
}
+void pstdout()
+{
+ if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
+ return;
+ printf("%s\n",statusstr[0]);
+ fflush(stdout);
+}
+
void statusloop()
{
void statusloop()
{
@@
-128,38
+142,41
@@
void statusloop()
while(statusContinue)
{
getcmds(i);
while(statusContinue)
{
getcmds(i);
-
setroot
();
+
writestatus
();
sleep(1.0);
i++;
}
}
sleep(1.0);
i++;
}
}
-void statusinit()
+#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
{
{
-
statusloop()
;
+
return
;
}
}
-
+#endif
void sighandler(int signum)
{
void sighandler(int signum)
{
- getsigcmds(signum-SIG
RTMIN
);
-
setroot
();
+ getsigcmds(signum-SIG
PLUS
);
+
writestatus
();
}
void termhandler(int signum)
{
statusContinue = 0;
}
void termhandler(int signum)
{
statusContinue = 0;
- exit(0);
}
int main(int argc, char** argv)
{
for(int i = 0; i < argc; i++)
}
int main(int argc, char** argv)
{
for(int i = 0; i < argc; i++)
- {
+ {
if (!strcmp("-d",argv[i]))
delim = argv[++i][0];
if (!strcmp("-d",argv[i]))
delim = argv[++i][0];
+ else if(!strcmp("-p",argv[i]))
+ writestatus = pstdout;
}
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
}
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
- status
init
();
+ status
loop
();
}
}