Move module structures out of headers

17 files changed, 109 insertions, 161 deletions

diff --git a/src/gamma-drm.c b/src/gamma-drm.c
index e706d46..67f819e 100644
--- a/src/gamma-drm.c
+++ b/src/gamma-drm.c
@@ -38,19 +38,40 @@
   #define O_CLOEXEC  02000000
 #endif
 
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
 #include "gamma-drm.h"
 #include "colorramp.h"
 
 
+typedef struct {
+	int crtc_num;
+	int crtc_id;
+	int gamma_size;
+	uint16_t* r_gamma;
+	uint16_t* g_gamma;
+	uint16_t* b_gamma;
+} drm_crtc_state_t;
+
+typedef struct {
+	int card_num;
+	int crtc_num;
+	int fd;
+	drmModeRes* res;
+	drm_crtc_state_t* crtcs;
+} drm_state_t;
+
+
 static int
 drm_init(drm_state_t **state)
 {
 	/* Initialize state. */
-        *state = malloc(sizeof(drm_state_t));
-        if (*state == NULL) return -1;
+	*state = malloc(sizeof(drm_state_t));
+	if (*state == NULL) return -1;
 
-        drm_state_t *s = *state;
-        s->card_num = 0;
+	drm_state_t *s = *state;
+	s->card_num = 0;
 	s->crtc_num = -1;
 	s->fd = -1;
 	s->res = NULL;
@@ -212,7 +233,7 @@ drm_free(drm_state_t *state)
 		state->fd = -1;
 	}
 
-        free(state);
+	free(state);
 }
 
 static void
diff --git a/src/gamma-drm.h b/src/gamma-drm.h
index 6f63413..21ba5c2 100644
--- a/src/gamma-drm.h
+++ b/src/gamma-drm.h
@@ -15,37 +15,14 @@
    along with Redshift.  If not, see <http://www.gnu.org/licenses/>.
 
    Copyright (c) 2014  Mattias Andrée <maandree@member.fsf.org>
+   Copyright (c) 2017  Jon Lund Steffensen <jonlst@gmail.com>
 */
 
 #ifndef REDSHIFT_GAMMA_DRM_H
 #define REDSHIFT_GAMMA_DRM_H
 
-#include <stdint.h>
-
-#include <xf86drm.h>
-#include <xf86drmMode.h>
-
 #include "redshift.h"
 
-
-typedef struct {
-	int crtc_num;
-	int crtc_id;
-	int gamma_size;
-	uint16_t* r_gamma;
-	uint16_t* g_gamma;
-	uint16_t* b_gamma;
-} drm_crtc_state_t;
-
-typedef struct {
-	int card_num;
-	int crtc_num;
-	int fd;
-	drmModeRes* res;
-	drm_crtc_state_t* crtcs;
-} drm_state_t;
-
-
 extern const gamma_method_t drm_gamma_method;
 
 #endif /* ! REDSHIFT_GAMMA_DRM_H */
diff --git a/src/gamma-dummy.h b/src/gamma-dummy.h
index df4dfe9..c610d94 100644
--- a/src/gamma-dummy.h
+++ b/src/gamma-dummy.h
@@ -22,8 +22,6 @@
 
 #include "redshift.h"
 
-
 extern const gamma_method_t dummy_gamma_method;
 
-
 #endif /* ! REDSHIFT_GAMMA_DUMMY_H */
diff --git a/src/gamma-quartz.c b/src/gamma-quartz.c
index 6b7d1ec..2b04d8b 100644
--- a/src/gamma-quartz.c
+++ b/src/gamma-quartz.c
@@ -37,6 +37,19 @@
 #include "colorramp.h"
 
 
+typedef struct {
+	CGDirectDisplayID display;
+	uint32_t ramp_size;
+	float *saved_ramps;
+} quartz_display_state_t;
+
+typedef struct {
+	quartz_display_state_t *displays;
+	uint32_t display_count;
+	int preserve;
+} quartz_state_t;
+
+
 static int
 quartz_init(quartz_state_t **state)
 {
diff --git a/src/gamma-quartz.h b/src/gamma-quartz.h
index 3c1a8c1..9a40137 100644
--- a/src/gamma-quartz.h
+++ b/src/gamma-quartz.h
@@ -20,26 +20,8 @@
 #ifndef REDSHIFT_GAMMA_QUARTZ_H
 #define REDSHIFT_GAMMA_QUARTZ_H
 
-#include <stdint.h>
-
-#include <ApplicationServices/ApplicationServices.h>
-
 #include "redshift.h"
 
-
-typedef struct {
-	CGDirectDisplayID display;
-	uint32_t ramp_size;
-	float *saved_ramps;
-} quartz_display_state_t;
-
-typedef struct {
-	quartz_display_state_t *displays;
-	uint32_t display_count;
-	int preserve;
-} quartz_state_t;
-
-
 extern const gamma_method_t quartz_gamma_method;
 
 #endif /* ! REDSHIFT_GAMMA_QUARTZ_H */
diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index 44bd497..e35315b 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -42,6 +42,25 @@
 #define RANDR_VERSION_MINOR  3
 
 
+typedef struct {
+	xcb_randr_crtc_t crtc;
+	unsigned int ramp_size;
+	uint16_t *saved_ramps;
+} randr_crtc_state_t;
+
+typedef struct {
+	xcb_connection_t *conn;
+	xcb_screen_t *screen;
+	int preferred_screen;
+	int preserve;
+	int screen_num;
+	int crtc_num_count;
+	int* crtc_num;
+	unsigned int crtc_count;
+	randr_crtc_state_t *crtcs;
+} randr_state_t;
+
+
 static int
 randr_init(randr_state_t **state)
 {
diff --git a/src/gamma-randr.h b/src/gamma-randr.h
index a44205d..0545d2f 100644
--- a/src/gamma-randr.h
+++ b/src/gamma-randr.h
@@ -14,41 +14,14 @@
    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>
 */
 
 #ifndef REDSHIFT_GAMMA_RANDR_H
 #define REDSHIFT_GAMMA_RANDR_H
 
-#include <stdio.h>
-#include <stdint.h>
-
-#include <xcb/xcb.h>
-#include <xcb/randr.h>
-
 #include "redshift.h"
 
-
-typedef struct {
-	xcb_randr_crtc_t crtc;
-	unsigned int ramp_size;
-	uint16_t *saved_ramps;
-} randr_crtc_state_t;
-
-typedef struct {
-	xcb_connection_t *conn;
-	xcb_screen_t *screen;
-	int preferred_screen;
-	int preserve;
-	int screen_num;
-	int crtc_num_count;
-	int* crtc_num;
-	unsigned int crtc_count;
-	randr_crtc_state_t *crtcs;
-} randr_state_t;
-
-
 extern const gamma_method_t randr_gamma_method;
 
-
 #endif /* ! REDSHIFT_GAMMA_RANDR_H */
diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c
index 8d1791a..76950c8 100644
--- a/src/gamma-vidmode.c
+++ b/src/gamma-vidmode.c
@@ -37,6 +37,15 @@
 #include "colorramp.h"
 
 
+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)
 {
diff --git a/src/gamma-vidmode.h b/src/gamma-vidmode.h
index dbd3e5d..6bad207 100644
--- a/src/gamma-vidmode.h
+++ b/src/gamma-vidmode.h
@@ -22,21 +22,6 @@
 
 #include "redshift.h"
 
-#include <stdio.h>
-#include <stdint.h>
-
-#include <X11/Xlib.h>
-
-typedef struct {
-	Display *display;
-	int preserve;
-	int screen_num;
-	int ramp_size;
-	uint16_t *saved_ramps;
-} vidmode_state_t;
-
-
 extern const gamma_method_t vidmode_gamma_method;
 
-
 #endif /* ! REDSHIFT_GAMMA_VIDMODE_H */
diff --git a/src/gamma-w32gdi.c b/src/gamma-w32gdi.c
index be39786..298528b 100644
--- a/src/gamma-w32gdi.c
+++ b/src/gamma-w32gdi.c
@@ -40,6 +40,12 @@
 #define MAX_ATTEMPTS  10
 
 
+typedef struct {
+	WORD *saved_ramps;
+	int preserve;
+} w32gdi_state_t;
+
+
 static int
 w32gdi_init(w32gdi_state_t **state)
 {
diff --git a/src/gamma-w32gdi.h b/src/gamma-w32gdi.h
index 9094acd..ac6eb10 100644
--- a/src/gamma-w32gdi.h
+++ b/src/gamma-w32gdi.h
@@ -20,19 +20,8 @@
 #ifndef REDSHIFT_GAMMA_W32GDI_H
 #define REDSHIFT_GAMMA_W32GDI_H
 
-#include <windows.h>
-#include <wingdi.h>
-
 #include "redshift.h"
 
-
-typedef struct {
-	WORD *saved_ramps;
-	int preserve;
-} w32gdi_state_t;
-
-
 extern const gamma_method_t w32gdi_gamma_method;
 
-
 #endif /* ! REDSHIFT_GAMMA_W32GDI_H */
diff --git a/src/location-corelocation.h b/src/location-corelocation.h
index 04ced29..4af302c 100644
--- a/src/location-corelocation.h
+++ b/src/location-corelocation.h
@@ -20,24 +20,8 @@
 #ifndef REDSHIFT_LOCATION_CORELOCATION_H
 #define REDSHIFT_LOCATION_CORELOCATION_H
 
-#include <stdio.h>
-
 #include "redshift.h"
 
-typedef struct location_corelocation_private location_corelocation_private_t;
-
-typedef struct {
-	location_corelocation_private_t *private;
-	int pipe_fd_read;
-	int pipe_fd_write;
-	int available;
-	int error;
-	float latitude;
-	float longitude;
-} location_corelocation_state_t;
-
-
 extern const location_provider_t corelocation_location_provider;
 
-
 #endif /* ! REDSHIFT_LOCATION_CORELOCATION_H */
diff --git a/src/location-corelocation.m b/src/location-corelocation.m
index bf60507..1a04d54 100644
--- a/src/location-corelocation.m
+++ b/src/location-corelocation.m
@@ -39,10 +39,16 @@
 #endif
 
 
-struct location_corelocation_private {
+typedef struct {
   NSThread *thread;
   NSLock *lock;
-};
+  int pipe_fd_read;
+  int pipe_fd_write;
+  int available;
+  int error;
+  float latitude;
+  float longitude;
+} location_corelocation_state_t;
 
 
 @interface LocationDelegate : NSObject <CLLocationManagerDelegate>
@@ -74,11 +80,11 @@ struct location_corelocation_private {
 
 - (void)markError
 {
-  [self.state->private->lock lock];
+  [self.state->lock lock];
 
   self.state->error = 1;
 
-  [self.state->private->lock unlock];
+  [self.state->lock unlock];
 
   pipeutils_signal(self.state->pipe_fd_write);
 }
@@ -88,13 +94,13 @@ struct location_corelocation_private {
 {
   CLLocation *newLocation = [locations firstObject];
 
-  [self.state->private->lock lock];
+  [self.state->lock lock];
 
   self.state->latitude = newLocation.coordinate.latitude;
   self.state->longitude = newLocation.coordinate.longitude;
   self.state->available = 1;
 
-  [self.state->private->lock unlock];
+  [self.state->lock unlock];
 
   pipeutils_signal(self.state->pipe_fd_write);
 }
@@ -191,14 +197,10 @@ location_corelocation_start(location_corelocation_state_t *state)
   state->latitude = 0;
   state->longitude = 0;
 
-  state->private = malloc(sizeof(location_corelocation_private_t));
-  if (state->private == NULL) return -1;
-
   int pipefds[2];
   int r = pipeutils_create_nonblocking(pipefds);
   if (r < 0) {
     fputs(_("Failed to start CoreLocation provider!\n"), stderr);
-    free(state->private);
     return -1;
   }
 
@@ -207,12 +209,12 @@ location_corelocation_start(location_corelocation_state_t *state)
 
   pipeutils_signal(state->pipe_fd_write);
 
-  state->private->lock = [[NSLock alloc] init];
+  state->lock = [[NSLock alloc] init];
 
   LocationThread *thread = [[LocationThread alloc] init];
   thread.state = state;
   [thread start];
-  state->private->thread = thread;
+  state->thread = thread;
 
   return 0;
 }
@@ -224,7 +226,6 @@ location_corelocation_free(location_corelocation_state_t *state)
     close(state->pipe_fd_read);
   }
 
-  free(state->private);
   free(state);
 }
 
@@ -256,14 +257,14 @@ location_corelocation_handle(
 {
   pipeutils_handle_signal(state->pipe_fd_read);
 
-  [state->private->lock lock];
+  [state->lock lock];
 
   int error = state->error;
   location->lat = state->latitude;
   location->lon = state->longitude;
   *available = state->available;
 
-  [state->private->lock unlock];
+  [state->lock unlock];
 
   if (error) return -1;
 
diff --git a/src/location-geoclue2.c b/src/location-geoclue2.c
index 0bb1024..696867e 100644
--- a/src/location-geoclue2.c
+++ b/src/location-geoclue2.c
@@ -38,6 +38,19 @@
 #define DBUS_ACCESS_ERROR  "org.freedesktop.DBus.Error.AccessDenied"
 
 
+typedef struct {
+	GMainLoop *loop;
+	GThread *thread;
+	GMutex lock;
+	int pipe_fd_read;
+	int pipe_fd_write;
+	int available;
+	int error;
+	float latitude;
+	float longitude;
+} location_geoclue2_state_t;
+
+
 /* Print the message explaining denial from GeoClue. */
 static void
 print_denial_message()
diff --git a/src/location-geoclue2.h b/src/location-geoclue2.h
index b20d5a9..a7189a7 100644
--- a/src/location-geoclue2.h
+++ b/src/location-geoclue2.h
@@ -20,26 +20,8 @@
 #ifndef REDSHIFT_LOCATION_GEOCLUE2_H
 #define REDSHIFT_LOCATION_GEOCLUE2_H
 
-#include <stdio.h>
-
-#include <glib.h>
-
 #include "redshift.h"
 
-typedef struct {
-	GMainLoop *loop;
-	GThread *thread;
-	GMutex lock;
-	int pipe_fd_read;
-	int pipe_fd_write;
-	int available;
-	int error;
-	float latitude;
-	float longitude;
-} location_geoclue2_state_t;
-
-
 extern const location_provider_t geoclue2_location_provider;
 
-
 #endif /* ! REDSHIFT_LOCATION_GEOCLUE2_H */
diff --git a/src/location-manual.c b/src/location-manual.c
index f459b27..137500c 100644
--- a/src/location-manual.c
+++ b/src/location-manual.c
@@ -33,6 +33,11 @@
 #endif
 
 
+typedef struct {
+	location_t loc;
+} location_manual_state_t;
+
+
 static int
 location_manual_init(location_manual_state_t **state)
 {
diff --git a/src/location-manual.h b/src/location-manual.h
index 58a0f4c..c7ef2ad 100644
--- a/src/location-manual.h
+++ b/src/location-manual.h
@@ -20,17 +20,8 @@
 #ifndef REDSHIFT_LOCATION_MANUAL_H
 #define REDSHIFT_LOCATION_MANUAL_H
 
-#include <stdio.h>
-
 #include "redshift.h"
 
-
-typedef struct {
-	location_t loc;
-} location_manual_state_t;
-
-
 extern const location_provider_t manual_location_provider;
 
-
 #endif /* ! REDSHIFT_LOCATION_MANUAL_H */