Merge lp:~joehillen/redshift/manual into lp:~jonls/redshift/trunk

[JoE]

I added a feature I was looking for to redshift. I wanted to be able to manually set the color temperature once without needing location data or have a daemon running.

Let me know what you think.

[JoE (joehillen)]

Are you ever going to merge this?

[Jon Lund Steffensen (jonls)]

Yes.

review: Approve

=== modified file 'redshift.1'
--- redshift.1	2010-10-18 00:03:26 +0000
+++ redshift.1	2011-02-26 03:59:52 +0000
@@ -42,6 +42,8 @@
 .TP
 \fB\-o\fR
 One shot mode (do not continously adjust color temperature)
+\fB\-O\fR TEMP
+One shot manual mode (set color temperature)
 .TP
 \fB\-x\fR
 Reset mode (remove adjustment from screen)

=== modified file 'src/redshift.c'
--- src/redshift.c	2010-10-17 22:58:00 +0000
+++ src/redshift.c	2011-02-26 03:59:52 +0000
@@ -202,7 +202,8 @@
 typedef enum {
 	PROGRAM_MODE_CONTINUAL,
 	PROGRAM_MODE_ONE_SHOT,
-	PROGRAM_MODE_RESET
+	PROGRAM_MODE_RESET,
+	PROGRAM_MODE_MANUAL
 } program_mode_t;
 
 
@@ -296,6 +297,7 @@
 		"  \t\t(Type `list' to see available methods)\n"
 		"  -o\t\tOne shot mode (do not continously adjust"
 		" color temperature)\n"
+		"  -O TEMP\tOne shot manual mode (set color temperature)\n"
 		"  -x\t\tReset mode (remove adjustment from screen)\n"
 		"  -r\t\tDisable temperature transitions\n"
 		"  -t DAY:NIGHT\tColor temperature to set at daytime/night\n"),
@@ -565,6 +567,19 @@
 	return provider;
 }
 
+/* Check Color Temperature */
+void
+check_temp(int temp)
+{
+	/* Color temperature at daytime */
+	if (temp < MIN_TEMP || temp > MAX_TEMP) {
+		fprintf(stderr,
+			_("Temperature must be between %uK and %uK.\n"),
+			MIN_TEMP, MAX_TEMP);
+		exit(EXIT_FAILURE);
+	}
+}
+
 
 int
 main(int argc, char *argv[])
@@ -584,6 +599,7 @@
 	/* Initialize settings to NULL values. */
 	char *config_filepath = NULL;
 
+	int temp_set = -1;
 	int temp_day = -1;
 	int temp_night = -1;
 	float gamma[3] = { NAN, NAN, NAN };
@@ -601,7 +617,7 @@
 
 	/* Parse command line arguments. */
 	int opt;
-	while ((opt = getopt(argc, argv, "c:g:hl:m:ort:vx")) != -1) {
+	while ((opt = getopt(argc, argv, "c:g:hl:m:oO:rt:vx")) != -1) {
 		switch (opt) {
 		case 'c':
 			if (config_filepath != NULL) free(config_filepath);
@@ -699,6 +715,22 @@
 		case 'o':
 			mode = PROGRAM_MODE_ONE_SHOT;
 			break;
+		case 'O':
+			mode = PROGRAM_MODE_MANUAL;
+
+			/* Remove K and k from argument just in case. */
+			char* s = optarg; //arg string
+			char* p; // position
+			char* k = "Kk";
+			for (int i = 0; i < strlen(k); i++)
+			{
+				if (p = strchr(s, k[i])) 
+					memmove(p, p+1, strlen(p));
+			}
+
+			temp_set = atoi(s);
+			check_temp(temp_set);
+			break;
 		case 'r':
 			transition = 0;
 			break;
@@ -813,12 +845,16 @@
 	if (isnan(gamma[0])) gamma[0] = gamma[1] = gamma[2] = DEFAULT_GAMMA;
 	if (transition < 0) transition = 1;
 
+	float lat = NAN;
+	float lon = NAN;
+
 	/* Initialize location provider. If provider is NULL
 	   try all providers until one that works is found. */
 	location_state_t location_state;
 
-	/* Location is not needed for reset mode. */
-	if (mode != PROGRAM_MODE_RESET) {
+	/* Location is not needed for reset mode
+       or for manual temperature setting */
+	if (mode != PROGRAM_MODE_RESET && mode != PROGRAM_MODE_MANUAL) {
 		if (provider != NULL) {
 			/* Use provider specified on command line. */
 			r = provider_try_start(provider, &location_state,
@@ -852,61 +888,47 @@
 				exit(EXIT_FAILURE);
 			}
 		}
-	}
-
-	float lat = NAN;
-	float lon = NAN;
-
-	if (mode != PROGRAM_MODE_RESET) {
+
 		/* Get current location. */
 		r = provider->get_location(&location_state, &lat, &lon);
 		if (r < 0) {
-			fputs(_("Unable to get location from provider.\n"),
-			      stderr);
-			exit(EXIT_FAILURE);
+		        fputs(_("Unable to get location from provider.\n"),
+		              stderr);
+		        exit(EXIT_FAILURE);
 		}
-
+	
 		provider->free(&location_state);
-
+	
 		if (verbose) {
-			/* TRANSLATORS: Append degree symbols if possible. */
-			printf(_("Location: %f, %f\n"), lat, lon);
+		        /* TRANSLATORS: Append degree symbols if possible. */
+		        printf(_("Location: %f, %f\n"), lat, lon);
 		}
-
+	
 		/* Latitude */
 		if (lat < MIN_LAT || lat > MAX_LAT) {
-			/* TRANSLATORS: Append degree symbols if possible. */
-			fprintf(stderr,
-				_("Latitude must be between %.1f and %.1f.\n"),
-				MIN_LAT, MAX_LAT);
-			exit(EXIT_FAILURE);
+		        /* TRANSLATORS: Append degree symbols if possible. */
+		        fprintf(stderr,
+		                _("Latitude must be between %.1f and %.1f.\n"),
+		                MIN_LAT, MAX_LAT);
+		        exit(EXIT_FAILURE);
 		}
-
+	
 		/* Longitude */
 		if (lon < MIN_LON || lon > MAX_LON) {
-			/* TRANSLATORS: Append degree symbols if possible. */
-			fprintf(stderr,
-				_("Longitude must be between"
-				  " %.1f and %.1f.\n"), MIN_LON, MAX_LON);
-			exit(EXIT_FAILURE);
+		        /* TRANSLATORS: Append degree symbols if possible. */
+		        fprintf(stderr,
+		                _("Longitude must be between"
+		                  " %.1f and %.1f.\n"), MIN_LON, MAX_LON);
+		        exit(EXIT_FAILURE);
 		}
-	}
-
-	/* Color temperature at daytime */
-	if (temp_day < MIN_TEMP || temp_day >= MAX_TEMP) {
-		fprintf(stderr,
-			_("Temperature must be between %uK and %uK.\n"),
-			MIN_TEMP, MAX_TEMP);
-		exit(EXIT_FAILURE);
-	}
-
-	/* Color temperature at night */
-	if (temp_night < MIN_TEMP || temp_night >= MAX_TEMP) {
-		fprintf(stderr,
-			_("Temperature must be between %uK and %uK.\n"),
-			MIN_TEMP, MAX_TEMP);
-		exit(EXIT_FAILURE);
-	}
+
+		/* Color temperature at daytime */
+		check_temp(temp_day);
+	
+		/* Color temperature at night */
+		check_temp(temp_night);
+	}
+
 
 	/* Gamma */
 	if (gamma[0] < MIN_GAMMA || gamma[0] > MAX_GAMMA ||
@@ -989,6 +1011,20 @@
 		}
 	}
 	break;
+	case PROGRAM_MODE_MANUAL:
+	{
+		if (verbose) printf(_("Color temperature: %uK\n"), temp_set);
+
+		/* Adjust temperature */
+		r = method->set_temperature(&state, temp_set, gamma);
+		if (r < 0) {
+			fputs(_("Temperature adjustment failed.\n"), stderr);
+			method->free(&state);
+			exit(EXIT_FAILURE);
+		}
+		
+	}
+	break;
 	case PROGRAM_MODE_RESET:
 	{
 		/* Reset screen */