Configurable adaptive brightness

Author: WhatAmISupposedToPutHere

share/tiny-dfr/config.toml

@@ -24,6 +24,11 @@ EnablePixelShift = false
 # https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
 FontTemplate = ":bold"
 
+# Set this to false if you want the brightness of the touchbar
+# to be set to a static value instead of following the primary
+# screen's brightness
+AdaptiveBrightness = true
+
 # This key defines the contents of the primary layer
 # (the one with F{number} keys)
 # You can change the individual buttons, add, or remove them

src/backlight.rs

@@ -8,13 +8,14 @@ use anyhow::{Result, anyhow};
 use input::event::{
     Event, switch::{Switch, SwitchEvent, SwitchState},
 };
+use crate::config::Config;
 use crate::TIMEOUT_MS;
 
 const MAX_DISPLAY_BRIGHTNESS: u32 = 509;
 const MAX_TOUCH_BAR_BRIGHTNESS: u32 = 255;
-const LOOKUP_TABLE_SIZE: usize = MAX_DISPLAY_BRIGHTNESS as usize + 1;
 const BRIGHTNESS_DIM_TIMEOUT: i32 = TIMEOUT_MS * 3; // should be a multiple of TIMEOUT_MS
 const BRIGHTNESS_OFF_TIMEOUT: i32 = TIMEOUT_MS * 6; // should be a multiple of TIMEOUT_MS
+const DEFAULT_BRIGHTNESS: u32 = 128;
 const DIMMED_BRIGHTNESS: u32 = 1;
 
 fn read_attr(path: &Path, attr: &str) -> u32 {
@@ -96,12 +97,16 @@ impl BacklightManager {
             _ => {}
         }
     }
-    pub fn update_backlight(&mut self) {
+    pub fn update_backlight(&mut self, cfg: &Config) {
         let since_last_active = (Instant::now() - self.last_active).as_millis() as u64;
         let new_bl = if self.lid_state == SwitchState::On {
             0
         } else if since_last_active < BRIGHTNESS_DIM_TIMEOUT as u64 {
-            BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"))
+            if cfg.adaptive_brightness {
+                BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"))
+            } else {
+                DEFAULT_BRIGHTNESS
+            }
         } else if since_last_active < BRIGHTNESS_OFF_TIMEOUT as u64 {
             DIMMED_BRIGHTNESS
         } else {

src/config.rs

@@ -16,6 +16,7 @@ pub struct Config {
     pub show_button_outlines: bool,
     pub enable_pixel_shift: bool,
     pub font_face: FontFace,
+    pub adaptive_brightness: bool,
 }
 
 #[derive(Deserialize)]
@@ -25,6 +26,7 @@ struct ConfigProxy {
     show_button_outlines: Option<bool>,
     enable_pixel_shift: Option<bool>,
     font_template: Option<String>,
+    adaptive_brightness: Option<bool>,
     primary_layer_keys: Option<Vec<ButtonConfig>>,
     media_layer_keys: Option<Vec<ButtonConfig>>
 }
@@ -59,6 +61,7 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
         base.show_button_outlines = user.show_button_outlines.or(base.show_button_outlines);
         base.enable_pixel_shift = user.enable_pixel_shift.or(base.enable_pixel_shift);
         base.font_template = user.font_template.or(base.font_template);
+        base.adaptive_brightness = user.adaptive_brightness.or(base.adaptive_brightness);
         base.media_layer_keys = user.media_layer_keys.or(base.media_layer_keys);
         base.primary_layer_keys = user.primary_layer_keys.or(base.primary_layer_keys);
     };
@@ -68,6 +71,7 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
     let cfg = Config {
         show_button_outlines: base.show_button_outlines.unwrap(),
         enable_pixel_shift: base.enable_pixel_shift.unwrap(),
+        adaptive_brightness: base.adaptive_brightness.unwrap(),
         font_face: load_font(&base.font_template.unwrap()),
     };
     (cfg, layers)

src/main.rs

@@ -477,6 +477,6 @@ fn real_main(drm: &mut DrmBackend) {
                 _ => {}
             }
         }
-        backlight.update_backlight();
+        backlight.update_backlight(&cfg);
     }
 }