diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/test/methods.h | 1 | ||||
| -rw-r--r-- | src/test/ramps.h | 43 | ||||
| -rw-r--r-- | src/test/test.c | 124 | ||||
| -rw-r--r-- | src/test/user.c | 131 | ||||
| -rw-r--r-- | src/test/user.h | 39 |
6 files changed, 219 insertions, 121 deletions
@@ -73,7 +73,7 @@ HEADERS_INFO = libgamma-error libgamma-facade libgamma-method HEADERS = libgamma libgamma-config $(HEADERS_INFO) # Object files for the test. -TESTOBJ = test methods errors crtcinfo +TESTOBJ = test methods errors crtcinfo user # The version of the library. LIB_MAJOR = 0 diff --git a/src/test/methods.h b/src/test/methods.h index c8720bc..194485d 100644 --- a/src/test/methods.h +++ b/src/test/methods.h @@ -23,6 +23,7 @@ # define __attribute__(x) #endif + /** * Get the name representation of an * adjustment method by its identifier. diff --git a/src/test/ramps.h b/src/test/ramps.h new file mode 100644 index 0000000..050ac59 --- /dev/null +++ b/src/test/ramps.h @@ -0,0 +1,43 @@ +/** + * libgamma -- Display server abstraction layer for gamma ramp adjustments + * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef LIBGAMMA_TEST_RAMPS_H +#define LIBGAMMA_TEST_RAMPS_H + + +/** + * X macros of all integer gamma ramps + */ +#define LIST_INTEGER_RAMPS X(ramps8) X(ramps32) X(ramps64) X(ramps16) + +/** + * X macros of all floating-point gamma ramps + */ +#define LIST_FLOAT_RAMPS X(rampsf) X(rampsd) + +/** + * X macros of all gamma ramps + */ +#define LIST_RAMPS LIST_FLOAT_RAMPS LIST_INTEGER_RAMPS + + +/* ramps16 is last because we want to make sure that the gamma ramps are + preserved exactly on exit, and we assume RandR X is used. */ + + +#endif + diff --git a/src/test/test.c b/src/test/test.c index 161835b..16c7841 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -19,137 +19,25 @@ #include "methods.h" #include "errors.h" #include "crtcinfo.h" +#include "user.h" +#include "ramps.h" #include <libgamma.h> #include <stdio.h> #include <stdlib.h> -#include <errno.h> -#include <string.h> #include <unistd.h> /** - * Let the user select adjustment method, site, partition and CRTC. - * - * @param site_state Output slot for the site. - * @param part_state Output slot for the partition. - * @param crtc_state Output slot for the CRTC. - * @return Zero on and only on success. - */ -static int select_monitor(libgamma_site_state_t* restrict site_state, - libgamma_partition_state_t* restrict part_state, - libgamma_crtc_state_t* restrict crtc_state) -{ - int method; - char* site; - char* tmp; - char buf[256]; - int r; - - - /* -- Adjustment method -- */ - - /* Let the user select adjustment method. */ - printf("Select adjustment method:\n"); - for (method = 0; method < LIBGAMMA_METHOD_COUNT; method++) - printf(" %i: %s\n", method, method_name(method)); - printf("> "); - fflush(stdout); - fgets(buf, sizeof(buf) / sizeof(char), stdin); - method = atoi(buf); - - - /* -- Site -- */ - - /* Let the user select site. */ - printf("Select site: "); - fflush(stdout); - fgets(buf, sizeof(buf) / sizeof(char), stdin); - tmp = strchr(buf, '\n'); - if (tmp != NULL) - *tmp = '\0'; - if (buf[0] == '\0') - site = NULL; - else - { - site = malloc((strlen(buf) + 1) * sizeof(char)); - memcpy(site, buf, strlen(buf) + 1); - } - - /* Initialise site state. */ - if ((r = libgamma_site_initialise(site_state, method, site))) - { - free(site); - return libgamma_perror("error", r), 1; - } - - - /* -- Partition -- */ - - /* Check that the site has at least one partition. */ - if (site_state->partitions_available == 0) - { - libgamma_site_free(site_state); - return printf("No partitions found\n"), 1; - } - - /* Let the user select partition. */ - printf("Select partition [0, %lu]: ", site_state->partitions_available - 1); - fflush(stdout); - fgets(buf, sizeof(buf) / sizeof(char), stdin); - - /* Initialise partition state. */ - if ((r = libgamma_partition_initialise(part_state, site_state, (size_t)atoll(buf)))) - { - libgamma_site_free(site_state); - return libgamma_perror("error", r), 1; - } - - - /* -- CRTC -- */ - - /* Check that the partition has at least one CRTC. */ - if (part_state->crtcs_available == 0) - { - libgamma_partition_free(part_state); - libgamma_site_free(site_state); - return printf("No CRTC:s found\n"), 1; - } - - /* Let the user select CRTC. */ - printf("Select CRTC [0, %lu]: ", part_state->crtcs_available - 1); - fflush(stdout); - fgets(buf, sizeof(buf) / sizeof(char), stdin); - - /* Initialise CRTC state. */ - if ((r = libgamma_crtc_initialise(crtc_state, part_state, (size_t)atoll(buf)))) - { - libgamma_partition_free(part_state); - libgamma_site_free(site_state); - return libgamma_perror("error", r), 1; - } - - printf("\n"); - return 0; -} - - -/** * Test `libgamma` * - * @return Non-zero on machine detectable error, it library may still - * be faulty if zero is returned. + * @return Non-zero on machine detectable error, it library + * may still be faulty if zero is returned. */ int main(void) { - /* ramps16 is last because we want to make sure that the gamma ramps are - preserved exactly on exit, and we assume RandR X is used. */ -#define LIST_INTEGER_RAMPS X(ramps8) X(ramps32) X(ramps64) X(ramps16) -#define LIST_FLOAT_RAMPS X(rampsf) X(rampsd) -#define LIST_RAMPS LIST_FLOAT_RAMPS LIST_INTEGER_RAMPS - libgamma_site_state_t* restrict site_state = malloc(sizeof(libgamma_site_state_t)); libgamma_partition_state_t* restrict part_state = malloc(sizeof(libgamma_partition_state_t)); libgamma_crtc_state_t* restrict crtc_state = malloc(sizeof(libgamma_crtc_state_t)); @@ -252,9 +140,5 @@ int main(void) libgamma_partition_free(part_state); libgamma_site_free(site_state); return rr; - -#undef LIST_FLOAT_RAMPS -#undef LIST_INTEGER_RAMPS -#undef LIST_RAMPS } diff --git a/src/test/user.c b/src/test/user.c new file mode 100644 index 0000000..a9980ed --- /dev/null +++ b/src/test/user.c @@ -0,0 +1,131 @@ +/** + * libgamma -- Display server abstraction layer for gamma ramp adjustments + * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library. If not, see <http://www.gnu.org/licenses/>. + */ +#include "user.h" + +#include "methods.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + + +/** + * Let the user select adjustment method, site, partition and CRTC. + * + * @param site_state Output slot for the site. + * @param part_state Output slot for the partition. + * @param crtc_state Output slot for the CRTC. + * @return Zero on and only on success. + */ +int select_monitor(libgamma_site_state_t* restrict site_state, + libgamma_partition_state_t* restrict part_state, + libgamma_crtc_state_t* restrict crtc_state) +{ + int method; + char* site; + char* tmp; + char buf[256]; + int r; + + + /* -- Adjustment method -- */ + + /* Let the user select adjustment method. */ + printf("Select adjustment method:\n"); + for (method = 0; method < LIBGAMMA_METHOD_COUNT; method++) + printf(" %i: %s\n", method, method_name(method)); + printf("> "); + fflush(stdout); + fgets(buf, sizeof(buf) / sizeof(char), stdin); + method = atoi(buf); + + + /* -- Site -- */ + + /* Let the user select site. */ + printf("Select site: "); + fflush(stdout); + fgets(buf, sizeof(buf) / sizeof(char), stdin); + tmp = strchr(buf, '\n'); + if (tmp != NULL) + *tmp = '\0'; + if (buf[0] == '\0') + site = NULL; + else + { + site = malloc((strlen(buf) + 1) * sizeof(char)); + memcpy(site, buf, strlen(buf) + 1); + } + + /* Initialise site state. */ + if ((r = libgamma_site_initialise(site_state, method, site))) + { + free(site); + return libgamma_perror("error", r), 1; + } + + + /* -- Partition -- */ + + /* Check that the site has at least one partition. */ + if (site_state->partitions_available == 0) + { + libgamma_site_free(site_state); + return printf("No partitions found\n"), 1; + } + + /* Let the user select partition. */ + printf("Select partition [0, %lu]: ", site_state->partitions_available - 1); + fflush(stdout); + fgets(buf, sizeof(buf) / sizeof(char), stdin); + + /* Initialise partition state. */ + if ((r = libgamma_partition_initialise(part_state, site_state, (size_t)atoll(buf)))) + { + libgamma_site_free(site_state); + return libgamma_perror("error", r), 1; + } + + + /* -- CRTC -- */ + + /* Check that the partition has at least one CRTC. */ + if (part_state->crtcs_available == 0) + { + libgamma_partition_free(part_state); + libgamma_site_free(site_state); + return printf("No CRTC:s found\n"), 1; + } + + /* Let the user select CRTC. */ + printf("Select CRTC [0, %lu]: ", part_state->crtcs_available - 1); + fflush(stdout); + fgets(buf, sizeof(buf) / sizeof(char), stdin); + + /* Initialise CRTC state. */ + if ((r = libgamma_crtc_initialise(crtc_state, part_state, (size_t)atoll(buf)))) + { + libgamma_partition_free(part_state); + libgamma_site_free(site_state); + return libgamma_perror("error", r), 1; + } + + printf("\n"); + return 0; +} + diff --git a/src/test/user.h b/src/test/user.h new file mode 100644 index 0000000..ed47560 --- /dev/null +++ b/src/test/user.h @@ -0,0 +1,39 @@ +/** + * libgamma -- Display server abstraction layer for gamma ramp adjustments + * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this library. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef LIBGAMMA_TEST_USER_H +#define LIBGAMMA_TEST_USER_H + + +#include <libgamma.h> + + +/** + * Let the user select adjustment method, site, partition and CRTC. + * + * @param site_state Output slot for the site. + * @param part_state Output slot for the partition. + * @param crtc_state Output slot for the CRTC. + * @return Zero on and only on success. + */ +int select_monitor(libgamma_site_state_t* restrict site_state, + libgamma_partition_state_t* restrict part_state, + libgamma_crtc_state_t* restrict crtc_state); + + +#endif + |