first commit
This commit is contained in:
commit
e616646ed8
53
.gitignore
vendored
Normal file
53
.gitignore
vendored
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
# Prerequisites
|
||||||
|
*.d
|
||||||
|
|
||||||
|
# Object files
|
||||||
|
*.o
|
||||||
|
*.ko
|
||||||
|
*.obj
|
||||||
|
*.elf
|
||||||
|
|
||||||
|
# Linker output
|
||||||
|
*.ilk
|
||||||
|
*.map
|
||||||
|
*.exp
|
||||||
|
|
||||||
|
# Precompiled Headers
|
||||||
|
*.gch
|
||||||
|
*.pch
|
||||||
|
|
||||||
|
# Libraries
|
||||||
|
*.lib
|
||||||
|
*.a
|
||||||
|
*.la
|
||||||
|
*.lo
|
||||||
|
|
||||||
|
# Shared objects (inc. Windows DLLs)
|
||||||
|
*.dll
|
||||||
|
*.so
|
||||||
|
*.so.*
|
||||||
|
*.dylib
|
||||||
|
|
||||||
|
# Executables
|
||||||
|
*.exe
|
||||||
|
*.out
|
||||||
|
*.app
|
||||||
|
*.i*86
|
||||||
|
*.x86_64
|
||||||
|
*.hex
|
||||||
|
dwmblocks
|
||||||
|
|
||||||
|
# Debug files
|
||||||
|
*.dSYM/
|
||||||
|
*.su
|
||||||
|
*.idb
|
||||||
|
*.pdb
|
||||||
|
|
||||||
|
# Kernel Module Compile Results
|
||||||
|
*.mod*
|
||||||
|
*.cmd
|
||||||
|
.tmp_versions/
|
||||||
|
modules.order
|
||||||
|
Module.symvers
|
||||||
|
Mkfile.old
|
||||||
|
dkms.conf
|
3
FUNDING.yml
Normal file
3
FUNDING.yml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
github: lukesmithxyz
|
||||||
|
custom: ["https://lukesmith.xyz/donate", "https://paypal.me/lukemsmith", "https://lukesmith.xyz/crypto"]
|
||||||
|
patreon: lukesmith
|
339
LICENSE
Normal file
339
LICENSE
Normal file
@ -0,0 +1,339 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
License is intended to guarantee your freedom to share and change free
|
||||||
|
software--to make sure the software is free for all its users. This
|
||||||
|
General Public License applies to most of the Free Software
|
||||||
|
Foundation's software and to any other program whose authors commit to
|
||||||
|
using it. (Some other Free Software Foundation software is covered by
|
||||||
|
the GNU Lesser General Public License instead.) You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if you
|
||||||
|
distribute copies of the software, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must give the recipients all the rights that
|
||||||
|
you have. You must make sure that they, too, receive or can get the
|
||||||
|
source code. And you must show them these terms so they know their
|
||||||
|
rights.
|
||||||
|
|
||||||
|
We protect your rights with two steps: (1) copyright the software, and
|
||||||
|
(2) offer you this license which gives you legal permission to copy,
|
||||||
|
distribute and/or modify the software.
|
||||||
|
|
||||||
|
Also, for each author's protection and ours, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
software. If the software is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original, so
|
||||||
|
that any problems introduced by others will not reflect on the original
|
||||||
|
authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that redistributors of a free
|
||||||
|
program will individually obtain patent licenses, in effect making the
|
||||||
|
program proprietary. To prevent this, we have made it clear that any
|
||||||
|
patent must be licensed for everyone's free use or not licensed at all.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License applies to any program or other work which contains
|
||||||
|
a notice placed by the copyright holder saying it may be distributed
|
||||||
|
under the terms of this General Public License. The "Program", below,
|
||||||
|
refers to any such program or work, and a "work based on the Program"
|
||||||
|
means either the Program or any derivative work under copyright law:
|
||||||
|
that is to say, a work containing the Program or a portion of it,
|
||||||
|
either verbatim or with modifications and/or translated into another
|
||||||
|
language. (Hereinafter, translation is included without limitation in
|
||||||
|
the term "modification".) Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running the Program is not restricted, and the output from the Program
|
||||||
|
is covered only if its contents constitute a work based on the
|
||||||
|
Program (independent of having been made by running the Program).
|
||||||
|
Whether that is true depends on what the Program does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Program's
|
||||||
|
source code as you receive it, in any medium, provided that you
|
||||||
|
conspicuously and appropriately publish on each copy an appropriate
|
||||||
|
copyright notice and disclaimer of warranty; keep intact all the
|
||||||
|
notices that refer to this License and to the absence of any warranty;
|
||||||
|
and give any other recipients of the Program a copy of this License
|
||||||
|
along with the Program.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy, and
|
||||||
|
you may at your option offer warranty protection in exchange for a fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Program or any portion
|
||||||
|
of it, thus forming a work based on the Program, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) You must cause the modified files to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
b) You must cause any work that you distribute or publish, that in
|
||||||
|
whole or in part contains or is derived from the Program or any
|
||||||
|
part thereof, to be licensed as a whole at no charge to all third
|
||||||
|
parties under the terms of this License.
|
||||||
|
|
||||||
|
c) If the modified program normally reads commands interactively
|
||||||
|
when run, you must cause it, when started running for such
|
||||||
|
interactive use in the most ordinary way, to print or display an
|
||||||
|
announcement including an appropriate copyright notice and a
|
||||||
|
notice that there is no warranty (or else, saying that you provide
|
||||||
|
a warranty) and that users may redistribute the program under
|
||||||
|
these conditions, and telling the user how to view a copy of this
|
||||||
|
License. (Exception: if the Program itself is interactive but
|
||||||
|
does not normally print such an announcement, your work based on
|
||||||
|
the Program is not required to print an announcement.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Program,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Program, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Program.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Program
|
||||||
|
with the Program (or with a work based on the Program) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may copy and distribute the Program (or a work based on it,
|
||||||
|
under Section 2) in object code or executable form under the terms of
|
||||||
|
Sections 1 and 2 above provided that you also do one of the following:
|
||||||
|
|
||||||
|
a) Accompany it with the complete corresponding machine-readable
|
||||||
|
source code, which must be distributed under the terms of Sections
|
||||||
|
1 and 2 above on a medium customarily used for software interchange; or,
|
||||||
|
|
||||||
|
b) Accompany it with a written offer, valid for at least three
|
||||||
|
years, to give any third party, for a charge no more than your
|
||||||
|
cost of physically performing source distribution, a complete
|
||||||
|
machine-readable copy of the corresponding source code, to be
|
||||||
|
distributed under the terms of Sections 1 and 2 above on a medium
|
||||||
|
customarily used for software interchange; or,
|
||||||
|
|
||||||
|
c) Accompany it with the information you received as to the offer
|
||||||
|
to distribute corresponding source code. (This alternative is
|
||||||
|
allowed only for noncommercial distribution and only if you
|
||||||
|
received the program in object code or executable form with such
|
||||||
|
an offer, in accord with Subsection b above.)
|
||||||
|
|
||||||
|
The source code for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For an executable work, complete source
|
||||||
|
code means all the source code for all modules it contains, plus any
|
||||||
|
associated interface definition files, plus the scripts used to
|
||||||
|
control compilation and installation of the executable. However, as a
|
||||||
|
special exception, the source code distributed need not include
|
||||||
|
anything that is normally distributed (in either source or binary
|
||||||
|
form) with the major components (compiler, kernel, and so on) of the
|
||||||
|
operating system on which the executable runs, unless that component
|
||||||
|
itself accompanies the executable.
|
||||||
|
|
||||||
|
If distribution of executable or object code is made by offering
|
||||||
|
access to copy from a designated place, then offering equivalent
|
||||||
|
access to copy the source code from the same place counts as
|
||||||
|
distribution of the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
|
except as expressly provided under this License. Any attempt
|
||||||
|
otherwise to copy, modify, sublicense or distribute the Program is
|
||||||
|
void, and will automatically terminate your rights under this License.
|
||||||
|
However, parties who have received copies, or rights, from you under
|
||||||
|
this License will not have their licenses terminated so long as such
|
||||||
|
parties remain in full compliance.
|
||||||
|
|
||||||
|
5. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Program or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Program (or any work based on the
|
||||||
|
Program), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Program or works based on it.
|
||||||
|
|
||||||
|
6. Each time you redistribute the Program (or any work based on the
|
||||||
|
Program), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute or modify the Program subject to
|
||||||
|
these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
7. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Program at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Program by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under
|
||||||
|
any particular circumstance, the balance of the section is intended to
|
||||||
|
apply and the section as a whole is intended to apply in other
|
||||||
|
circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system, which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Program under this License
|
||||||
|
may add an explicit geographical distribution limitation excluding
|
||||||
|
those countries, so that distribution is permitted only in or among
|
||||||
|
countries not thus excluded. In such case, this License incorporates
|
||||||
|
the limitation as if written in the body of this License.
|
||||||
|
|
||||||
|
9. The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies a version number of this License which applies to it and "any
|
||||||
|
later version", you have the option of following the terms and conditions
|
||||||
|
either of that version or of any later version published by the Free
|
||||||
|
Software Foundation. If the Program does not specify a version number of
|
||||||
|
this License, you may choose any version ever published by the Free Software
|
||||||
|
Foundation.
|
||||||
|
|
||||||
|
10. If you wish to incorporate parts of the Program into other free
|
||||||
|
programs whose distribution conditions are different, write to the author
|
||||||
|
to ask for permission. For software which is copyrighted by the Free
|
||||||
|
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||||
|
make exceptions for this. Our decision will be guided by the two goals
|
||||||
|
of preserving the free status of all derivatives of our free software and
|
||||||
|
of promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||||
|
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||||
|
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||||
|
REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
|
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||||
|
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||||
|
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||||
|
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||||
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program is interactive, make it output a short notice like this
|
||||||
|
when it starts in an interactive mode:
|
||||||
|
|
||||||
|
Gnomovision version 69, Copyright (C) year name of author
|
||||||
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, the commands you use may
|
||||||
|
be called something other than `show w' and `show c'; they could even be
|
||||||
|
mouse-clicks or menu items--whatever suits your program.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
|
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1989
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
This General Public License does not permit incorporating your program into
|
||||||
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
|
consider it more useful to permit linking proprietary applications with the
|
||||||
|
library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License.
|
19
Makefile
Normal file
19
Makefile
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
.POSIX:
|
||||||
|
|
||||||
|
PREFIX = /usr/local
|
||||||
|
CC = gcc
|
||||||
|
|
||||||
|
dwmblocks: dwmblocks.o
|
||||||
|
$(CC) dwmblocks.o -lX11 -o dwmblocks
|
||||||
|
dwmblocks.o: dwmblocks.c config.h
|
||||||
|
$(CC) -c dwmblocks.c
|
||||||
|
clean:
|
||||||
|
rm -f *.o *.gch dwmblocks
|
||||||
|
install: dwmblocks
|
||||||
|
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
||||||
|
cp -f dwmblocks $(DESTDIR)$(PREFIX)/bin
|
||||||
|
chmod 755 $(DESTDIR)$(PREFIX)/bin/dwmblocks
|
||||||
|
uninstall:
|
||||||
|
rm -f $(DESTDIR)$(PREFIX)/bin/dwmblocks
|
||||||
|
|
||||||
|
.PHONY: clean install uninstall
|
46
README.md
Normal file
46
README.md
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
# THANK YOU LUKE FOR YOUR HARD WORK
|
||||||
|
|
||||||
|
# dwmblocks
|
||||||
|
|
||||||
|
Modular status bar for dwm written in c.
|
||||||
|
|
||||||
|
# Modifying blocks
|
||||||
|
|
||||||
|
The statusbar is made from text output from commandline programs. Blocks are
|
||||||
|
added and removed by editing the config.h file.
|
||||||
|
|
||||||
|
# Luke's build
|
||||||
|
|
||||||
|
I have dwmblocks read my preexisting scripts
|
||||||
|
[here in my dotfiles repo](https://github.com/LukeSmithxyz/voidrice/tree/master/.local/bin/statusbar).
|
||||||
|
So if you want my build out of the box, download those and put them in your
|
||||||
|
`$PATH`. I do this to avoid redundancy in LARBS, both i3 and dwm use the same
|
||||||
|
statusbar scripts.
|
||||||
|
|
||||||
|
# Signaling changes
|
||||||
|
|
||||||
|
Most statusbars constantly rerun every script every several seconds to update.
|
||||||
|
This is an option here, but a superior choice is giving your module a signal
|
||||||
|
that you can signal to it to update on a relevant event, rather than having it
|
||||||
|
rerun idly.
|
||||||
|
|
||||||
|
For example, the audio module has the update signal 10 by default. Thus,
|
||||||
|
running `pkill -RTMIN+10 dwmblocks` will update it.
|
||||||
|
|
||||||
|
You can also run `kill -44 $(pidof dwmblocks)` which will have the same effect,
|
||||||
|
but is faster. Just add 34 to your typical signal number.
|
||||||
|
|
||||||
|
My volume module *never* updates on its own, instead I have this command run
|
||||||
|
along side my volume shortcuts in dwm to only update it when relevant.
|
||||||
|
|
||||||
|
Note that all modules must have different signal numbers.
|
||||||
|
|
||||||
|
# Clickable modules
|
||||||
|
|
||||||
|
Like i3blocks, this build allows you to build in additional actions into your
|
||||||
|
scripts in response to click events. See the above linked scripts for examples
|
||||||
|
of this using the `$BLOCK_BUTTON` variable.
|
||||||
|
|
||||||
|
For this feature to work, you need the appropriate patch in dwm as well. See
|
||||||
|
[here](https://dwm.suckless.org/patches/statuscmd/).
|
||||||
|
Credit for those patches goes to Daniel Bylinka (daniel.bylinka@gmail.com).
|
22
config.h
Normal file
22
config.h
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
//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*/
|
||||||
|
{"", "sb-music", 0, 11},
|
||||||
|
{"", "sb-temp", 60, 14},
|
||||||
|
{"", "sb-weather", 18000, 5},
|
||||||
|
{"", "sb-mail", 180, 12},
|
||||||
|
{"", "sb-cpu", 10, 13},
|
||||||
|
{"", "sb-mem", 10, 20},
|
||||||
|
{"", "sb-network", 5, 4},
|
||||||
|
{"", "sb-battery", 5, 3},
|
||||||
|
{"", "sb-volume", 0, 10},
|
||||||
|
{"", "sb-clock", 30, 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 & }
|
241
dwmblocks.c
Normal file
241
dwmblocks.c
Normal file
@ -0,0 +1,241 @@
|
|||||||
|
#include<stdlib.h>
|
||||||
|
#include<stdio.h>
|
||||||
|
#include<string.h>
|
||||||
|
#include<unistd.h>
|
||||||
|
#include<signal.h>
|
||||||
|
#include<X11/Xlib.h>
|
||||||
|
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
|
||||||
|
#define CMDLENGTH 50
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
char* icon;
|
||||||
|
char* command;
|
||||||
|
unsigned int interval;
|
||||||
|
unsigned int signal;
|
||||||
|
} Block;
|
||||||
|
void sighandler(int num);
|
||||||
|
void buttonhandler(int sig, siginfo_t *si, void *ucontext);
|
||||||
|
void replace(char *str, char old, char new);
|
||||||
|
void remove_all(char *str, char to_remove);
|
||||||
|
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();
|
||||||
|
void termhandler(int signum);
|
||||||
|
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
static Display *dpy;
|
||||||
|
static int screen;
|
||||||
|
static Window root;
|
||||||
|
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
|
||||||
|
static char statusstr[2][256];
|
||||||
|
static int statusContinue = 1;
|
||||||
|
static void (*writestatus) () = setroot;
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
void remove_all(char *str, char to_remove) {
|
||||||
|
char *read = str;
|
||||||
|
char *write = str;
|
||||||
|
while (*read) {
|
||||||
|
if (*read == to_remove) {
|
||||||
|
read++;
|
||||||
|
*write = *read;
|
||||||
|
}
|
||||||
|
read++;
|
||||||
|
write++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//opens process *cmd and stores output in *output
|
||||||
|
void getcmd(const Block *block, char *output)
|
||||||
|
{
|
||||||
|
if (block->signal)
|
||||||
|
{
|
||||||
|
output[0] = block->signal;
|
||||||
|
output++;
|
||||||
|
}
|
||||||
|
strcpy(output, block->icon);
|
||||||
|
char *cmd = block->command;
|
||||||
|
FILE *cmdf = popen(cmd,"r");
|
||||||
|
if (!cmdf)
|
||||||
|
return;
|
||||||
|
char c;
|
||||||
|
int i = strlen(block->icon);
|
||||||
|
fgets(output+i, CMDLENGTH-(strlen(delim)+1), cmdf);
|
||||||
|
remove_all(output, '\n');
|
||||||
|
i = strlen(output);
|
||||||
|
if ((i > 0 && block != &blocks[LENGTH(blocks) - 1]))
|
||||||
|
strcat(output, delim);
|
||||||
|
i+=strlen(delim);
|
||||||
|
output[i++] = '\0';
|
||||||
|
pclose(cmdf);
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
for (int i = 0; i < LENGTH(blocks); i++)
|
||||||
|
{
|
||||||
|
current = blocks + i;
|
||||||
|
if (current->signal == signal)
|
||||||
|
getcmd(current,statusbar[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupsignals()
|
||||||
|
{
|
||||||
|
struct sigaction sa;
|
||||||
|
|
||||||
|
for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
|
||||||
|
signal(i, SIG_IGN);
|
||||||
|
|
||||||
|
for(int i = 0; i < LENGTH(blocks); i++)
|
||||||
|
{
|
||||||
|
if (blocks[i].signal > 0)
|
||||||
|
{
|
||||||
|
signal(SIGRTMIN+blocks[i].signal, sighandler);
|
||||||
|
sigaddset(&sa.sa_mask, SIGRTMIN+blocks[i].signal);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sa.sa_sigaction = buttonhandler;
|
||||||
|
sa.sa_flags = SA_SIGINFO;
|
||||||
|
sigaction(SIGUSR1, &sa, NULL);
|
||||||
|
struct sigaction sigchld_action = {
|
||||||
|
.sa_handler = SIG_DFL,
|
||||||
|
.sa_flags = SA_NOCLDWAIT
|
||||||
|
};
|
||||||
|
sigaction(SIGCHLD, &sigchld_action, NULL);
|
||||||
|
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int getstatus(char *str, char *last)
|
||||||
|
{
|
||||||
|
strcpy(last, str);
|
||||||
|
str[0] = '\0';
|
||||||
|
for(int i = 0; i < LENGTH(blocks); i++) {
|
||||||
|
strcat(str, statusbar[i]);
|
||||||
|
if (i == LENGTH(blocks) - 1)
|
||||||
|
strcat(str, " ");
|
||||||
|
}
|
||||||
|
str[strlen(str)-1] = '\0';
|
||||||
|
return strcmp(str, last);//0 if they are the same
|
||||||
|
}
|
||||||
|
|
||||||
|
void setroot()
|
||||||
|
{
|
||||||
|
if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
|
||||||
|
return;
|
||||||
|
Display *d = XOpenDisplay(NULL);
|
||||||
|
if (d) {
|
||||||
|
dpy = d;
|
||||||
|
}
|
||||||
|
screen = DefaultScreen(dpy);
|
||||||
|
root = RootWindow(dpy, screen);
|
||||||
|
XStoreName(dpy, root, statusstr[0]);
|
||||||
|
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()
|
||||||
|
{
|
||||||
|
#ifndef __OpenBSD__
|
||||||
|
setupsignals();
|
||||||
|
#endif
|
||||||
|
int i = 0;
|
||||||
|
getcmds(-1);
|
||||||
|
while(statusContinue)
|
||||||
|
{
|
||||||
|
getcmds(i);
|
||||||
|
writestatus();
|
||||||
|
sleep(1.0);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef __OpenBSD__
|
||||||
|
void sighandler(int signum)
|
||||||
|
{
|
||||||
|
getsigcmds(signum-SIGRTMIN);
|
||||||
|
writestatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
void buttonhandler(int sig, siginfo_t *si, void *ucontext)
|
||||||
|
{
|
||||||
|
char button[2] = {'0' + si->si_value.sival_int & 0xff, '\0'};
|
||||||
|
pid_t process_id = getpid();
|
||||||
|
sig = si->si_value.sival_int >> 8;
|
||||||
|
if (fork() == 0)
|
||||||
|
{
|
||||||
|
const Block *current;
|
||||||
|
for (int i = 0; i < LENGTH(blocks); i++)
|
||||||
|
{
|
||||||
|
current = blocks + i;
|
||||||
|
if (current->signal == sig)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
char shcmd[1024];
|
||||||
|
sprintf(shcmd,"%s && kill -%d %d",current->command, current->signal+34,process_id);
|
||||||
|
char *command[] = { "/bin/sh", "-c", shcmd, NULL };
|
||||||
|
setenv("BLOCK_BUTTON", button, 1);
|
||||||
|
setsid();
|
||||||
|
execvp(command[0], command);
|
||||||
|
exit(EXIT_SUCCESS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void termhandler(int signum)
|
||||||
|
{
|
||||||
|
statusContinue = 0;
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
{
|
||||||
|
if (!strcmp("-d",argv[i]))
|
||||||
|
delim = argv[++i];
|
||||||
|
else if(!strcmp("-p",argv[i]))
|
||||||
|
writestatus = pstdout;
|
||||||
|
}
|
||||||
|
signal(SIGTERM, termhandler);
|
||||||
|
signal(SIGINT, termhandler);
|
||||||
|
statusloop();
|
||||||
|
}
|
77
patches/dwmblocks-statuscmd-fork.diff
Normal file
77
patches/dwmblocks-statuscmd-fork.diff
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
diff --git a/dwmblocks.c b/dwmblocks.c
|
||||||
|
index 7d7a564..e2c5dd0 100644
|
||||||
|
--- a/dwmblocks.c
|
||||||
|
+++ b/dwmblocks.c
|
||||||
|
@@ -34,8 +34,6 @@ static int screen;
|
||||||
|
static Window root;
|
||||||
|
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
|
||||||
|
static char statusstr[2][256];
|
||||||
|
-static char exportstring[CMDLENGTH + 22] = "export BLOCK_BUTTON=-;";
|
||||||
|
-static int button = 0;
|
||||||
|
static int statusContinue = 1;
|
||||||
|
static void (*writestatus) () = setroot;
|
||||||
|
|
||||||
|
@@ -55,21 +53,8 @@ void getcmd(const Block *block, char *output)
|
||||||
|
output[0] = block->signal;
|
||||||
|
output++;
|
||||||
|
}
|
||||||
|
- char* cmd;
|
||||||
|
- FILE *cmdf;
|
||||||
|
- if (button)
|
||||||
|
- {
|
||||||
|
- cmd = strcat(exportstring, block->command);
|
||||||
|
- cmd[20] = '0' + button;
|
||||||
|
- button = 0;
|
||||||
|
- cmdf = popen(cmd,"r");
|
||||||
|
- cmd[22] = '\0';
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- cmd = block->command;
|
||||||
|
- cmdf = popen(cmd,"r");
|
||||||
|
- }
|
||||||
|
+ char *cmd = block->command;
|
||||||
|
+ FILE *cmdf = popen(cmd,"r");
|
||||||
|
if (!cmdf)
|
||||||
|
return;
|
||||||
|
fgets(output, CMDLENGTH, cmdf);
|
||||||
|
@@ -117,6 +102,7 @@ void setupsignals()
|
||||||
|
sa.sa_sigaction = buttonhandler;
|
||||||
|
sa.sa_flags = SA_SIGINFO;
|
||||||
|
sigaction(SIGUSR1, &sa, NULL);
|
||||||
|
+ signal(SIGCHLD, SIG_IGN);
|
||||||
|
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -179,9 +165,29 @@ void sighandler(int signum)
|
||||||
|
|
||||||
|
void buttonhandler(int sig, siginfo_t *si, void *ucontext)
|
||||||
|
{
|
||||||
|
- button = si->si_value.sival_int & 0xff;
|
||||||
|
- getsigcmds(si->si_value.sival_int >> 8);
|
||||||
|
+ int button = si->si_value.sival_int & 0xff;
|
||||||
|
+ sig = si->si_value.sival_int >> 8;
|
||||||
|
+ getsigcmds(sig);
|
||||||
|
writestatus();
|
||||||
|
+ if (fork() == 0)
|
||||||
|
+ {
|
||||||
|
+ static char exportstring[CMDLENGTH + 22] = "export BLOCK_BUTTON=-;";
|
||||||
|
+ const Block *current;
|
||||||
|
+ int i;
|
||||||
|
+ for (i = 0; i < LENGTH(blocks); i++)
|
||||||
|
+ {
|
||||||
|
+ current = blocks + i;
|
||||||
|
+ if (current->signal == sig)
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ char *cmd = strcat(exportstring, blocks[i].command);
|
||||||
|
+ cmd[20] = '0' + button;
|
||||||
|
+ char *command[] = { "/bin/sh", "-c", cmd, NULL };
|
||||||
|
+ setsid();
|
||||||
|
+ execvp(command[0], command);
|
||||||
|
+ exit(EXIT_SUCCESS);
|
||||||
|
+ cmd[22] = '\0';
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
93
patches/dwmblocks-statuscmd-signal.diff
Normal file
93
patches/dwmblocks-statuscmd-signal.diff
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
diff --git a/dwmblocks.c b/dwmblocks.c
|
||||||
|
index 88bdfb0..7bd14df 100644
|
||||||
|
--- a/dwmblocks.c
|
||||||
|
+++ b/dwmblocks.c
|
||||||
|
@@ -14,6 +14,7 @@ typedef struct {
|
||||||
|
unsigned int signal;
|
||||||
|
} Block;
|
||||||
|
void sighandler(int num);
|
||||||
|
+void buttonhandler(int sig, siginfo_t *si, void *ucontext);
|
||||||
|
void replace(char *str, char old, char new);
|
||||||
|
void getcmds(int time);
|
||||||
|
#ifndef __OpenBSD__
|
||||||
|
@@ -34,6 +35,8 @@ static int screen;
|
||||||
|
static Window root;
|
||||||
|
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
|
||||||
|
static char statusstr[2][256];
|
||||||
|
+static char exportstring[CMDLENGTH + 16] = "export BUTTON=-;";
|
||||||
|
+static int button = 0;
|
||||||
|
static int statusContinue = 1;
|
||||||
|
static void (*writestatus) () = setroot;
|
||||||
|
|
||||||
|
@@ -48,16 +51,34 @@ void replace(char *str, char old, char new)
|
||||||
|
//opens process *cmd and stores output in *output
|
||||||
|
void getcmd(const Block *block, char *output)
|
||||||
|
{
|
||||||
|
+ if (block->signal)
|
||||||
|
+ {
|
||||||
|
+ output[0] = block->signal;
|
||||||
|
+ output++;
|
||||||
|
+ }
|
||||||
|
strcpy(output, block->icon);
|
||||||
|
- char *cmd = block->command;
|
||||||
|
- FILE *cmdf = popen(cmd,"r");
|
||||||
|
+ char* cmd;
|
||||||
|
+ FILE *cmdf;
|
||||||
|
+ if (button)
|
||||||
|
+ {
|
||||||
|
+ cmd = strcat(exportstring, block->command);
|
||||||
|
+ cmd[14] = '0' + button;
|
||||||
|
+ button = 0;
|
||||||
|
+ cmdf = popen(cmd,"r");
|
||||||
|
+ cmd[16] = '\0';
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ cmd = block->command;
|
||||||
|
+ cmdf = popen(cmd,"r");
|
||||||
|
+ }
|
||||||
|
if (!cmdf)
|
||||||
|
return;
|
||||||
|
char c;
|
||||||
|
int i = strlen(block->icon);
|
||||||
|
fgets(output+i, CMDLENGTH-i, cmdf);
|
||||||
|
i = strlen(output);
|
||||||
|
- if (delim != '\0' && --i)
|
||||||
|
+ if (delim != '\0' && i)
|
||||||
|
output[i++] = delim;
|
||||||
|
output[i++] = '\0';
|
||||||
|
pclose(cmdf);
|
||||||
|
@@ -88,11 +106,18 @@ void getsigcmds(int signal)
|
||||||
|
|
||||||
|
void setupsignals()
|
||||||
|
{
|
||||||
|
+ struct sigaction sa;
|
||||||
|
for(int i = 0; i < LENGTH(blocks); i++)
|
||||||
|
{
|
||||||
|
if (blocks[i].signal > 0)
|
||||||
|
+ {
|
||||||
|
signal(SIGRTMIN+blocks[i].signal, sighandler);
|
||||||
|
+ sigaddset(&sa.sa_mask, SIGRTMIN+blocks[i].signal);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
+ sa.sa_sigaction = buttonhandler;
|
||||||
|
+ sa.sa_flags = SA_SIGINFO;
|
||||||
|
+ sigaction(SIGUSR1, &sa, NULL);
|
||||||
|
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -152,6 +177,14 @@ void sighandler(int signum)
|
||||||
|
getsigcmds(signum-SIGRTMIN);
|
||||||
|
writestatus();
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void buttonhandler(int sig, siginfo_t *si, void *ucontext)
|
||||||
|
+{
|
||||||
|
+ button = si->si_value.sival_int & 0xff;
|
||||||
|
+ getsigcmds(si->si_value.sival_int >> 8);
|
||||||
|
+ writestatus();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void termhandler(int signum)
|
Loading…
Reference in New Issue
Block a user