From 16034a633e97e49e11e52d967feaba971d4c8547 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 22 May 2014 20:59:02 +0200 Subject: m misc + gamma-quartz-cg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/gamma-quartz-cg.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/gamma-w32-gdi.c | 18 ++++++- src/libgamma-error.h | 29 ++++++++++++ src/libgamma-method.h | 6 ++- 4 files changed, 178 insertions(+), 3 deletions(-) diff --git a/src/gamma-quartz-cg.c b/src/gamma-quartz-cg.c index 598780f..99d46e1 100644 --- a/src/gamma-quartz-cg.c +++ b/src/gamma-quartz-cg.c @@ -23,6 +23,14 @@ #include "libgamma-error.h" +#ifdef FAKE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS +# include "fake-quartz-cg.h" +#else +# include +# define close_fake_quartz_cg() /* For compatibility with "fake-quartz-cg.h". */ +#endif + +#include #include @@ -76,6 +84,11 @@ void libgamma_quartz_cg_method_capabilities(libgamma_method_capabilities_t* rest int libgamma_quartz_cg_site_initialise(libgamma_site_state_t* restrict this, char* restrict site) { + if (site != NULL) + return LIBGAMMA_NO_SUCH_SITE; + + this->partitions_available = 1; + return 0; } @@ -86,6 +99,8 @@ int libgamma_quartz_cg_site_initialise(libgamma_site_state_t* restrict this, */ void libgamma_quartz_cg_site_destroy(libgamma_site_state_t* restrict this) { + (void) this; + close_fake_quartz_cg(); } @@ -98,6 +113,9 @@ void libgamma_quartz_cg_site_destroy(libgamma_site_state_t* restrict this) */ int libgamma_quartz_cg_site_restore(libgamma_site_state_t* restrict this) { + (void) this; + CGDisplayRestoreColorSyncSettings(); + return 0; } @@ -114,6 +132,49 @@ int libgamma_quartz_cg_site_restore(libgamma_site_state_t* restrict this) int libgamma_quartz_cg_partition_initialise(libgamma_partition_state_t* restrict this, libgamma_site_state_t* restrict site, size_t partition) { + uint32_t cap = 4, n; + CGDirectDisplayID* crtcs; + CGDirectDisplayID* crtcs_old; + CGError r; + + (void) site; + + this->data = NULL; + + if (partition != 0) + return LIBGAMMA_NO_SUCH_PARTITION; + + crtcs = malloc((size_t)cap * sizeof(CGDirectDisplayID)); + if (crtcs == NULL) + return LIBGAMMA_ERRNO_SET; + + for (;;) + { + r = CGGetOnlineDisplayList(cap, crtcs, &n); + if (r != kCGErrorSuccess) + { + free(crtcs); + return LIBGAMMA_LIST_CRTCS_FAILED; + } + if (n < cap) + break; + if (cap == 0) /* We could also test ~0, but it is still too many. */ + { + free(crtcs); + return LIBGAMMA_IMPOSSIBLE_AMOUNT; + } + crtcs_old = crtcs; + crtcs = realloc(crtcs, (size_t)cap * sizeof(CGDirectDisplayID)); + if (crtcs) + { + free(crtcs_old); + return LIBGAMMA_ERRNO_SET; + } + } + + this->data = crtcs; + this->crtcs_available = (size_t)n; + return 0; } @@ -124,6 +185,7 @@ int libgamma_quartz_cg_partition_initialise(libgamma_partition_state_t* restrict */ void libgamma_quartz_cg_partition_destroy(libgamma_partition_state_t* restrict this) { + free(this->data); } @@ -153,6 +215,10 @@ int libgamma_quartz_cg_partition_restore(libgamma_partition_state_t* restrict th int libgamma_quartz_cg_crtc_initialise(libgamma_crtc_state_t* restrict this, libgamma_partition_state_t* restrict partition, size_t crtc) { + (void) this; + if (crtc >= partition->crtcs_available) + return LIBGAMMA_NO_SUCH_CRTC; + return 0; } @@ -163,6 +229,7 @@ int libgamma_quartz_cg_crtc_initialise(libgamma_crtc_state_t* restrict this, */ void libgamma_quartz_cg_crtc_destroy(libgamma_crtc_state_t* restrict this) { + (void) this; } @@ -192,6 +259,41 @@ int libgamma_quartz_cg_crtc_restore(libgamma_crtc_state_t* restrict this) int libgamma_quartz_cg_get_crtc_information(libgamma_crtc_information_t* restrict this, libgamma_crtc_state_t* restrict crtc, int32_t fields) { +#define SUPPORTED_FIELDS (CRTC_INFO_GAMMA_SIZE | CRTC_INFO_GAMMA_DEPTH) + +#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); + if ((fields & CRTC_INFO_GAMMA_SIZE)) + { + CGDirectDisplayID* crtcs = crtc->partition->data; + CGDirectDisplayID crtc_id = crtcs[crtc->crtc]; + size_t gamma_size = CGDisplayGammaTableCapacity(crtc_id);; + this->red_gamma_size = (size_t)gamma_size; + this->green_gamma_size = this->red_gamma_size; + this->blue_gamma_size = this->red_gamma_size; + this->gamma_size_error = gamma_size < 2 ? LIBGAMMA_SINGLETON_GAMMA_RAMP : 0; + } + else + this->gamma_size_error = 0; + this->gamma_depth = -1; + 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 this->gamma_size_error ? -1 : (fields & ~SUPPORTED_FIELDS) ? -1 : 0; + +#undef SUPPORTED_FIELDS } @@ -206,6 +308,22 @@ int libgamma_quartz_cg_get_crtc_information(libgamma_crtc_information_t* restric int libgamma_quartz_cg_crtc_get_gamma_rampsf(libgamma_crtc_state_t* restrict this, libgamma_gamma_rampsf_t* restrict ramps) { + CGDirectDisplayID* crtcs = this->partition->data; + CGDirectDisplayID crtc_id = crtcs[this->crtc]; + uint32_t gamma_size_out; + CGError r; +#ifdef DEBUG + if ((ramps->red_size != ramps->green_size) || + (ramps->red_size != ramps->blue_size)) + return LIBGAMMA_MIXED_GAMMA_RAMP_SIZE; +#endif + r = CGGetDisplayTransferByTable(crtc_id, (uint32_t)(ramps->red_size), + ramps->red, ramps->green, ramps->blue, &gamma_size_out); + if (r != kCGErrorSuccess) + return LIBGAMMA_GAMMA_RAMP_READ_FAILED; + if (gamma_size_out != ramps->red_size) + return LIBGAMMA_GAMMA_RAMP_SIZE_CHANGED; + return 0; } @@ -220,5 +338,15 @@ int libgamma_quartz_cg_crtc_get_gamma_rampsf(libgamma_crtc_state_t* restrict thi int libgamma_quartz_cg_crtc_set_gamma_rampsf(libgamma_crtc_state_t* restrict this, libgamma_gamma_rampsf_t ramps) { + CGDirectDisplayID* crtcs = this->partition->data; + CGDirectDisplayID crtc_id = crtcs[this->crtc]; + CGError r; +#ifdef DEBUG + if ((ramps.red_size != ramps.green_size) || (ramps.red_size != ramps.blue_size)) + return LIBGAMMA_MIXED_GAMMA_RAMP_SIZE; +#endif + r = CGSetDisplayTransferByTable(crtc_id, (uint32_t)(ramps.red_size), + ramps.red, ramps.green, ramps.blue); + return r == kCGErrorSuccess ? 0 : LIBGAMMA_GAMMA_RAMP_WRITE_FAILED; } diff --git a/src/gamma-w32-gdi.c b/src/gamma-w32-gdi.c index a1d8ffe..5065641 100644 --- a/src/gamma-w32-gdi.c +++ b/src/gamma-w32-gdi.c @@ -247,6 +247,8 @@ int libgamma_w32_gdi_crtc_restore(libgamma_crtc_state_t* restrict this) int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t* restrict this, libgamma_crtc_state_t* restrict crtc, int32_t fields) { +#define KNOWN_FIELDS (CRTC_INFO_GAMMA_SIZE | CRTC_INFO_GAMMA_DEPTH | CRTC_INFO_GAMMA_SUPPORT) + #define _E(FIELD) ((fields & FIELD) ? LIBGAMMA_CRTC_INFO_NOT_SUPPORTED : 0) this->edid_error = _E(CRTC_INFO_EDID); @@ -271,7 +273,9 @@ int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t* restrict #undef _E - return 0; + return (fields & ~KNOWN_FIELDS) ? -1 : 0; + +#undef KNOWN_FIELDS } @@ -286,6 +290,12 @@ int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t* restrict int libgamma_w32_gdi_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this, libgamma_gamma_ramps_t* restrict ramps) { +#ifdef DEBUG + if ((ramps-> red_size != GAMMA_RAMP_SIZE) || + (ramps->green_size != GAMMA_RAMP_SIZE) || + (ramps-> blue_size != GAMMA_RAMP_SIZE)) + return LIBGAMMA_WRONG_GAMMA_RAMP_SIZE; +#endif if (!GetDeviceGammaRamp(this->data, ramps->red)) return LIBGAMMA_GAMMA_RAMP_READ_FAILED; return 0; @@ -303,6 +313,12 @@ int libgamma_w32_gdi_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this, int libgamma_w32_gdi_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this, libgamma_gamma_ramps_t ramps) { +#ifdef DEBUG + if ((ramps. red_size != GAMMA_RAMP_SIZE) || + (ramps.green_size != GAMMA_RAMP_SIZE) || + (ramps. blue_size != GAMMA_RAMP_SIZE)) + return LIBGAMMA_WRONG_GAMMA_RAMP_SIZE; +#endif if (!SetDeviceGammaRamp(this->data, ramps.red)) return LIBGAMMA_GAMMA_RAMP_WRITE_FAILED; return 0; diff --git a/src/libgamma-error.h b/src/libgamma-error.h index 639d59f..c3c3c2f 100644 --- a/src/libgamma-error.h +++ b/src/libgamma-error.h @@ -80,6 +80,35 @@ */ #define LIBGAMMA_GAMMA_RAMP_WRITE_FAILED (-11) +/** + * The specified ramp sizes does not match the ramps sizes returned by the + * adjustment methods in response to the query/command + */ +#define LIBGAMMA_GAMMA_RAMP_SIZE_CHANGED (-12) + +/** + * The specified ramp sizes are not identical which is required by the adjustment method + * (Only returned in debug mode) + */ +#define LIBGAMMA_MIXED_GAMMA_RAMP_SIZE (-13) + +/** + * The specified ramp sizes are not supported by the adjustment method + * (Only returned in debug mode) + */ +#define LIBGAMMA_WRONG_GAMMA_RAMP_SIZE (-14) + +/** + * The adjustment method reported that the gamma ramps size is 1 or 0 + */ +#define LIBGAMMA_SINGLETON_GAMMA_RAMP (-15) + +/** + * The adjustment method failed to list available CRTC:s, reason unknown + */ +#define LIBGAMMA_LIST_CRTCS_FAILED (-16) + + #endif diff --git a/src/libgamma-method.h b/src/libgamma-method.h index f9d625a..58b364d 100644 --- a/src/libgamma-method.h +++ b/src/libgamma-method.h @@ -525,9 +525,11 @@ typedef struct libgamma_crtc_information /** - * The bit-depth of the value axes of gamma ramps + * The bit-depth of the value axes of gamma ramps, + * -1 for single precision floating point, and -2 for + * double precision floating point. */ - size_t gamma_depth; + signed gamma_depth; /** * Zero on success, positive it holds the value `errno` had -- cgit v1.2.3-70-g09d2