implement gamma-x-vidmode

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 104 insertions, 3 deletions

diff --git a/src/gamma-x-vidmode.c b/src/gamma-x-vidmode.c
index 5e9b080..42bce6e 100644
--- a/src/gamma-x-vidmode.c
+++ b/src/gamma-x-vidmode.c
@@ -23,6 +23,9 @@
 
 #include "libgamma-error.h"
 
+#include <X11/Xlib.h>
+#include <X11/extensions/xf86vmode.h>
+
 #include <stdlib.h>
 #include <errno.h>
 
@@ -69,6 +72,16 @@ void libgamma_x_vidmode_method_capabilities(libgamma_method_capabilities_t* rest
 int libgamma_x_vidmode_site_initialise(libgamma_site_state_t* restrict this,
 				       char* restrict site)
 {
+  Display* connection = XOpenDisplay(site);
+  int _major, _minor, screens;
+  if ((this->data = connection) == NULL)
+    return LIBGAMMA_OPEN_SITE_FAILED;
+  if (!XF86VidModeQueryVersion(connection, &_major, &_minor))
+    return LIBGAMMA_PROTOCOL_VERSION_QUERY_FAILED;
+  if ((screens = ScreenCount(connection)) < 0)
+    return LIBGAMMA_NEGATIVE_PARTITION_COUNT;
+  this->partitions_available = (size_t)screens;
+  return 0;
 }
 
 
@@ -79,6 +92,7 @@ int libgamma_x_vidmode_site_initialise(libgamma_site_state_t* restrict this,
  */
 void libgamma_x_vidmode_site_destroy(libgamma_site_state_t* restrict this)
 {
+  XCloseDisplay((Display*)(this->data));
 }
 
 
@@ -109,6 +123,10 @@ int libgamma_x_vidmode_site_restore(libgamma_site_state_t* restrict this)
 int libgamma_x_vidmode_partition_initialise(libgamma_partition_state_t* restrict this,
 					    libgamma_site_state_t* restrict site, size_t partition)
 {
+  if (partition >= site->partitions_available)
+    return LIBGAMMA_NO_SUCH_PARTITION;
+  this->crtcs_available = 1;
+  return 0;
 }
 
 
@@ -119,6 +137,7 @@ int libgamma_x_vidmode_partition_initialise(libgamma_partition_state_t* restrict
  */
 void libgamma_x_vidmode_partition_destroy(libgamma_partition_state_t* restrict this)
 {
+  (void) this;
 }
 
 
@@ -149,6 +168,9 @@ int libgamma_x_vidmode_partition_restore(libgamma_partition_state_t* restrict th
 int libgamma_x_vidmode_crtc_initialise(libgamma_crtc_state_t* restrict this,
 				       libgamma_partition_state_t* restrict partition, size_t crtc)
 {
+  (void) this;
+  (void) partition;
+  return crtc == 0 ? 0 : LIBGAMMA_NO_SUCH_CRTC;
 }
 
 
@@ -159,6 +181,7 @@ int libgamma_x_vidmode_crtc_initialise(libgamma_crtc_state_t* restrict this,
  */
 void libgamma_x_vidmode_crtc_destroy(libgamma_crtc_state_t* restrict this)
 {
+  (void) this;
 }
 
 
@@ -188,6 +211,37 @@ int libgamma_x_vidmode_crtc_restore(libgamma_crtc_state_t* restrict this)
 int libgamma_x_vidmode_get_crtc_information(libgamma_crtc_information_t* restrict this,
 					    libgamma_crtc_state_t* restrict crtc, int32_t fields)
 {
+#define _E(FIELD)  ((fields & FIELD) ? LIBGAMMA_CRTC_INFO_NOT_SUPPORTED : 0)
+  
+  this->edid_error = _E(CRTC_INFO_EDID);
+  this->width_mm_error = _E(CRTC_INFO_WIDTH_MM);
+  this->height_mm_error = _E(CRTC_INFO_HEIGHT_MM);
+  this->width_mm_edid_error = _E(CRTC_INFO_WIDTH_MM_EDID);
+  this->height_mm_edid_error = _E(CRTC_INFO_HEIGHT_MM_EDID);
+  this->gamma_size_error = 0;
+  if ((fields & CRTC_INFO_GAMMA_SUPPORT))
+    {
+      Display* connection = crtc->partition->site->data;
+      int stops;
+      if (!XF86VidModeGetGammaRampSize(connection, (int)(crtc->partition->partition), &stops))
+	this->gamma_size_error = LIBGAMMA_GAMMA_RAMPS_SIZE_QUERY_FAILED;
+      else if (stops < 2)
+	this->gamma_size_error = LIBGAMMA_SINGLETON_GAMMA_RAMP;
+      else
+	this->red_gamma_size = this->green_gamma_size = this->blue_gamma_size = (size_t)stops;
+    }
+  this->gamma_depth = 16;
+  this->gamma_depth_error = 0;
+  this->gamma_support_error = _E(CRTC_INFO_GAMMA_SUPPORT);
+  this->subpixel_order_error = _E(CRTC_INFO_SUBPIXEL_ORDER);
+  this->active_error = _E(CRTC_INFO_ACTIVE);
+  this->connector_name_error = _E(CRTC_INFO_CONNECTOR_NAME);
+  this->connector_type_error = _E(CRTC_INFO_CONNECTOR_TYPE);
+  this->gamma_error = _E(CRTC_INFO_GAMMA);
+  
+#undef _E
+  
+  return (fields & ~(CRTC_INFO_GAMMA_DEPTH | CRTC_INFO_GAMMA_SIZE)) ? -1 : this->gamma_size_error;
 }
 
 
@@ -202,6 +256,15 @@ int libgamma_x_vidmode_get_crtc_information(libgamma_crtc_information_t* restric
 int libgamma_x_vidmode_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
 					    libgamma_gamma_ramps_t* restrict ramps)
 {
+#ifdef DEBUG
+  if ((ramps->red_size != ramps->green_size) ||
+      (ramps->red_size != ramps->blue_size))
+    return LIBGAMMA_MIXED_GAMMA_RAMP_SIZE;
+#endif
+  if (!XF86VidModeGetGammaRamp((Display*)(this->partition->site->data), (int)(this->partition->partition),
+			       (int)(ramps->red_size), ramps->red, ramps->green, ramps->blue))
+    return LIBGAMMA_GAMMA_RAMP_READ_FAILED;
+  return 0;
 }
 
 
@@ -216,5 +279,14 @@ int libgamma_x_vidmode_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this
 int libgamma_x_vidmode_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
 					    libgamma_gamma_ramps_t ramps)
 {
+#ifdef DEBUG
+  if ((ramps.red_size != ramps.green_size) ||
+      (ramps.red_size != ramps.blue_size))
+    return LIBGAMMA_MIXED_GAMMA_RAMP_SIZE;
+#endif
+  if (!XF86VidModeSetGammaRamp((Display*)(this->partition->site->data), (int)(this->partition->partition),
+			       (int)(ramps.red_size), ramps.red, ramps.green, ramps.blue))
+    return LIBGAMMA_GAMMA_RAMP_WRITE_FAILED;
+  return 0;
 }
 
diff --git a/src/gamma-x-vidmode.h b/src/gamma-x-vidmode.h
index 396fd7a..f2c915a 100644
--- a/src/gamma-x-vidmode.h
+++ b/src/gamma-x-vidmode.h
@@ -83,7 +83,7 @@ int libgamma_x_vidmode_partition_initialise(libgamma_partition_state_t* restrict
  * 
  * @param  this  The partition state
  */
-void libgamma_x_vidmode_partition_destroy(libgamma_partition_state_t* restrict this);
+void libgamma_x_vidmode_partition_destroy(libgamma_partition_state_t* restrict this) __attribute__((const));
 
 /**
  * Restore the gamma ramps all CRTCS with a partition to the system settings
@@ -105,14 +105,14 @@ int libgamma_x_vidmode_partition_restore(libgamma_partition_state_t* restrict th
  *                     error identifier provided by this library
  */
 int libgamma_x_vidmode_crtc_initialise(libgamma_crtc_state_t* restrict this,
-				       libgamma_partition_state_t* restrict partition, size_t crtc);
+				       libgamma_partition_state_t* restrict partition, size_t crtc) __attribute__((const));
 
 /**
  * Release all resources held by a CRTC state
  * 
  * @param  this  The CRTC state
  */
-void libgamma_x_vidmode_crtc_destroy(libgamma_crtc_state_t* restrict this);
+void libgamma_x_vidmode_crtc_destroy(libgamma_crtc_state_t* restrict this) __attribute__((const));
 
 /**
  * Restore the gamma ramps for a CRTC to the system settings for that CRTC
diff --git a/src/libgamma-error.h b/src/libgamma-error.h
index c4da13c..5cdfc65 100644
--- a/src/libgamma-error.h
+++ b/src/libgamma-error.h
@@ -212,6 +212,35 @@ extern const char* libgamma_group_name;
  */
 #define LIBGAMMA_GAMMA_NOT_SPECIFIED_AND_EDID_CHECKSUM_ERROR  (-33)
 
+/**
+ * Failed to query the gamma ramps size from the adjustment method, reason unknown
+ */
+#define LIBGAMMA_GAMMA_RAMPS_SIZE_QUERY_FAILED  (-34)
+
+/**
+ * The selected partition could not be opened, reason unknown
+ */
+#define LIBGAMMA_OPEN_PARTITION_FAILED  (-35)
+
+/**
+ * The selected site could not be opened, reason unknown
+ */
+#define LIBGAMMA_OPEN_SITE_FAILED  (-36)
+
+/**
+ * Failed to query the adjustment method for its protocol version, reason unknown
+ */
+#define LIBGAMMA_PROTOCOL_VERSION_QUERY_FAILED  (-37)
+
+
+
+/**
+ * The number of the libgamma error with the lowest number.
+ * If this is lower than the number your program thinks it
+ * should be sould update your program for new errors.
+ */
+#define LIBGAMMA_ERROR_MIN  (-37)
+
 
 
 #endif