├── .gitignore ├── FUNDING.yml ├── LICENSE ├── Makefile ├── README.md ├── config.h ├── dwmblocks.c └── patches ├── dwmblocks-statuscmd-fork.diff └── dwmblocks-statuscmd-signal.diff /.gitignore: -------------------------------------------------------------------------------- 1 | # Prerequisites 2 | *.d 3 | 4 | # Object files 5 | *.o 6 | *.ko 7 | *.obj 8 | *.elf 9 | 10 | # Linker output 11 | *.ilk 12 | *.map 13 | *.exp 14 | 15 | # Precompiled Headers 16 | *.gch 17 | *.pch 18 | 19 | # Libraries 20 | *.lib 21 | *.a 22 | *.la 23 | *.lo 24 | 25 | # Shared objects (inc. Windows DLLs) 26 | *.dll 27 | *.so 28 | *.so.* 29 | *.dylib 30 | 31 | # Executables 32 | *.exe 33 | *.out 34 | *.app 35 | *.i*86 36 | *.x86_64 37 | *.hex 38 | dwmblocks 39 | 40 | # Debug files 41 | *.dSYM/ 42 | *.su 43 | *.idb 44 | *.pdb 45 | 46 | # Kernel Module Compile Results 47 | *.mod* 48 | *.cmd 49 | .tmp_versions/ 50 | modules.order 51 | Module.symvers 52 | Mkfile.old 53 | dkms.conf 54 | -------------------------------------------------------------------------------- /FUNDING.yml: -------------------------------------------------------------------------------- 1 | github: lukesmithxyz 2 | custom: ["https://lukesmith.xyz/donate", "https://paypal.me/lukemsmith", "https://lukesmith.xyz/crypto"] 3 | patreon: lukesmith 4 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | GNU GENERAL PUBLIC LICENSE 2 | Version 2, June 1991 3 | 4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc., 5 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 6 | Everyone is permitted to copy and distribute verbatim copies 7 | of this license document, but changing it is not allowed. 8 | 9 | Preamble 10 | 11 | The licenses for most software are designed to take away your 12 | freedom to share and change it. By contrast, the GNU General Public 13 | License is intended to guarantee your freedom to share and change free 14 | software--to make sure the software is free for all its users. This 15 | General Public License applies to most of the Free Software 16 | Foundation's software and to any other program whose authors commit to 17 | using it. (Some other Free Software Foundation software is covered by 18 | the GNU Lesser General Public License instead.) You can apply it to 19 | your programs, too. 20 | 21 | When we speak of free software, we are referring to freedom, not 22 | price. Our General Public Licenses are designed to make sure that you 23 | have the freedom to distribute copies of free software (and charge for 24 | this service if you wish), that you receive source code or can get it 25 | if you want it, that you can change the software or use pieces of it 26 | in new free programs; and that you know you can do these things. 27 | 28 | To protect your rights, we need to make restrictions that forbid 29 | anyone to deny you these rights or to ask you to surrender the rights. 30 | These restrictions translate to certain responsibilities for you if you 31 | distribute copies of the software, or if you modify it. 32 | 33 | For example, if you distribute copies of such a program, whether 34 | gratis or for a fee, you must give the recipients all the rights that 35 | you have. You must make sure that they, too, receive or can get the 36 | source code. And you must show them these terms so they know their 37 | rights. 38 | 39 | We protect your rights with two steps: (1) copyright the software, and 40 | (2) offer you this license which gives you legal permission to copy, 41 | distribute and/or modify the software. 42 | 43 | Also, for each author's protection and ours, we want to make certain 44 | that everyone understands that there is no warranty for this free 45 | software. If the software is modified by someone else and passed on, we 46 | want its recipients to know that what they have is not the original, so 47 | that any problems introduced by others will not reflect on the original 48 | authors' reputations. 49 | 50 | Finally, any free program is threatened constantly by software 51 | patents. We wish to avoid the danger that redistributors of a free 52 | program will individually obtain patent licenses, in effect making the 53 | program proprietary. To prevent this, we have made it clear that any 54 | patent must be licensed for everyone's free use or not licensed at all. 55 | 56 | The precise terms and conditions for copying, distribution and 57 | modification follow. 58 | 59 | GNU GENERAL PUBLIC LICENSE 60 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 61 | 62 | 0. This License applies to any program or other work which contains 63 | a notice placed by the copyright holder saying it may be distributed 64 | under the terms of this General Public License. The "Program", below, 65 | refers to any such program or work, and a "work based on the Program" 66 | means either the Program or any derivative work under copyright law: 67 | that is to say, a work containing the Program or a portion of it, 68 | either verbatim or with modifications and/or translated into another 69 | language. (Hereinafter, translation is included without limitation in 70 | the term "modification".) Each licensee is addressed as "you". 71 | 72 | Activities other than copying, distribution and modification are not 73 | covered by this License; they are outside its scope. The act of 74 | running the Program is not restricted, and the output from the Program 75 | is covered only if its contents constitute a work based on the 76 | Program (independent of having been made by running the Program). 77 | Whether that is true depends on what the Program does. 78 | 79 | 1. You may copy and distribute verbatim copies of the Program's 80 | source code as you receive it, in any medium, provided that you 81 | conspicuously and appropriately publish on each copy an appropriate 82 | copyright notice and disclaimer of warranty; keep intact all the 83 | notices that refer to this License and to the absence of any warranty; 84 | and give any other recipients of the Program a copy of this License 85 | along with the Program. 86 | 87 | You may charge a fee for the physical act of transferring a copy, and 88 | you may at your option offer warranty protection in exchange for a fee. 89 | 90 | 2. You may modify your copy or copies of the Program or any portion 91 | of it, thus forming a work based on the Program, and copy and 92 | distribute such modifications or work under the terms of Section 1 93 | above, provided that you also meet all of these conditions: 94 | 95 | a) You must cause the modified files to carry prominent notices 96 | stating that you changed the files and the date of any change. 97 | 98 | b) You must cause any work that you distribute or publish, that in 99 | whole or in part contains or is derived from the Program or any 100 | part thereof, to be licensed as a whole at no charge to all third 101 | parties under the terms of this License. 102 | 103 | c) If the modified program normally reads commands interactively 104 | when run, you must cause it, when started running for such 105 | interactive use in the most ordinary way, to print or display an 106 | announcement including an appropriate copyright notice and a 107 | notice that there is no warranty (or else, saying that you provide 108 | a warranty) and that users may redistribute the program under 109 | these conditions, and telling the user how to view a copy of this 110 | License. (Exception: if the Program itself is interactive but 111 | does not normally print such an announcement, your work based on 112 | the Program is not required to print an announcement.) 113 | 114 | These requirements apply to the modified work as a whole. If 115 | identifiable sections of that work are not derived from the Program, 116 | and can be reasonably considered independent and separate works in 117 | themselves, then this License, and its terms, do not apply to those 118 | sections when you distribute them as separate works. But when you 119 | distribute the same sections as part of a whole which is a work based 120 | on the Program, the distribution of the whole must be on the terms of 121 | this License, whose permissions for other licensees extend to the 122 | entire whole, and thus to each and every part regardless of who wrote it. 123 | 124 | Thus, it is not the intent of this section to claim rights or contest 125 | your rights to work written entirely by you; rather, the intent is to 126 | exercise the right to control the distribution of derivative or 127 | collective works based on the Program. 128 | 129 | In addition, mere aggregation of another work not based on the Program 130 | with the Program (or with a work based on the Program) on a volume of 131 | a storage or distribution medium does not bring the other work under 132 | the scope of this License. 133 | 134 | 3. You may copy and distribute the Program (or a work based on it, 135 | under Section 2) in object code or executable form under the terms of 136 | Sections 1 and 2 above provided that you also do one of the following: 137 | 138 | a) Accompany it with the complete corresponding machine-readable 139 | source code, which must be distributed under the terms of Sections 140 | 1 and 2 above on a medium customarily used for software interchange; or, 141 | 142 | b) Accompany it with a written offer, valid for at least three 143 | years, to give any third party, for a charge no more than your 144 | cost of physically performing source distribution, a complete 145 | machine-readable copy of the corresponding source code, to be 146 | distributed under the terms of Sections 1 and 2 above on a medium 147 | customarily used for software interchange; or, 148 | 149 | c) Accompany it with the information you received as to the offer 150 | to distribute corresponding source code. (This alternative is 151 | allowed only for noncommercial distribution and only if you 152 | received the program in object code or executable form with such 153 | an offer, in accord with Subsection b above.) 154 | 155 | The source code for a work means the preferred form of the work for 156 | making modifications to it. For an executable work, complete source 157 | code means all the source code for all modules it contains, plus any 158 | associated interface definition files, plus the scripts used to 159 | control compilation and installation of the executable. However, as a 160 | special exception, the source code distributed need not include 161 | anything that is normally distributed (in either source or binary 162 | form) with the major components (compiler, kernel, and so on) of the 163 | operating system on which the executable runs, unless that component 164 | itself accompanies the executable. 165 | 166 | If distribution of executable or object code is made by offering 167 | access to copy from a designated place, then offering equivalent 168 | access to copy the source code from the same place counts as 169 | distribution of the source code, even though third parties are not 170 | compelled to copy the source along with the object code. 171 | 172 | 4. You may not copy, modify, sublicense, or distribute the Program 173 | except as expressly provided under this License. Any attempt 174 | otherwise to copy, modify, sublicense or distribute the Program is 175 | void, and will automatically terminate your rights under this License. 176 | However, parties who have received copies, or rights, from you under 177 | this License will not have their licenses terminated so long as such 178 | parties remain in full compliance. 179 | 180 | 5. You are not required to accept this License, since you have not 181 | signed it. However, nothing else grants you permission to modify or 182 | distribute the Program or its derivative works. These actions are 183 | prohibited by law if you do not accept this License. Therefore, by 184 | modifying or distributing the Program (or any work based on the 185 | Program), you indicate your acceptance of this License to do so, and 186 | all its terms and conditions for copying, distributing or modifying 187 | the Program or works based on it. 188 | 189 | 6. Each time you redistribute the Program (or any work based on the 190 | Program), the recipient automatically receives a license from the 191 | original licensor to copy, distribute or modify the Program subject to 192 | these terms and conditions. You may not impose any further 193 | restrictions on the recipients' exercise of the rights granted herein. 194 | You are not responsible for enforcing compliance by third parties to 195 | this License. 196 | 197 | 7. If, as a consequence of a court judgment or allegation of patent 198 | infringement or for any other reason (not limited to patent issues), 199 | conditions are imposed on you (whether by court order, agreement or 200 | otherwise) that contradict the conditions of this License, they do not 201 | excuse you from the conditions of this License. If you cannot 202 | distribute so as to satisfy simultaneously your obligations under this 203 | License and any other pertinent obligations, then as a consequence you 204 | may not distribute the Program at all. For example, if a patent 205 | license would not permit royalty-free redistribution of the Program by 206 | all those who receive copies directly or indirectly through you, then 207 | the only way you could satisfy both it and this License would be to 208 | refrain entirely from distribution of the Program. 209 | 210 | If any portion of this section is held invalid or unenforceable under 211 | any particular circumstance, the balance of the section is intended to 212 | apply and the section as a whole is intended to apply in other 213 | circumstances. 214 | 215 | It is not the purpose of this section to induce you to infringe any 216 | patents or other property right claims or to contest validity of any 217 | such claims; this section has the sole purpose of protecting the 218 | integrity of the free software distribution system, which is 219 | implemented by public license practices. Many people have made 220 | generous contributions to the wide range of software distributed 221 | through that system in reliance on consistent application of that 222 | system; it is up to the author/donor to decide if he or she is willing 223 | to distribute software through any other system and a licensee cannot 224 | impose that choice. 225 | 226 | This section is intended to make thoroughly clear what is believed to 227 | be a consequence of the rest of this License. 228 | 229 | 8. If the distribution and/or use of the Program is restricted in 230 | certain countries either by patents or by copyrighted interfaces, the 231 | original copyright holder who places the Program under this License 232 | may add an explicit geographical distribution limitation excluding 233 | those countries, so that distribution is permitted only in or among 234 | countries not thus excluded. In such case, this License incorporates 235 | the limitation as if written in the body of this License. 236 | 237 | 9. The Free Software Foundation may publish revised and/or new versions 238 | of the General Public License from time to time. Such new versions will 239 | be similar in spirit to the present version, but may differ in detail to 240 | address new problems or concerns. 241 | 242 | Each version is given a distinguishing version number. If the Program 243 | specifies a version number of this License which applies to it and "any 244 | later version", you have the option of following the terms and conditions 245 | either of that version or of any later version published by the Free 246 | Software Foundation. If the Program does not specify a version number of 247 | this License, you may choose any version ever published by the Free Software 248 | Foundation. 249 | 250 | 10. If you wish to incorporate parts of the Program into other free 251 | programs whose distribution conditions are different, write to the author 252 | to ask for permission. For software which is copyrighted by the Free 253 | Software Foundation, write to the Free Software Foundation; we sometimes 254 | make exceptions for this. Our decision will be guided by the two goals 255 | of preserving the free status of all derivatives of our free software and 256 | of promoting the sharing and reuse of software generally. 257 | 258 | NO WARRANTY 259 | 260 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 261 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 262 | OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 263 | PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 264 | OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 265 | MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 266 | TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 267 | PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 268 | REPAIR OR CORRECTION. 269 | 270 | 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 271 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 272 | REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 273 | INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 274 | OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 275 | TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 276 | YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 277 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 278 | POSSIBILITY OF SUCH DAMAGES. 279 | 280 | END OF TERMS AND CONDITIONS 281 | 282 | How to Apply These Terms to Your New Programs 283 | 284 | If you develop a new program, and you want it to be of the greatest 285 | possible use to the public, the best way to achieve this is to make it 286 | free software which everyone can redistribute and change under these terms. 287 | 288 | To do so, attach the following notices to the program. It is safest 289 | to attach them to the start of each source file to most effectively 290 | convey the exclusion of warranty; and each file should have at least 291 | the "copyright" line and a pointer to where the full notice is found. 292 | 293 | 294 | Copyright (C) 295 | 296 | This program is free software; you can redistribute it and/or modify 297 | it under the terms of the GNU General Public License as published by 298 | the Free Software Foundation; either version 2 of the License, or 299 | (at your option) any later version. 300 | 301 | This program is distributed in the hope that it will be useful, 302 | but WITHOUT ANY WARRANTY; without even the implied warranty of 303 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 304 | GNU General Public License for more details. 305 | 306 | You should have received a copy of the GNU General Public License along 307 | with this program; if not, write to the Free Software Foundation, Inc., 308 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 309 | 310 | Also add information on how to contact you by electronic and paper mail. 311 | 312 | If the program is interactive, make it output a short notice like this 313 | when it starts in an interactive mode: 314 | 315 | Gnomovision version 69, Copyright (C) year name of author 316 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 317 | This is free software, and you are welcome to redistribute it 318 | under certain conditions; type `show c' for details. 319 | 320 | The hypothetical commands `show w' and `show c' should show the appropriate 321 | parts of the General Public License. Of course, the commands you use may 322 | be called something other than `show w' and `show c'; they could even be 323 | mouse-clicks or menu items--whatever suits your program. 324 | 325 | You should also get your employer (if you work as a programmer) or your 326 | school, if any, to sign a "copyright disclaimer" for the program, if 327 | necessary. Here is a sample; alter the names: 328 | 329 | Yoyodyne, Inc., hereby disclaims all copyright interest in the program 330 | `Gnomovision' (which makes passes at compilers) written by James Hacker. 331 | 332 | , 1 April 1989 333 | Ty Coon, President of Vice 334 | 335 | This General Public License does not permit incorporating your program into 336 | proprietary programs. If your program is a subroutine library, you may 337 | consider it more useful to permit linking proprietary applications with the 338 | library. If this is what you want to do, use the GNU Lesser General 339 | Public License instead of this License. 340 | -------------------------------------------------------------------------------- /Makefile: -------------------------------------------------------------------------------- 1 | .POSIX: 2 | 3 | PREFIX = /usr/local 4 | CC = gcc 5 | 6 | dwmblocks: dwmblocks.o 7 | $(CC) dwmblocks.o -lX11 -o dwmblocks 8 | dwmblocks.o: dwmblocks.c config.h 9 | $(CC) -c dwmblocks.c 10 | clean: 11 | rm -f *.o *.gch dwmblocks 12 | install: dwmblocks 13 | mkdir -p $(DESTDIR)$(PREFIX)/bin 14 | cp -f dwmblocks $(DESTDIR)$(PREFIX)/bin 15 | chmod 755 $(DESTDIR)$(PREFIX)/bin/dwmblocks 16 | uninstall: 17 | rm -f $(DESTDIR)$(PREFIX)/bin/dwmblocks 18 | 19 | .PHONY: clean install uninstall 20 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # dwmblocks 2 | 3 | Modular status bar for dwm written in c. 4 | 5 | # Modifying blocks 6 | 7 | The statusbar is made from text output from commandline programs. Blocks are 8 | added and removed by editing the config.h file. 9 | 10 | # Luke's build 11 | 12 | I have dwmblocks read my preexisting scripts 13 | [here in my dotfiles repo](https://github.com/LukeSmithxyz/voidrice/tree/master/.local/bin/statusbar). 14 | So if you want my build out of the box, download those and put them in your 15 | `$PATH`. I do this to avoid redundancy in LARBS, both i3 and dwm use the same 16 | statusbar scripts. 17 | 18 | # Signaling changes 19 | 20 | Most statusbars constantly rerun every script every several seconds to update. 21 | This is an option here, but a superior choice is giving your module a signal 22 | that you can signal to it to update on a relevant event, rather than having it 23 | rerun idly. 24 | 25 | For example, the audio module has the update signal 10 by default. Thus, 26 | running `pkill -RTMIN+10 dwmblocks` will update it. 27 | 28 | You can also run `kill -44 $(pidof dwmblocks)` which will have the same effect, 29 | but is faster. Just add 34 to your typical signal number. 30 | 31 | My volume module *never* updates on its own, instead I have this command run 32 | along side my volume shortcuts in dwm to only update it when relevant. 33 | 34 | Note that all modules must have different signal numbers. 35 | 36 | # Clickable modules 37 | 38 | Like i3blocks, this build allows you to build in additional actions into your 39 | scripts in response to click events. See the above linked scripts for examples 40 | of this using the `$BLOCK_BUTTON` variable. 41 | 42 | For this feature to work, you need the appropriate patch in dwm as well. See 43 | [here](https://dwm.suckless.org/patches/statuscmd/). 44 | Credit for those patches goes to Daniel Bylinka (daniel.bylinka@gmail.com). 45 | -------------------------------------------------------------------------------- /config.h: -------------------------------------------------------------------------------- 1 | //Modify this file to change what commands output to your statusbar, and recompile using the make command. 2 | static const Block blocks[] = { 3 | /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ 4 | /* {"⌨", "sb-kbselect", 0, 30}, */ 5 | {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9}, 6 | {"", "sb-tasks", 10, 26}, 7 | /* {"", "sb-music", 0, 11}, */ 8 | {"", "sb-pacpackages", 0, 8}, 9 | {"", "sb-news", 0, 6}, 10 | /* {"", "sb-price xmr-btc \"Monero to Bitcoin\" 🔒 25", 9000, 25}, */ 11 | /* {"", "sb-price xmr Monero 🔒 24", 9000, 24}, */ 12 | /* {"", "sb-price eth Ethereum 🍸 23", 9000, 23}, */ 13 | /* {"", "sb-price btc Bitcoin 💰 21", 9000, 21}, */ 14 | {"", "sb-torrent", 20, 7}, 15 | /* {"", "sb-memory", 10, 14}, */ 16 | /* {"", "sb-cpu", 10, 18}, */ 17 | /* {"", "sb-moonphase", 18000, 17}, */ 18 | {"", "sb-doppler", 0, 13}, 19 | {"", "sb-forecast", 18000, 5}, 20 | {"", "sb-mailbox", 180, 12}, 21 | {"", "sb-nettraf", 1, 16}, 22 | {"", "sb-volume", 0, 10}, 23 | {"", "sb-battery", 5, 3}, 24 | {"", "sb-clock", 60, 1}, 25 | {"", "sb-internet", 5, 4}, 26 | /* {"", "sb-iplocate", 0, 27}, */ 27 | {"", "sb-help-icon", 0, 15}, 28 | }; 29 | 30 | //Sets delimiter between status commands. NULL character ('\0') means no delimiter. 31 | static char *delim = " "; 32 | 33 | // Have dwmblocks automatically recompile and run when you edit this file in 34 | // vim with the following line in your vimrc/init.vim: 35 | 36 | // autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid dwmblocks & } 37 | -------------------------------------------------------------------------------- /dwmblocks.c: -------------------------------------------------------------------------------- 1 | #include 2 | #include 3 | #include 4 | #include 5 | #include 6 | #include 7 | #include 8 | #include 9 | #include 10 | #include 11 | #define LENGTH(X) (sizeof(X) / sizeof (X[0])) 12 | #define CMDLENGTH 50 13 | 14 | typedef struct { 15 | char* icon; 16 | char* command; 17 | unsigned int interval; 18 | unsigned int signal; 19 | } Block; 20 | void sighandler(); 21 | void buttonhandler(int ssi_int); 22 | void replace(char *str, char old, char new); 23 | void remove_all(char *str, char to_remove); 24 | void getcmds(int time); 25 | void getsigcmds(int signal); 26 | void setupsignals(); 27 | int getstatus(char *str, char *last); 28 | void setroot(); 29 | void statusloop(); 30 | void termhandler(int signum); 31 | 32 | 33 | #include "config.h" 34 | 35 | static Display *dpy; 36 | static int screen; 37 | static Window root; 38 | static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0}; 39 | static char statusstr[2][256]; 40 | static int statusContinue = 1; 41 | static int signalFD; 42 | static int timerInterval = -1; 43 | static void (*writestatus) () = setroot; 44 | 45 | void replace(char *str, char old, char new) 46 | { 47 | for(char * c = str; *c; c++) 48 | if(*c == old) 49 | *c = new; 50 | } 51 | 52 | // the previous function looked nice but unfortunately it didnt work if to_remove was in any position other than the last character 53 | // theres probably still a better way of doing this 54 | void remove_all(char *str, char to_remove) { 55 | char *read = str; 56 | char *write = str; 57 | while (*read) { 58 | if (*read != to_remove) { 59 | *write++ = *read; 60 | } 61 | ++read; 62 | } 63 | *write = '\0'; 64 | } 65 | 66 | int gcd(int a, int b) 67 | { 68 | int temp; 69 | while (b > 0){ 70 | temp = a % b; 71 | 72 | a = b; 73 | b = temp; 74 | } 75 | return a; 76 | } 77 | 78 | 79 | //opens process *cmd and stores output in *output 80 | void getcmd(const Block *block, char *output) 81 | { 82 | if (block->signal) 83 | { 84 | output[0] = block->signal; 85 | output++; 86 | } 87 | char *cmd = block->command; 88 | FILE *cmdf = popen(cmd,"r"); 89 | if (!cmdf){ 90 | //printf("failed to run: %s, %d\n", block->command, errno); 91 | return; 92 | } 93 | char tmpstr[CMDLENGTH] = ""; 94 | // TODO decide whether its better to use the last value till next time or just keep trying while the error was the interrupt 95 | // this keeps trying to read if it got nothing and the error was an interrupt 96 | // could also just read to a separate buffer and not move the data over if interrupted 97 | // this way will take longer trying to complete 1 thing but will get it done 98 | // 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 99 | // 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 100 | char * s; 101 | int e; 102 | do { 103 | errno = 0; 104 | s = fgets(tmpstr, CMDLENGTH-(strlen(delim)+1), cmdf); 105 | e = errno; 106 | } while (!s && e == EINTR); 107 | pclose(cmdf); 108 | int i = strlen(block->icon); 109 | strcpy(output, block->icon); 110 | strcpy(output+i, tmpstr); 111 | remove_all(output, '\n'); 112 | i = strlen(output); 113 | if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])){ 114 | strcat(output, delim); 115 | } 116 | i+=strlen(delim); 117 | output[i++] = '\0'; 118 | } 119 | 120 | void getcmds(int time) 121 | { 122 | const Block* current; 123 | for(int i = 0; i < LENGTH(blocks); i++) 124 | { 125 | current = blocks + i; 126 | if ((current->interval != 0 && time % current->interval == 0) || time == -1){ 127 | getcmd(current,statusbar[i]); 128 | } 129 | } 130 | } 131 | 132 | void getsigcmds(int signal) 133 | { 134 | const Block *current; 135 | for (int i = 0; i < LENGTH(blocks); i++) 136 | { 137 | current = blocks + i; 138 | if (current->signal == signal){ 139 | getcmd(current,statusbar[i]); 140 | } 141 | } 142 | } 143 | 144 | void setupsignals() 145 | { 146 | sigset_t signals; 147 | sigemptyset(&signals); 148 | sigaddset(&signals, SIGALRM); // Timer events 149 | sigaddset(&signals, SIGUSR1); // Button events 150 | // All signals assigned to blocks 151 | for (size_t i = 0; i < LENGTH(blocks); i++) 152 | if (blocks[i].signal > 0) 153 | sigaddset(&signals, SIGRTMIN + blocks[i].signal); 154 | // Create signal file descriptor for pooling 155 | signalFD = signalfd(-1, &signals, 0); 156 | // Block all real-time signals 157 | for (int i = SIGRTMIN; i <= SIGRTMAX; i++) sigaddset(&signals, i); 158 | sigprocmask(SIG_BLOCK, &signals, NULL); 159 | // Do not transform children into zombies 160 | struct sigaction sigchld_action = { 161 | .sa_handler = SIG_DFL, 162 | .sa_flags = SA_NOCLDWAIT 163 | }; 164 | sigaction(SIGCHLD, &sigchld_action, NULL); 165 | 166 | } 167 | 168 | int getstatus(char *str, char *last) 169 | { 170 | strcpy(last, str); 171 | str[0] = '\0'; 172 | for(int i = 0; i < LENGTH(blocks); i++) { 173 | strcat(str, statusbar[i]); 174 | if (i == LENGTH(blocks) - 1) 175 | strcat(str, " "); 176 | } 177 | str[strlen(str)-1] = '\0'; 178 | return strcmp(str, last);//0 if they are the same 179 | } 180 | 181 | void setroot() 182 | { 183 | if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed. 184 | return; 185 | Display *d = XOpenDisplay(NULL); 186 | if (d) { 187 | dpy = d; 188 | } 189 | screen = DefaultScreen(dpy); 190 | root = RootWindow(dpy, screen); 191 | XStoreName(dpy, root, statusstr[0]); 192 | XCloseDisplay(dpy); 193 | } 194 | 195 | void pstdout() 196 | { 197 | if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed. 198 | return; 199 | printf("%s\n",statusstr[0]); 200 | fflush(stdout); 201 | } 202 | 203 | 204 | void statusloop() 205 | { 206 | setupsignals(); 207 | // first figure out the default wait interval by finding the 208 | // greatest common denominator of the intervals 209 | for(int i = 0; i < LENGTH(blocks); i++){ 210 | if(blocks[i].interval){ 211 | timerInterval = gcd(blocks[i].interval, timerInterval); 212 | } 213 | } 214 | getcmds(-1); // Fist time run all commands 215 | raise(SIGALRM); // Schedule first timer event 216 | int ret; 217 | struct pollfd pfd[] = {{.fd = signalFD, .events = POLLIN}}; 218 | while (statusContinue) { 219 | // Wait for new signal 220 | ret = poll(pfd, sizeof(pfd) / sizeof(pfd[0]), -1); 221 | if (ret < 0 || !(pfd[0].revents & POLLIN)) break; 222 | sighandler(); // Handle signal 223 | } 224 | } 225 | 226 | void sighandler() 227 | { 228 | static int time = 0; 229 | struct signalfd_siginfo si; 230 | int ret = read(signalFD, &si, sizeof(si)); 231 | if (ret < 0) return; 232 | int signal = si.ssi_signo; 233 | switch (signal) { 234 | case SIGALRM: 235 | // Execute blocks and schedule the next timer event 236 | getcmds(time); 237 | alarm(timerInterval); 238 | time += timerInterval; 239 | break; 240 | case SIGUSR1: 241 | // Handle buttons 242 | buttonhandler(si.ssi_int); 243 | return; 244 | default: 245 | // Execute the block that has the given signal 246 | getsigcmds(signal - SIGRTMIN); 247 | break; 248 | } 249 | writestatus(); 250 | } 251 | 252 | void buttonhandler(int ssi_int) 253 | { 254 | char button[2] = {'0' + ssi_int & 0xff, '\0'}; 255 | pid_t process_id = getpid(); 256 | int sig = ssi_int >> 8; 257 | if (fork() == 0) 258 | { 259 | const Block *current; 260 | for (int i = 0; i < LENGTH(blocks); i++) 261 | { 262 | current = blocks + i; 263 | if (current->signal == sig) 264 | break; 265 | } 266 | char shcmd[1024]; 267 | sprintf(shcmd,"%s && kill -%d %d",current->command, current->signal+34,process_id); 268 | char *command[] = { "/bin/sh", "-c", shcmd, NULL }; 269 | setenv("BLOCK_BUTTON", button, 1); 270 | setsid(); 271 | execvp(command[0], command); 272 | exit(EXIT_SUCCESS); 273 | } 274 | } 275 | 276 | 277 | void termhandler(int signum) 278 | { 279 | statusContinue = 0; 280 | } 281 | 282 | int main(int argc, char** argv) 283 | { 284 | for(int i = 0; i < argc; i++) 285 | { 286 | if (!strcmp("-d",argv[i])) 287 | delim = argv[++i]; 288 | else if(!strcmp("-p",argv[i])) 289 | writestatus = pstdout; 290 | } 291 | signal(SIGTERM, termhandler); 292 | signal(SIGINT, termhandler); 293 | statusloop(); 294 | close(signalFD); 295 | } 296 | -------------------------------------------------------------------------------- /patches/dwmblocks-statuscmd-fork.diff: -------------------------------------------------------------------------------- 1 | diff --git a/dwmblocks.c b/dwmblocks.c 2 | index 7d7a564..e2c5dd0 100644 3 | --- a/dwmblocks.c 4 | +++ b/dwmblocks.c 5 | @@ -34,8 +34,6 @@ static int screen; 6 | static Window root; 7 | static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0}; 8 | static char statusstr[2][256]; 9 | -static char exportstring[CMDLENGTH + 22] = "export BLOCK_BUTTON=-;"; 10 | -static int button = 0; 11 | static int statusContinue = 1; 12 | static void (*writestatus) () = setroot; 13 | 14 | @@ -55,21 +53,8 @@ void getcmd(const Block *block, char *output) 15 | output[0] = block->signal; 16 | output++; 17 | } 18 | - char* cmd; 19 | - FILE *cmdf; 20 | - if (button) 21 | - { 22 | - cmd = strcat(exportstring, block->command); 23 | - cmd[20] = '0' + button; 24 | - button = 0; 25 | - cmdf = popen(cmd,"r"); 26 | - cmd[22] = '\0'; 27 | - } 28 | - else 29 | - { 30 | - cmd = block->command; 31 | - cmdf = popen(cmd,"r"); 32 | - } 33 | + char *cmd = block->command; 34 | + FILE *cmdf = popen(cmd,"r"); 35 | if (!cmdf) 36 | return; 37 | fgets(output, CMDLENGTH, cmdf); 38 | @@ -117,6 +102,7 @@ void setupsignals() 39 | sa.sa_sigaction = buttonhandler; 40 | sa.sa_flags = SA_SIGINFO; 41 | sigaction(SIGUSR1, &sa, NULL); 42 | + signal(SIGCHLD, SIG_IGN); 43 | 44 | } 45 | #endif 46 | @@ -179,9 +165,29 @@ void sighandler(int signum) 47 | 48 | void buttonhandler(int sig, siginfo_t *si, void *ucontext) 49 | { 50 | - button = si->si_value.sival_int & 0xff; 51 | - getsigcmds(si->si_value.sival_int >> 8); 52 | + int button = si->si_value.sival_int & 0xff; 53 | + sig = si->si_value.sival_int >> 8; 54 | + getsigcmds(sig); 55 | writestatus(); 56 | + if (fork() == 0) 57 | + { 58 | + static char exportstring[CMDLENGTH + 22] = "export BLOCK_BUTTON=-;"; 59 | + const Block *current; 60 | + int i; 61 | + for (i = 0; i < LENGTH(blocks); i++) 62 | + { 63 | + current = blocks + i; 64 | + if (current->signal == sig) 65 | + break; 66 | + } 67 | + char *cmd = strcat(exportstring, blocks[i].command); 68 | + cmd[20] = '0' + button; 69 | + char *command[] = { "/bin/sh", "-c", cmd, NULL }; 70 | + setsid(); 71 | + execvp(command[0], command); 72 | + exit(EXIT_SUCCESS); 73 | + cmd[22] = '\0'; 74 | + } 75 | } 76 | 77 | #endif 78 | -------------------------------------------------------------------------------- /patches/dwmblocks-statuscmd-signal.diff: -------------------------------------------------------------------------------- 1 | diff --git a/dwmblocks.c b/dwmblocks.c 2 | index 88bdfb0..7bd14df 100644 3 | --- a/dwmblocks.c 4 | +++ b/dwmblocks.c 5 | @@ -14,6 +14,7 @@ typedef struct { 6 | unsigned int signal; 7 | } Block; 8 | void sighandler(int num); 9 | +void buttonhandler(int sig, siginfo_t *si, void *ucontext); 10 | void replace(char *str, char old, char new); 11 | void getcmds(int time); 12 | #ifndef __OpenBSD__ 13 | @@ -34,6 +35,8 @@ static int screen; 14 | static Window root; 15 | static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0}; 16 | static char statusstr[2][256]; 17 | +static char exportstring[CMDLENGTH + 16] = "export BUTTON=-;"; 18 | +static int button = 0; 19 | static int statusContinue = 1; 20 | static void (*writestatus) () = setroot; 21 | 22 | @@ -48,16 +51,34 @@ void replace(char *str, char old, char new) 23 | //opens process *cmd and stores output in *output 24 | void getcmd(const Block *block, char *output) 25 | { 26 | + if (block->signal) 27 | + { 28 | + output[0] = block->signal; 29 | + output++; 30 | + } 31 | strcpy(output, block->icon); 32 | - char *cmd = block->command; 33 | - FILE *cmdf = popen(cmd,"r"); 34 | + char* cmd; 35 | + FILE *cmdf; 36 | + if (button) 37 | + { 38 | + cmd = strcat(exportstring, block->command); 39 | + cmd[14] = '0' + button; 40 | + button = 0; 41 | + cmdf = popen(cmd,"r"); 42 | + cmd[16] = '\0'; 43 | + } 44 | + else 45 | + { 46 | + cmd = block->command; 47 | + cmdf = popen(cmd,"r"); 48 | + } 49 | if (!cmdf) 50 | return; 51 | char c; 52 | int i = strlen(block->icon); 53 | fgets(output+i, CMDLENGTH-i, cmdf); 54 | i = strlen(output); 55 | - if (delim != '\0' && --i) 56 | + if (delim != '\0' && i) 57 | output[i++] = delim; 58 | output[i++] = '\0'; 59 | pclose(cmdf); 60 | @@ -88,11 +106,18 @@ void getsigcmds(int signal) 61 | 62 | void setupsignals() 63 | { 64 | + struct sigaction sa; 65 | for(int i = 0; i < LENGTH(blocks); i++) 66 | { 67 | if (blocks[i].signal > 0) 68 | + { 69 | signal(SIGRTMIN+blocks[i].signal, sighandler); 70 | + sigaddset(&sa.sa_mask, SIGRTMIN+blocks[i].signal); 71 | + } 72 | } 73 | + sa.sa_sigaction = buttonhandler; 74 | + sa.sa_flags = SA_SIGINFO; 75 | + sigaction(SIGUSR1, &sa, NULL); 76 | 77 | } 78 | #endif 79 | @@ -152,6 +177,14 @@ void sighandler(int signum) 80 | getsigcmds(signum-SIGRTMIN); 81 | writestatus(); 82 | } 83 | + 84 | +void buttonhandler(int sig, siginfo_t *si, void *ucontext) 85 | +{ 86 | + button = si->si_value.sival_int & 0xff; 87 | + getsigcmds(si->si_value.sival_int >> 8); 88 | + writestatus(); 89 | +} 90 | + 91 | #endif 92 | 93 | void termhandler(int signum) 94 | --------------------------------------------------------------------------------