diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2017-10-13 18:23:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-13 18:23:24 -0700 |
| commit | d6c6aa64d7185812e8f089a84ab166f080c6aa31 (patch) | |
| tree | 96ea9fa167c30a348466b9660be7b89e34d9177a /src/gamma-vidmode.c | |
| parent | Merge pull request #536 from jonls/gtk-help-args (diff) | |
| parent | Add function for resetting color_setting_t (diff) | |
| download | redshift-ng-d6c6aa64d7185812e8f089a84ab166f080c6aa31.tar.gz redshift-ng-d6c6aa64d7185812e8f089a84ab166f080c6aa31.tar.bz2 redshift-ng-d6c6aa64d7185812e8f089a84ab166f080c6aa31.tar.xz | |
Merge pull request #535 from jonls/cleanup
Cleanup redshift.c + modules + options
Diffstat (limited to 'src/gamma-vidmode.c')
| -rw-r--r-- | src/gamma-vidmode.c | 58 |
1 files changed, 42 insertions, 16 deletions
diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c index e664f80..76950c8 100644 --- a/src/gamma-vidmode.c +++ b/src/gamma-vidmode.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see <http://www.gnu.org/licenses/>. - Copyright (c) 2010-2014 Jon Lund Steffensen <jonlst@gmail.com> + Copyright (c) 2010-2017 Jon Lund Steffensen <jonlst@gmail.com> */ #include <stdlib.h> @@ -37,26 +37,38 @@ #include "colorramp.h" -int -vidmode_init(vidmode_state_t *state) +typedef struct { + Display *display; + int preserve; + int screen_num; + int ramp_size; + uint16_t *saved_ramps; +} vidmode_state_t; + + +static int +vidmode_init(vidmode_state_t **state) { - state->screen_num = -1; - state->saved_ramps = NULL; + *state = malloc(sizeof(vidmode_state_t)); + if (*state == NULL) return -1; - state->preserve = 1; + vidmode_state_t *s = *state; + s->screen_num = -1; + s->saved_ramps = NULL; + + s->preserve = 1; /* Open display */ - state->display = XOpenDisplay(NULL); - if (state->display == NULL) { - fprintf(stderr, _("X request failed: %s\n"), - "XOpenDisplay"); + s->display = XOpenDisplay(NULL); + if (s->display == NULL) { + fprintf(stderr, _("X request failed: %s\n"), "XOpenDisplay"); return -1; } return 0; } -int +static int vidmode_start(vidmode_state_t *state) { int r; @@ -113,7 +125,7 @@ vidmode_start(vidmode_state_t *state) return 0; } -void +static void vidmode_free(vidmode_state_t *state) { /* Free saved ramps */ @@ -121,9 +133,11 @@ vidmode_free(vidmode_state_t *state) /* Close display connection */ XCloseDisplay(state->display); + + free(state); } -void +static void vidmode_print_help(FILE *f) { fputs(_("Adjust gamma ramps with the X VidMode extension.\n"), f); @@ -138,7 +152,7 @@ vidmode_print_help(FILE *f) fputs("\n", f); } -int +static int vidmode_set_option(vidmode_state_t *state, const char *key, const char *value) { if (strcasecmp(key, "screen") == 0) { @@ -153,7 +167,7 @@ vidmode_set_option(vidmode_state_t *state, const char *key, const char *value) return 0; } -void +static void vidmode_restore(vidmode_state_t *state) { uint16_t *gamma_r = &state->saved_ramps[0*state->ramp_size]; @@ -170,7 +184,7 @@ vidmode_restore(vidmode_state_t *state) } } -int +static int vidmode_set_temperature(vidmode_state_t *state, const color_setting_t *setting) { @@ -220,3 +234,15 @@ vidmode_set_temperature(vidmode_state_t *state, return 0; } + + +const gamma_method_t vidmode_gamma_method = { + "vidmode", 1, + (gamma_method_init_func *)vidmode_init, + (gamma_method_start_func *)vidmode_start, + (gamma_method_free_func *)vidmode_free, + (gamma_method_print_help_func *)vidmode_print_help, + (gamma_method_set_option_func *)vidmode_set_option, + (gamma_method_restore_func *)vidmode_restore, + (gamma_method_set_temperature_func *)vidmode_set_temperature +}; |