Merge lp:~valodim/redshift/printmode into lp:~jonls/redshift/trunk

[Valodim]

Mostly trivial change, adding an option -p to simply print the Solr Elevation and Color Temperature parameters for the current time and location, then exit.

This can be useful for a simple scripted lookup, e.g. for use in status bar scripts. I use it from within conky with ${execi}.

[Jon Lund Steffensen (jonls)]

Thanks!

review: Approve

=== modified file 'redshift.1'
--- redshift.1	2011-10-18 17:49:20 +0000
+++ redshift.1	2011-11-27 17:56:25 +0000
@@ -60,6 +60,9 @@
 \fB\-O\fR TEMP
 One shot manual mode (set color temperature)
 .TP
+\fB\-p\fR
+Print mode (only print parameters and exit)
+.TP
 \fB\-x\fR
 Reset mode (remove adjustment from screen)
 .TP
 
=== modified file 'src/redshift.c'
--- src/redshift.c	2011-10-18 16:02:28 +0000
+++ src/redshift.c	2011-11-27 17:56:25 +0000
@@ -226,6 +226,7 @@
 typedef enum {
 	PROGRAM_MODE_CONTINUAL,
 	PROGRAM_MODE_ONE_SHOT,
+	PROGRAM_MODE_PRINT,
 	PROGRAM_MODE_RESET,
 	PROGRAM_MODE_MANUAL
 } program_mode_t;
@@ -333,6 +334,7 @@
 		"  -o\t\tOne shot mode (do not continously adjust"
 		" color temperature)\n"
 		"  -O TEMP\tOne shot manual mode (set color temperature)\n"
+		"  -p\t\tPrint mode (only print parameters and exit)"
 		"  -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"),
@@ -666,7 +668,7 @@
 	
 	/* Parse command line arguments. */
 	int opt;
-	while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:rt:vVx")) != -1) {
+	while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:prt:vVx")) != -1) {
 		switch (opt) {
 		case 'b':
 			parse_brightness_string(optarg, &brightness_day, &brightness_night);
@@ -771,6 +773,9 @@
 			mode = PROGRAM_MODE_MANUAL;
 			temp_set = atoi(optarg);
 			break;
+		case 'p':
+			mode = PROGRAM_MODE_PRINT;
+			break;
 		case 'r':
 			transition = 0;
 			break;
@@ -1082,6 +1087,7 @@
 
 	switch (mode) {
 	case PROGRAM_MODE_ONE_SHOT:
+	case PROGRAM_MODE_PRINT:
 	{
 		/* Current angular elevation of the sun */
 		double now;
@@ -1105,11 +1111,14 @@
 		float brightness = calculate_interpolated_value(elevation,
 								brightness_day, brightness_night);
 
-		if (verbose) {
+		if (verbose || mode == PROGRAM_MODE_PRINT) {
 			print_period(elevation);
 			printf(_("Color temperature: %uK\n"), temp);
 			printf(_("Brightness: %.2f\n"), brightness);
 		}
+		if(mode == PROGRAM_MODE_PRINT) {
+			exit(EXIT_SUCCESS);
+		}
 
 		/* Adjust temperature */
 		r = method->set_temperature(&state, temp, brightness, gamma);