From 2f6722a1d580efe25524cf19aa62bc370c57a4be Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 19 Dec 2016 01:26:20 +0100 Subject: m + cg-base: class_suffixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/cg-base.c | 173 ++++++++++++++++++++++++++++++---------------------- src/cg-base.h | 5 ++ src/cg-brilliance.c | 5 ++ src/cg-darkroom.c | 5 ++ src/cg-gamma.c | 5 ++ src/cg-icc.c | 5 ++ src/cg-limits.c | 5 ++ src/cg-negative.c | 5 ++ src/cg-rainbow.c | 5 ++ src/cg-sleepmode.c | 5 ++ 10 files changed, 145 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/cg-base.c b/src/cg-base.c index c8ed045..b44c065 100644 --- a/src/cg-base.c +++ b/src/cg-base.c @@ -161,11 +161,11 @@ int make_slaves(void) struct crtc_sort_data* data; size_t i, j, n = 0, master = 0, master_i; - data = alloca(crtcs_n * sizeof(*data)); - memset(data, 0, crtcs_n * sizeof(*data)); - for (i = 0; i < crtcs_n; i++) + data = alloca(filters_n * sizeof(*data)); + memset(data, 0, filters_n * sizeof(*data)); + for (i = 0; i < filters_n; i++) { - if (!(crtc_info[i].supported)) + if (!(crtc_info[crtc_updates[i].crtc].supported)) continue; data[n].depth = crtc_updates[i].filter.depth; @@ -303,7 +303,7 @@ int synchronise(int timeout) if (pollfd.revents & (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI | POLLERR | POLLHUP | POLLNVAL)) for (;;) { - if (libcoopgamma_synchronise(&cg, asyncs, crtcs_n, &selected) < 0) + if (libcoopgamma_synchronise(&cg, asyncs, filters_n, &selected) < 0) { if (errno == 0) continue; @@ -562,13 +562,16 @@ int main(int argc, char* argv[]) int rc = 0; char* method = NULL; char* site = NULL; - size_t crtcs_i = 0; + size_t crtc_i = 0; int64_t priority = default_priority; char* prio = NULL; char* rule = NULL; char* class = default_class; + char** classes = NULL; + size_t classes_n = 0; int explicit_crtcs = 0; int have_crtc_q = 0; + size_t i, filter_i; argv0 = *argv++, argc--; @@ -612,7 +615,7 @@ int main(int argc, char* argv[]) { if (arg == NULL) usage(); - crtcs[crtcs_i++] = arg; + crtcs[crtc_i++] = arg; explicit_crtcs = 1; if (!have_crtc_q && !strcmp(arg, "?")) have_crtc_q = 1; @@ -644,14 +647,14 @@ int main(int argc, char* argv[]) } } - crtcs_n = crtcs_i; - crtcs[crtcs_i] = NULL; - if (!have_crtc_q && - nulstrcmp(prio, "?") && nulstrcmp(rule, "??") && - nulstrcmp(rule, "?") && nulstrcmp(method, "?")) + crtcs_n = crtc_i; + crtcs[crtc_i] = NULL; + if (!have_crtc_q && nulstrcmp(method, "?") && + nulstrcmp(rule, "?") && nulstrcmp(rule, "??") && + ((default_priority == NO_DEFAULT_PRIORITY) || nulstrcmp(prio, "?"))) if (handle_args(argc, argv, prio) < 0) goto fail; - + if (default_priority != NO_DEFAULT_PRIORITY) { if (!nulstrcmp(prio, "?")) @@ -671,7 +674,12 @@ int main(int argc, char* argv[]) if (!nulstrcmp(rule, "??")) { - printf("%s\n", class); + size_t i; + if (*class_suffixes == NULL) + printf("%s\n", class); + else + for (i = 0; class_suffixes[i] != NULL; i++) + printf("%s%s\n", class, class_suffixes[i]); return 0; } else if (!nulstrcmp(rule, "?")) @@ -729,7 +737,6 @@ int main(int argc, char* argv[]) dealloc_crtcs = 1; for (; crtcs[crtcs_n] != NULL; crtcs_n++); } - filters_n = crtcs_n; if (crtcs_n == 0) { @@ -737,19 +744,38 @@ int main(int argc, char* argv[]) goto custom_fail; } + if (*class_suffixes == NULL) + { + classes = &class; + classes_n = 1; + } + else + { + size_t len = strlen(class); + while (class_suffixes[classes_n]) + classes_n++; + classes = alloca(classes_n * sizeof(*classes)); + for (i = 0; i < classes_n; i++) + { + classes[i] = alloca(len + strlen(class_suffixes[i]) + sizeof(":")); + stpcpy(stpcpy(stpcpy(classes[i], class), ":"), class_suffixes[i]); + } + } + filters_n = classes_n * crtcs_n; + crtc_info = alloca(crtcs_n * sizeof(*crtc_info)); memset(crtc_info, 0, crtcs_n * sizeof(*crtc_info)); - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) - if (libcoopgamma_crtc_info_initialise(crtc_info + crtcs_i) < 0) + for (crtc_i = 0; crtc_i < crtcs_n; crtc_i++) + if (libcoopgamma_crtc_info_initialise(crtc_info + crtc_i) < 0) goto cg_fail; if (libcoopgamma_set_nonblocking(&cg, 1) < 0) goto fail; - asyncs = alloca(crtcs_n * sizeof(*asyncs)); - memset(asyncs, 0, crtcs_n * sizeof(*asyncs)); - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) - if (libcoopgamma_async_context_initialise(asyncs + crtcs_i) < 0) + asyncs = alloca(filters_n * sizeof(*asyncs)); + memset(asyncs, 0, filters_n * sizeof(*asyncs)); + for (filter_i = 0; filter_i < filters_n; filter_i++) + if (libcoopgamma_async_context_initialise(asyncs + filter_i) < 0) goto fail; switch (get_crtc_info()) @@ -762,51 +788,52 @@ int main(int argc, char* argv[]) goto cg_fail; } - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) + for (crtc_i = 0; crtc_i < crtcs_n; crtc_i++) { - if (explicit_crtcs && !(crtc_info[crtcs_i].supported)) + if (explicit_crtcs && !(crtc_info[crtc_i].supported)) fprintf(stderr, "%s: warning: gamma adjustments not supported on CRTC: %s\n", - argv0, crtcs[crtcs_i]); - if (crtc_info[crtcs_i].cooperative == 0) + argv0, crtcs[crtc_i]); + if (crtc_info[crtc_i].cooperative == 0) fprintf(stderr, "%s: warning: cooperative gamma server not running for CRTC: %s\n", - argv0, crtcs[crtcs_i]); + argv0, crtcs[crtc_i]); } - crtc_updates = alloca(crtcs_n * sizeof(*crtc_updates)); - memset(crtc_updates, 0, crtcs_n * sizeof(*crtc_updates)); - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) - { - if (libcoopgamma_filter_initialise(&(crtc_updates[crtcs_i].filter)) < 0) - goto fail; - if (libcoopgamma_error_initialise(&(crtc_updates[crtcs_i].error)) < 0) - goto fail; - crtc_updates[crtcs_i].crtc = crtcs_i; - crtc_updates[crtcs_i].synced = 1; - crtc_updates[crtcs_i].failed = 0; - crtc_updates[crtcs_i].master = 1; - crtc_updates[crtcs_i].slaves = NULL; - crtc_updates[crtcs_i].filter.crtc = crtcs[crtcs_i]; - crtc_updates[crtcs_i].filter.class = class; - crtc_updates[crtcs_i].filter.priority = priority; - crtc_updates[crtcs_i].filter.depth = crtc_info[crtcs_i].depth; - crtc_updates[crtcs_i].filter.ramps.u8.red_size = crtc_info[crtcs_i].red_size; - crtc_updates[crtcs_i].filter.ramps.u8.green_size = crtc_info[crtcs_i].green_size; - crtc_updates[crtcs_i].filter.ramps.u8.blue_size = crtc_info[crtcs_i].blue_size; - switch (crtc_updates[crtcs_i].filter.depth) - { + crtc_updates = alloca(filters_n * sizeof(*crtc_updates)); + memset(crtc_updates, 0, filters_n * sizeof(*crtc_updates)); + for (filter_i = i = 0; i < classes_n; i++) + for (crtc_i = 0; crtc_i < crtcs_n; crtc_i++, filter_i++) + { + if (libcoopgamma_filter_initialise(&(crtc_updates[filter_i].filter)) < 0) + goto fail; + if (libcoopgamma_error_initialise(&(crtc_updates[filter_i].error)) < 0) + goto fail; + crtc_updates[filter_i].crtc = crtc_i; + crtc_updates[filter_i].synced = 1; + crtc_updates[filter_i].failed = 0; + crtc_updates[filter_i].master = 1; + crtc_updates[filter_i].slaves = NULL; + crtc_updates[filter_i].filter.crtc = crtcs[crtc_i]; + crtc_updates[filter_i].filter.class = classes[i]; + crtc_updates[filter_i].filter.priority = priority; + crtc_updates[filter_i].filter.depth = crtc_info[crtc_i].depth; + crtc_updates[filter_i].filter.ramps.u8.red_size = crtc_info[crtc_i].red_size; + crtc_updates[filter_i].filter.ramps.u8.green_size = crtc_info[crtc_i].green_size; + crtc_updates[filter_i].filter.ramps.u8.blue_size = crtc_info[crtc_i].blue_size; + switch (crtc_updates[filter_i].filter.depth) + { #define X(CONST, MEMBER, MAX, TYPE)\ - case CONST:\ - libcoopgamma_ramps_initialise(&(crtc_updates[crtcs_i].filter.ramps.MEMBER));\ - libclut_start_over(&(crtc_updates[crtcs_i].filter.ramps.MEMBER), MAX, TYPE, 1, 1, 1);\ - break; + case CONST:\ + libcoopgamma_ramps_initialise(&(crtc_updates[filter_i].filter.ramps.MEMBER));\ + libclut_start_over(&(crtc_updates[filter_i].filter.ramps.MEMBER), MAX, TYPE, 1, 1, 1);\ + break; LIST_DEPTHS #undef X - default: - fprintf(stderr, "%s: internal error: gamma ramp type is unrecognised: %i\n", - argv0, crtc_updates[crtcs_i].filter.depth); - goto custom_fail; - } - } + default: + fprintf(stderr, "%s: internal error: gamma ramp type is unrecognised: %i\n", + argv0, crtc_updates[filter_i].filter.depth); + goto custom_fail; + } + } switch (start()) { @@ -820,11 +847,11 @@ LIST_DEPTHS goto custom_fail; } - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) - if (crtc_updates[crtcs_i].failed) + for (filter_i = 0; filter_i < filters_n; filter_i++) + if (crtc_updates[filter_i].failed) { const char* side = cg.error.server_side ? "server" : "client"; - const char* crtc = crtc_updates[crtcs_i].filter.crtc; + const char* crtc = crtc_updates[filter_i].filter.crtc; if (cg.error.custom) { if ((cg.error.number != 0) && (cg.error.description != NULL)) @@ -846,23 +873,23 @@ LIST_DEPTHS if (dealloc_crtcs) free(crtcs); if (crtc_info != NULL) - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) - libcoopgamma_crtc_info_destroy(crtc_info + crtcs_i); + for (crtc_i = 0; crtc_i < crtcs_n; crtc_i++) + libcoopgamma_crtc_info_destroy(crtc_info + crtc_i); if (asyncs != NULL) - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) - libcoopgamma_async_context_destroy(asyncs + crtcs_i); + for (filter_i = 0; filter_i < filters_n; filter_i++) + libcoopgamma_async_context_destroy(asyncs + filter_i); if (stage >= 1) libcoopgamma_context_destroy(&cg, stage >= 2); if (crtc_updates != NULL) - for (crtcs_i = 0; crtcs_i < crtcs_n; crtcs_i++) + for (filter_i = 0; filter_i < filters_n; filter_i++) { - if (crtc_updates[crtcs_i].master == 0) - memset(&(crtc_updates[crtcs_i].filter.ramps.u8), 0, sizeof(crtc_updates[crtcs_i].filter.ramps.u8)); - crtc_updates[crtcs_i].filter.crtc = NULL; - crtc_updates[crtcs_i].filter.class = NULL; - libcoopgamma_filter_destroy(&(crtc_updates[crtcs_i].filter)); - libcoopgamma_error_destroy(&(crtc_updates[crtcs_i].error)); - free(crtc_updates[crtcs_i].slaves); + if (crtc_updates[filter_i].master == 0) + memset(&(crtc_updates[filter_i].filter.ramps.u8), 0, sizeof(crtc_updates[filter_i].filter.ramps.u8)); + crtc_updates[filter_i].filter.crtc = NULL; + crtc_updates[filter_i].filter.class = NULL; + libcoopgamma_filter_destroy(&(crtc_updates[filter_i].filter)); + libcoopgamma_error_destroy(&(crtc_updates[filter_i].error)); + free(crtc_updates[filter_i].slaves); } return rc; diff --git a/src/cg-base.h b/src/cg-base.h index 0b3f497..cd885e7 100644 --- a/src/cg-base.h +++ b/src/cg-base.h @@ -155,6 +155,11 @@ extern const int64_t default_priority; */ extern char default_class[]; +/** + * Class suffixes + */ +extern const char* const* class_suffixes; + /** diff --git a/src/cg-brilliance.c b/src/cg-brilliance.c index c948014..40d74a7 100644 --- a/src/cg-brilliance.c +++ b/src/cg-brilliance.c @@ -37,6 +37,11 @@ const int64_t default_priority = ((int64_t)1) << 61; */ char default_class[] = PKGNAME "::cg-brilliance::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-darkroom.c b/src/cg-darkroom.c index 0c07b7d..2151e1b 100644 --- a/src/cg-darkroom.c +++ b/src/cg-darkroom.c @@ -37,6 +37,11 @@ const int64_t default_priority = ((int64_t)3) << 61; */ char default_class[] = PKGNAME "::cg-darkroom::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-gamma.c b/src/cg-gamma.c index 27e8433..62b35df 100644 --- a/src/cg-gamma.c +++ b/src/cg-gamma.c @@ -40,6 +40,11 @@ const int64_t default_priority = 0; */ char default_class[] = PKGNAME "::cg-gamma::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-icc.c b/src/cg-icc.c index 31ac50c..f1a6be7 100644 --- a/src/cg-icc.c +++ b/src/cg-icc.c @@ -63,6 +63,11 @@ const int64_t default_priority = 0; */ char default_class[] = PKGNAME "::cg-icc::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-limits.c b/src/cg-limits.c index f3f0277..390059e 100644 --- a/src/cg-limits.c +++ b/src/cg-limits.c @@ -40,6 +40,11 @@ const int64_t default_priority = -(((int64_t)1) << 62); */ char default_class[] = PKGNAME "::cg-limits::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-negative.c b/src/cg-negative.c index 836a876..90b0df2 100644 --- a/src/cg-negative.c +++ b/src/cg-negative.c @@ -37,6 +37,11 @@ const int64_t default_priority = ((int64_t)1) << 62; */ char default_class[] = PKGNAME "::cg-negative::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-rainbow.c b/src/cg-rainbow.c index 8cb5871..2cfb581 100644 --- a/src/cg-rainbow.c +++ b/src/cg-rainbow.c @@ -40,6 +40,11 @@ const int64_t default_priority = ((int64_t)1) << 60; */ char default_class[] = PKGNAME "::cg-rainbow::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** diff --git a/src/cg-sleepmode.c b/src/cg-sleepmode.c index 9c1fbf7..1ec2e1d 100644 --- a/src/cg-sleepmode.c +++ b/src/cg-sleepmode.c @@ -43,6 +43,11 @@ const int64_t default_priority = ((int64_t)3) << 59; */ char default_class[] = PKGNAME "::cg-sleepmode::standard"; +/** + * Class suffixes + */ +const char* const* class_suffixes = (const char* const[]){NULL}; + /** -- cgit v1.2.3-70-g09d2