summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-04-13 16:12:31 -0400
committerJune McEnroe <june@causal.agency>2018-04-13 16:12:31 -0400
commit46d2093274157528fc40153e7189d40e3c441a9a (patch)
tree0711897416b3c8902d5f18c6521aaec2fdb16c09
parentCombine brot rotate and scale (diff)
downloadsrc-46d2093274157528fc40153e7189d40e3c441a9a.tar.gz
src-46d2093274157528fc40153e7189d40e3c441a9a.zip
Parse brot options
Diffstat (limited to '')
-rw-r--r--bin/brot.c53
1 files changed, 36 insertions, 17 deletions
diff --git a/bin/brot.c b/bin/brot.c
index c8922465..ec0ac27f 100644
--- a/bin/brot.c
+++ b/bin/brot.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sysexits.h>
+#include <unistd.h>
 
 #include "gfx/gfx.h"
 
@@ -61,25 +62,24 @@ void draw(uint32_t *buf, size_t width, size_t height) {
     }
 }
 
-static uint32_t depthDelta = 1;
-static double translateDelta = 0.01;
-static double rotateDelta = 0.01;
-static double scaleFactor = 1.1;
+static double translateStep = 1.0 / 128.0;
+static double rotateStep = 1.0 / 128.0;
+static double scaleStep = 1.0 / 32.0;
 
 bool input(char in) {
     const double PI = acos(-1.0);
     switch (in) {
         case 'q': return false;
-        case '.': depth += depthDelta; break;
-        case ',': if (depth > depthDelta) depth -= depthDelta; break;
-        case 'l': translate += translateDelta * transform; break;
-        case 'h': translate -= translateDelta * transform; break;
-        case 'j': translate += translateDelta * I * transform; break;
-        case 'k': translate -= translateDelta * I * transform; break;
-        case 'u': transform *= cexp(rotateDelta * PI * I); break;
-        case 'i': transform /= cexp(rotateDelta * PI * I); break;
-        case '+': transform /= scaleFactor; break;
-        case '-': transform *= scaleFactor; break;
+        break; case '.': depth++;
+        break; case ',': if (depth) depth--;
+        break; case 'l': translate += translateStep * transform;
+        break; case 'h': translate -= translateStep * transform;
+        break; case 'j': translate += translateStep * I * transform;
+        break; case 'k': translate -= translateStep * I * transform;
+        break; case 'u': transform *= cexp(rotateStep * PI * I);
+        break; case 'i': transform /= cexp(rotateStep * PI * I);
+        break; case '+': transform *= 1.0 - scaleStep;
+        break; case '-': transform /= 1.0 - scaleStep;
     }
     return true;
 }
@@ -88,7 +88,7 @@ const char *status(void) {
     static char buf[256];
     snprintf(
         buf, sizeof(buf),
-        "-i %u -t %g+%gi -f %g+%gi",
+        "brot -i %u -t %g%+gi -f %g%+gi",
         depth,
         creal(translate), cimag(translate),
         creal(transform), cimag(transform)
@@ -96,8 +96,27 @@ const char *status(void) {
     return buf;
 }
 
+static double complex parseComplex(const char *str) {
+    double real = 0.0, imag = 0.0;
+    real = strtod(str, (char **)&str);
+    if (str[0] == 'i') {
+        imag = real;
+        real = 0.0;
+    } else if (str[0]) {
+        imag = strtod(str, NULL);
+    }
+    return real + imag * I;
+}
+
 int init(int argc, char *argv[]) {
-    (void)argc;
-    (void)argv;
+    int opt;
+    while (0 < (opt = getopt(argc, argv, "f:i:t:"))) {
+        switch (opt) {
+            case 'f': transform = parseComplex(optarg); break;
+            case 'i': depth = strtoul(optarg, NULL, 0); break;
+            case 't': translate = parseComplex(optarg); break;
+            default: return EX_USAGE;
+        }
+    }
     return EX_OK;
 }
rs, the compiler will initialize all other fields to their default value. This will be needed when we add the extra_args field in the next patch. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-12html: remove redundant htmlfd variableJohn Keeping This is never changed from STDOUT_FILENO, so just use that value directly. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-12tests: add Valgrind supportJohn Keeping Now running tests with the "--valgrind" option will run cgit under Valgrind instead of all Git commands. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-12cache: don't leave cache_slot fields uninitializedJohn Keeping Valgrind says: ==18344== Conditional jump or move depends on uninitialised value(s) ==18344== at 0x406C83: open_slot (cache.c:63) ==18344== by 0x407478: cache_ls (cache.c:403) ==18344== by 0x404C9A: process_request (cgit.c:639) ==18344== by 0x406BD2: fill_slot (cache.c:190) ==18344== by 0x4071A0: cache_process (cache.c:284) ==18344== by 0x404461: main (cgit.c:952) ==18344== Uninitialised value was created by a stack allocation ==18344== at 0x40738B: cache_ls (cache.c:375) This is caused by the keylen field being used to calculate whether or not a slot is matched. We never then check the value of this and the length of data read depends on the key length read from the file so this isn't dangerous, but it's nice to avoid branching based on uninitialized data. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-10filter: split filter functions into their own fileJason A. Donenfeld A first step for more interesting things. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-10filter: make exit status localJason A. Donenfeld It's only used in one place, and not useful to have around since close_filter will die() if exit_status isn't what it expects, anyway. So this is best as just a local variable instead of as part of the struct. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-10parsing: fix header typoJason A. Donenfeld 2014-01-10cgit.c: Fix comment on bit mask hackLukas Fleischer * Formatting and spelling fixes. * A bit mask with the size of one byte only allows for storing 8 (not 255!) different flags. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10cgit.c: Use "else" for mutually exclusive branchesLukas Fleischer When parsing command line arguments, no pair of command line options can ever match simultaneously. Use "else if" blocks to reflect this. This change improves both readability and speed. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10ui-snapshot.c: Do not reinvent suffixcmp()Lukas Fleischer Use suffixcmp() from Git instead of reimplementing it. This is a preparation for moving to ends_with() in Git 1.8.6. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Refactor cgit_parse_snapshots_mask()Lukas Fleischer Use Git string lists instead of str{spn,cspn,ncmp}() magic. This significantly improves readability. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Disallow use of undocumented snapshot delimitersLukas Fleischer Since the introduction of selective snapshot format configuration in dc3c9b5 (allow selective enabling of snapshots, 2007-07-21), we allowed seven different delimiters for snapshot formats, while the documentation has always been clear about spaces being the only valid delimiter: The value is a space-separated list of zero or more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Supporting the undocumented delimiters makes the code unnecessarily complex. Remove them. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer This is a preparation for replacing all prefix checks with either strip_prefix() or starts_with() when Git 1.8.6 is released. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-09README: Fix dependenciesLukas Fleischer * Remove the dependency on Git (which can be obtained automatically when building, using either the Git submodule or `make get-git`). * Use proper upstream names of dependencies. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08README: Spelling and formatting fixesLukas Fleischer * Several small spelling and capitalization fixes. * Use consistent and better-looking formatting that is compatible with AsciiDoc (and partly compatible with RST). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch Previously the script tried to encode output from Pygments with the ASCII codec, which failed. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Add a suggestion to the manpagePřemysl Janouch So that people wishing to use "enable-http-clone" don't have to find out the correct settings on their own. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix the example configurationPřemysl Janouch "enable-git-clone" doesn't exist, replaced with "enable-http-clone". Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix about-formatting.shPřemysl Janouch dash failed to parse the script. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix some spelling errorsPřemysl Janouch Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts