summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/glitch.c34
1 files changed, 21 insertions, 13 deletions
diff --git a/bin/glitch.c b/bin/glitch.c
index 8ce3905d..37d93a70 100644
--- a/bin/glitch.c
+++ b/bin/glitch.c
@@ -265,10 +265,10 @@ enum PACKED Filter {
 
 static struct {
     bool brokenPaeth;
-    bool forceDeclareFilter;
-    bool forceApplyFilter;
-    enum Filter declareFilter;
-    enum Filter applyFilter;
+    uint8_t declareFilter;
+    uint8_t applyFilter;
+    enum Filter declareFilters[255];
+    enum Filter applyFilters[255];
 } options;
 
 struct Bytes {
@@ -366,14 +366,15 @@ static void filterData(void) {
             if (heuristic[type] < heuristic[minType]) minType = type;
         }
 
-        if (options.forceDeclareFilter) {
-            lines[y]->type = options.declareFilter;
+        if (options.declareFilter) {
+            lines[y]->type = options.declareFilters[y % options.declareFilter];
         } else {
             lines[y]->type = minType;
         }
 
-        if (options.forceApplyFilter) {
-            memcpy(lines[y]->data, filter[options.applyFilter], lineSize());
+        if (options.applyFilter) {
+            enum Filter type = options.applyFilters[y % options.applyFilter];
+            memcpy(lines[y]->data, filter[type], lineSize());
         } else {
             memcpy(lines[y]->data, filter[minType], lineSize());
         }
@@ -421,7 +422,7 @@ static void glitch(const char *inPath, const char *outPath) {
     if (error) err(EX_IOERR, "%s", path);
 }
 
-enum Filter parseFilter(const char *s) {
+static enum Filter parseFilter(const char *s) {
     switch (s[0]) {
         case 'N': case 'n': return NONE;
         case 'S': case 's': return SUB;
@@ -432,6 +433,15 @@ enum Filter parseFilter(const char *s) {
     }
 }
 
+static uint8_t parseFilters(enum Filter *filters, const char *s) {
+    uint8_t len = 0;
+    do {
+        filters[len++] = parseFilter(s);
+        s = strchr(s, ',');
+    } while (s++);
+    return len;
+}
+
 int main(int argc, char *argv[]) {
     bool stdio = false;
     char *output = NULL;
@@ -440,13 +450,11 @@ int main(int argc, char *argv[]) {
     while (0 < (opt = getopt(argc, argv, "a:cd:o:p"))) {
         switch (opt) {
             case 'a': {
-                options.forceApplyFilter = true;
-                options.applyFilter = parseFilter(optarg);
+                options.applyFilter = parseFilters(options.applyFilters, optarg);
             } break;
             case 'c': stdio = true; break;
             case 'd': {
-                options.forceDeclareFilter = true;
-                options.declareFilter = parseFilter(optarg);
+                options.declareFilter = parseFilters(options.declareFilters, optarg);
             } break;
             case 'o': output = optarg; break;
             case 'p': options.brokenPaeth = true; break;
June McEnroe 2020-11-13Add x4 to LESSJune McEnroe 2020-11-04Remove modified sensitivity settingsJune McEnroe 2020-10-29Remove editJune McEnroe 2020-10-27Switch gr alias back to git rebaseJune McEnroe I always type out git reset and sometimes still expect gr to be rebase... Never got used to it I guess. 2020-10-27Allow cd host: to cd to same path over sshJune McEnroe 2020-10-27Use SendEnv for cd host:pathJune McEnroe Works properly for weird paths, etc. 2020-10-27Allow cd host:path over sshJune McEnroe Requires AcceptEnv SSH_CD in the remote sshd_config. 2020-10-07Use mandoc -T utf8 for text.June McEnroe Don't depend on LANG being set. 2020-09-20Add The Awakened KingdomJune McEnroe A cute extra novella. Finally finished this series. 2020-09-12Move /opt/local back, cheat port select to use system manJune McEnroe This is not really how you're supposed to use the select system, I don't think, since the mandoc package actually creates those files, but it does work. This lets me actually use the git installed by MacPorts. 2020-09-12Move /opt/local behind /usr againJune McEnroe The reason I did this with pkgsrc was because I actually don't want the man(1) from mandoc, since it won't follow MANSECT. Same applies to MacPorts. I wish I could disable its man(1) with a variant or whatever. 2020-09-12Enable toc in cgit renderings of man pagesJune McEnroe But keep it disabled for READMEs since they always use non-standard sections and the TOC is just distracting there, I think. Also add the style so its h1 is the same size as the ones inside sections... 2020-09-11Install mandoc on macOSJune McEnroe 2020-09-11Rewrite install script yet againJune McEnroe 2020-09-11Remove NetBSD from install scriptJune McEnroe I never use it. 2020-09-11Use MacPorts rather than pkgsrcJune McEnroe My system is probably such a mess now... 2020-09-11Add debian VM name to sshJune McEnroe 2020-09-11Add influencer tweetJune McEnroe 2020-09-10Add The Kingdom of GodsJune McEnroe Reading has really slowed down :( 2020-09-07Add SunglassesJune McEnroe An IRC find. 2020-09-06Add Between the BreathsJune McEnroe One of those good songs from a soundtrack of a film that probably isn't? The summary sounds a lot more interesting than the title implies, at least. 2020-09-04Open /dev/tty in nudgeJune McEnroe This makes it work even when it's run connected to a pipe, i.e. as the notify command of catgirl... 2020-09-04Add nudgeJune McEnroe 2020-09-03Build fbclock with -lzJune McEnroe I guess this got lost somewhere, long ago... 2020-08-29Add tweets from retweetsJune McEnroe