Refactor

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

1 files changed, 30 insertions, 17 deletions

diff --git a/src/gamma-coopgamma.c b/src/gamma-coopgamma.c
index a4e08ef..fab083b 100644
--- a/src/gamma-coopgamma.c
+++ b/src/gamma-coopgamma.c
@@ -1,4 +1,5 @@
-/* redshift-ng - Automatically adjust display colour temperature according the Sun
+/*-
+ * redshift-ng - Automatically adjust display colour temperature according the Sun
  * 
  * Copyright (c) 2009-2018        Jon Lund Steffensen <jonlst@gmail.com>
  * Copyright (c) 2014-2016, 2025  Mattias Andrée <m@maandree.se>
@@ -20,18 +21,24 @@
 
 #include <libcoopgamma.h>
 
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wkeyword-macro"
+#endif
+
 
 struct coopgamma_output_id {
 	char *edid;
 	size_t index;
 };
 
+
 struct coopgamma_crtc_state {
 	libcoopgamma_filter_t filter;
 	libcoopgamma_ramps_t plain_ramps;
 	size_t rampsize;
 };
 
+
 struct gamma_state {
 	libcoopgamma_context_t ctx;
 	struct coopgamma_crtc_state *crtcs;
@@ -49,6 +56,7 @@ struct gamma_state {
 
 struct signal_blockage {int dummy;};
 
+
 static int
 unblocked_signal(int signo, struct signal_blockage *prev)
 {
@@ -145,6 +153,7 @@ coopgamma_create(struct gamma_state **state_out)
 	return 0;
 }
 
+
 static int
 coopgamma_start(struct gamma_state *state)
 {
@@ -242,12 +251,12 @@ coopgamma_start(struct gamma_state *state)
 		crtc->filter.priority = state->priority;
 		crtc->filter.crtc = state->outputs[i].edid;
 		crtc->filter.lifespan = lifespan;
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
 #endif
 		crtc->filter.class = PACKAGE "::redshift::standard";
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 # pragma GCC diagnostic pop
 #endif
 
@@ -276,14 +285,15 @@ coopgamma_start(struct gamma_state *state)
 		LIST_RAMPS_STOP_VALUE_TYPES(X, ;);
 #undef X
 		default:
-			if (info.depth > 0)
-				fprintf(stderr, _("output `%s' uses an unsupported depth "
-						  "for its gamma ramps: %i bits, skipping\n"),
-					outputs[i], info.depth);
-			else
-				fprintf(stderr, _("output `%s' uses an unrecognised depth, "
-						  "for its gamma ramps, with the code %i, "
-						  "skipping\n"), outputs[i], info.depth);
+			if (info.depth > 0) {
+				weprintf(_("output `%s' uses an unsupported depth "
+				           "for its gamma ramps: %i bits, skipping\n"),
+				         outputs[i], info.depth);
+			} else {
+				weprintf(_("output `%s' uses an unrecognised depth, "
+				           "for its gamma ramps, with the code %i, "
+				           "skipping\n"), outputs[i], info.depth);
+			}
 			continue;
 		}
 		crtc->rampsize *= info.red_size + info.green_size + info.blue_size;
@@ -347,6 +357,7 @@ coopgamma_start(struct gamma_state *state)
 	return 0;
 }
 
+
 static void
 coopgamma_free(struct gamma_state *state)
 {
@@ -374,14 +385,14 @@ coopgamma_free(struct gamma_state *state)
 	state->outputs = NULL;
 }
 
+
 static void
 coopgamma_print_help(FILE *f)
 {
 	fputs(_("Adjust gamma ramps with coopgamma.\n"), f);
 	fputs("\n", f);
 
-	/* TRANSLATORS: coopgamma help output
-	   left column must not be translated */
+	/* TRANSLATORS: coopgamma help output left column must not be translated */
 	fputs(_("  edid=EDID      \tEDID of monitor to apply adjustments to, enter "
 		"`list' to list available monitors\n"
 		"  crtc=N         \tIndex of CRTC to apply adjustments to\n"
@@ -394,6 +405,7 @@ coopgamma_print_help(FILE *f)
 	fputs("\n", f);
 }
 
+
 static int
 coopgamma_set_option(struct gamma_state *state, const char *key, const char *value)
 {
@@ -416,8 +428,7 @@ coopgamma_set_option(struct gamma_state *state, const char *key, const char *val
 			return -1;
 		}
 		if (!strcasecmp(value, "list")) {
-			/* TRANSLATORS: coopgamma help output
-			   the word "coopgamma" must not be translated */
+			/* TRANSLATORS: coopgamma help output the word "coopgamma" must not be translated */
 			printf(_("Available adjustment methods for coopgamma:\n"));
 			for (i = 0; state->methods[i]; i++)
 				printf("  %s\n", state->methods[i]);
@@ -454,13 +465,14 @@ coopgamma_set_option(struct gamma_state *state, const char *key, const char *val
 		}
 		state->n_outputs++;
 	} else {
-		fprintf(stderr, _("Unknown method parameter: `%s'."), key);
+		weprintf(_("Unknown method parameter: `%s'."), key);
 		return -1;
 	}
 
 	return 0;
 }
 
+
 static void
 coopgamma_restore(struct gamma_state *state)
 {
@@ -472,6 +484,7 @@ coopgamma_restore(struct gamma_state *state)
 		state->crtcs[i].filter.lifespan = LIBCOOPGAMMA_UNTIL_DEATH;
 }
 
+
 static int
 coopgamma_apply(struct gamma_state *state, const struct colour_setting *setting, int perserve)
 {
@@ -517,4 +530,4 @@ coopgamma_apply(struct gamma_state *state, const struct colour_setting *setting,
 }
 
 
-const struct gamma_method coopgamma_gamma_method = GAMMA_METHOD_INIT("coopgamma", 1, coopgamma);
+const struct gamma_method coopgamma_gamma_method = GAMMA_METHOD_INIT("coopgamma", 1, 0, coopgamma);