Merge pull request #12 from kdkasad/patch-1

Change `cp`/`chmod` to `install` in Makefile

diff --git a/.gitignore b/.gitignore
index c4bb9708b2b07e18d203ac705fc4ae1c689a8806..b6605b413074a4a711c2e4bcdb0a109412d50434 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Custom blocks file
+blocks.h
+
 # Prerequisites
 *.d
 

diff --git a/Makefile b/Makefile
index 5f2bb98d143bfdbe18c8abb71cc3def859b46a33..3cfa764b2026d47fcee7b27cbb05af2f26025a13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 PREFIX ?= /usr/local
 
-output: dwmblocks.c blocks.h
+output: dwmblocks.c blocks.def.h blocks.h
        cc `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks
+blocks.h:
+       cp blocks.def.h $@
+
+
 clean:
        rm -f *.o *.gch dwmblocks
 install: output

diff --git a/README.md b/README.md
index fe02a0c55234fb6125d28d1713ff9f2256b8f8c4..33f4e9de34b1b2bdf59161e0ff383d21895aec6f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,15 @@
 # dwmblocks
 Modular status bar for dwm written in c.
+# usage
+To use dwmblocks first run 'make' and then install it with 'sudo make install'.
+After that you can put dwmblocks in your xinitrc or other startup script to have it start with dwm.
 # modifying blocks
 The statusbar is made from text output from commandline programs.
 Blocks are added and removed by editing the blocks.h header file.
+By default the blocks.h header file is created the first time you run make which copies the default config from blocks.def.h.
+This is so you can edit your status bar commands and they will not get overwritten in a future update.
+# patches
+Here are some patches to dwmblocks that add features that I either don't want to merge in, or that require a dwm patch to work.
+I do not maintain these but I will take pull requests to update them.
+<br>
+<a href=https://gist.github.com/torrinfail/fb423345f0f9c340db25181c8159cdd2>dwmblocks-statuscmd-signal.diff</a>

diff --git a/blocks.def.h b/blocks.def.h
new file mode 100644 (file)
index 0000000..35738db
--- /dev/null
+++ b/blocks.def.h
@@ -0,0 +1,10 @@
+//Modify this file to change what commands output to your statusbar, and recompile using the make command.
+static const Block blocks[] = {
+       /*Icon*/        /*Command*/             /*Update Interval*/     /*Update Signal*/
+       {"Mem:", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",     30,             0},
+
+       {"", "date '+%b %d (%a) %I:%M%p'",                                      5,              0},
+};
+
+//sets delimeter between status commands. NULL character ('\0') means no delimeter.
+static char delim = '|';

diff --git a/blocks.h b/blocks.h
deleted file mode 100644 (file)
index 31e98af..0000000
--- a/blocks.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//Modify this file to change what commands output to your statusbar, and recompile using the make command.
-static const Block blocks[] = {
-       /*Icon*/        /*Command*/             /*Update Interval*/     /*Update Signal*/
-       {"", "cat ~/.pacupdate | sed /📦0/d",                                 0,              9},
-       
-       {"🧠", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",     30,             0},
-
-       {"", "~/bin/statusbar/volume",                                          0,              10},
-
-       {"☀", "xbacklight | sed 's/\\..*//'",                                 0,              11},
-       
-       {"", "~/bin/statusbar/battery",                                         5,              0},
-
-       {"🌡", "sensors | awk '/^temp1:/{print $2}'",                         5,              0},
-
-       {"", "~/bin/statusbar/clock",                                           5,              0},
-};
-
-//sets delimeter between status commands. NULL character ('\0') means no delimeter.
-static char delim = '|';

diff --git a/dwmblocks.c b/dwmblocks.c
index 2f3b774664cfca6eac7e016b946b1eed3088f9cf..3e27b0b833c21928304a69b917f13a60dc176dbf 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -4,8 +4,16 @@
 #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 CMDLENGTH              50
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
        char* icon;
@@ -13,13 +21,14 @@ typedef struct {
        unsigned int interval;
        unsigned int signal;
 } Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
 void sighandler(int num);
 void getcmds(int time);
-#ifndef __OpenBSD__
 void getsigcmds(int signal);
 void setupsignals();
 void sighandler(int signum);
-#endif
 int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
@@ -32,7 +41,7 @@ static Display *dpy;
 static int screen;
 static Window root;
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
-static char statusstr[2][256];
+static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
 static void (*writestatus) () = setroot;
 
@@ -58,14 +67,13 @@ void getcmds(int time)
 {
        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]);
        }
 }
 
-#ifndef __OpenBSD__
 void getsigcmds(int signal)
 {
        const Block *current;
@@ -79,14 +87,19 @@ void getsigcmds(int signal)
 
 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++)
-       {         
+       {
                if (blocks[i].signal > 0)
-                       signal(SIGRTMIN+blocks[i].signal, sighandler);
+                       signal(SIGMINUS+blocks[i].signal, sighandler);
        }
 
 }
-#endif
 
 int getstatus(char *str, char *last)
 {
@@ -123,9 +136,7 @@ void pstdout()
 
 void statusloop()
 {
-#ifndef __OpenBSD__
        setupsignals();
-#endif
        int i = 0;
        getcmds(-1);
        while(statusContinue)
@@ -138,12 +149,18 @@ void statusloop()
 }
 
 #ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
+{
+    return;
+}
+#endif
+
 void sighandler(int signum)
 {
-       getsigcmds(signum-SIGRTMIN);
+       getsigcmds(signum-SIGPLUS);
        writestatus();
 }
-#endif
 
 void termhandler(int signum)
 {
@@ -154,7 +171,7 @@ void termhandler(int signum)
 int main(int argc, char** argv)
 {
        for(int i = 0; i < argc; i++)
-       {       
+       {
                if (!strcmp("-d",argv[i]))
                        delim = argv[++i][0];
                else if(!strcmp("-p",argv[i]))