Support running only for specific output (display)

[PATCH 1/4] Support running only for specific output (display) Export this patch

Artur Sinila <logarithmus.dev@gmail.com>

Useful for laptops with external displays connected. External displays
usually have an ability to adjust color temperature via built-in menu,
so you can run `wlsunset` exclusively for laptop's internal display

Kenny Levinsen <kl@kl.wtf>

3 years ago

While external monitors can configure their color temperature, they 
usually do not adjust based on time of day. wlsunset tracks the sun 
after all. The feature is pretty small though, so if it has some use 
that's fine.

Right now the patch is too big, and things like .clang-tidy and use of 
_GNU_SOURCE is a separate topic altogether. I would appreciate if you 
could make a patch containing just the feature and related changes 
(e.g. moving gamma_control_manager together with xdg_output_manager). 
The refactor with dedicated RGB structs is a decent improvement, but it 
should be a separate patch instead of being the same commit.

The patches should also use tabs for indentation to match the rest of 
the source - I have pushed an .editorconfig to master to help.

---
 README.md                  |   2 +-
 color_math.c               |  31 +++---
 color_math.h               |   6 +-
 main.c                     | 168 ++++++++++++++++++++++------
 meson.build                |   4 +-
 xdg-output-unstable-v1.xml | 220 +++++++++++++++++++++++++++++++++++++
 6 files changed, 378 insertions(+), 53 deletions(-)
 create mode 100644 xdg-output-unstable-v1.xml

diff --git a/README.md b/README.md
index c408bdd..2e98730 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # wlsunset
 
-Day/night gamma adjustments for Wayland compositors supporting wlr-gamma-control-unstable-v1.
+Day/night gamma adjustments for Wayland compositors supporting `wlr-gamma-control-unstable-v1` & `xdg-output-unstable-v1`.
 
 # How to build and install
 
diff --git a/color_math.c b/color_math.c
index b850b96..ce27220 100644
--- a/color_math.c
+++ b/color_math.c
@@ -159,24 +159,25 @@ static double clamp(double value) {
 	}
 }
 
-static void xyz_to_srgb(double x, double y, double z, double *r, double *g, double *b) {
+static struct rgb xyz_to_srgb(double x, double y, double z) {
 	// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
-	*r = srgb_gamma(clamp(3.2404542 * x - 1.5371385 * y - 0.4985314 * z), 2.2);
-	*g = srgb_gamma(clamp(-0.9692660 * x + 1.8760108 * y + 0.0415560 * z), 2.2);
-	*b = srgb_gamma(clamp(0.0556434 * x - 0.2040259 * y + 1.0572252 * z), 2.2);
+  return (struct rgb) {
+	  .r = srgb_gamma(clamp(3.2404542 * x - 1.5371385 * y - 0.4985314 * z), 2.2),
+	  .g = srgb_gamma(clamp(-0.9692660 * x + 1.8760108 * y + 0.0415560 * z), 2.2),
+	  .b = srgb_gamma(clamp(0.0556434 * x - 0.2040259 * y + 1.0572252 * z), 2.2)
+  };
 }
 
-static void srgb_normalize(double *r, double *g, double *b) {
-	double maxw = fmaxl(*r, fmaxl(*g, *b));
-	*r /= maxw;
-	*g /= maxw;
-	*b /= maxw;
+static void srgb_normalize(struct rgb *rgb) {
+	double maxw = fmax(rgb->r, fmax(rgb->g, rgb->b));
+	rgb->r /= maxw;
+	rgb->g /= maxw;
+	rgb->b /= maxw;
 }
 
-void calc_whitepoint(int temp, double *rw, double *gw, double *bw) {
+struct rgb calc_whitepoint(int temp) {
 	if (temp == 6500) {
-		*rw = *gw = *bw = 1.0;
-		return;
+		return (struct rgb) {.r = 1.0, .g = 1.0, .b = 1.0};
 	}
 
 	double x = 1.0, y = 1.0;
@@ -200,7 +201,9 @@ void calc_whitepoint(int temp, double *rw, double *gw, double *bw) {
 	}
 	double z = 1.0 - x - y;
 
-	xyz_to_srgb(x, y, z, rw, gw, bw);
-	srgb_normalize(rw, gw, bw);
+	struct rgb whitepoint = xyz_to_srgb(x, y, z);
+	srgb_normalize(&whitepoint);
+
+  return whitepoint;
 }
 
diff --git a/color_math.h b/color_math.h
index 629d2b7..afb0be8 100644
--- a/color_math.h
+++ b/color_math.h
@@ -22,7 +22,11 @@ struct sun {
 	time_t dusk;
 };
 
+struct rgb {
+  double r, g, b;
+};
+

Kenny Levinsen <kl@kl.wtf>

3 years ago
Why do you only make a struct for RGB? What about XYZ which is also 
used?
Next

 enum sun_condition calc_sun(struct tm *tm, double latitude, struct sun *sun);
-void calc_whitepoint(int temp, double *rw, double *gw, double *bw);
+struct rgb calc_whitepoint(int temp);
 
 #endif
diff --git a/main.c b/main.c
index 38e0faa..6a05dcc 100644
--- a/main.c
+++ b/main.c
@@ -15,6 +15,7 @@
 #include <wayland-client.h>
 
 #include "wlr-gamma-control-unstable-v1-client-protocol.h"
+#include "xdg-output-unstable-v1-client-protocol.h"
 #include "color_math.h"
 
 #if defined(SPEEDRUN)
@@ -117,6 +118,9 @@ struct context {
 	bool new_output;
 	struct wl_list outputs;
 	timer_t timer;
+
+  struct zwlr_gamma_control_manager_v1 *gamma_control_manager;
+  struct zxdg_output_manager_v1 *xdg_output_manager;
 };
 
 struct output {
@@ -124,12 +128,14 @@ struct output {
 
 	struct context *context;
 	struct wl_output *wl_output;
+	struct zxdg_output_v1 *xdg_output;
 	struct zwlr_gamma_control_v1 *gamma_control;
 
 	int table_fd;
 	uint32_t id;
 	uint32_t ramp_size;
 	uint16_t *table;
+  char* name;
 };
 
 static void print_trajectory(struct context *ctx) {
@@ -354,7 +360,6 @@ static void update_timer(const struct context *ctx, timer_t timer, time_t now) {
 	timer_settime(timer, TIMER_ABSTIME, &timerspec, NULL);
 }
 
-static struct zwlr_gamma_control_manager_v1 *gamma_control_manager = NULL;
 
 static int create_anonymous_file(off_t size) {
 	char template[] = "/tmp/wlsunset-shared-XXXXXX";
@@ -433,17 +438,66 @@ static const struct zwlr_gamma_control_v1_listener gamma_control_listener = {
 	.failed = gamma_control_handle_failed,
 };
 
-static void setup_output(struct output *output) {
+static void xdg_output_handle_logical_position(void *data,
+		struct zxdg_output_v1 *xdg_output, int32_t x, int32_t y) {
+  // No-op

Kenny Levinsen <kl@kl.wtf>

3 years ago
No need to write that an empty function is a no-op.
Next

+  (void)data, (void)xdg_output, (void)x, (void)y;
+}
+
+static void xdg_output_handle_logical_size(void *data,
+		struct zxdg_output_v1 *xdg_output, int32_t width, int32_t height) {
+  // No-op
+  (void)data, (void)xdg_output, (void)width, (void)height;
+}
+
+static void xdg_output_handle_done(void *data,
+		struct zxdg_output_v1 *xdg_output) {
+  // No-op
+  (void)data, (void)xdg_output;
+}
+
+static void xdg_output_handle_name(void *data,
+		struct zxdg_output_v1 *xdg_output, const char *name) {
+  (void)xdg_output;
+	struct output *output = data;
+	output->name = strdup(name);
+}
+
+static void xdg_output_handle_description(void *data,
+		struct zxdg_output_v1 *xdg_output, const char *description) {
+	// No-op
+  (void)data, (void)xdg_output, (void)description;
+}
+
+static const struct zxdg_output_v1_listener xdg_output_listener = {
+  .logical_position = xdg_output_handle_logical_position,
+	.logical_size = xdg_output_handle_logical_size,
+	.done = xdg_output_handle_done,
+	.name = xdg_output_handle_name,
+	.description = xdg_output_handle_description,
+};
+
+static void setup_output(struct context *ctx, struct output *output) {
 	if (output->gamma_control != NULL) {
 		return;
 	}
-	if (gamma_control_manager == NULL) {
+	if (ctx->xdg_output_manager == NULL) {
+		fprintf(stderr, "skipping setup of output %d: xdg_output_manager is missing\n",
+				output->id);
+		return;
+	}

Kenny Levinsen <kl@kl.wtf>

3 years ago

The xdg_output_manager is only needed when we need to pick outputs by 
name. Maybe it should be split into a setup_xdg_output and 
setup_gamma_control, each skipping if already setup or missing their 
protocol implementation.

+	if (ctx->xdg_output_manager == NULL) {
 		fprintf(stderr, "skipping setup of output %d: gamma_control_manager missing\n",
 				output->id);
 		return;
 	}

Kenny Levinsen <kl@kl.wtf>

3 years ago
This should have been ctx->gamma_control_manager, not 
xdg_output_manager.
Next

+
+  output->xdg_output = zxdg_output_manager_v1_get_xdg_output(
+    ctx->xdg_output_manager, output->wl_output);
+  zxdg_output_v1_add_listener(output->xdg_output, &xdg_output_listener, output);
+
 	output->gamma_control = zwlr_gamma_control_manager_v1_get_gamma_control(
-		gamma_control_manager, output->wl_output);
+		ctx->gamma_control_manager, output->wl_output);
 	zwlr_gamma_control_v1_add_listener(output->gamma_control,
 		&gamma_control_listener, output);
 }
@@ -495,35 +549,49 @@ static const struct wl_registry_listener registry_listener = {
 	.global_remove = registry_handle_global_remove,
 };
 
-static void fill_gamma_table(uint16_t *table, uint32_t ramp_size, double rw,
-		double gw, double bw, double gamma) {
+static void fill_gamma_table(uint16_t *table, uint32_t ramp_size,
+    struct rgb* whitepoint, double gamma) {
 	uint16_t *r = table;
 	uint16_t *g = table + ramp_size;
 	uint16_t *b = table + 2 * ramp_size;
 	for (uint32_t i = 0; i < ramp_size; ++i) {
 		double val = (double)i / (ramp_size - 1);
-		r[i] = (uint16_t)(UINT16_MAX * pow(val * rw, 1.0 / gamma));
-		g[i] = (uint16_t)(UINT16_MAX * pow(val * gw, 1.0 / gamma));
-		b[i] = (uint16_t)(UINT16_MAX * pow(val * bw, 1.0 / gamma));
+		r[i] = (uint16_t)(UINT16_MAX * pow(val * whitepoint->r, 1.0 / gamma));
+		g[i] = (uint16_t)(UINT16_MAX * pow(val * whitepoint->g, 1.0 / gamma));
+		b[i] = (uint16_t)(UINT16_MAX * pow(val * whitepoint->b, 1.0 / gamma));
 	}
 }
 
-static void set_temperature(struct wl_list *outputs, int temp, double gamma) {
-	double rw, gw, bw;
-	calc_whitepoint(temp, &rw, &gw, &bw);
-	fprintf(stderr, "setting temperature to %d K\n", temp);
-
-	struct output *output;
-	wl_list_for_each(output, outputs, link) {
-		if (output->gamma_control == NULL || output->table_fd == -1) {
-			continue;
-		}
-		fill_gamma_table(output->table, output->ramp_size,
-				rw, gw, bw, gamma);
-		lseek(output->table_fd, 0, SEEK_SET);
-		zwlr_gamma_control_v1_set_gamma(output->gamma_control,
-				output->table_fd);
+static void set_temperature(struct output *output,
+    struct rgb *whitepoint, double gamma) {
+	if (output->gamma_control == NULL || output->table_fd == -1) {
+		return;
 	}
+	fill_gamma_table(output->table, output->ramp_size, whitepoint, gamma);
+	lseek(output->table_fd, 0, SEEK_SET);
+	zwlr_gamma_control_v1_set_gamma(output->gamma_control,
+			output->table_fd);
+}
+
+static void set_temperature_all_outputs(struct wl_list *outputs,
+    const char* cfg_output_name, int temp, double gamma) {
+  struct rgb whitepoint = calc_whitepoint(temp);
+
+  struct output *output;
+  if (cfg_output_name) {
+    wl_list_for_each(output, outputs, link) {
+      if (output->name && strcmp(cfg_output_name, output->name) == 0) {
+	      fprintf(stderr, "setting temperature on '%s' to %d K\n", output->name, temp);
+        set_temperature(output, &whitepoint, gamma);
+        break;
+      }
+    }
+  } else {
+    wl_list_for_each(output, outputs, link) {
+	    fprintf(stderr, "setting temperature on '%s' to %d K\n", output->name, temp);
+      set_temperature(output, &whitepoint, gamma);
+    }
+  }
 }
 
 static int timer_fired = 0;
@@ -631,7 +699,6 @@ static int setup_timer(struct context *ctx) {
 }
 
 static int wlrun(struct config cfg) {
-
 	// Initialize defaults
 	struct context ctx = {
 		.sun = { 0 },
@@ -639,6 +706,7 @@ static int wlrun(struct config cfg) {
 		.state = STATE_INITIAL,
 		.config = cfg,
 	};
+
 	if (!cfg.manual_time) {
 		ctx.longitude_time_offset = longitude_time_offset(cfg.longitude);
 	}
@@ -659,14 +727,19 @@ static int wlrun(struct config cfg) {
 	wl_registry_add_listener(registry, &registry_listener, &ctx);
 	wl_display_roundtrip(display);
 
-	if (gamma_control_manager == NULL) {
+	if (ctx.gamma_control_manager == NULL) {
 		fprintf(stderr, "compositor doesn't support wlr-gamma-control-unstable-v1\n");
 		return EXIT_FAILURE;
 	}
 
+  if (ctx.xdg_output_manager == NULL) {
+		fprintf(stderr, "compositor doesn't support xdg-output-unstable-v1\n");
+		return EXIT_FAILURE;
+  }

Kenny Levinsen <kl@kl.wtf>

3 years ago
We should not fail here if the user is not using the new feature.
Next

+
 	struct output *output;
 	wl_list_for_each(output, &ctx.outputs, link) {
-		setup_output(output);
+		setup_output(&ctx, output);
 	}
 	wl_display_roundtrip(display);
 
@@ -674,8 +747,9 @@ static int wlrun(struct config cfg) {
 	recalc_stops(&ctx, now);
 	update_timer(&ctx, ctx.timer, now);
 
-	int temp = get_temperature(&ctx, now);
-	set_temperature(&ctx.outputs, temp, ctx.config.gamma);
+  int temp = get_temperature(&ctx, now);
+  set_temperature_all_outputs(&ctx.outputs, ctx.config.output_name,
+      temp, ctx.config.gamma);
 
 	int old_temp = temp;
 	while (display_dispatch(display, -1) != -1) {
@@ -689,12 +763,14 @@ static int wlrun(struct config cfg) {
 			if ((temp = get_temperature(&ctx, now)) != old_temp) {
 				old_temp = temp;
 				ctx.new_output = false;
-				set_temperature(&ctx.outputs, temp,
-						ctx.config.gamma);
+				set_temperature_all_outputs(&ctx.outputs, ctx.config.output_name,
+            temp, ctx.config.gamma);
 			}
 		} else if (ctx.new_output) {
 			ctx.new_output = false;
-			set_temperature(&ctx.outputs, temp, ctx.config.gamma);
+
+			set_temperature_all_outputs(&ctx.outputs, ctx.config.output_name,
+          temp, ctx.config.gamma);
 		}
 	}
 
@@ -719,6 +795,8 @@ static int parse_time_of_day(const char *s, time_t *time) {
 static const char usage[] = "usage: %s [options]\n"
 "  -h             show this help message\n"
 "  -v             show the version number\n"
+"  -o <output>    name of output (display) to use,\n"
+"                 by default all outputs are used\n"
 "  -t <temp>      set low temperature (default: 4000)\n"
 "  -T <temp>      set high temperature (default: 6500)\n"
 "  -l <lat>       set latitude (e.g. 39.9)\n"
@@ -740,11 +818,18 @@ int main(int argc, char *argv[]) {
 		.high_temp = 6500,
 		.low_temp = 4000,
 		.gamma = 1.0,
+    .output_name = NULL
 	};
 
 	int opt;
-	while ((opt = getopt(argc, argv, "hvt:T:l:L:S:s:d:g:")) != -1) {
+	while ((opt = getopt(argc, argv, "hvo:t:T:l:L:S:s:d:g:")) != -1) {
 		switch (opt) {
+      case 'o':
+        if (config.output_name) {
+          free(config.output_name);
+        }
+        config.output_name = strdup(optarg);

Kenny Levinsen <kl@kl.wtf>

3 years ago
Do we only want to allow one enabled monitor?
Next

+        break;
 			case 't':
 				config.low_temp = strtol(optarg, NULL, 10);
 				break;
@@ -760,6 +845,7 @@ int main(int argc, char *argv[]) {
 			case 'S':
 				if (parse_time_of_day(optarg, &config.sunrise) != 0) {
 					fprintf(stderr, "invalid time, expected HH:MM, got %s\n", optarg);
+          free(config.output_name);

Kenny Levinsen <kl@kl.wtf>

3 years ago

You do not need to free this memory as we are about to exit. If we 
really wanted to, the proper way is to replace all the returns with 
gotos to an "error" label at the end of the function which then frees 
stuff.

 					return EXIT_FAILURE;
 				}
 				config.manual_time = true;
@@ -767,6 +853,7 @@ int main(int argc, char *argv[]) {
 			case 's':
 				if (parse_time_of_day(optarg, &config.sunset) != 0) {
 					fprintf(stderr, "invalid time, expected HH:MM, got %s\n", optarg);
+          free(config.output_name);
 					return EXIT_FAILURE;
 				}
 				config.manual_time = true;
@@ -779,38 +866,49 @@ int main(int argc, char *argv[]) {
 				break;
 			case 'v':
 				printf("wlsunset version %s\n", WLSUNSET_VERSION);
+        free(config.output_name);
 				return EXIT_SUCCESS;
 			case 'h':
+				fprintf(stderr, usage, argv[0]);
+        free(config.output_name);
+        return EXIT_SUCCESS;
 			default:
 				fprintf(stderr, usage, argv[0]);
-				return opt == 'h' ? EXIT_SUCCESS : EXIT_FAILURE;
+        free(config.output_name);
+				return EXIT_FAILURE;
 		}
 	}
 
 	if (config.high_temp <= config.low_temp) {
 		fprintf(stderr, "high temp (%d) must be higher than low (%d) temp\n",
 				config.high_temp, config.low_temp);
+    free(config.output_name);
 		return EXIT_FAILURE;
 	}
 	if (config.manual_time) {
 		if (!isnan(config.latitude) || !isnan(config.longitude)) {
 			fprintf(stderr, "latitude and longitude are not valid in manual time mode\n");
+      free(config.output_name);
 			return EXIT_FAILURE;
 		}
 	} else {
 		if (config.latitude > 90.0 || config.latitude < -90.0) {
 			fprintf(stderr, "latitude (%lf) must be in interval [-90,90]\n",
 					config.latitude);
+      free(config.output_name);
 			return EXIT_FAILURE;
 		}
 		config.latitude = RADIANS(config.latitude);
 		if (config.longitude > 180.0 || config.longitude < -180.0) {
 			fprintf(stderr, "longitude (%lf) must be in interval [-180,180]\n",
 					config.longitude);
+      free(config.output_name);
 			return EXIT_FAILURE;
 		}
 		config.longitude = RADIANS(config.longitude);
 	}
 
-	return wlrun(config);
+	int code = wlrun(config);
+  free(config.output_name);
+  return code;
 }
diff --git a/meson.build b/meson.build
index 9a02caf..224b6a6 100644
--- a/meson.build
+++ b/meson.build
@@ -37,8 +37,8 @@ scanner = find_program('wayland-scanner')
 scanner_private_code = generator(scanner, output: '@BASENAME@-protocol.c', arguments: ['private-code', '@INPUT@', '@OUTPUT@'])
 scanner_client_header = generator(scanner, output: '@BASENAME@-client-protocol.h', arguments: ['client-header', '@INPUT@', '@OUTPUT@'])
 
-protocols_src = [scanner_private_code.process('wlr-gamma-control-unstable-v1.xml')]
-protocols_headers = [scanner_client_header.process('wlr-gamma-control-unstable-v1.xml')]
+protocols_src = [scanner_private_code.process('wlr-gamma-control-unstable-v1.xml', 'xdg-output-unstable-v1.xml')]
+protocols_headers = [scanner_client_header.process('wlr-gamma-control-unstable-v1.xml', 'xdg-output-unstable-v1.xml')]
 
 wl_client = dependency('wayland-client')
 wl_protocols = dependency('wayland-protocols')
diff --git a/xdg-output-unstable-v1.xml b/xdg-output-unstable-v1.xml
new file mode 100644
index 0000000..9a5b790
--- /dev/null
+++ b/xdg-output-unstable-v1.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="xdg_output_unstable_v1">
+
+  <copyright>
+    Copyright © 2017 Red Hat Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice (including the next
+    paragraph) shall be included in all copies or substantial portions of the
+    Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+  </copyright>
+
+  <description summary="Protocol to describe output regions">
+    This protocol aims at describing outputs in a way which is more in line
+    with the concept of an output on desktop oriented systems.
+
+    Some information are more specific to the concept of an output for
+    a desktop oriented system and may not make sense in other applications,
+    such as IVI systems for example.
+
+    Typically, the global compositor space on a desktop system is made of
+    a contiguous or overlapping set of rectangular regions.
+
+    Some of the information provided in this protocol might be identical
+    to their counterparts already available from wl_output, in which case
+    the information provided by this protocol should be preferred to their
+    equivalent in wl_output. The goal is to move the desktop specific
+    concepts (such as output location within the global compositor space,
+    the connector name and types, etc.) out of the core wl_output protocol.
+
+    Warning! The protocol described in this file is experimental and
+    backward incompatible changes may be made. Backward compatible
+    changes may be added together with the corresponding interface
+    version bump.
+    Backward incompatible changes are done by bumping the version
+    number in the protocol and interface names and resetting the
+    interface version. Once the protocol is to be declared stable,
+    the 'z' prefix and the version number in the protocol and
+    interface names are removed and the interface version number is
+    reset.
+  </description>
+
+  <interface name="zxdg_output_manager_v1" version="3">
+    <description summary="manage xdg_output objects">
+      A global factory interface for xdg_output objects.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the xdg_output_manager object">
+	Using this request a client can tell the server that it is not
+	going to use the xdg_output_manager object anymore.
+
+	Any objects already created through this instance are not affected.
+      </description>
+    </request>
+
+    <request name="get_xdg_output">
+      <description summary="create an xdg output from a wl_output">
+	This creates a new xdg_output object for the given wl_output.
+      </description>
+      <arg name="id" type="new_id" interface="zxdg_output_v1"/>
+      <arg name="output" type="object" interface="wl_output"/>
+    </request>
+  </interface>
+
+  <interface name="zxdg_output_v1" version="3">
+    <description summary="compositor logical output region">
+      An xdg_output describes part of the compositor geometry.
+
+      This typically corresponds to a monitor that displays part of the
+      compositor space.
+
+      For objects version 3 onwards, after all xdg_output properties have been
+      sent (when the object is created and when properties are updated), a
+      wl_output.done event is sent. This allows changes to the output
+      properties to be seen as atomic, even if they happen via multiple events.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the xdg_output object">
+	Using this request a client can tell the server that it is not
+	going to use the xdg_output object anymore.
+      </description>
+    </request>
+
+    <event name="logical_position">
+      <description summary="position of the output within the global compositor space">
+	The position event describes the location of the wl_output within
+	the global compositor space.
+
+	The logical_position event is sent after creating an xdg_output
+	(see xdg_output_manager.get_xdg_output) and whenever the location
+	of the output changes within the global compositor space.
+      </description>
+      <arg name="x" type="int"
+	   summary="x position within the global compositor space"/>
+      <arg name="y" type="int"
+	   summary="y position within the global compositor space"/>
+    </event>
+
+    <event name="logical_size">
+      <description summary="size of the output in the global compositor space">
+	The logical_size event describes the size of the output in the
+	global compositor space.
+
+	For example, a surface without any buffer scale, transformation
+	nor rotation set, with the size matching the logical_size will
+	have the same size as the corresponding output when displayed.
+
+	Most regular Wayland clients should not pay attention to the
+	logical size and would rather rely on xdg_shell interfaces.
+
+	Some clients such as Xwayland, however, need this to configure
+	their surfaces in the global compositor space as the compositor
+	may apply a different scale from what is advertised by the output
+	scaling property (to achieve fractional scaling, for example).
+
+	For example, for a wl_output mode 3840×2160 and a scale factor 2:
+
+	- A compositor not scaling the surface buffers will advertise a
+	  logical size of 3840×2160,
+
+	- A compositor automatically scaling the surface buffers will
+	  advertise a logical size of 1920×1080,
+
+	- A compositor using a fractional scale of 1.5 will advertise a
+	  logical size of 2560×1440.
+
+	For example, for a wl_output mode 1920×1080 and a 90 degree rotation,
+	the compositor will advertise a logical size of 1080x1920.
+
+	The logical_size event is sent after creating an xdg_output
+	(see xdg_output_manager.get_xdg_output) and whenever the logical
+	size of the output changes, either as a result of a change in the
+	applied scale or because of a change in the corresponding output
+	mode(see wl_output.mode) or transform (see wl_output.transform).
+      </description>
+      <arg name="width" type="int"
+	   summary="width in global compositor space"/>
+      <arg name="height" type="int"
+	   summary="height in global compositor space"/>
+    </event>
+
+    <event name="done">
+      <description summary="all information about the output have been sent">
+	This event is sent after all other properties of an xdg_output
+	have been sent.
+
+	This allows changes to the xdg_output properties to be seen as
+	atomic, even if they happen via multiple events.
+
+	For objects version 3 onwards, this event is deprecated. Compositors
+	are not required to send it anymore and must send wl_output.done
+	instead.
+      </description>
+    </event>
+
+    <!-- Version 2 additions -->
+
+    <event name="name" since="2">
+      <description summary="name of this output">
+	Many compositors will assign names to their outputs, show them to the
+	user, allow them to be configured by name, etc. The client may wish to
+	know this name as well to offer the user similar behaviors.
+
+	The naming convention is compositor defined, but limited to
+	alphanumeric characters and dashes (-). Each name is unique among all
+	wl_output globals, but if a wl_output global is destroyed the same name
+	may be reused later. The names will also remain consistent across
+	sessions with the same hardware and software configuration.
+
+	Examples of names include 'HDMI-A-1', 'WL-1', 'X11-1', etc. However, do
+	not assume that the name is a reflection of an underlying DRM
+	connector, X11 connection, etc.
+
+	The name event is sent after creating an xdg_output (see
+	xdg_output_manager.get_xdg_output). This event is only sent once per
+	xdg_output, and the name does not change over the lifetime of the
+	wl_output global.
+      </description>
+      <arg name="name" type="string" summary="output name"/>
+    </event>
+
+    <event name="description" since="2">
+      <description summary="human-readable description of this output">
+	Many compositors can produce human-readable descriptions of their
+	outputs.  The client may wish to know this description as well, to
+	communicate the user for various purposes.
+
+	The description is a UTF-8 string with no convention defined for its
+	contents. Examples might include 'Foocorp 11" Display' or 'Virtual X11
+	output via :1'.
+
+	The description event is sent after creating an xdg_output (see
+	xdg_output_manager.get_xdg_output) and whenever the description
+	changes. The description is optional, and may not be sent at all.
+
+	For objects of version 2 and lower, this event is only sent once per
+	xdg_output, and the description does not change over the lifetime of
+	the wl_output global.
+      </description>
+      <arg name="description" type="string" summary="output description"/>
+    </event>
+
+  </interface>
+</protocol>
-- 
2.34.1

[PATCH 2/4] Add .gitignore Export this patch

Artur Sinila <logarithmus.dev@gmail.com>

3 years ago

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9785597
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build
+.cache
-- 
2.34.1

[PATCH 3/4] Add .clang-tidy Export this patch

Artur Sinila <logarithmus.dev@gmail.com>

3 years ago

---
 .clang-tidy | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .clang-tidy

diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000..8d7e499
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,5 @@
+---
+Checks: '*,-fuchsia-*,-google-*,-zircon-*,-abseil-*,-modernize-use-trailing-return-type,-llvm-*,-llvmlibc-*,-misc-non-private-member-variables-in-classes,-cert-dcl21-cpp,-altera-struct-pack-align,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-readability-isolate-declaration,-cppcoreguidelines-init-variables,-clang-diagnostic-unused-function'
+WarningsAsErrors: '-*'
+HeaderFilterRegex: ''
+FormatStyle: none
-- 
2.34.1

[PATCH 4/4] Fix some clang-tidy warnings Export this patch

Artur Sinila <logarithmus.dev@gmail.com>

3 years ago

---
 color_math.c | 20 +++++++++---------
 color_math.h |  4 ++--
 main.c       | 58 ++++++++++++++++++++++++++++++++--------------------
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/color_math.c b/color_math.c
index ce27220..74be514 100644
--- a/color_math.c
+++ b/color_math.c
@@ -1,11 +1,11 @@
-#define _POSIX_C_SOURCE 200809L
+#define _POSIX_C_SOURCE 200809L // NOLINT
 #include <math.h>
 #include <errno.h>
 #include <time.h>
 #include "color_math.h"
 
-static double SOLAR_START_TWILIGHT = RADIANS(90.833 + 6.0);
-static double SOLAR_END_TWILIGHT   = RADIANS(90.833 - 3.0);
+static double const SOLAR_START_TWILIGHT = RADIANS(90.833 + 6.0);
+static double const SOLAR_END_TWILIGHT   = RADIANS(90.833 - 3.0);
 
 static int days_in_year(int year) {
 	int leap = (year % 4 == 0 && year % 100 != 0) || year % 400 == 0;
@@ -144,19 +144,18 @@ static double srgb_gamma(double value, double gamma) {
 	// https://en.wikipedia.org/wiki/SRGB
 	if (value <= 0.0031308) {
 		return 12.92 * value;
-	} else {
-		return pow(1.055 * value, 1.0/gamma) - 0.055;
-	}
+  }
+	return pow(1.055 * value, 1.0/gamma) - 0.055;
 }
 
 static double clamp(double value) {
 	if (value > 1.0) {
 		return 1.0;
-	} else if (value < 0.0) {
+  }
+	if (value < 0.0) {
 		return 0.0;
-	} else {
-		return value;
 	}
+	return value;
 }
 
 static struct rgb xyz_to_srgb(double x, double y, double z) {
@@ -175,6 +174,7 @@ static void srgb_normalize(struct rgb *rgb) {
 	rgb->b /= maxw;
 }
 
+
 struct rgb calc_whitepoint(int temp) {
 	if (temp == 6500) {
 		return (struct rgb) {.r = 1.0, .g = 1.0, .b = 1.0};
@@ -190,7 +190,7 @@ struct rgb calc_whitepoint(int temp) {
 		illuminant_d(temp, &x1, &y1);
 		planckian_locus(temp, &x2, &y2);
 
-		double factor = (4000 - temp) / 1500;
+		double factor = (4000 - temp) / 1500.0;
 		double sinefactor = (cos(M_PI*factor) + 1.0) / 2.0;
 		x = x1 * sinefactor + x2 * (1.0 - sinefactor);
 		y = y1 * sinefactor + y2 * (1.0 - sinefactor);
diff --git a/color_math.h b/color_math.h
index afb0be8..db10de1 100644
--- a/color_math.h
+++ b/color_math.h
@@ -1,5 +1,5 @@
-#ifndef _COLOR_MATH_H
-#define _COLOR_MATH_H
+#ifndef COLOR_MATH_H
+#define COLOR_MATH_H
 
 #include "math.h"
 #include "time.h"
diff --git a/main.c b/main.c
index 6a05dcc..c6f0f15 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE // NOLINT
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -13,9 +15,10 @@
 #include <unistd.h>
 #include <wayland-client-protocol.h>
 #include <wayland-client.h>
+#include <wayland-util.h>
+#include <wlr-gamma-control-unstable-v1-client-protocol.h>
+#include <xdg-output-unstable-v1-client-protocol.h>
 
-#include "wlr-gamma-control-unstable-v1-client-protocol.h"
-#include "xdg-output-unstable-v1-client-protocol.h"
 #include "color_math.h"
 
 #if defined(SPEEDRUN)
@@ -78,7 +81,7 @@ static time_t tomorrow(time_t now, time_t offset) {
 }
 
 static time_t longitude_time_offset(double longitude) {
-	return longitude * 43200 / M_PI;
+	return (time_t)(longitude * 43200 / M_PI);
 }
 
 struct config {
@@ -93,6 +96,8 @@ struct config {
 	time_t sunrise;
 	time_t sunset;
 	time_t duration;
+
+  char* output_name;
 };
 
 enum state {
@@ -106,7 +111,7 @@ struct context {
 	struct config config;
 	struct sun sun;
 
-	double longitude_time_offset;
+	time_t longitude_time_offset;
 
 	enum state state;
 	enum sun_condition condition;
@@ -165,7 +170,7 @@ static void print_trajectory(struct context *ctx) {
 	}
 }
 
-static int anim_kelvin_step = 25;
+static const int anim_kelvin_step = 25;
 
 static void recalc_stops(struct context *ctx, time_t now) {
 	time_t day = round_day_offset(now, -ctx->longitude_time_offset);
@@ -248,7 +253,7 @@ done:
 static int interpolate_temperature(time_t now, time_t start, time_t stop,
 		int temp_start, int temp_stop) {
 	if (start == stop) {
-		return stop;
+		return temp_stop;
 	}
 	double time_pos = (double)(now - start) / (double)(stop - start);
 	if (time_pos > 1.0) {
@@ -256,26 +261,28 @@ static int interpolate_temperature(time_t now, time_t start, time_t stop,
 	} else if (time_pos < 0.0) {
 		time_pos = 0.0;
 	}
-	int temp_pos = (double)(temp_stop - temp_start) * time_pos;
+	int temp_pos = (int)((temp_stop - temp_start) * time_pos);
 	return temp_start + temp_pos;
 }
 
 static int get_temperature_normal(const struct context *ctx, time_t now) {
 	if (now < ctx->sun.dawn) {
 		return ctx->config.low_temp;
-	} else if (now < ctx->sun.sunrise) {
+	}
+  if (now < ctx->sun.sunrise) {
 		return interpolate_temperature(now, ctx->sun.dawn,
 				ctx->sun.sunrise, ctx->config.low_temp,
 				ctx->config.high_temp);
-	} else if (now < ctx->sun.sunset) {
+	}
+  if (now < ctx->sun.sunset) {
 		return ctx->config.high_temp;
-	} else if (now < ctx->sun.dusk) {
+	}
+  if (now < ctx->sun.dusk) {
 		return interpolate_temperature(now, ctx->sun.sunset,
 				ctx->sun.dusk, ctx->config.high_temp,
 				ctx->config.low_temp);
-	} else {
-		return ctx->config.low_temp;
 	}
+	return ctx->config.low_temp;
 }
 
 static int get_temperature_transition(const struct context *ctx, time_t now) {
@@ -307,15 +314,17 @@ static int get_temperature(const struct context *ctx, time_t now) {
 static time_t get_deadline_normal(const struct context *ctx, time_t now) {
 	if (now < ctx->sun.dawn) {
 		return ctx->sun.dawn;
-	} else if (now < ctx->sun.sunrise) {
+	}
+  if (now < ctx->sun.sunrise) {
 		return now + ctx->dawn_step_time;
-	} else if (now < ctx->sun.sunset) {
+	}
+  if (now < ctx->sun.sunset) {
 		return ctx->sun.sunset;
-	} else if (now < ctx->sun.dusk) {
+	}
+  if (now < ctx->sun.dusk) {
 		return now + ctx->dusk_step_time;
-	} else {
-		return tomorrow(now, -ctx->longitude_time_offset);
 	}
+	return tomorrow(now, -ctx->longitude_time_offset);
 }
 
 static time_t get_deadline_transition(const struct context *ctx, time_t now) {
@@ -392,7 +401,7 @@ static int create_gamma_table(uint32_t ramp_size, uint16_t **table) {
 
 	void *data =
 		mmap(NULL, table_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-	if (data == MAP_FAILED) {
+	if (data == MAP_FAILED) { // NOLINT
 		fprintf(stderr, "failed to mmap()\n");
 		close(fd);
 		return -1;
@@ -515,12 +524,14 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
 		output->table_fd = -1;
 		output->context = ctx;
 		wl_list_insert(&ctx->outputs, &output->link);
-		setup_output(output);
+		setup_output(ctx, output);
 	} else if (strcmp(interface,
 				zwlr_gamma_control_manager_v1_interface.name) == 0) {
-		gamma_control_manager = wl_registry_bind(registry, name,
+		ctx->gamma_control_manager = wl_registry_bind(registry, name,
 				&zwlr_gamma_control_manager_v1_interface, 1);
-	}
+	} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
+    ctx->xdg_output_manager = wl_registry_bind(registry, name, &zxdg_output_manager_v1_interface, version);
+  }
 }
 
 static void registry_handle_global_remove(void *data,
@@ -535,6 +546,9 @@ static void registry_handle_global_remove(void *data,
 			if (output->gamma_control != NULL) {
 				zwlr_gamma_control_v1_destroy(output->gamma_control);
 			}
+      if (output->xdg_output != NULL) {
+        zxdg_output_v1_destroy(output->xdg_output);
+      }
 			if (output->table_fd != -1) {
 				close(output->table_fd);
 			}
@@ -674,7 +688,7 @@ static int setup_timer(struct context *ctx) {
 		.sa_handler = timer_signal,
 		.sa_flags = 0,
 	};
-	if (pipe(timer_signal_fds) == -1) {
+	if (pipe2(timer_signal_fds, O_CLOEXEC) == -1) {
 		fprintf(stderr, "could not create signal pipe: %s\n",
 				strerror(errno));
 		return -1;
-- 
2.34.1

~kennylevinsen/wlsunset-devel

Support running only for specific output (display) v1 SUPERSEDED

[PATCH 1/4] Support running only for specific output (display) Export this patch

[PATCH 2/4] Add .gitignore Export this patch

[PATCH 3/4] Add .clang-tidy Export this patch

[PATCH 4/4] Fix some clang-tidy warnings Export this patch