Add cg-shallow, minor fixes, and bump year1.3

Signed-off-by: Mattias Andrée <maandree@kth.se>

13 files changed, 304 insertions, 25 deletions

diff --git a/src/cg-base.c b/src/cg-base.c
index b44c065..9f77937 100644
--- a/src/cg-base.c
+++ b/src/cg-base.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
diff --git a/src/cg-brilliance.c b/src/cg-brilliance.c
index 40d74a7..3541d03 100644
--- a/src/cg-brilliance.c
+++ b/src/cg-brilliance.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -30,7 +30,7 @@
 /**
  * The default filter priority for the program
  */
-const int64_t default_priority = ((int64_t)1) << 61;
+const int64_t default_priority = (int64_t)1 << 61;
 
 /**
  * The default class for the program
@@ -128,7 +128,7 @@ int handle_opt(char* opt, char* arg)
  * 
  * @param   out  Output parameter for the value
  * @param   str  The string
- * @retunr       Zero on success, -1 if the string is invalid
+ * @return       Zero on success, -1 if the string is invalid
  */
 static int parse_double(double* restrict out, const char* restrict str)
 {
diff --git a/src/cg-darkroom.c b/src/cg-darkroom.c
index 2151e1b..9990aa3 100644
--- a/src/cg-darkroom.c
+++ b/src/cg-darkroom.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -30,7 +30,7 @@
 /**
  * The default filter priority for the program
  */
-const int64_t default_priority = ((int64_t)3) << 61;
+const int64_t default_priority = (int64_t)3 << 61;
 
 /**
  * The default class for the program
@@ -118,7 +118,7 @@ int handle_opt(char* opt, char* arg)
  * 
  * @param   out  Output parameter for the value
  * @param   str  The string
- * @retunr       Zero on success, -1 if the string is invalid
+ * @return       Zero on success, -1 if the string is invalid
  */
 static int parse_double(double* restrict out, const char* restrict str)
 {
diff --git a/src/cg-gamma.c b/src/cg-gamma.c
index 62b35df..1d24d07 100644
--- a/src/cg-gamma.c
+++ b/src/cg-gamma.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -213,7 +213,7 @@ static char* get_conf_file(const char* restrict confname)
  * 
  * @param   out  Output parameter for the value
  * @param   str  The string
- * @retunr       Zero on success, -1 if the string is invalid
+ * @return       Zero on success, -1 if the string is invalid
  */
 static int parse_double(double* restrict out, const char* restrict str)
 {
diff --git a/src/cg-icc.c b/src/cg-icc.c
index f1a6be7..5970930 100644
--- a/src/cg-icc.c
+++ b/src/cg-icc.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
diff --git a/src/cg-limits.c b/src/cg-limits.c
index 390059e..8390385 100644
--- a/src/cg-limits.c
+++ b/src/cg-limits.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -33,7 +33,7 @@
 /**
  * The default filter priority for the program
  */
-const int64_t default_priority = -(((int64_t)1) << 62);
+const int64_t default_priority = -((int64_t)1 << 62);
 
 /**
  * The default class for the program
@@ -272,7 +272,7 @@ static char* get_conf_file(const char* restrict confname)
  * 
  * @param   out  Output parameter for the value
  * @param   str  The string
- * @retunr       Zero on success, -1 if the string is invalid
+ * @return       Zero on success, -1 if the string is invalid
  */
 static int parse_double(double* restrict out, const char* restrict str)
 {
@@ -293,7 +293,7 @@ static int parse_double(double* restrict out, const char* restrict str)
  * @param   left   Output parameter for the first value
  * @param   right  Output parameter for the second value
  * @param   str    The string
- * @retunr         Zero on success, -1 if the string is invalid
+ * @return         Zero on success, -1 if the string is invalid
  */
 static int parse_twidouble(double* restrict left, double* restrict right, const char* restrict str)
 {
diff --git a/src/cg-linear.c b/src/cg-linear.c
index 9423014..1ce9a5d 100644
--- a/src/cg-linear.c
+++ b/src/cg-linear.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
diff --git a/src/cg-negative.c b/src/cg-negative.c
index 90b0df2..8a98959 100644
--- a/src/cg-negative.c
+++ b/src/cg-negative.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -30,7 +30,7 @@
 /**
  * The default filter priority for the program
  */
-const int64_t default_priority = ((int64_t)1) << 62;
+const int64_t default_priority = (int64_t)1 << 62;
 
 /**
  * The default class for the program
diff --git a/src/cg-query.c b/src/cg-query.c
index 23b6349..a24ef11 100644
--- a/src/cg-query.c
+++ b/src/cg-query.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
diff --git a/src/cg-rainbow.c b/src/cg-rainbow.c
index 2cfb581..067785f 100644
--- a/src/cg-rainbow.c
+++ b/src/cg-rainbow.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -33,7 +33,7 @@
 /**
  * The default filter priority for the program
  */
-const int64_t default_priority = ((int64_t)1) << 60;
+const int64_t default_priority = (int64_t)1 << 60;
 
 /**
  * The default class for the program
@@ -123,7 +123,7 @@ int handle_opt(char* opt, char* arg)
  * 
  * @param   out  Output parameter for the value
  * @param   str  The string
- * @retunr       Zero on success, -1 if the string is invalid
+ * @return       Zero on success, -1 if the string is invalid
  */
 static int parse_double(double* restrict out, const char* restrict str)
 {
diff --git a/src/cg-remove.c b/src/cg-remove.c
index e7315e8..d942f87 100644
--- a/src/cg-remove.c
+++ b/src/cg-remove.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
diff --git a/src/cg-shallow.c b/src/cg-shallow.c
new file mode 100644
index 0000000..230da88
--- /dev/null
+++ b/src/cg-shallow.c
@@ -0,0 +1,279 @@
+/**
+ * cg-tools -- Cooperative gamma-enabled tools
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
+ * 
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+#include "cg-base.h"
+
+#include <libclut.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+
+
+/**
+ * The default filter priority for the program
+ */
+const int64_t default_priority = -((int64_t)3 << 61);
+
+/**
+ * The default class for the program
+ */
+char default_class[] = PKGNAME "::cg-shallow::standard";
+
+/**
+ * Class suffixes
+ */
+const char* const* class_suffixes = (const char* const[]){NULL};
+
+
+
+/**
+ * -d: keep process alive and remove filter on death
+ */
+static int dflag = 0;
+
+/**
+ * -x: remove filter rather than adding it
+ */
+static int xflag = 0;
+
+/**
+ * The emulated red resolution, 0 for unchanged.
+ */
+static size_t rres = 2;
+
+/**
+ * The emulated green resolution, 0 for unchanged.
+ */
+static size_t gres = 2;
+
+/**
+ * The emulated blue resolution, 0 for unchanged.
+ */
+static size_t bres = 2;
+
+
+/**
+ * Print usage information and exit
+ */
+void usage(void)
+{
+  fprintf(stderr,
+	  "Usage: %s [-M method] [-S site] [-c crtc]... [-R rule] "
+	  "(-x | [-p priority] [-d] [all | red green blue])\n",
+	  argv0);
+  exit(1);
+}
+
+
+/**
+ * Handle a command line option
+ * 
+ * @param   opt  The option, it is a NUL-terminate two-character
+ *               string starting with either '-' or '+', if the
+ *               argument is not recognised, call `usage`. This
+ *               string will not be "-M", "-S", "-c", "-p", or "-R".
+ * @param   arg  The argument associated with `opt`,
+ *               `NULL` there is no next argument, if this
+ *               parameter is `NULL` but needed, call `usage`
+ * @return       0 if `arg` was not used,
+ *               1 if `arg` was used,
+ *               -1 on error
+ */
+int handle_opt(char* opt, char* arg)
+{
+  if (opt[0] == '-')
+    switch (opt[1])
+      {
+      case 'd':
+	if (dflag || xflag)
+	  usage();
+	dflag = 1;
+	break;
+      case 'x':
+	if (xflag || dflag)
+	  usage();
+	xflag = 1;
+	break;
+      default:
+	usage();
+      }
+  else
+    usage();
+  return 0;
+  (void) arg;
+}
+
+
+/**
+ * Parse a non-negative integer encoded as a string
+ * 
+ * @param   out  Output parameter for the value
+ * @param   str  The string
+ * @return       Zero on success, -1 if the string is invalid
+ */
+static int parse_int(size_t* restrict out, const char* restrict str)
+{
+  char* end;
+  errno = 0;
+  if (!isdigit(*str))
+    return -1;
+  *out = strtoul(str, &end, 10);
+  if (errno || *end)
+    return -1;
+  return 0;
+}
+
+
+/**
+ * This function is called after the last
+ * call to `handle_opt`
+ * 
+ * @param   argc  The number of unparsed arguments
+ * @param   argv  `NULL` terminated list of unparsed arguments
+ * @param   prio  The argument associated with the "-p" option
+ * @return        Zero on success, -1 on error
+ */
+int handle_args(int argc, char* argv[], char* prio)
+{
+  char* red = NULL;
+  char* green = NULL;
+  char* blue = NULL;
+  int q = xflag + (dflag | (argc > 0));
+  if ((q > 1) || (xflag && (prio != NULL)))
+    usage();
+  if (argc == 1)
+    red = green = blue = argv[0];
+  else if (argc == 3)
+    {
+      red   = argv[0];
+      green = argv[1];
+      blue  = argv[2];
+    }
+  else if (argc && !xflag)
+    usage();
+  if (argc)
+    {
+      if (parse_int(&rres, red) < 0)
+        usage();
+      if (parse_int(&gres, blue) < 0)
+        usage();
+      if (parse_int(&bres, green) < 0)
+        usage();
+    }
+  return 0;
+  (void) argv;
+}
+
+
+/**
+ * Fill a filter
+ * 
+ * @param  filter  The filter to fill
+ */
+static void fill_filter(libcoopgamma_filter_t* restrict filter)
+{
+  switch (filter->depth)
+    {
+#define X(CONST, MEMBER, MAX, TYPE)\
+    case CONST:\
+	    libclut_lower_resolution(&(filter->ramps.MEMBER), MAX, TYPE, 0, rres, 0, gres, 0, bres);\
+      break;
+LIST_DEPTHS
+#undef X
+    default:
+      abort();
+    }
+}
+
+
+/**
+ * The main function for the program-specific code
+ * 
+ * @return  0: Success
+ *          -1: Error, `errno` set
+ *          -2: Error, `cg.error` set
+ *          -3: Error, message already printed
+ */
+int start(void)
+{
+  int r;
+  size_t i, j;
+  
+  if (xflag)
+    for (i = 0; i < filters_n; i++)
+      crtc_updates[i].filter.lifespan = LIBCOOPGAMMA_REMOVE;
+  else if (dflag)
+    for (i = 0; i < filters_n; i++)
+      crtc_updates[i].filter.lifespan = LIBCOOPGAMMA_UNTIL_DEATH;
+  else
+    for (i = 0; i < filters_n; i++)
+      crtc_updates[i].filter.lifespan = LIBCOOPGAMMA_UNTIL_REMOVAL;
+  
+  if (!xflag)
+    if ((r = make_slaves()) < 0)
+      return r;
+  
+  for (i = 0, r = 1; i < filters_n; i++)
+    {
+      if (!(crtc_updates[i].master) || !(crtc_info[crtc_updates[i].crtc].supported))
+	continue;
+      if (!xflag)
+	fill_filter(&(crtc_updates[i].filter));
+      r = update_filter(i, 0);
+      if ((r == -2) || ((r == -1) && (errno != EAGAIN)))
+	return r;
+      if (crtc_updates[i].slaves != NULL)
+	for (j = 0; crtc_updates[i].slaves[j] != 0; j++)
+	  {
+	    r = update_filter(crtc_updates[i].slaves[j], 0);
+	    if ((r == -2) || ((r == -1) && (errno != EAGAIN)))
+	      return r;
+	  }
+    }
+  
+  while (r != 1)
+    if ((r = synchronise(-1)) < 0)
+      return r;
+  
+  if (!dflag)
+    return 0;
+  
+  if (libcoopgamma_set_nonblocking(&cg, 0) < 0)
+    return -1;
+  for (;;)
+    if (libcoopgamma_synchronise(&cg, NULL, 0, &j) < 0)
+      switch (errno)
+	{
+	case 0:
+	  break;
+	case ENOTRECOVERABLE:
+	  goto enotrecoverable;
+	default:
+	  return -1;
+	}
+  
+ enotrecoverable:
+  for (;;)
+    if (pause() < 0)
+      return -1;
+}
+
diff --git a/src/cg-sleepmode.c b/src/cg-sleepmode.c
index 1ec2e1d..3248d58 100644
--- a/src/cg-sleepmode.c
+++ b/src/cg-sleepmode.c
@@ -1,6 +1,6 @@
 /**
  * cg-tools -- Cooperative gamma-enabled tools
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
+ * Copyright (C) 2016, 2018  Mattias Andrée (maandree@kth.se)
  * 
  * 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
@@ -36,7 +36,7 @@
 /**
  * The default filter priority for the program
  */
-const int64_t default_priority = ((int64_t)3) << 59;
+const int64_t default_priority = (int64_t)3 << 59;
 
 /**
  * The default class for the program
@@ -174,7 +174,7 @@ int handle_opt(char* opt, char* arg)
  * 
  * @param   out  Output parameter for the value
  * @param   str  The string
- * @retunr       Zero on success, -1 if the string is invalid
+ * @return       Zero on success, -1 if the string is invalid
  */
 static int parse_double(double* restrict out, const char* restrict str)
 {