aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-05-24 03:59:46 +0200
committerMattias Andrée <maandree@operamail.com>2014-05-24 03:59:46 +0200
commit63a9c89770f158fdd1296e7a5d8b60ba21abf3f0 (patch)
treec5d501475875c3fb9a6314cd280d93b35f518fa9 /src
parentm (diff)
downloadlibgamma-63a9c89770f158fdd1296e7a5d8b60ba21abf3f0.tar.gz
libgamma-63a9c89770f158fdd1296e7a5d8b60ba21abf3f0.tar.bz2
libgamma-63a9c89770f158fdd1296e7a5d8b60ba21abf3f0.tar.xz
gamma-x-randr: get_output_name
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r--src/gamma-x-randr.c43
-rw-r--r--src/libgamma-error.h7
2 files changed, 47 insertions, 3 deletions
diff --git a/src/gamma-x-randr.c b/src/gamma-x-randr.c
index a0e269f..88afd6b 100644
--- a/src/gamma-x-randr.c
+++ b/src/gamma-x-randr.c
@@ -459,6 +459,45 @@ static int get_connector_type(libgamma_crtc_information_t* restrict this)
/**
+ * Get the output name of a CRTC
+ *
+ * @param this Instance of a data structure to fill with the information about the CRTC
+ * @param output The CRTC's output's information
+ * @return Non-zero on error
+ */
+static int get_output_name(libgamma_crtc_information_t* restrict out, xcb_randr_get_output_info_reply_t* restrict output)
+{
+ char* store;
+ uint8_t* name;
+ uint16_t length;
+ size_t i;
+
+ name = xcb_randr_get_output_info_name(output);
+ length = output->name_len; /* There is no NUL-termination. */
+ if (name == NULL)
+ {
+ out->connector_name_error = LIBGAMMA_REPLY_VALUE_EXTRACTION_FAILED;
+ return -1;
+ }
+
+ store = malloc(((size_t)length + 1) * sizeof(char));
+ if (store == NULL)
+ {
+ out->connector_name_error = errno;
+ return -1;
+ }
+
+ /* char is guaranteed to be (u)int_least8_t, but it is only guaranteed to be (u)int8_t
+ * on POSIX, so to be truly portable we will not assume that char is (u)int8_t. */
+ for (i = 0; i < (size_t)length; i++)
+ store[i] = (char)(name[i]);
+ store[length] = '\0';
+
+ return 0;
+}
+
+
+/**
* Read information about a CRTC
*
* @param this Instance of a data structure to fill with the information about the CRTC
@@ -494,7 +533,7 @@ int libgamma_x_randr_get_crtc_information(libgamma_crtc_information_t* restrict
/* FIXME output */
- e |= this->connector_name_error = -1; /* FIXME */
+ e |= get_output_name(this, output);
if ((fields & CRTC_INFO_CONNECTOR_TYPE))
e |= get_connector_type(this);
e |= read_output_data(this, output);
@@ -510,7 +549,7 @@ int libgamma_x_randr_get_crtc_information(libgamma_crtc_information_t* restrict
= this->height_mm_edid_error = LIBGAMMA_NOT_CONNECTED;
goto cont;
}
- e |= get_edid(output, this); /* FIXME */
+ e |= get_edid(this, output); /* FIXME */
if (this->edid == NULL)
{
this->gamma_error = this->width_mm_edid_error = this->height_mm_edid_error = this->edid_error;
diff --git a/src/libgamma-error.h b/src/libgamma-error.h
index 15a913c..271bec9 100644
--- a/src/libgamma-error.h
+++ b/src/libgamma-error.h
@@ -252,6 +252,11 @@ extern const char* libgamma_group_name;
*/
#define LIBGAMMA_NOT_CONNECTED (-41)
+/**
+ * Data extraction from a reply from the adjustment method failed, reason unknown
+ */
+#define LIBGAMMA_REPLY_VALUE_EXTRACTION_FAILED (-42)
+
/**
@@ -259,7 +264,7 @@ extern const char* libgamma_group_name;
* If this is lower than the number your program thinks it
* should be sould update your program for new errors.
*/
-#define LIBGAMMA_ERROR_MIN (-41)
+#define LIBGAMMA_ERROR_MIN (-42)