diff options
Diffstat (limited to '')
| -rw-r--r-- | src/types/filter.c (renamed from src/filter.c) | 2 | ||||
| -rw-r--r-- | src/types/filter.h (renamed from src/filter.h) | 7 | ||||
| -rw-r--r-- | src/types/message.c (renamed from src/message.c) | 2 | ||||
| -rw-r--r-- | src/types/message.h (renamed from src/message.h) | 7 | ||||
| -rw-r--r-- | src/types/output.c (renamed from src/output.c) | 220 | ||||
| -rw-r--r-- | src/types/output.h (renamed from src/output.h) | 34 | ||||
| -rw-r--r-- | src/types/ramps.c (renamed from src/ramps.c) | 67 | ||||
| -rw-r--r-- | src/types/ramps.h (renamed from src/ramps.h) | 21 | ||||
| -rw-r--r-- | src/types/ring.c (renamed from src/ring.c) | 0 | ||||
| -rw-r--r-- | src/types/ring.h (renamed from src/ring.h) | 7 |
10 files changed, 35 insertions, 332 deletions
diff --git a/src/filter.c b/src/types/filter.c index c335e0b..e6facc9 100644 --- a/src/filter.c +++ b/src/types/filter.c @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "filter.h" -#include "util.h" +#include "../util.h" #include <stdlib.h> #include <string.h> diff --git a/src/filter.h b/src/types/filter.h index 5691f6c..c9e01bb 100644 --- a/src/filter.h +++ b/src/types/filter.h @@ -15,6 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef TYPES_FILTER_H +#define TYPES_FILTER_H + + #include <stddef.h> #include <stdint.h> @@ -129,3 +133,6 @@ size_t filter_marshal(const struct filter* restrict this, void* restrict buf, si GCC_ONLY(__attribute__((nonnull))) size_t filter_unmarshal(struct filter* restrict this, const void* restrict buf, size_t ramps_size); + +#endif + diff --git a/src/message.c b/src/types/message.c index 48bdbff..e7c844d 100644 --- a/src/message.c +++ b/src/types/message.c @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "message.h" -#include "util.h" +#include "../util.h" #include <sys/socket.h> #include <errno.h> diff --git a/src/message.h b/src/types/message.h index 15a9330..00a2a50 100644 --- a/src/message.h +++ b/src/types/message.h @@ -15,6 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef TYPES_MESSAGE_H +#define TYPES_MESSAGE_H + + #include <stddef.h> #include <limits.h> @@ -151,3 +155,6 @@ size_t message_unmarshal(struct message* restrict this, const void* restrict buf GCC_ONLY(__attribute__((nonnull))) int message_read(struct message* restrict this, int fd); + +#endif + diff --git a/src/output.c b/src/types/output.c index e8913dd..8576baa 100644 --- a/src/output.c +++ b/src/types/output.c @@ -16,24 +16,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "output.h" -#include "util.h" +#include "../util.h" -#include <libclut.h> - -#include <stdio.h> #include <stdlib.h> #include <string.h> /** - * The name of the process - */ -extern char* restrict argv0; - - - -/** * Free all resources allocated to an output. * The allocation of `output` itself is not freed, * nor is its the libgamma destroyed. @@ -272,211 +262,3 @@ struct output* output_find_by_name(const char* restrict key, struct output* rest return bsearch(&k, base, n, sizeof(*base), output_cmp_by_name); } - -/** - * Remove a filter from an output - * - * @param out The output - * @param filter The filter - * @return The index of the filter, `out->table_size` if not found - */ -static ssize_t remove_filter(struct output* restrict out, struct filter* restrict filter) -{ - size_t i, n = out->table_size; - - for (i = 0; i < n; i++) - if (!strcmp(filter->class, out->table_filters[i].class)) - break; - - if (i == out->table_size) - { - fprintf(stderr, "%s: ignoring attempt to removing non-existing filter on CRTC %s: %s", - argv0, out->name, filter->class); - return (ssize_t)(out->table_size); - } - - filter_destroy(out->table_filters + i); - libgamma_gamma_ramps8_destroy(&(out->table_sums[i].u8)); - - n = n - i - 1; - memmove(out->table_filters + i, out->table_filters + i + 1, n * sizeof(*(out->table_filters))); - memmove(out->table_sums + i, out->table_sums + i + 1, n * sizeof(*(out->table_sums))); - out->table_size--; - - return (ssize_t)i; -} - - -/** - * Add a filter to an output - * - * @param out The output - * @param filter The filter - * @return The index given to the filter, -1 on error - */ -ssize_t add_filter(struct output* restrict out, struct filter* restrict filter) -{ - size_t i, n = out->table_size; - int r = -1; - - /* Remove? */ - if (filter->lifespan == LIFESPAN_REMOVE) - return remove_filter(out, filter); - - /* Update? */ - for (i = 0; i < n; i++) - if (!strcmp(filter->class, out->table_filters[i].class)) - break; - if (i != n) - { - filter_destroy(out->table_filters + i); - out->table_filters[i] = *filter; - return (ssize_t)i; - } - - /* Add! */ - for (i = 0; i < n; i++) - if (filter->priority > out->table_filters[i].priority) - break; - - if (n == out->table_alloc) - { - void* new; - - new = realloc(out->table_filters, (n + 10) * sizeof(*(out->table_filters))); - if (new == NULL) - return -1; - out->table_filters = new; - - new = realloc(out->table_sums, (n + 10) * sizeof(*(out->table_sums))); - if (new == NULL) - return -1; - out->table_sums = new; - - out->table_alloc += 10; - } - - memmove(out->table_filters + i + 1, out->table_filters + i, (n - i) * sizeof(*(out->table_filters))); - memmove(out->table_sums + i + 1, out->table_sums + i, (n - i) * sizeof(*(out->table_sums))); - out->table_size++; - - COPY_RAMP_SIZES(&(out->table_sums[i].u8), out); - switch (out->depth) - { - case 8: r = libgamma_gamma_ramps8_initialise(&(out->table_sums[i].u8)); break; - case 16: r = libgamma_gamma_ramps16_initialise(&(out->table_sums[i].u16)); break; - case 32: r = libgamma_gamma_ramps32_initialise(&(out->table_sums[i].u32)); break; - case 64: r = libgamma_gamma_ramps64_initialise(&(out->table_sums[i].u64)); break; - case -1: r = libgamma_gamma_rampsf_initialise(&(out->table_sums[i].f)); break; - case -2: r = libgamma_gamma_rampsd_initialise(&(out->table_sums[i].d)); break; - default: - abort(); - } - if (r < 0) - return -1; - - out->table_filters[i] = *filter; - - return (ssize_t)i; -} - - -/** - * Recalculate the resulting gamma and - * update push the new gamma ramps to the CRTC - * - * @param output The output - * @param first_updated The index of the first added or removed filter - * @return Zero on success, -1 on error - */ -int flush_filters(struct output* restrict output, size_t first_updated) -{ - union gamma_ramps plain; - union gamma_ramps* last; - size_t i; - int r = 0; - - if (first_updated == 0) - { - if (make_plain_ramps(&plain, output) < 0) - return -1; - last = &plain; - } - else - last = output->table_sums + (first_updated - 1); - - for (i = first_updated; i < output->table_size; i++) - { - apply(output->table_sums + i, output->table_filters[i].ramps, output->depth, last); - last = output->table_sums + i; - } - - switch (output->depth) - { - case 8: r = libgamma_crtc_set_gamma_ramps8(output->crtc, last->u8); break; - case 16: r = libgamma_crtc_set_gamma_ramps16(output->crtc, last->u16); break; - case 32: r = libgamma_crtc_set_gamma_ramps32(output->crtc, last->u32); break; - case 64: r = libgamma_crtc_set_gamma_ramps64(output->crtc, last->u64); break; - case -1: r = libgamma_crtc_set_gamma_rampsf(output->crtc, last->f); break; - case -2: r = libgamma_crtc_set_gamma_rampsd(output->crtc, last->d); break; - default: - abort(); - } - if (r) - libgamma_perror(argv0, r); /* Not fatal */ - - if (first_updated == 0) - libgamma_gamma_ramps8_destroy(&(plain.u8)); - - return 0; -} - - -/** - * Make identity mapping ramps - * - * @param ramps Output parameter for the ramps - * @param output The output for which the ramps shall be configured - * @return Zero on success, -1 on error - */ -int make_plain_ramps(union gamma_ramps* restrict ramps, struct output* restrict output) -{ - COPY_RAMP_SIZES(&(ramps->u8), output); - switch (output->depth) - { - case 8: - if (libgamma_gamma_ramps8_initialise(&(ramps->u8))) - return -1; - libclut_start_over(&(ramps->u8), UINT8_MAX, uint8_t, 1, 1, 1); - break; - case 16: - if (libgamma_gamma_ramps16_initialise(&(ramps->u16))) - return -1; - libclut_start_over(&(ramps->u16), UINT16_MAX, uint16_t, 1, 1, 1); - break; - case 32: - if (libgamma_gamma_ramps32_initialise(&(ramps->u32))) - return -1; - libclut_start_over(&(ramps->u32), UINT32_MAX, uint32_t, 1, 1, 1); - break; - case 64: - if (libgamma_gamma_ramps64_initialise(&(ramps->u64))) - return -1; - libclut_start_over(&(ramps->u64), UINT64_MAX, uint64_t, 1, 1, 1); - break; - case -1: - if (libgamma_gamma_rampsf_initialise(&(ramps->f))) - return -1; - libclut_start_over(&(ramps->f), 1.0f, float, 1, 1, 1); - break; - case -2: - if (libgamma_gamma_rampsd_initialise(&(ramps->d))) - return -1; - libclut_start_over(&(ramps->d), (double)1, double, 1, 1, 1); - break; - default: - abort(); - } - return 0; -} - diff --git a/src/output.h b/src/types/output.h index 08978b5..f8a4c3e 100644 --- a/src/output.h +++ b/src/types/output.h @@ -15,6 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef TYPES_OUTPUT_H +#define TYPES_OUTPUT_H + + #include <stddef.h> #include <libgamma.h> @@ -197,34 +201,6 @@ int output_cmp_by_name(const void* restrict a, const void* restrict b); GCC_ONLY(__attribute__((pure, nonnull))) struct output* output_find_by_name(const char* restrict key, struct output* restrict base, size_t n); -/** - * Add a filter to an output - * - * @param output The output - * @param filter The filter - * @return The index given to the filter, -1 on error - */ -GCC_ONLY(__attribute__((nonnull))) -ssize_t add_filter(struct output* restrict output, struct filter* restrict filter); - -/** - * Recalculate the resulting gamma and - * update push the new gamma ramps to the CRTC - * - * @param output The output - * @param first_updated The index of the first added or removed filter - * @return Zero on success, -1 on error - */ -GCC_ONLY(__attribute__((nonnull))) -int flush_filters(struct output* restrict output, size_t first_updated); -/** - * Make identity mapping ramps - * - * @param ramps Output parameter for the ramps - * @param output The output for which the ramps shall be configured - * @return Zero on success, -1 on error - */ -GCC_ONLY(__attribute__((nonnull))) -int make_plain_ramps(union gamma_ramps* restrict ramps, struct output* restrict output); +#endif diff --git a/src/ramps.c b/src/types/ramps.c index 2b855a4..30bed3e 100644 --- a/src/ramps.c +++ b/src/types/ramps.c @@ -96,70 +96,3 @@ size_t gamma_ramps_unmarshal(union gamma_ramps* restrict this, const void* restr return ramps_size; } - -/** - * Apply a ramp-trio on top of another ramp-trio - * - * @param dest The output for the resulting ramp-trio, must be initialised - * @param application The red, green and blue ramps, as one single raw array, - * of the filter that should be applied - * @param depth -1: `float` stops - * -2: `double` stops - * Other: the number of bits of each (integral) stop - * @param base The CLUT on top of which the new filter should be applied, - * this can be the same pointer as `dest` - */ -void apply(union gamma_ramps* restrict dest, void* restrict application, - int depth, union gamma_ramps* restrict base) -{ - union gamma_ramps app; - size_t bytedepth; - size_t red_width, green_width, blue_width; - - if (depth == -1) - bytedepth = sizeof(float); - else if (depth == -2) - bytedepth = sizeof(double); - else - bytedepth = (size_t)depth / 8; - - red_width = (app.u8.red_size = base->u8.red_size) * bytedepth; - green_width = (app.u8.green_size = base->u8.green_size) * bytedepth; - blue_width = (app.u8.blue_size = base->u8.blue_size) * bytedepth; - - app.u8.red = application; - app.u8.green = app.u8.red + red_width; - app.u8.blue = app.u8.green + green_width; - - if (dest != base) - { - memcpy(dest->u8.red, base->u8.red, red_width); - memcpy(dest->u8.green, base->u8.green, green_width); - memcpy(dest->u8.blue, base->u8.blue, blue_width); - } - - switch (depth) - { - case 8: - libclut_apply(&(dest->u8), UINT8_MAX, uint8_t, &(app.u8), UINT8_MAX, uint8_t, 1, 1, 1); - break; - case 16: - libclut_apply(&(dest->u16), UINT16_MAX, uint16_t, &(app.u16), UINT16_MAX, uint16_t, 1, 1, 1); - break; - case 32: - libclut_apply(&(dest->u32), UINT32_MAX, uint32_t, &(app.u32), UINT32_MAX, uint32_t, 1, 1, 1); - break; - case 64: - libclut_apply(&(dest->u64), UINT64_MAX, uint64_t, &(app.u64), UINT64_MAX, uint64_t, 1, 1, 1); - break; - case -1: - libclut_apply(&(dest->f), 1.0f, float, &(app.d), 1.0f, float, 1, 1, 1); - break; - case -2: - libclut_apply(&(dest->d), (double)1, double, &(app.f), (double)1, double, 1, 1, 1); - break; - default: - abort(); - } -} - diff --git a/src/ramps.h b/src/types/ramps.h index 0ba8579..001d504 100644 --- a/src/ramps.h +++ b/src/types/ramps.h @@ -15,6 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef TYPES_RAMPS_H +#define TYPES_RAMPS_H + + #include <libgamma.h> @@ -93,19 +97,6 @@ size_t gamma_ramps_marshal(const union gamma_ramps* restrict this, void* restric GCC_ONLY(__attribute__((nonnull))) size_t gamma_ramps_unmarshal(union gamma_ramps* restrict this, const void* restrict buf, size_t ramps_size); -/** - * Apply a ramp-trio on top of another ramp-trio - * - * @param dest The output for the resulting ramp-trio, must be initialised - * @param application The red, green and blue ramps, as one single raw array, - * of the filter that should be applied - * @param depth -1: `float` stops - * -2: `double` stops - * Other: the number of bits of each (integral) stop - * @param base The CLUT on top of which the new filter should be applied, - * this can be the same pointer as `dest` - */ -GCC_ONLY(__attribute__((nonnull))) -void apply(union gamma_ramps* restrict dest, void* restrict application, - int depth, union gamma_ramps* restrict base); + +#endif diff --git a/src/ring.c b/src/types/ring.c index 13cf8c9..13cf8c9 100644 --- a/src/ring.c +++ b/src/types/ring.c diff --git a/src/ring.h b/src/types/ring.h index 5825810..0474f39 100644 --- a/src/ring.h +++ b/src/types/ring.h @@ -15,6 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef TYPES_RING_H +#define TYPES_RING_H + + #include <stddef.h> @@ -143,3 +147,6 @@ static inline int ring_have_more(struct ring* restrict this) return this->buffer != NULL; } + +#endif + |