From 5da69a78f0e2c73977b3643345037ba80d0bed7c Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 23 Mar 2025 23:08:43 +0100 Subject: Change w32gdi to wingdi to reflect what the method is called for the user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/Makefile | 2 +- src/common.h | 2 +- src/gamma-w32gdi.c | 51 --------------------------------------------------- src/gamma-wingdi.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/gamma.c | 2 +- 5 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 src/gamma-w32gdi.c create mode 100644 src/gamma-wingdi.c diff --git a/src/Makefile b/src/Makefile index d37ae41..a62a0cf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ OBJ =\ gamma-quartz.o\ gamma-randr.o\ gamma-vidmode.o\ - gamma-w32gdi.o\ + gamma-wingdi.o\ hooks.o\ location.o\ location-geoclue2.o\ diff --git a/src/common.h b/src/common.h index 5d3e7a4..f5be542 100644 --- a/src/common.h +++ b/src/common.h @@ -1639,7 +1639,7 @@ extern const struct gamma_method randr_gamma_method; extern const struct gamma_method vidmode_gamma_method; extern const struct gamma_method drm_gamma_method; extern const struct gamma_method quartz_gamma_method; -extern const struct gamma_method w32gdi_gamma_method; +extern const struct gamma_method wingdi_gamma_method; extern const struct location_provider manual_location_provider; #ifdef ENABLE_GEOCLUE2 diff --git a/src/gamma-w32gdi.c b/src/gamma-w32gdi.c deleted file mode 100644 index 751d9fd..0000000 --- a/src/gamma-w32gdi.c +++ /dev/null @@ -1,51 +0,0 @@ -/*- - * redshift-ng - Automatically adjust display colour temperature according the Sun - * - * Copyright (c) 2009-2018 Jon Lund Steffensen - * Copyright (c) 2014-2016, 2025 Mattias Andrée - * - * redshift-ng 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. - * - * redshift-ng 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 redshift-ng. If not, see . - */ -#include "common.h" - - -static int -w32gdi_is_available(void) -{ - return libgamma_is_method_available(LIBGAMMA_METHOD_W32_GDI); -} - - -static int -w32gdi_create(struct gamma_state **state_out) -{ - return direct_create(state_out, LIBGAMMA_METHOD_W32_GDI, "wingdi"); -} - - -static void -w32gdi_print_help(void) -{ - printf(_("Adjust gamma ramps with the Windows GDI.\n")); - printf("\n"); - direct_print_help(LIBGAMMA_METHOD_W32_GDI); -} - - -#define w32gdi_set_option direct_set_option -#define w32gdi_start direct_start -#define w32gdi_apply direct_apply -#define w32gdi_restore direct_restore -#define w32gdi_free direct_free -const struct gamma_method w32gdi_gamma_method = GAMMA_METHOD_INIT("wingdi", 1, 0, w32gdi); diff --git a/src/gamma-wingdi.c b/src/gamma-wingdi.c new file mode 100644 index 0000000..6d983c5 --- /dev/null +++ b/src/gamma-wingdi.c @@ -0,0 +1,51 @@ +/*- + * redshift-ng - Automatically adjust display colour temperature according the Sun + * + * Copyright (c) 2009-2018 Jon Lund Steffensen + * Copyright (c) 2014-2016, 2025 Mattias Andrée + * + * redshift-ng 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. + * + * redshift-ng 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 redshift-ng. If not, see . + */ +#include "common.h" + + +static int +wingdi_is_available(void) +{ + return libgamma_is_method_available(LIBGAMMA_METHOD_W32_GDI); +} + + +static int +wingdi_create(struct gamma_state **state_out) +{ + return direct_create(state_out, LIBGAMMA_METHOD_W32_GDI, "wingdi"); +} + + +static void +wingdi_print_help(void) +{ + printf(_("Adjust gamma ramps with the Windows GDI.\n")); + printf("\n"); + direct_print_help(LIBGAMMA_METHOD_W32_GDI); +} + + +#define wingdi_set_option direct_set_option +#define wingdi_start direct_start +#define wingdi_apply direct_apply +#define wingdi_restore direct_restore +#define wingdi_free direct_free +const struct gamma_method wingdi_gamma_method = GAMMA_METHOD_INIT("wingdi", 1, 0, wingdi); diff --git a/src/gamma.c b/src/gamma.c index 44042d0..8dbb99b 100644 --- a/src/gamma.c +++ b/src/gamma.c @@ -28,7 +28,7 @@ const struct gamma_method *gamma_methods[] = { &randr_gamma_method, &vidmode_gamma_method, &quartz_gamma_method, - &w32gdi_gamma_method, + &wingdi_gamma_method, &dummy_gamma_method, NULL }; -- cgit v1.2.3-70-g09d2