diff options
| author | June McEnroe <june@causal.agency> | 2018-08-20 23:24:39 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2018-08-20 23:24:39 -0400 |
| commit | 911274a7a166585dc4dcf052c0504eabb33df76e (patch) | |
| tree | 73608fe1ab57647a97e9b05ccfa1e21af3fb12a3 /bin | |
| parent | Generate scheme.h (diff) | |
| download | src-911274a7a166585dc4dcf052c0504eabb33df76e.tar.gz src-911274a7a166585dc4dcf052c0504eabb33df76e.zip | |
Use scheme.h in fbatt and fbclock
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Makefile | 2 | ||||
| -rw-r--r-- | bin/fbatt.c | 12 | ||||
| -rw-r--r-- | bin/fbclock.c | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/bin/Makefile b/bin/Makefile index 5ccf614a..6e92483d 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -21,6 +21,8 @@ tags: *.c scheme.h: scheme ./scheme -c > scheme.h +fbatt.o fbclock.o: scheme.h + atch: dtch ln -f dtch atch diff --git a/bin/fbatt.c b/bin/fbatt.c index 3486ba59..a8256d22 100644 --- a/bin/fbatt.c +++ b/bin/fbatt.c @@ -27,17 +27,19 @@ #include <sysexits.h> #include <unistd.h> +#include "scheme.h" + static const char *CLASS = "/sys/class/power_supply"; static const uint32_t RIGHT = 5 * 8 + 1; // fbclock width. static const uint32_t WIDTH = 8; static const uint32_t HEIGHT = 16; -static const uint32_t BG = 0x161510; -static const uint32_t BORDER = 0x7A7155; -static const uint32_t GRAY = 0x4C4635; -static const uint32_t YELLOW = 0xA37720; -static const uint32_t RED = 0xA32810; +static const uint32_t BG = SCHEME.darkBlack; +static const uint32_t BORDER = SCHEME.darkWhite; +static const uint32_t GRAY = SCHEME.lightBlack; +static const uint32_t YELLOW = SCHEME.darkYellow; +static const uint32_t RED = SCHEME.darkRed; int main() { int error; diff --git a/bin/fbclock.c b/bin/fbclock.c index 699ce969..1554a95e 100644 --- a/bin/fbclock.c +++ b/bin/fbclock.c @@ -28,6 +28,8 @@ #include <unistd.h> #include <zlib.h> +#include "scheme.h" + static const uint32_t PSF2_MAGIC = 0x864AB572; struct Psf2Header { uint32_t magic; @@ -40,8 +42,8 @@ struct Psf2Header { uint32_t glyphWidth; }; -static const uint32_t BG = 0x161510; -static const uint32_t FG = 0x7A7155; +static const uint32_t BG = SCHEME.darkBlack; +static const uint32_t FG = SCHEME.darkWhite; int main() { size_t len; |