Merge pull request #24 from srithon/topic-23-configurable-nightlight

Add configuration options for xrandr gamma and redshift color temperature

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "brightness_control"
-version = "1.4.6"
+version = "1.4.7"
 authors = ["Sridaran Thoniyil <sri7thon@gmail.com>"]
 edition = "2018"
 

config_template.toml

@@ -1,4 +1,4 @@
-# v1.4.5
+# v1.4.7
 # ^ KEEP THIS IN THE TEMPLATE
 # Every time the template is updated, the current version is put at the top
 # You can delete it in your own config, but this should stay in the template
@@ -24,6 +24,19 @@ use_redshift = false
 # to that display
 auto_reconfigure = true
 
+[nightlight_options]
+# When use_redshift is set to false, BrightnessControl uses xrandr --gamma to
+# emulate a nightlight
+# The format is R:G:B, where each number is a multiplier for its corresponding
+# color
+# This default value was obtained through testing
+xrandr_gamma = "1.0:0.7:0.45"
+
+# Redshift has a -o flag that takes in the desired color temperature in Kelvin
+# Lower values are "warmer" and higher values are "cooler"
+# https://en.wikipedia.org/wiki/Color_temperature
+redshift_temperature = 1400
+
 [fade_options]
 # the highest brightness shift that does not use fading automatically
 # to disable automatic fading altogether, set this to 100

src/daemon.rs

@@ -265,6 +265,12 @@ impl FileUtils {
     }
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct NightlightOptions {
+    xrandr_gamma: String,
+    redshift_temperature: u32
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 struct FadeOptions {
     threshold: u8,
@@ -278,7 +284,8 @@ struct FadeOptions {
 struct DaemonOptions {
     use_redshift: bool,
     auto_reconfigure: bool,
-    fade_options: FadeOptions
+    fade_options: FadeOptions,
+    nightlight_options: NightlightOptions
 }
 
 impl DaemonOptions {
@@ -498,7 +505,7 @@ impl Daemon {
         // turn on redshift
         let mut redshift_enable = Command::new("redshift");
         redshift_enable.arg("-O");
-        redshift_enable.arg("1400");
+        redshift_enable.arg(format!("{}", self.config.nightlight_options.redshift_temperature));
         redshift_enable.spawn()?;
         Ok(())
     }
@@ -776,7 +783,7 @@ impl Daemon {
         {
             if self.mode {
                 xrandr_call.arg("--gamma")
-                    .arg("1.0:0.7:0.45");
+                    .arg(&self.config.nightlight_options.xrandr_gamma);
             }
         }
 
@@ -929,7 +936,7 @@ fn get_configuration_from_file(configuration_file: &mut File) -> std::result::Re
     }
 
     // TODO figure out how to use derive macro for this
-    overwrite_values!(use_redshift, auto_reconfigure, fade_options);
+    overwrite_values!(use_redshift, auto_reconfigure, fade_options, nightlight_options);
 
     return Ok(config);
 }