diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-14 17:07:31 +0100 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-14 17:07:52 +0100 |
commit | 45b959f601d103c9c308807b55f62f1859556b59 (patch) | |
tree | 3bf415ea88a41ed666a80850b909775d4af6831f | |
parent | Merge pull request #313 from mikkeloscar/bar-confing-subcommands (diff) | |
download | sway-45b959f601d103c9c308807b55f62f1859556b59.tar.gz sway-45b959f601d103c9c308807b55f62f1859556b59.tar.zst sway-45b959f601d103c9c308807b55f62f1859556b59.zip |
Move numlen(1) to sway/util.c
-rw-r--r-- | include/util.h | 5 | ||||
-rw-r--r-- | sway/util.c | 10 | ||||
-rw-r--r-- | swaygrab/main.c | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/include/util.h b/include/util.h index 8e65e6d6..9cb861dd 100644 --- a/include/util.h +++ b/include/util.h | |||
@@ -6,4 +6,9 @@ | |||
6 | */ | 6 | */ |
7 | int wrap(int i, int max); | 7 | int wrap(int i, int max); |
8 | 8 | ||
9 | /** | ||
10 | * Count number of digits in int | ||
11 | */ | ||
12 | int numlen(int n); | ||
13 | |||
9 | #endif | 14 | #endif |
diff --git a/sway/util.c b/sway/util.c index 9a59ddf9..ed6d033f 100644 --- a/sway/util.c +++ b/sway/util.c | |||
@@ -3,3 +3,13 @@ | |||
3 | int wrap(int i, int max) { | 3 | int wrap(int i, int max) { |
4 | return ((i % max) + max) % max; | 4 | return ((i % max) + max) % max; |
5 | } | 5 | } |
6 | |||
7 | int numlen(int n) { | ||
8 | if (n >= 1000000) return 7; | ||
9 | if (n >= 100000) return 6; | ||
10 | if (n >= 10000) return 5; | ||
11 | if (n >= 1000) return 4; | ||
12 | if (n >= 100) return 3; | ||
13 | if (n >= 10) return 2; | ||
14 | return 1; | ||
15 | } | ||
diff --git a/swaygrab/main.c b/swaygrab/main.c index 681a6da4..2c6cf2dd 100644 --- a/swaygrab/main.c +++ b/swaygrab/main.c | |||
@@ -8,21 +8,12 @@ | |||
8 | #include <time.h> | 8 | #include <time.h> |
9 | #include "log.h" | 9 | #include "log.h" |
10 | #include "ipc-client.h" | 10 | #include "ipc-client.h" |
11 | #include "util.h" | ||
11 | 12 | ||
12 | void sway_terminate(void) { | 13 | void sway_terminate(void) { |
13 | exit(EXIT_FAILURE); | 14 | exit(EXIT_FAILURE); |
14 | } | 15 | } |
15 | 16 | ||
16 | int numlen(int n) { | ||
17 | if (n >= 1000000) return 7; | ||
18 | if (n >= 100000) return 6; | ||
19 | if (n >= 10000) return 5; | ||
20 | if (n >= 1000) return 4; | ||
21 | if (n >= 100) return 3; | ||
22 | if (n >= 10) return 2; | ||
23 | return 1; | ||
24 | } | ||
25 | |||
26 | void grab_and_apply_magick(const char *file, const char *output, | 17 | void grab_and_apply_magick(const char *file, const char *output, |
27 | int socketfd, int raw) { | 18 | int socketfd, int raw) { |
28 | uint32_t len = strlen(output); | 19 | uint32_t len = strlen(output); |