Cleanup and style update (avoid typedef)

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 86 insertions, 84 deletions

diff --git a/src/common.h b/src/common.h
index 028865f..895fedc 100644
--- a/src/common.h
+++ b/src/common.h
@@ -20,139 +20,142 @@
 #ifndef REDSHIFT_COMMON_H
 #define REDSHIFT_COMMON_H
 
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <locale.h>
+#include <math.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#if !defined(__WIN32__)
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#ifdef _POSIX_TIMERS
+# include <sys/time.h>
+#endif
+#if defined(__WIN32__) || defined(_WIN32)
+# include <windows.h>
+#else
+# include <pwd.h>
 # include <signal.h>
+# include <time.h>
+#endif
+
+#include <libred.h>
+
+#ifdef ENABLE_NLS
+# include <libintl.h>
+#else
+# define gettext(s) (s)
 #endif
+# define _(s) gettext(s)
+# define N_(s) (s)
 
 
 /* The color temperature when no adjustment is applied. */
 #define NEUTRAL_TEMP  6500
 
 
-/* Location */
-typedef struct {
-	float lat;
-	float lon;
-} location_t;
-
-/* Periods of day. */
-typedef enum {
+enum period {
 	PERIOD_NONE = 0,
 	PERIOD_DAYTIME,
 	PERIOD_NIGHT,
 	PERIOD_TRANSITION
-} period_t;
+} ;
 
-/* Color setting */
-typedef struct {
-	int temperature;
-	float gamma[3];
-	float brightness;
-} color_setting_t;
-
-/* Program modes. */
-typedef enum {
+enum program_mode {
 	PROGRAM_MODE_CONTINUAL,
 	PROGRAM_MODE_ONE_SHOT,
 	PROGRAM_MODE_PRINT,
 	PROGRAM_MODE_RESET,
 	PROGRAM_MODE_MANUAL
-} program_mode_t;
+};
+
+struct location {
+	float lat, lon;
+};
+
+struct color_setting {
+	int temperature;
+	float gamma[3];
+	float brightness;
+};
 
 /* Time range.
    Fields are offsets from midnight in seconds. */
-typedef struct {
+struct time_range {
 	int start;
 	int end;
-} time_range_t;
+};
 
 /* Transition scheme.
    The solar elevations at which the transition begins/ends,
    and the association color settings. */
-typedef struct {
+struct transition_scheme {
 	double high;
 	double low;
 	int use_time; /* When enabled, ignore elevation and use time ranges. */
-	time_range_t dawn;
-	time_range_t dusk;
-	color_setting_t day;
-	color_setting_t night;
-} transition_scheme_t;
+	struct time_range dawn;
+	struct time_range dusk;
+	struct color_setting day;
+	struct color_setting night;
+};
 
 
 /* Gamma adjustment method */
-typedef struct gamma_state gamma_state_t;
-
-typedef int gamma_method_init_func(gamma_state_t **state);
-typedef int gamma_method_start_func(gamma_state_t *state, program_mode_t mode);
-typedef void gamma_method_free_func(gamma_state_t *state);
-typedef void gamma_method_print_help_func(FILE *f);
-typedef int gamma_method_set_option_func(gamma_state_t *state, const char *key,
-					 const char *value);
-typedef void gamma_method_restore_func(gamma_state_t *state);
-typedef int gamma_method_set_temperature_func(
-	gamma_state_t *state, const color_setting_t *setting, int preserve);
-
-typedef struct {
+typedef struct gamma_state GAMMA_STATE;
+
+struct gamma_method {
 	char *name;
 
 	/* If true, this method will be tried if none is explicitly chosen. */
 	int autostart;
 
 	/* Initialize state. Options can be set between init and start. */
-	gamma_method_init_func *init;
+	int (*init)(GAMMA_STATE **state);
 	/* Allocate storage and make connections that depend on options. */
-	gamma_method_start_func *start;
+	int (*start)(GAMMA_STATE *state, enum program_mode mode);
 	/* Free all allocated storage and close connections. */
-	gamma_method_free_func *free;
+	void (*free)(GAMMA_STATE *state);
 
 	/* Print help on options for this adjustment method. */
-	gamma_method_print_help_func *print_help;
+	void (*print_help)(FILE *f);
 	/* Set an option key, value-pair */
-	gamma_method_set_option_func *set_option;
+	int (*set_option)(GAMMA_STATE *state, const char *key, const char *value);
 
 	/* Restore the adjustment to the state before start was called. */
-	gamma_method_restore_func *restore;
+	void (*restore)(GAMMA_STATE *state);
 	/* Set a specific color temperature. */
-	gamma_method_set_temperature_func *set_temperature;
-} gamma_method_t;
+	int (*set_temperature)(GAMMA_STATE *state, const struct color_setting *setting, int preserve);
+};
 
 
 /* Location provider */
-typedef struct location_state location_state_t;
-
-typedef int location_provider_init_func(location_state_t **state);
-typedef int location_provider_start_func(location_state_t *state);
-typedef void location_provider_free_func(location_state_t *state);
-typedef void location_provider_print_help_func(FILE *f);
-typedef int location_provider_set_option_func(
-	location_state_t *state, const char *key, const char *value);
-typedef int location_provider_get_fd_func(location_state_t *state);
-typedef int location_provider_handle_func(
-	location_state_t *state, location_t *location, int *available);
-
-typedef struct {
+typedef struct location_state LOCATION_STATE;
+
+struct location_provider {
 	char *name;
 
 	/* Initialize state. Options can be set between init and start. */
-	location_provider_init_func *init;
+	int (*init)(LOCATION_STATE **state);
 	/* Allocate storage and make connections that depend on options. */
-	location_provider_start_func *start;
+	int (*start)(LOCATION_STATE *state);
 	/* Free all allocated storage and close connections. */
-	location_provider_free_func *free;
+	void (*free)(LOCATION_STATE *state);
 
 	/* Print help on options for this location provider. */
-	location_provider_print_help_func *print_help;
+	void (*print_help)(FILE *f);
 	/* Set an option key, value-pair. */
-	location_provider_set_option_func *set_option;
+	int (*set_option)(LOCATION_STATE *state, const char *key, const char *value);
 
 	/* Listen and handle location updates. */
-	location_provider_get_fd_func *get_fd;
-	location_provider_handle_func *handle;
-} location_provider_t;
+	int (*get_fd)(LOCATION_STATE *state);
+	int (*handle)(LOCATION_STATE *state, struct location *location, int *available);
+};
 
 
 #define LIST_RAMPS_STOP_VALUE_TYPES\
@@ -165,14 +168,13 @@ typedef struct {
 
 #define X(SUFFIX, TYPE, MAX, TRUE_MAX, DEPTH)\
 	void colorramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\
-				     size_t size_r, size_t size_g, size_t size_b,\
-				     const color_setting_t *setting);
+	                             size_t size_r, size_t size_g, size_t size_b,\
+	                             const struct color_setting *setting);
 LIST_RAMPS_STOP_VALUE_TYPES
 #undef X
 
 
-void hooks_signal_period_change(period_t prev_period,
-				period_t period);
+void hooks_signal_period_change(enum period prev_period, enum period period);
 
 
 int pipeutils_create_nonblocking(int pipefds[2]);
@@ -196,41 +198,41 @@ int systemtime_get_time(double *now);
 void systemtime_msleep(unsigned int msecs);
 
 
-extern const gamma_method_t dummy_gamma_method;
+extern const struct gamma_method dummy_gamma_method;
 
 #ifdef ENABLE_COOPGAMMA
-extern const gamma_method_t coopgamma_gamma_method;
+extern const struct gamma_method coopgamma_gamma_method;
 #endif
 
 #ifdef ENABLE_RANDR
-extern const gamma_method_t randr_gamma_method;
+extern const struct gamma_method randr_gamma_method;
 #endif
 
 #ifdef ENABLE_VIDMODE
-extern const gamma_method_t vidmode_gamma_method;
+extern const struct gamma_method vidmode_gamma_method;
 #endif
 
 #ifdef ENABLE_DRM
-extern const gamma_method_t drm_gamma_method;
+extern const struct gamma_method drm_gamma_method;
 #endif
 
 #ifdef ENABLE_QUARTZ
-extern const gamma_method_t quartz_gamma_method;
+extern const struct gamma_method quartz_gamma_method;
 #endif
 
 #ifdef ENABLE_W32GDI
-extern const gamma_method_t w32gdi_gamma_method;
+extern const struct gamma_method w32gdi_gamma_method;
 #endif
 
 
-extern const location_provider_t manual_location_provider;
+extern const struct location_provider manual_location_provider;
 
 #ifdef ENABLE_GEOCLUE2
-extern const location_provider_t geoclue2_location_provider;
+extern const struct location_provider geoclue2_location_provider;
 #endif
 
 #ifdef ENABLE_CORELOCATION
-extern const location_provider_t corelocation_location_provider;
+extern const struct location_provider corelocation_location_provider;
 #endif