misc

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

1 files changed, 302 insertions, 8 deletions

diff --git a/gamma-dummy.h b/method-dummy.h
index 684934e..d6c5488 100644
--- a/gamma-dummy.h
+++ b/method-dummy.h
@@ -1,6 +1,188 @@
 /* See LICENSE file for copyright and license details. */
-#ifndef LIBGAMMA_GAMMA_DUMMY_H
-#define LIBGAMMA_GAMMA_DUMMY_H
+#if !defined(LIBGAMMA_DUMMY_GET_RAMPS) && !defined(LIBGAMMA_DUMMY_SET_RAMPS)
+
+
+/**
+ * Configuration set for the dummy adjustment method
+ */
+typedef struct libgamma_dummy_configurations {
+	/**
+	 * The method's capabilities
+	 * 
+	 * Some fields are ignored:
+	 * - real
+	 * - fake
+	 */
+	libgamma_method_capabilities_t capabilities;
+
+	/**
+	 * Template for CRTC:s information
+	 * 
+	 * Some fields are ignored:
+	 * - width_mm_edid
+	 * - width_mm_edid_error
+	 * - height_mm_edid
+	 * - height_mm_edid_error
+	 * - gamma_red
+	 * - gamma_green
+	 * - gamma_blue
+	 * - gamma_error
+	 */
+	libgamma_crtc_information_t crtc_info_template;
+
+	/**
+	 * The adjustment method to use
+	 */
+	int real_method;
+
+	/**
+	 * The number of sites on the system
+	 */
+	size_t site_count;
+
+	/**
+	 * The number of paritions on a site before it has been configured
+	 */
+	size_t default_partition_count;
+
+	/**
+	 * The number of CRTC:s on a paritions before it has been configured
+	 */
+	size_t default_crtc_count;
+
+	/**
+	 * Whether the sites should be inherited from the real method
+	 */
+	unsigned inherit_sites : 1;
+
+	/**
+	 * Whether the partitions should be inherited from the real method
+	 */
+	unsigned inherit_partition_count : 1;
+
+	/**
+	 * Whether the CRTC:s should be inherited from the real method
+	 */
+	unsigned inherit_crtc_count : 1;
+
+	/**
+	 * When a site has been created, stall until the partition count has
+	 * been configured
+	 */
+	unsigned stall_for_partition_count : 1;
+
+	/**
+	 * When a parition has been created, stall until the CRTC count has
+	 * been configured
+	 */
+	unsigned stall_for_crtc_count : 1;
+
+	/**
+	 * Methods should stall until the system has been configured
+	 * unless $LIBGAMMA_DUMMY_STALL is not true
+	 */
+	unsigned stalled_start : 1;
+
+	/**
+	 * Whether to print what is going on in the phony system
+	 */
+	unsigned verbose : 1;
+
+} libgamma_dummy_configurations_t;
+
+
+/**
+ * Dummy adjustment method internal data for a CRTC
+ */
+typedef struct libgamma_dummy_crtc {
+	/**
+	 * The gamma ramp for the red channel
+	 */
+	void *restrict gamma_red;
+
+	/**
+	 * The gamma ramp for the green channel
+	 */
+	void *restrict gamma_green;
+
+	/**
+	 * The gamma ramp for the blue channel
+	 */
+	void *restrict gamma_blue;
+
+	/**
+	 * Information about the CRTC and monitor
+	 * 
+	 * Some fields are ignored:
+	 * - width_mm_edid
+	 * - width_mm_edid_error
+	 * - height_mm_edid
+	 * - height_mm_edid_error
+	 * - gamma_red
+	 * - gamma_green
+	 * - gamma_blue
+	 * - gamma_error
+	 */
+	libgamma_crtc_information_t info;
+
+	/**
+	 * Partition state that contains this information
+	 */
+	libgamma_crtc_state_t *state;
+
+} libgamma_dummy_crtc_t;
+
+
+/**
+ * Dummy adjustment method internal data for a partition
+ */
+typedef struct libgamma_dummy_partition {
+	/**
+	 * The CRTC:s on the system
+	 */
+	libgamma_dummy_crtc_t *crtcs;
+
+	/**
+	 * The number of CRTC:s on the system
+	 */
+	size_t crtc_count;
+
+	/**
+	 * Partition state that contains this information
+	 */
+	libgamma_partition_state_t *state;
+
+} libgamma_dummy_partition_t;
+
+
+/**
+ * Dummy adjustment method internal data for a site
+ */
+typedef struct libgamma_dummy_site {
+	/**
+	 * The partitions on the system
+	 */
+	libgamma_dummy_partition_t *partitions;
+
+	/**
+	 * The number of partitions on the system
+	 */
+	size_t partition_count;
+
+	/**
+	 * Site state that contains this information
+	 */
+	libgamma_site_state_t *state;
+
+} libgamma_dummy_site_t;
+
+
+
+/**
+ * Configurations for the dummy adjustment method
+ */
+extern libgamma_dummy_configurations_t libgamma_dummy_internal_configurations;
+
 
 
 /**
@@ -8,6 +190,7 @@
  * 
  * @param  this  The data structure to fill with the method's capabilities
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_dummy_method_capabilities(libgamma_method_capabilities_t *restrict);
 
 /**
@@ -23,6 +206,7 @@ void libgamma_dummy_method_capabilities(libgamma_method_capabilities_t *restrict
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__(1), __warn_unused_result__)))
 int libgamma_dummy_site_initialise(libgamma_site_state_t *restrict, char *restrict);
 
 /**
@@ -30,6 +214,7 @@ int libgamma_dummy_site_initialise(libgamma_site_state_t *restrict, char *restri
  * 
  * @param  this  The site state
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_dummy_site_destroy(libgamma_site_state_t *restrict);
 
 /**
@@ -39,6 +224,7 @@ void libgamma_dummy_site_destroy(libgamma_site_state_t *restrict);
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_site_restore(libgamma_site_state_t *restrict);
 
 
@@ -51,6 +237,7 @@ int libgamma_dummy_site_restore(libgamma_site_state_t *restrict);
  * @return             Zero on success, otherwise (negative) the value of an
  *                     error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_partition_initialise(libgamma_partition_state_t *restrict, libgamma_site_state_t *restrict, size_t);
 
 /**
@@ -58,6 +245,7 @@ int libgamma_dummy_partition_initialise(libgamma_partition_state_t *restrict, li
  * 
  * @param  this  The partition state
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_dummy_partition_destroy(libgamma_partition_state_t *restrict);
 
 /**
@@ -67,6 +255,7 @@ void libgamma_dummy_partition_destroy(libgamma_partition_state_t *restrict);
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_partition_restore(libgamma_partition_state_t *restrict);
 
 
@@ -79,6 +268,7 @@ int libgamma_dummy_partition_restore(libgamma_partition_state_t *restrict);
  * @return             Zero on success, otherwise (negative) the value of an
  *                     error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_initialise(libgamma_crtc_state_t *restrict, libgamma_partition_state_t *restrict, size_t);
 
 /**
@@ -86,6 +276,7 @@ int libgamma_dummy_crtc_initialise(libgamma_crtc_state_t *restrict, libgamma_par
  * 
  * @param  this  The CRTC state
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__)))
 void libgamma_dummy_crtc_destroy(libgamma_crtc_state_t *restrict);
 
 /**
@@ -95,6 +286,7 @@ void libgamma_dummy_crtc_destroy(libgamma_crtc_state_t *restrict);
  * @return        Zero on success, otherwise (negative) the value of an
  *                error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_restore(libgamma_crtc_state_t *restrict);
 
 
@@ -106,8 +298,10 @@ int libgamma_dummy_crtc_restore(libgamma_crtc_state_t *restrict);
  * @param   fields  OR:ed identifiers for the information about the CRTC that should be read
  * @return          Zero on success, -1 on error; on error refer to the error reports in `this`
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_get_crtc_information(libgamma_crtc_information_t *restrict, libgamma_crtc_state_t *restrict, int32_t);
 
+
 /**
  * Get the current gamma ramps for a CRTC, 8-bit gamma-depth version
  * 
@@ -116,6 +310,7 @@ int libgamma_dummy_get_crtc_information(libgamma_crtc_information_t *restrict, l
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_get_gamma_ramps8(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps8_t *restrict);
 
 /**
@@ -126,7 +321,8 @@ int libgamma_dummy_crtc_get_gamma_ramps8(libgamma_crtc_state_t *restrict, libgam
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_dummy_crtc_set_gamma_ramps8(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps8_t);
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_crtc_set_gamma_ramps8(libgamma_crtc_state_t *restrict, const libgamma_gamma_ramps8_t *restrict);
 
 
 /**
@@ -137,6 +333,7 @@ int libgamma_dummy_crtc_set_gamma_ramps8(libgamma_crtc_state_t *restrict, libgam
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_get_gamma_ramps16(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps16_t *restrict);
 
 /**
@@ -147,7 +344,8 @@ int libgamma_dummy_crtc_get_gamma_ramps16(libgamma_crtc_state_t *restrict, libga
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_dummy_crtc_set_gamma_ramps16(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps16_t);
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_crtc_set_gamma_ramps16(libgamma_crtc_state_t *restrict, const libgamma_gamma_ramps16_t *restrict);
 
 
 /**
@@ -158,6 +356,7 @@ int libgamma_dummy_crtc_set_gamma_ramps16(libgamma_crtc_state_t *restrict, libga
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_get_gamma_ramps32(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps32_t *restrict);
 
 /**
@@ -168,7 +367,8 @@ int libgamma_dummy_crtc_get_gamma_ramps32(libgamma_crtc_state_t *restrict, libga
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_dummy_crtc_set_gamma_ramps32(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps32_t);
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_crtc_set_gamma_ramps32(libgamma_crtc_state_t *restrict, const libgamma_gamma_ramps32_t *restrict);
 
 
 /**
@@ -179,6 +379,7 @@ int libgamma_dummy_crtc_set_gamma_ramps32(libgamma_crtc_state_t *restrict, libga
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_get_gamma_ramps64(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps64_t *restrict);
 
 /**
@@ -189,7 +390,8 @@ int libgamma_dummy_crtc_get_gamma_ramps64(libgamma_crtc_state_t *restrict, libga
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_dummy_crtc_set_gamma_ramps64(libgamma_crtc_state_t *restrict, libgamma_gamma_ramps64_t);
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_crtc_set_gamma_ramps64(libgamma_crtc_state_t *restrict, const libgamma_gamma_ramps64_t *restrict);
 
 
 /**
@@ -200,6 +402,7 @@ int libgamma_dummy_crtc_set_gamma_ramps64(libgamma_crtc_state_t *restrict, libga
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_get_gamma_rampsf(libgamma_crtc_state_t *restrict, libgamma_gamma_rampsf_t *restrict);
 
 /**
@@ -210,7 +413,8 @@ int libgamma_dummy_crtc_get_gamma_rampsf(libgamma_crtc_state_t *restrict, libgam
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_dummy_crtc_set_gamma_rampsf(libgamma_crtc_state_t *restrict, libgamma_gamma_rampsf_t);
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_crtc_set_gamma_rampsf(libgamma_crtc_state_t *restrict, const libgamma_gamma_rampsf_t *restrict);
 
 /**
  * Get the current gamma ramps for a CRTC, `double` version
@@ -220,6 +424,7 @@ int libgamma_dummy_crtc_set_gamma_rampsf(libgamma_crtc_state_t *restrict, libgam
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
 int libgamma_dummy_crtc_get_gamma_rampsd(libgamma_crtc_state_t *restrict, libgamma_gamma_rampsd_t *restrict);
 
 /**
@@ -230,7 +435,96 @@ int libgamma_dummy_crtc_get_gamma_rampsd(libgamma_crtc_state_t *restrict, libgam
  * @return         Zero on success, otherwise (negative) the value of an
  *                 error identifier provided by this library
  */
-int libgamma_dummy_crtc_set_gamma_rampsd(libgamma_crtc_state_t *restrict, libgamma_gamma_rampsd_t);
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_crtc_set_gamma_rampsd(libgamma_crtc_state_t *restrict, const libgamma_gamma_rampsd_t *restrict);
+
+
+
+/**
+ * Restore the gamma ramps for a CRTC to the system settings for that CRTC
+ * and ignore the method's capabilities
+ * 
+ * @param   this  The CRTC data
+ * @return        Zero on success, otherwise (negative) the value of an
+ *                error identifier provided by this library
+ */
+LIBGAMMA_GCC_ONLY__(__attribute__((__nonnull__, __warn_unused_result__)))
+int libgamma_dummy_internal_crtc_restore_forced(libgamma_dummy_crtc_t *restrict);
+
+
+#else
+
+libgamma_dummy_crtc_t *data = this->data;
+gamma_ramps_any_t ramps_;
+TYPE *r_ramp = data->gamma_red;
+TYPE *g_ramp = data->gamma_green;
+TYPE *b_ramp = data->gamma_blue;
+size_t rn = data->info.red_gamma_size;
+size_t gn = data->info.green_gamma_size;
+size_t bn = data->info.blue_gamma_size;
+size_t i;
+
+#ifdef DEBUG
+/* Check gamma ramp sizes */
+if (libgamma_dummy_internal_configurations.capabilities.identical_gamma_sizes)
+	if (ramps->red_size != ramps->green_size || ramps->red_size != ramps->blue_size)
+		return LIBGAMMA_MIXED_GAMMA_RAMP_SIZE;
+if (ramps->red_size != rn || ramps->green_size != gn || ramps->blue_size != bn)
+	return LIBGAMMA_WRONG_GAMMA_RAMP_SIZE;
+#endif
+
+if (!data->info.gamma_support)
+	return LIBGAMMA_GAMMA_RAMP_READ_FAILED;
+
+#ifdef LIBGAMMA_DUMMY_GET_RAMPS
+# define __trans(TDEPTH, SUFFIX)\
+do {\
+	if (data->info.gamma_depth == DEPTH) {\
+		ramps_.FIELD = *ramps;\
+		return libgamma_internal_translated_ramp_get(this, &ramps_, DEPTH, TDEPTH, libgamma_crtc_get_gamma_ramps##SUFFIX);\
+	}\
+} while (0)
+#else
+# define __trans(TDEPTH, SUFFIX)\
+do {\
+	if (data->info.gamma_depth == DEPTH) {\
+		ramps_.FIELD = *ramps;\
+		return libgamma_internal_translated_ramp_set(this, &ramps_, DEPTH, TDEPTH, libgamma_crtc_set_gamma_ramps##SUFFIX); \
+	}\
+} while (0)
+#endif
+
+#if DEPTH != 8
+__trans(8, 8);
+#endif
+#if DEPTH != 16
+__trans(16, 16);
+#endif
+#if DEPTH != 32
+__trans(32, 32);
+#endif
+#if DEPTH != 64
+__trans(64, 64);
+#endif
+#if DEPTH != -1
+__trans(-1, f);
+#endif
+#if DEPTH != -2
+__trans(-2, d);
+#endif
+
+#undef __trans
+
+#ifdef LIBGAMMA_DUMMY_GET_RAMPS
+for (i = 0; i < rn; i++) ramps->red[i]   = r_ramp[i];
+for (i = 0; i < gn; i++) ramps->green[i] = g_ramp[i];
+for (i = 0; i < bn; i++) ramps->blue[i]  = b_ramp[i];
+#else
+for (i = 0; i < rn; i++) r_ramp[i] = ramps->red[i];
+for (i = 0; i < gn; i++) g_ramp[i] = ramps->green[i];
+for (i = 0; i < bn; i++) b_ramp[i] = ramps->blue[i];
+#endif
 
+return 0;
 
 #endif