From c2b3b2351ccfed0900b581ac931d6bafe2dc6c1f Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Mon, 11 Dec 2023 17:35:21 +0100
Subject: [PATCH 01/24] Do not fail if config is not present in /etc

---
 src/config.rs | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.rs   | 107 +++++-------------------------------------
 2 files changed, 139 insertions(+), 95 deletions(-)
 create mode 100644 src/config.rs

diff --git a/src/config.rs b/src/config.rs
new file mode 100644
index 0000000..fc6c86e
--- /dev/null
+++ b/src/config.rs
@@ -0,0 +1,127 @@
+use std::fs::read_to_string;
+use anyhow::Error;
+use cairo::FontFace;
+use crate::FunctionLayer;
+use crate::fonts::{FontConfig, Pattern};
+use freetype::Library as FtLibrary;
+use input_linux::Key;
+use nix::errno::Errno;
+use nix::poll::{PollFd, PollFlags};
+use nix::sys::inotify::{AddWatchFlags, InitFlags, Inotify, WatchDescriptor};
+use serde::Deserialize;
+
+const USER_CFG_PATH: &'static str = "/etc/tiny-dfr/config.toml";
+
+pub struct Config {
+    pub show_button_outlines: bool,
+    pub enable_pixel_shift: bool,
+    pub font_face: FontFace,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "PascalCase")]
+struct ConfigProxy {
+    media_layer_default: Option<bool>,
+    show_button_outlines: Option<bool>,
+    enable_pixel_shift: Option<bool>,
+    font_template: Option<String>,
+    primary_layer_keys: Option<Vec<ButtonConfig>>,
+    media_layer_keys: Option<Vec<ButtonConfig>>
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct ButtonConfig {
+    #[serde(alias = "Svg")]
+    pub icon: Option<String>,
+    pub text: Option<String>,
+    pub action: Key
+}
+
+fn load_font(name: &str) -> FontFace {
+    let fontconfig = FontConfig::new();
+    let mut pattern = Pattern::new(name);
+    fontconfig.perform_substitutions(&mut pattern);
+    let pat_match = fontconfig.match_pattern(&pattern);
+    let file_name = pat_match.get_file_name();
+    let file_idx = pat_match.get_font_index();
+    let ft_library = FtLibrary::init().unwrap();
+    let face = ft_library.new_face(file_name, file_idx).unwrap();
+    FontFace::create_from_ft(&face).unwrap()
+}
+
+fn load_config() -> (Config, [FunctionLayer; 2]) {
+    let mut base = toml::from_str::<ConfigProxy>(&read_to_string("/usr/share/tiny-dfr/config.toml").unwrap()).unwrap();
+    let user = read_to_string(USER_CFG_PATH).map_err::<Error, _>(|e| e.into())
+        .and_then(|r| Ok(toml::from_str::<ConfigProxy>(&r)?));
+    if let Ok(user) = user {
+        base.media_layer_default = user.media_layer_default.or(base.media_layer_default);
+        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.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);
+    };
+    let media_layer = FunctionLayer::with_config(base.media_layer_keys.unwrap());
+    let fkey_layer = FunctionLayer::with_config(base.primary_layer_keys.unwrap());
+    let layers = if base.media_layer_default.unwrap(){ [media_layer, fkey_layer] } else { [fkey_layer, media_layer] };
+    let cfg = Config {
+        show_button_outlines: base.show_button_outlines.unwrap(),
+        enable_pixel_shift: base.enable_pixel_shift.unwrap(),
+        font_face: load_font(&base.font_template.unwrap()),
+    };
+    (cfg, layers)
+}
+
+pub struct ConfigManager {
+    inotify_fd: Inotify,
+    watch_desc: Option<WatchDescriptor>
+}
+
+fn arm_inotify(inotify_fd: &Inotify) -> Option<WatchDescriptor> {
+    let flags = AddWatchFlags::IN_MOVED_TO | AddWatchFlags::IN_CLOSE | AddWatchFlags::IN_ONESHOT;
+    match inotify_fd.add_watch(USER_CFG_PATH, flags) {
+        Ok(wd) => Some(wd),
+        Err(Errno::ENOENT) => None,
+        e => Some(e.unwrap())
+    }
+}
+
+impl ConfigManager {
+    pub fn new() -> ConfigManager {
+        let inotify_fd = Inotify::init(InitFlags::IN_NONBLOCK).unwrap();
+        let watch_desc = arm_inotify(&inotify_fd);
+        ConfigManager {
+            inotify_fd, watch_desc
+        }
+    }
+    pub fn load_config(&self) -> (Config, [FunctionLayer; 2]) {
+        load_config()
+    }
+    pub fn update_config(&mut self, cfg: &mut Config, layers: &mut [FunctionLayer; 2]) -> bool {
+        if self.watch_desc.is_none() {
+            self.watch_desc = arm_inotify(&self.inotify_fd);
+            return false;
+        }
+        let evts = match self.inotify_fd.read_events() {
+            Ok(e) => e,
+            Err(Errno::EAGAIN) => Vec::new(),
+            r => r.unwrap(),
+        };
+        let mut ret = false;
+        for evt in evts {
+            if evt.wd != self.watch_desc.unwrap() {
+                continue
+            }
+            let parts = load_config();
+            *cfg = parts.0;
+            *layers = parts.1;
+            ret = true;
+            self.watch_desc = arm_inotify(&self.inotify_fd);
+        }
+        ret
+    }
+    pub fn pollfd(&self) -> PollFd {
+        PollFd::new(&self.inotify_fd, PollFlags::POLLIN)
+    }
+}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 3929e2e..6c0b089 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 use std::{
-    fs::{File, OpenOptions, read_to_string},
+    fs::{File, OpenOptions},
     os::{
         fd::{AsRawFd, AsFd},
         unix::{io::OwnedFd, fs::OpenOptionsExt}
@@ -9,10 +9,10 @@ use std::{
     cmp::min,
     panic::{self, AssertUnwindSafe}
 };
-use cairo::{ImageSurface, Format, Context, Surface, Rectangle, FontFace, Antialias};
+use cairo::{ImageSurface, Format, Context, Surface, Rectangle, Antialias};
 use rsvg::{Loader, CairoRenderer, SvgHandle};
 use drm::control::ClipRect;
-use anyhow::{Error, Result};
+use anyhow::Result;
 use input::{
     Libinput, LibinputInterface, Device as InputDevice,
     event::{
@@ -26,25 +26,21 @@ use input_linux::{uinput::UInputHandle, EventKind, Key, SynchronizeKind};
 use input_linux_sys::{uinput_setup, input_id, timeval, input_event};
 use nix::{
     poll::{poll, PollFd, PollFlags},
-    sys::{
-        signal::{Signal, SigSet},
-        inotify::{AddWatchFlags, InitFlags, Inotify, WatchDescriptor}
-    },
-    errno::Errno
+    sys::signal::{Signal, SigSet},
 };
 use privdrop::PrivDrop;
-use serde::Deserialize;
-use freetype::Library as FtLibrary;
 
 mod backlight;
 mod display;
 mod pixel_shift;
 mod fonts;
+mod config;
 
 use backlight::BacklightManager;
 use display::DrmBackend;
 use pixel_shift::{PixelShiftManager, PIXEL_SHIFT_WIDTH_PX};
-use fonts::{FontConfig, Pattern};
+use config::{ButtonConfig, Config};
+use crate::config::ConfigManager;
 
 const DFR_WIDTH: i32 = 2008;
 const DFR_HEIGHT: i32 = 60;
@@ -54,33 +50,6 @@ const BUTTON_COLOR_INACTIVE: f64 = 0.200;
 const BUTTON_COLOR_ACTIVE: f64 = 0.400;
 const ICON_SIZE: i32 = 48;
 const TIMEOUT_MS: i32 = 10 * 1000;
-const USER_CFG_PATH: &'static str = "/etc/tiny-dfr/config.toml";
-
-#[derive(Deserialize)]
-#[serde(rename_all = "PascalCase")]
-struct ConfigProxy {
-    media_layer_default: Option<bool>,
-    show_button_outlines: Option<bool>,
-    enable_pixel_shift: Option<bool>,
-    font_template: Option<String>,
-    primary_layer_keys: Option<Vec<ButtonConfig>>,
-    media_layer_keys: Option<Vec<ButtonConfig>>
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "PascalCase")]
-struct ButtonConfig {
-    #[serde(alias = "Svg")]
-    icon: Option<String>,
-    text: Option<String>,
-    action: Key
-}
-
-struct Config {
-    show_button_outlines: bool,
-    enable_pixel_shift: bool,
-    font_face: FontFace,
-}
 
 enum ButtonImage {
     Text(String),
@@ -184,7 +153,7 @@ impl Button {
 }
 
 #[derive(Default)]
-struct FunctionLayer {
+pub struct FunctionLayer {
     buttons: Vec<Button>
 }
 
@@ -338,41 +307,6 @@ fn toggle_key<F>(uinput: &mut UInputHandle<F>, code: Key, value: i32) where F: A
     emit(uinput, EventKind::Synchronize, SynchronizeKind::Report as u16, 0);
 }
 
-fn load_font(name: &str) -> FontFace {
-    let fontconfig = FontConfig::new();
-    let mut pattern = Pattern::new(name);
-    fontconfig.perform_substitutions(&mut pattern);
-    let pat_match = fontconfig.match_pattern(&pattern);
-    let file_name = pat_match.get_file_name();
-    let file_idx = pat_match.get_font_index();
-    let ft_library = FtLibrary::init().unwrap();
-    let face = ft_library.new_face(file_name, file_idx).unwrap();
-    FontFace::create_from_ft(&face).unwrap()
-}
-
-fn load_config() -> (Config, [FunctionLayer; 2]) {
-    let mut base = toml::from_str::<ConfigProxy>(&read_to_string("/usr/share/tiny-dfr/config.toml").unwrap()).unwrap();
-    let user = read_to_string(USER_CFG_PATH).map_err::<Error, _>(|e| e.into())
-        .and_then(|r| Ok(toml::from_str::<ConfigProxy>(&r)?));
-    if let Ok(user) = user {
-        base.media_layer_default = user.media_layer_default.or(base.media_layer_default);
-        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.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);
-    };
-    let media_layer = FunctionLayer::with_config(base.media_layer_keys.unwrap());
-    let fkey_layer = FunctionLayer::with_config(base.primary_layer_keys.unwrap());
-    let layers = if base.media_layer_default.unwrap(){ [media_layer, fkey_layer] } else { [fkey_layer, media_layer] };
-    let cfg = Config {
-        show_button_outlines: base.show_button_outlines.unwrap(),
-        enable_pixel_shift: base.enable_pixel_shift.unwrap(),
-        font_face: load_font(&base.font_template.unwrap()),
-    };
-    (cfg, layers)
-}
-
 fn main() {
     let mut drm = DrmBackend::open_card().unwrap();
     let _ = panic::catch_unwind(AssertUnwindSafe(|| {
@@ -400,15 +334,11 @@ fn main() {
     sigset.wait().unwrap();
 }
 
-fn arm_inotify(inotify_fd: &Inotify) -> WatchDescriptor {
-    let flags = AddWatchFlags::IN_MOVED_TO | AddWatchFlags::IN_CLOSE | AddWatchFlags::IN_ONESHOT;
-    inotify_fd.add_watch(USER_CFG_PATH, flags).unwrap()
-}
-
 fn real_main(drm: &mut DrmBackend) {
     let mut uinput = UInputHandle::new(OpenOptions::new().write(true).open("/dev/uinput").unwrap());
     let mut backlight = BacklightManager::new();
-    let (mut cfg, mut layers) = load_config();
+    let mut cfg_mgr = ConfigManager::new();
+    let (mut cfg, mut layers) = cfg_mgr.load_config();
     let mut pixel_shift = PixelShiftManager::new();
 
     // drop privileges to input and video group
@@ -438,9 +368,6 @@ fn real_main(drm: &mut DrmBackend) {
             uinput.set_keybit(button.action).unwrap();
         }
     }
-    let inotify_fd = Inotify::init(InitFlags::IN_NONBLOCK).unwrap();
-    let mut cfg_watch_desc = arm_inotify(&inotify_fd);
-    let pollfd_notify = PollFd::new(&inotify_fd, PollFlags::POLLIN);
     let mut dev_name_c = [0 as c_char; 80];
     let dev_name = "Dynamic Function Row Virtual Input Device".as_bytes();
     for i in 0..dev_name.len() {
@@ -461,19 +388,9 @@ fn real_main(drm: &mut DrmBackend) {
     let mut digitizer: Option<InputDevice> = None;
     let mut touches = HashMap::new();
     loop {
-        let evts = match inotify_fd.read_events() {
-            Ok(e) => e,
-            Err(Errno::EAGAIN) => Vec::new(),
-            r => r.unwrap(),
-        };
-        for evt in evts {
-            if evt.wd != cfg_watch_desc {
-                continue
-            }
-            (cfg, layers) = load_config();
+        if cfg_mgr.update_config(&mut cfg, &mut layers) {
             active_layer = 0;
             needs_complete_redraw = true;
-            cfg_watch_desc = arm_inotify(&inotify_fd);
         }
 
         let mut next_timeout_ms = TIMEOUT_MS;
@@ -498,7 +415,7 @@ fn real_main(drm: &mut DrmBackend) {
             needs_complete_redraw = false;
         }
 
-        poll(&mut [pollfd_tb, pollfd_main, pollfd_notify], next_timeout_ms).unwrap();
+        poll(&mut [pollfd_tb, pollfd_main, cfg_mgr.pollfd()], next_timeout_ms).unwrap();
         input_tb.dispatch().unwrap();
         input_main.dispatch().unwrap();
         for event in &mut input_tb.clone().chain(input_main.clone()) {

From 59ccc41f42309d9d2d923554fed3c976b43121dd Mon Sep 17 00:00:00 2001
From: isoamyl50 <100697734+isoamyl50@users.noreply.github.com>
Date: Mon, 11 Dec 2023 15:51:33 +0700
Subject: [PATCH 02/24] Added adaptive brightness functionality

Un-hard-code the lookup table & minor fixes

Minor fix: clamp the brightness value down so that it does not exceed max
---
 src/backlight.rs | 31 ++++++++++++++++++++++++++-----
 src/config.rs    |  2 +-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/backlight.rs b/src/backlight.rs
index dd6bd2a..792c2b4 100644
--- a/src/backlight.rs
+++ b/src/backlight.rs
@@ -10,9 +10,11 @@ use input::event::{
 };
 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 {
@@ -30,7 +32,17 @@ fn find_backlight() -> Result<PathBuf> {
             return Ok(entry.path());
         }
     }
-    Err(anyhow!("No backlight device found"))
+    Err(anyhow!("No Touch Bar backlight device found"))
+}
+
+fn find_display_backlight() -> Result<PathBuf> {
+    for entry in fs::read_dir("/sys/class/backlight/")? {
+        let entry = entry?;
+        if entry.file_name().to_string_lossy().eq("apple-panel-bl") {
+            return Ok(entry.path());
+        }
+    }
+    Err(anyhow!("No Built-in Retina Display backlight device found"))
 }
 
 fn set_backlight(mut file: &File, value: u32) {
@@ -41,20 +53,29 @@ pub struct BacklightManager {
     last_active: Instant,
     current_bl: u32,
     lid_state: SwitchState,
-    bl_file: File
+    bl_file: File,
+    display_bl_path: PathBuf
 }
 
 impl BacklightManager {
     pub fn new() -> BacklightManager {
         let bl_path = find_backlight().unwrap();
+        let display_bl_path = find_display_backlight().unwrap();
         let bl_file = OpenOptions::new().write(true).open(bl_path.join("brightness")).unwrap();
         BacklightManager {
             bl_file,
             lid_state: SwitchState::Off,
             current_bl: read_attr(&bl_path, "brightness"),
-            last_active: Instant::now()
+            last_active: Instant::now(),
+            display_bl_path
         }
     }
+    fn display_to_touchbar(display: u32) -> u32 {
+        let normalized = display as f64 / MAX_DISPLAY_BRIGHTNESS as f64;
+        // Add one so that the touch bar does not turn off
+        let adjusted = (normalized.powf(0.5) * MAX_TOUCH_BAR_BRIGHTNESS as f64) as u32 + 1;
+        adjusted.min(MAX_TOUCH_BAR_BRIGHTNESS) // Clamp the value to the maximum allowed brightness
+    }
     pub fn process_event(&mut self, event: &Event) {
         match event {
             Event::Keyboard(_) | Event::Pointer(_) | Event::Gesture(_) | Event::Touch(_) => {
@@ -80,7 +101,7 @@ impl BacklightManager {
         let new_bl = if self.lid_state == SwitchState::On {
             0
         } else if since_last_active < BRIGHTNESS_DIM_TIMEOUT as u64 {
-            DEFAULT_BRIGHTNESS
+            BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"))
         } else if since_last_active < BRIGHTNESS_OFF_TIMEOUT as u64 {
             DIMMED_BRIGHTNESS
         } else {
diff --git a/src/config.rs b/src/config.rs
index fc6c86e..f93a6ee 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -124,4 +124,4 @@ impl ConfigManager {
     pub fn pollfd(&self) -> PollFd {
         PollFd::new(&self.inotify_fd, PollFlags::POLLIN)
     }
-}
\ No newline at end of file
+}

From 750b2f032d9d14a3bd38a4d73311d3445e1b6e1d Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Tue, 12 Dec 2023 16:12:09 +0100
Subject: [PATCH 03/24] Configurable adaptive brightness

---
 share/tiny-dfr/config.toml |  5 +++++
 src/backlight.rs           | 11 ++++++++---
 src/config.rs              |  4 ++++
 src/main.rs                |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/share/tiny-dfr/config.toml b/share/tiny-dfr/config.toml
index 2eae719..7c2531a 100644
--- a/share/tiny-dfr/config.toml
+++ b/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
diff --git a/src/backlight.rs b/src/backlight.rs
index 792c2b4..6095ae5 100644
--- a/src/backlight.rs
+++ b/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 {
diff --git a/src/config.rs b/src/config.rs
index f93a6ee..4619c00 100644
--- a/src/config.rs
+++ b/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)
diff --git a/src/main.rs b/src/main.rs
index 6c0b089..3358255 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -477,6 +477,6 @@ fn real_main(drm: &mut DrmBackend) {
                 _ => {}
             }
         }
-        backlight.update_backlight();
+        backlight.update_backlight(&cfg);
     }
 }

From bb4e6485d3afb62dc457dea868440432deaf343e Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Thu, 14 Dec 2023 23:01:33 +0100
Subject: [PATCH 04/24] use epoll

---
 Cargo.toml    |  2 +-
 src/config.rs | 16 ++++++++++------
 src/main.rs   | 16 ++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7b66159..5e85378 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ input = "0.8"
 libc = "0.2"
 input-linux = { version = "0.6", features = ["serde"] }
 input-linux-sys = "0.8"
-nix = { version = "0.27", features = ["poll", "signal", "inotify"] }
+nix = { version = "0.27", features = ["event", "signal", "inotify"] }
 privdrop = "0.5.3"
 serde = { version = "1", features = ["derive"] }
 toml = "0.8"
diff --git a/src/config.rs b/src/config.rs
index 4619c00..1e4464b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,13 +1,17 @@
-use std::fs::read_to_string;
+use std::{
+    fs::read_to_string,
+    os::fd::AsFd
+};
 use anyhow::Error;
 use cairo::FontFace;
 use crate::FunctionLayer;
 use crate::fonts::{FontConfig, Pattern};
 use freetype::Library as FtLibrary;
 use input_linux::Key;
-use nix::errno::Errno;
-use nix::poll::{PollFd, PollFlags};
-use nix::sys::inotify::{AddWatchFlags, InitFlags, Inotify, WatchDescriptor};
+use nix::{
+    errno::Errno,
+    sys::inotify::{AddWatchFlags, InitFlags, Inotify, WatchDescriptor}
+};
 use serde::Deserialize;
 
 const USER_CFG_PATH: &'static str = "/etc/tiny-dfr/config.toml";
@@ -125,7 +129,7 @@ impl ConfigManager {
         }
         ret
     }
-    pub fn pollfd(&self) -> PollFd {
-        PollFd::new(&self.inotify_fd, PollFlags::POLLIN)
+    pub fn fd(&self) -> &impl AsFd {
+        &self.inotify_fd
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 3358255..d2b48ae 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,9 +24,9 @@ use input::{
 use libc::{O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY, c_char};
 use input_linux::{uinput::UInputHandle, EventKind, Key, SynchronizeKind};
 use input_linux_sys::{uinput_setup, input_id, timeval, input_event};
-use nix::{
-    poll::{poll, PollFd, PollFlags},
-    sys::signal::{Signal, SigSet},
+use nix::sys::{
+    signal::{Signal, SigSet},
+    epoll::{Epoll, EpollCreateFlags, EpollEvent, EpollFlags}
 };
 use privdrop::PrivDrop;
 
@@ -358,10 +358,10 @@ fn real_main(drm: &mut DrmBackend) {
     let mut input_main = Libinput::new_with_udev(Interface);
     input_tb.udev_assign_seat("seat-touchbar").unwrap();
     input_main.udev_assign_seat("seat0").unwrap();
-    let fd_tb = input_tb.as_fd().try_clone_to_owned().unwrap();
-    let fd_main = input_main.as_fd().try_clone_to_owned().unwrap();
-    let pollfd_tb = PollFd::new(&fd_tb, PollFlags::POLLIN);
-    let pollfd_main = PollFd::new(&fd_main, PollFlags::POLLIN);
+    let epoll = Epoll::new(EpollCreateFlags::empty()).unwrap();
+    epoll.add(input_main.as_fd(), EpollEvent::new(EpollFlags::EPOLLIN, 0)).unwrap();
+    epoll.add(input_tb.as_fd(), EpollEvent::new(EpollFlags::EPOLLIN, 1)).unwrap();
+    epoll.add(cfg_mgr.fd(), EpollEvent::new(EpollFlags::EPOLLIN, 2)).unwrap();
     uinput.set_evbit(EventKind::Key).unwrap();
     for layer in &layers {
         for button in &layer.buttons {
@@ -415,7 +415,7 @@ fn real_main(drm: &mut DrmBackend) {
             needs_complete_redraw = false;
         }
 
-        poll(&mut [pollfd_tb, pollfd_main, cfg_mgr.pollfd()], next_timeout_ms).unwrap();
+        epoll.wait(&mut [EpollEvent::new(EpollFlags::EPOLLIN, 0)], next_timeout_ms as isize).unwrap();
         input_tb.dispatch().unwrap();
         input_main.dispatch().unwrap();
         for event in &mut input_tb.clone().chain(input_main.clone()) {

From d74a3706fc6a52a5cdfd04aec4fcd93445c690d2 Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Sat, 16 Dec 2023 15:18:25 +0100
Subject: [PATCH 05/24] More detailed errors

---
 src/display.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/display.rs b/src/display.rs
index a0c1589..45f8a77 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -174,6 +174,7 @@ fn try_open_card(path: &Path) -> Result<DrmBackend> {
 
 impl DrmBackend {
     pub fn open_card() -> Result<DrmBackend> {
+        let mut errors = Vec::new();
         for entry in fs::read_dir("/dev/dri/")? {
             let entry = entry?;
             if !entry.file_name().to_string_lossy().starts_with("card") {
@@ -181,10 +182,12 @@ impl DrmBackend {
             }
             match try_open_card(&entry.path()) {
                 Ok(card) => return Ok(card),
-                Err(_) => {}
+                Err(err) => {
+                    errors.push(format!("{}: {}", entry.path().as_os_str().to_string_lossy(), err.to_string()))
+                }
             }
         }
-        Err(anyhow!("No touchbar device found"))
+        Err(anyhow!("No touchbar device found, attempted: [\n    {}\n]", errors.join(",\n    ")))
     }
     pub fn dirty(&self, clips: &[ClipRect]) -> Result<()> {
         Ok(self.card.dirty_framebuffer(self.fb, clips)?)

From b938de2c4af57bf7115f90823f1b057fa648fa26 Mon Sep 17 00:00:00 2001
From: Declan Baggins <declan.fraser.rixon@gmail.com>
Date: Tue, 26 Dec 2023 06:45:05 +1100
Subject: [PATCH 06/24] Add flake.nix for building with Nix.

---
 .gitignore |  1 +
 flake.lock | 27 +++++++++++++++++++++++++++
 flake.nix  | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/.gitignore b/.gitignore
index ea8c4bf..d787b70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target
+/result
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..5e0824e
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1703068421,
+        "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..927180e
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,43 @@
+{
+  description = "The most basic dynamic function row daemon possible";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+  };
+  outputs = { self, nixpkgs }:
+    let
+      pkgs = import nixpkgs { system = "aarch64-linux"; };
+    in
+    rec {
+      packages.aarch64-linux.default = pkgs.rustPlatform.buildRustPackage {
+        name = "tiny-dfr";
+        version = "0.2.0";
+        src = ./.;
+        cargoLock = {
+          lockFile = ./Cargo.lock;
+        };
+        nativeBuildInputs = [
+          pkgs.pkg-config
+        ];
+        buildInputs = [
+          pkgs.cairo
+          pkgs.libinput
+          pkgs.freetype
+          pkgs.fontconfig
+          pkgs.glib
+          pkgs.pango
+          pkgs.gdk-pixbuf
+          pkgs.libxml2
+        ];
+      };
+      devShells.aarch64-linux.default = pkgs.mkShell {
+        inputsFrom = [
+          packages.aarch64-linux.default
+        ];
+        packages = [
+	  pkgs.rustfmt
+          pkgs.rust-analyzer
+        ];
+        RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
+      };
+    };
+}

From abe14088f546d3f7b64693b75dc29fce747df5fb Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Tue, 26 Dec 2023 14:01:54 +0100
Subject: [PATCH 07/24] Fix crashing on sleep

Fixes #28
---
 src/main.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d2b48ae..a5c4067 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,9 +24,12 @@ use input::{
 use libc::{O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY, c_char};
 use input_linux::{uinput::UInputHandle, EventKind, Key, SynchronizeKind};
 use input_linux_sys::{uinput_setup, input_id, timeval, input_event};
-use nix::sys::{
-    signal::{Signal, SigSet},
-    epoll::{Epoll, EpollCreateFlags, EpollEvent, EpollFlags}
+use nix::{
+    sys::{
+        signal::{Signal, SigSet},
+        epoll::{Epoll, EpollCreateFlags, EpollEvent, EpollFlags}
+    }, 
+    errno::Errno
 };
 use privdrop::PrivDrop;
 
@@ -415,7 +418,10 @@ fn real_main(drm: &mut DrmBackend) {
             needs_complete_redraw = false;
         }
 
-        epoll.wait(&mut [EpollEvent::new(EpollFlags::EPOLLIN, 0)], next_timeout_ms as isize).unwrap();
+        match epoll.wait(&mut [EpollEvent::new(EpollFlags::EPOLLIN, 0)], next_timeout_ms as isize) {
+            Err(Errno::EINTR) | Ok(_) => { 0 },
+            e => e.unwrap(),
+        };
         input_tb.dispatch().unwrap();
         input_main.dispatch().unwrap();
         for event in &mut input_tb.clone().chain(input_main.clone()) {

From 9a4dc601b709786f79f3d077ed18a88273d1ff4c Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Tue, 26 Dec 2023 14:38:40 +0100
Subject: [PATCH 08/24] Do not crash on missing fonts

---
 src/config.rs |  5 ++++-
 src/fonts.rs  | 53 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 1e4464b..b04eaca 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -48,7 +48,10 @@ fn load_font(name: &str) -> FontFace {
     let fontconfig = FontConfig::new();
     let mut pattern = Pattern::new(name);
     fontconfig.perform_substitutions(&mut pattern);
-    let pat_match = fontconfig.match_pattern(&pattern);
+    let pat_match = match fontconfig.match_pattern(&pattern) {
+        Ok(pat) => pat,
+        Err(_) => panic!("Unable to find specified font. If you are using the default config, make sure you have at least one font installed")
+    };
     let file_name = pat_match.get_file_name();
     let file_idx = pat_match.get_font_index();
     let ft_library = FtLibrary::init().unwrap();
diff --git a/src/fonts.rs b/src/fonts.rs
index 9e08c19..d358fad 100644
--- a/src/fonts.rs
+++ b/src/fonts.rs
@@ -1,3 +1,4 @@
+#![allow(non_upper_case_globals)]
 use std::ffi::{c_char, c_int, CStr, CString};
 use std::ptr;
 
@@ -9,11 +10,21 @@ struct FcPattern {
 struct FcConfig {
     _data: [u8; 0]
 }
+
 type FcResult = c_int;
+const FcResultMatch: FcResult = 0;
+const FcResultNoMatch: FcResult = 1;
+const FcResultTypeMismatch: FcResult = 2;
+const FcResultNoId: FcResult = 3;
+const FcResultOutOfMemory: FcResult = 4;
+
 type FcMatchKind = c_int;
-#[allow(non_upper_case_globals)]
 const FcMatchPattern: FcMatchKind = 0;
 
+pub enum FontConfigError {
+    FontNotFound
+}
+
 pub struct FontConfig {
     config: *const FcConfig
 }
@@ -27,18 +38,23 @@ impl FontConfig {
             config
         }
     }
-    pub fn match_pattern(&self, pattern: &Pattern) -> Pattern {
+    pub fn match_pattern(&self, pattern: &Pattern) -> Result<Pattern, FontConfigError> {
         let mut result: FcResult = 0;
         let match_ = unsafe {
             FcFontMatch(self.config, pattern.pattern, &mut result)
         };
-        Pattern {
-            pattern: match_
+        if match_ == ptr::null_mut() {
+            return Err(FontConfigError::FontNotFound);
         }
+        Ok(Pattern {
+            pattern: match_
+        })
     }
     pub fn perform_substitutions(&self, pattern: &mut Pattern) {
         unsafe {
-            FcConfigSubstitute(self.config, pattern.pattern, FcMatchPattern);
+            if (FcConfigSubstitute(self.config, pattern.pattern, FcMatchPattern)) == 0 {
+                panic!("Allocation error while loading fontconfig data");
+            }
             FcDefaultSubstitute(pattern.pattern);
         }
     }
@@ -52,6 +68,27 @@ impl Drop for FontConfig {
     }
 }
 
+fn throw_on_fcpattern_result(res: FcResult) {
+    match res {
+        FcResultMatch => {},
+        FcResultNoMatch => {
+            panic!("NULL pattern");
+        },
+        FcResultTypeMismatch => {
+            panic!("Wrong type for pattern element");
+        },
+        FcResultNoId => {
+            panic!("Unknown pattern element");
+        },
+        FcResultOutOfMemory => {
+            panic!("Out of memory");
+        },
+        r => {
+            panic!("Unknown fontconfig return value {:?}", r)
+        }
+    }
+}
+
 pub struct Pattern {
     pattern: *const FcPattern
 }
@@ -70,7 +107,8 @@ impl Pattern {
         let name = CString::new("file").unwrap();
         unsafe {
             let mut file_name = ptr::null();
-            FcPatternGetString(self.pattern, name.as_ptr(), 0, &mut file_name);
+            let res = FcPatternGetString(self.pattern, name.as_ptr(), 0, &mut file_name);
+            throw_on_fcpattern_result(res);
             CStr::from_ptr(file_name).to_str().unwrap()
         }
     }
@@ -78,7 +116,8 @@ impl Pattern {
         let name = CString::new("index").unwrap();
         unsafe {
             let mut index = 0;
-            FcPatternGetInteger(self.pattern, name.as_ptr(), 0, &mut index);
+            let res = FcPatternGetInteger(self.pattern, name.as_ptr(), 0, &mut index);
+            throw_on_fcpattern_result(res);
             index as isize
         }
     }

From 276b1b09baf87e719eb1b8cd9a8f674506e3c73b Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Tue, 26 Dec 2023 14:57:58 +0100
Subject: [PATCH 09/24] Configurable brightness

---
 share/tiny-dfr/config.toml | 6 ++++++
 src/backlight.rs           | 9 ++++-----
 src/config.rs              | 4 ++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/share/tiny-dfr/config.toml b/share/tiny-dfr/config.toml
index 7c2531a..1545186 100644
--- a/share/tiny-dfr/config.toml
+++ b/share/tiny-dfr/config.toml
@@ -29,6 +29,12 @@ FontTemplate = ":bold"
 # screen's brightness
 AdaptiveBrightness = true
 
+# With adaptive brightness disabled this is used as the brightness
+# in the active state
+# With it enabled, this is the maximum point on the brightness curve
+# Accepted values are 0-255
+ActiveBrightness = 128
+
 # 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
diff --git a/src/backlight.rs b/src/backlight.rs
index 6095ae5..21f3e03 100644
--- a/src/backlight.rs
+++ b/src/backlight.rs
@@ -15,7 +15,6 @@ const MAX_DISPLAY_BRIGHTNESS: u32 = 509;
 const MAX_TOUCH_BAR_BRIGHTNESS: u32 = 255;
 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 {
@@ -71,10 +70,10 @@ impl BacklightManager {
             display_bl_path
         }
     }
-    fn display_to_touchbar(display: u32) -> u32 {
+    fn display_to_touchbar(display: u32, active_brightness: u32) -> u32 {
         let normalized = display as f64 / MAX_DISPLAY_BRIGHTNESS as f64;
         // Add one so that the touch bar does not turn off
-        let adjusted = (normalized.powf(0.5) * MAX_TOUCH_BAR_BRIGHTNESS as f64) as u32 + 1;
+        let adjusted = (normalized.powf(0.5) * active_brightness as f64) as u32 + 1;
         adjusted.min(MAX_TOUCH_BAR_BRIGHTNESS) // Clamp the value to the maximum allowed brightness
     }
     pub fn process_event(&mut self, event: &Event) {
@@ -103,9 +102,9 @@ impl BacklightManager {
             0
         } else if since_last_active < BRIGHTNESS_DIM_TIMEOUT as u64 {
             if cfg.adaptive_brightness {
-                BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"))
+                BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"), cfg.active_brightness)
             } else {
-                DEFAULT_BRIGHTNESS
+                cfg.active_brightness
             }
         } else if since_last_active < BRIGHTNESS_OFF_TIMEOUT as u64 {
             DIMMED_BRIGHTNESS
diff --git a/src/config.rs b/src/config.rs
index b04eaca..0178446 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -21,6 +21,7 @@ pub struct Config {
     pub enable_pixel_shift: bool,
     pub font_face: FontFace,
     pub adaptive_brightness: bool,
+    pub active_brightness: u32,
 }
 
 #[derive(Deserialize)]
@@ -31,6 +32,7 @@ struct ConfigProxy {
     enable_pixel_shift: Option<bool>,
     font_template: Option<String>,
     adaptive_brightness: Option<bool>,
+    active_brightness: Option<u32>,
     primary_layer_keys: Option<Vec<ButtonConfig>>,
     media_layer_keys: Option<Vec<ButtonConfig>>
 }
@@ -71,6 +73,7 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
         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);
+        base.active_brightness = user.active_brightness.or(base.active_brightness);
     };
     let media_layer = FunctionLayer::with_config(base.media_layer_keys.unwrap());
     let fkey_layer = FunctionLayer::with_config(base.primary_layer_keys.unwrap());
@@ -80,6 +83,7 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
         enable_pixel_shift: base.enable_pixel_shift.unwrap(),
         adaptive_brightness: base.adaptive_brightness.unwrap(),
         font_face: load_font(&base.font_template.unwrap()),
+        active_brightness: base.active_brightness.unwrap()
     };
     (cfg, layers)
 }

From b738c6237423bc0ef14b840337210aad91c0b204 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <davide@cavalca.name>
Date: Wed, 17 Jan 2024 21:22:29 -0800
Subject: [PATCH 10/24] Bump drm to 0.11.1

---
 Cargo.lock | 145 +++++++++++++++++++++++++++++++++++++++++++++--------
 Cargo.toml |   2 +-
 2 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 44393d8..dd20c70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -230,25 +230,25 @@ dependencies = [
 
 [[package]]
 name = "drm"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87"
+checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
 dependencies = [
  "bitflags 2.4.0",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
- "nix 0.27.1",
+ "rustix",
 ]
 
 [[package]]
 name = "drm-ffi"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d"
+checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
 dependencies = [
  "drm-sys",
- "nix 0.27.1",
+ "rustix",
 ]
 
 [[package]]
@@ -259,9 +259,13 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae"
+checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.6.4",
+]
 
 [[package]]
 name = "dtoa"
@@ -299,6 +303,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "float-cmp"
 version = "0.9.0"
@@ -648,7 +662,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -680,9 +694,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "librsvg"
@@ -732,6 +746,18 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4"
+
 [[package]]
 name = "locale_config"
 version = "0.3.0"
@@ -1048,7 +1074,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -1424,6 +1450,19 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+dependencies = [
+ "bitflags 2.4.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "safe_arch"
 version = "0.7.1"
@@ -1852,7 +1891,16 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -1861,13 +1909,28 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -1876,42 +1939,84 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
 version = "0.5.15"
diff --git a/Cargo.toml b/Cargo.toml
index 5e85378..06ffe96 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr"
 [dependencies]
 cairo-rs = { version = "0.18", default-features = false, features = ["freetype"] }
 librsvg = "2.56.0"
-drm = "0.10.0"
+drm = "0.11.1"
 anyhow = "1"
 input = "0.8"
 libc = "0.2"

From b5b795443908ffde65233aa1806298cde74bc494 Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Fri, 2 Feb 2024 20:07:04 +0100
Subject: [PATCH 11/24] Update librsvg

Fixes #8
---
 Cargo.lock | 212 +++++++++--------------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 34 insertions(+), 180 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd20c70..a3e7d4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,9 +78,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cairo-rs"
-version = "0.18.0"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b"
+checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
  "bitflags 2.4.0",
  "cairo-sys-rs",
@@ -133,12 +133,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.8"
@@ -184,19 +178,15 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.29.6"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
+checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
 dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "matches",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
+ "phf",
  "smallvec",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -221,10 +211,8 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
  "syn 1.0.109",
 ]
 
@@ -460,17 +448,6 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -479,7 +456,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -700,11 +677,10 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "librsvg"
-version = "2.56.92"
+version = "2.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e30ebdab4ce0c632d361b54989020c2e15060f77728ca99b8e3daa4cc94f3c"
+checksum = "a7411554079bdc0af967356757e6c9b1a60fba1aa7ee95d9c80e170be8ea4892"
 dependencies = [
- "byteorder",
  "cairo-rs",
  "cast",
  "cssparser",
@@ -809,19 +785,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
 dependencies = [
  "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
+ "phf",
+ "phf_codegen",
  "string_cache",
  "string_cache_codegen",
  "tendril",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "matrixmultiply"
 version = "0.3.7"
@@ -913,12 +883,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "num-complex"
 version = "0.4.4"
@@ -1089,15 +1053,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
 [[package]]
 name = "phf"
 version = "0.10.1"
@@ -1105,38 +1060,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
  "phf_macros",
- "phf_shared 0.10.0",
+ "phf_shared",
  "proc-macro-hack",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
+ "phf_generator",
+ "phf_shared",
 ]
 
 [[package]]
@@ -1145,8 +1080,8 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
+ "phf_shared",
+ "rand",
 ]
 
 [[package]]
@@ -1155,23 +1090,14 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
+ "phf_generator",
+ "phf_shared",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.10.0"
@@ -1279,20 +1205,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1300,18 +1212,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -1321,16 +1223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -1339,25 +1232,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.10",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -1441,15 +1316,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.30"
@@ -1480,28 +1346,23 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "selectors"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
+checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "cssparser",
  "derive_more",
  "fxhash",
  "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
+ "new_debug_unreachable",
+ "phf",
+ "phf_codegen",
  "precomputed-hash",
  "servo_arc",
  "smallvec",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
-
 [[package]]
 name = "serde"
 version = "1.0.188"
@@ -1533,11 +1394,10 @@ dependencies = [
 
 [[package]]
 name = "servo_arc"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
+checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
 dependencies = [
- "nodrop",
  "stable_deref_trait",
 ]
 
@@ -1590,7 +1450,7 @@ dependencies = [
  "new_debug_unreachable",
  "once_cell",
  "parking_lot",
- "phf_shared 0.10.0",
+ "phf_shared",
  "precomputed-hash",
  "serde",
 ]
@@ -1601,8 +1461,8 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
 ]
@@ -1695,7 +1555,7 @@ dependencies = [
  "nix 0.27.1",
  "pkg-config",
  "privdrop",
- "rand 0.8.5",
+ "rand",
  "serde",
  "toml 0.8.8",
 ]
@@ -1841,12 +1701,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/Cargo.toml b/Cargo.toml
index 06ffe96..4733aaa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr"
 
 [dependencies]
 cairo-rs = { version = "0.18", default-features = false, features = ["freetype"] }
-librsvg = "2.56.0"
+librsvg = "2.57"
 drm = "0.11.1"
 anyhow = "1"
 input = "0.8"

From 6f957fdd246452b14d1f787c2630d0a500f082e7 Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Sat, 22 Jun 2024 11:39:15 +0200
Subject: [PATCH 12/24] Do a release

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3e7d4a..d326b46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1541,7 +1541,7 @@ dependencies = [
 
 [[package]]
 name = "tiny-dfr"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "cairo-rs",
diff --git a/Cargo.toml b/Cargo.toml
index 4733aaa..121a960 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tiny-dfr"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 license = "MIT AND Apache-2.0"
 description = "The most basic dynamic function row daemon possible"

From f6d86c670f79198fc8c89eed34af900b3e2bf049 Mon Sep 17 00:00:00 2001
From: Kerem Karabay <kekrby@gmail.com>
Date: Sat, 21 Oct 2023 13:29:07 +0300
Subject: [PATCH 13/24] Create an empty override for systemd-backlight instead
 of setting SYSTEMD_READY to 0 to disable it

Disabling systemd-backlight this way doesn't prevent other services from
depending on the backlight device
---
 ...systemd-backlight@backlight:228200000.display-pipe.0.service | 0
 etc/udev/rules.d/99-touchbar-backlight.rules                    | 2 --
 2 files changed, 2 deletions(-)
 create mode 100644 etc/systemd/system/systemd-backlight@backlight:228200000.display-pipe.0.service
 delete mode 100644 etc/udev/rules.d/99-touchbar-backlight.rules

diff --git a/etc/systemd/system/systemd-backlight@backlight:228200000.display-pipe.0.service b/etc/systemd/system/systemd-backlight@backlight:228200000.display-pipe.0.service
new file mode 100644
index 0000000..e69de29
diff --git a/etc/udev/rules.d/99-touchbar-backlight.rules b/etc/udev/rules.d/99-touchbar-backlight.rules
deleted file mode 100644
index 69d50e8..0000000
--- a/etc/udev/rules.d/99-touchbar-backlight.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# The backlight is managed by tiny-df. Tell systemd to leave it alone
-SUBSYSTEM=="backlight", KERNEL=="228200000.display-pipe.0", DRIVERS=="panel-summit", ENV{SYSTEMD_READY}="0"

From 08a556ee33d46f556c7cc5a8e94a58955e07ca0c Mon Sep 17 00:00:00 2001
From: Kerem Karabay <kekrby@gmail.com>
Date: Sat, 21 Oct 2023 15:36:34 +0300
Subject: [PATCH 14/24] Make the systemd service bind to the backlight and
 display devices

This ensures that the service won't be started until both the backlight
and display devices are present, and that it will be stopped when one of
them disappears
---
 etc/systemd/system/tiny-dfr.service         | 3 +--
 etc/udev/rules.d/99-touchbar-tiny-dfr.rules | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/systemd/system/tiny-dfr.service b/etc/systemd/system/tiny-dfr.service
index cdae366..78c2392 100644
--- a/etc/systemd/system/tiny-dfr.service
+++ b/etc/systemd/system/tiny-dfr.service
@@ -1,8 +1,7 @@
 [Unit]
 Description=Tiny Apple silicon touch bar daemon
 After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-StartLimitIntervalSec=30
-StartLimitBurst=2
+BindsTo=dev-tiny_dfr_display.device dev-tiny_dfr_backlight.device
 
 [Service]
 ExecStart=/usr/bin/tiny-dfr
diff --git a/etc/udev/rules.d/99-touchbar-tiny-dfr.rules b/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
index 5169f8f..fe16715 100644
--- a/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
+++ b/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
@@ -1,2 +1,6 @@
 SUBSYSTEM=="input", ATTR{name}=="MacBookPro17,1 Touch Bar", TAG+="systemd", ENV{SYSTEMD_WANTS}="tiny-dfr.service"
 SUBSYSTEM=="input", ATTR{name}=="Mac14,7 Touch Bar", TAG+="systemd", ENV{SYSTEMD_WANTS}="tiny-dfr.service"
+
+SUBSYSTEM=="drm", KERNEL=="card[0-9]*", DRIVERS=="adp", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display"
+
+SUBSYSTEM=="backlight", KERNEL=="228200000.display-pipe.0", DRIVERS=="panel-summit", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_backlight"

From 448689bd03710719d3bca9d1fc2dc47f5ac4190a Mon Sep 17 00:00:00 2001
From: Kerem Karabay <kekrby@gmail.com>
Date: Thu, 13 Jul 2023 18:25:36 +0300
Subject: [PATCH 15/24] Don't hardcode the touchbar width and height

---
 src/display.rs | 11 ++++++++--
 src/main.rs    | 58 +++++++++++++++++++++++++-------------------------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/display.rs b/src/display.rs
index 45f8a77..0e2a850 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -7,7 +7,7 @@ use drm::{
     ClientCapability, Device as DrmDevice, buffer::DrmFourcc,
     control::{
         connector, Device as ControlDevice, property, ResourceHandle, atomic, AtomicCommitFlags,
-        dumbbuffer::{DumbBuffer, DumbMapping}, framebuffer, ClipRect
+        dumbbuffer::{DumbBuffer, DumbMapping}, framebuffer, ClipRect, Mode
     }
 };
 use anyhow::{Result, anyhow};
@@ -34,6 +34,7 @@ impl Card {
 
 pub struct DrmBackend {
     card: Card,
+    mode: Mode,
     db: DumbBuffer,
     fb: framebuffer::Handle
 }
@@ -169,7 +170,7 @@ fn try_open_card(path: &Path) -> Result<DrmBackend> {
     card.atomic_commit(AtomicCommitFlags::ALLOW_MODESET, atomic_req)?;
 
 
-    Ok(DrmBackend { card, db, fb })
+    Ok(DrmBackend { card, mode, db, fb })
 }
 
 impl DrmBackend {
@@ -189,6 +190,12 @@ impl DrmBackend {
         }
         Err(anyhow!("No touchbar device found, attempted: [\n    {}\n]", errors.join(",\n    ")))
     }
+    pub fn mode(&self) -> Mode {
+        self.mode
+    }
+    pub fn fb_info(&self) -> Result<framebuffer::Info> {
+        Ok(self.card.get_framebuffer(self.fb)?)
+    }
     pub fn dirty(&self, clips: &[ClipRect]) -> Result<()> {
         Ok(self.card.dirty_framebuffer(self.fb, clips)?)
     }
diff --git a/src/main.rs b/src/main.rs
index a5c4067..86b0d04 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -45,9 +45,6 @@ use pixel_shift::{PixelShiftManager, PIXEL_SHIFT_WIDTH_PX};
 use config::{ButtonConfig, Config};
 use crate::config::ConfigManager;
 
-const DFR_WIDTH: i32 = 2008;
-const DFR_HEIGHT: i32 = 60;
-const DFR_STRIDE: i32 = 64;
 const BUTTON_SPACING_PX: i32 = 16;
 const BUTTON_COLOR_INACTIVE: f64 = 0.200;
 const BUTTON_COLOR_ACTIVE: f64 = 0.400;
@@ -117,20 +114,20 @@ impl Button {
             changed: false,
         }
     }
-    fn render(&self, c: &Context, button_left_edge: f64, button_width: u64, y_shift: f64) {
+    fn render(&self, c: &Context, height: i32, button_left_edge: f64, button_width: u64, y_shift: f64) {
         match &self.image {
             ButtonImage::Text(text) => {
                 let extents = c.text_extents(text).unwrap();
                 c.move_to(
                     button_left_edge + (button_width as f64 / 2.0 - extents.width() / 2.0).round(),
-                    y_shift + (DFR_HEIGHT as f64 / 2.0 + extents.height() / 2.0).round()
+                    y_shift + (height as f64 / 2.0 + extents.height() / 2.0).round()
                 );
                 c.show_text(text).unwrap();
             },
             ButtonImage::Svg(svg) => {
                 let renderer = CairoRenderer::new(&svg);
                 let x = button_left_edge + (button_width as f64 / 2.0 - (ICON_SIZE / 2) as f64).round();
-                let y = y_shift + ((DFR_HEIGHT as f64 - ICON_SIZE as f64) / 2.0).round();
+                let y = y_shift + ((height as f64 - ICON_SIZE as f64) / 2.0).round();
 
                 renderer.render_document(c,
                     &Rectangle::new(x, y, ICON_SIZE as f64, ICON_SIZE as f64)
@@ -138,7 +135,7 @@ impl Button {
             }
             ButtonImage::Bitmap(surf) => {
                 let x = button_left_edge + (button_width as f64 / 2.0 - (ICON_SIZE / 2) as f64).round();
-                let y = y_shift + ((DFR_HEIGHT as f64 - ICON_SIZE as f64) / 2.0).round();
+                let y = y_shift + ((height as f64 - ICON_SIZE as f64) / 2.0).round();
                 c.set_source_surface(surf, x, y).unwrap();
                 c.rectangle(x, y, ICON_SIZE as f64, ICON_SIZE as f64);
                 c.fill().unwrap();
@@ -169,20 +166,20 @@ impl FunctionLayer {
             buttons: cfg.into_iter().map(Button::with_config).collect()
         }
     }
-    fn draw(&mut self, config: &Config, surface: &Surface, pixel_shift: (f64, f64), complete_redraw: bool) -> Vec<ClipRect> {
+    fn draw(&mut self, config: &Config, width: i32, height: i32, surface: &Surface, pixel_shift: (f64, f64), complete_redraw: bool) -> Vec<ClipRect> {
         let c = Context::new(&surface).unwrap();
         let mut modified_regions = if complete_redraw {
-            vec![ClipRect::new(0, 0, DFR_HEIGHT as u16, DFR_WIDTH as u16)]
+            vec![ClipRect::new(0, 0, height as u16, width as u16)]
         } else {
             Vec::new()
         };
-        c.translate(DFR_HEIGHT as f64, 0.0);
+        c.translate(height as f64, 0.0);
         c.rotate((90.0f64).to_radians());
         let pixel_shift_width = if config.enable_pixel_shift { PIXEL_SHIFT_WIDTH_PX } else { 0 };
-        let button_width = ((DFR_WIDTH - pixel_shift_width as i32) - (BUTTON_SPACING_PX * (self.buttons.len() - 1) as i32)) as f64 / self.buttons.len() as f64;
+        let button_width = ((width - pixel_shift_width as i32) - (BUTTON_SPACING_PX * (self.buttons.len() - 1) as i32)) as f64 / self.buttons.len() as f64;
         let radius = 8.0f64;
-        let bot = (DFR_HEIGHT as f64) * 0.15;
-        let top = (DFR_HEIGHT as f64) * 0.85;
+        let bot = (height as f64) * 0.15;
+        let top = (height as f64) * 0.85;
         let (pixel_shift_x, pixel_shift_y) = pixel_shift;
 
         if complete_redraw {
@@ -246,15 +243,15 @@ impl FunctionLayer {
 
             c.fill().unwrap();
             c.set_source_rgb(1.0, 1.0, 1.0);
-            button.render(&c, left_edge, button_width.ceil() as u64, pixel_shift_y);
+            button.render(&c, height, left_edge, button_width.ceil() as u64, pixel_shift_y);
 
             button.changed = false;
 
             if !complete_redraw {
                 modified_regions.push(ClipRect::new(
-                    DFR_HEIGHT as u16 - top as u16 - radius as u16,
+                    height as u16 - top as u16 - radius as u16,
                     left_edge as u16,
-                    DFR_HEIGHT as u16 - bot as u16 + radius as u16,
+                    height as u16 - bot as u16 + radius as u16,
                     left_edge as u16 + button_width as u16
                 ));
             }
@@ -284,13 +281,13 @@ impl LibinputInterface for Interface {
 }
 
 
-fn button_hit(num: u32, idx: u32, x: f64, y: f64) -> bool {
-    let button_width = (DFR_WIDTH - (BUTTON_SPACING_PX * (num - 1) as i32)) as f64 / num as f64;
+fn button_hit(num: u32, idx: u32, width: u16, height: u16, x: f64, y: f64) -> bool {
+    let button_width = (width as i32 - (BUTTON_SPACING_PX * (num - 1) as i32)) as f64 / num as f64;
     let left_edge = idx as f64 * (button_width + BUTTON_SPACING_PX as f64);
     if x < left_edge || x > (left_edge + button_width) {
         return false
     }
-    y > 0.1 * DFR_HEIGHT as f64 && y < 0.9 * DFR_HEIGHT as f64
+    y > 0.1 * height as f64 && y < 0.9 * height as f64
 }
 
 fn emit<F>(uinput: &mut UInputHandle<F>, ty: EventKind, code: u16, value: i32) where F: AsRawFd {
@@ -312,6 +309,7 @@ fn toggle_key<F>(uinput: &mut UInputHandle<F>, code: Key, value: i32) where F: A
 
 fn main() {
     let mut drm = DrmBackend::open_card().unwrap();
+    let (height, width) = drm.mode().size();
     let _ = panic::catch_unwind(AssertUnwindSafe(|| {
         real_main(&mut drm)
     }));
@@ -331,13 +329,15 @@ fn main() {
         }
     }
     drop(map);
-    drm.dirty(&[ClipRect::new(0, 0, DFR_HEIGHT as u16, DFR_WIDTH as u16)]).unwrap();
+    drm.dirty(&[ClipRect::new(0, 0, height as u16, width as u16)]).unwrap();
     let mut sigset = SigSet::empty();
     sigset.add(Signal::SIGTERM);
     sigset.wait().unwrap();
 }
 
 fn real_main(drm: &mut DrmBackend) {
+    let (height, width) = drm.mode().size();
+    let (db_width, db_height) = drm.fb_info().unwrap().size();
     let mut uinput = UInputHandle::new(OpenOptions::new().write(true).open("/dev/uinput").unwrap());
     let mut backlight = BacklightManager::new();
     let mut cfg_mgr = ConfigManager::new();
@@ -353,7 +353,7 @@ fn real_main(drm: &mut DrmBackend) {
         .apply()
         .unwrap_or_else(|e| { panic!("Failed to drop privileges: {}", e) });
 
-    let mut surface = ImageSurface::create(Format::ARgb32, DFR_STRIDE, DFR_WIDTH).unwrap();
+    let mut surface = ImageSurface::create(Format::ARgb32, db_width as i32, db_height as i32).unwrap();
     let mut active_layer = 0;
     let mut needs_complete_redraw = true;
 
@@ -411,7 +411,7 @@ fn real_main(drm: &mut DrmBackend) {
             } else {
                 (0.0, 0.0)
             };
-            let clips = layers[active_layer].draw(&cfg, &surface, shift, needs_complete_redraw);
+            let clips = layers[active_layer].draw(&cfg, width as i32, height as i32, &surface, shift, needs_complete_redraw);
             let data = surface.data().unwrap();
             drm.map().unwrap().as_mut()[..data.len()].copy_from_slice(&data);
             drm.dirty(&clips).unwrap();
@@ -451,10 +451,10 @@ fn real_main(drm: &mut DrmBackend) {
                     }
                     match te {
                         TouchEvent::Down(dn) => {
-                            let x = dn.x_transformed(DFR_WIDTH as u32);
-                            let y = dn.y_transformed(DFR_HEIGHT as u32);
-                            let btn = (x / (DFR_WIDTH as f64 / layers[active_layer].buttons.len() as f64)) as u32;
-                            if button_hit(layers[active_layer].buttons.len() as u32, btn, x, y) {
+                            let x = dn.x_transformed(width as u32);
+                            let y = dn.y_transformed(height as u32);
+                            let btn = (x / (width as f64 / layers[active_layer].buttons.len() as f64)) as u32;
+                            if button_hit(layers[active_layer].buttons.len() as u32, btn, width, height, x, y) {
                                 touches.insert(dn.seat_slot(), (active_layer, btn));
                                 layers[active_layer].buttons[btn as usize].set_active(&mut uinput, true);
                             }
@@ -464,10 +464,10 @@ fn real_main(drm: &mut DrmBackend) {
                                 continue;
                             }
 
-                            let x = mtn.x_transformed(DFR_WIDTH as u32);
-                            let y = mtn.y_transformed(DFR_HEIGHT as u32);
+                            let x = mtn.x_transformed(width as u32);
+                            let y = mtn.y_transformed(height as u32);
                             let (layer, btn) = *touches.get(&mtn.seat_slot()).unwrap();
-                            let hit = button_hit(layers[layer].buttons.len() as u32, btn, x, y);
+                            let hit = button_hit(layers[layer].buttons.len() as u32, btn, width, height, x, y);
                             layers[layer].buttons[btn as usize].set_active(&mut uinput, hit);
                         },
                         TouchEvent::Up(up) => {

From 03a8e1bcb50527e7959e37eeee3bd719da6d75c6 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Tue, 26 Mar 2024 16:16:15 -0700
Subject: [PATCH 16/24]  Display an escape key on Macs without a physical one

---
 share/tiny-dfr/config.toml |  2 ++
 src/config.rs              | 19 ++++++++++++-------
 src/main.rs                |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/share/tiny-dfr/config.toml b/share/tiny-dfr/config.toml
index 1545186..60c5efb 100644
--- a/share/tiny-dfr/config.toml
+++ b/share/tiny-dfr/config.toml
@@ -52,6 +52,8 @@ PrimaryLayerKeys = [
     # if both are present, the behavior is undefined.
     # For the list of supported key codes see
     # https://docs.rs/input-linux/latest/input_linux/enum.Key.html
+    # Note that the escape key is not specified here, as it is added
+    # automatically on Macs without a physical one
     { Text = "F1",  Action = "F1"  },
     { Text = "F2",  Action = "F2"  },
     { Text = "F3",  Action = "F3"  },
diff --git a/src/config.rs b/src/config.rs
index 0178446..6d88452 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,7 +4,7 @@ use std::{
 };
 use anyhow::Error;
 use cairo::FontFace;
-use crate::FunctionLayer;
+use crate::{FunctionLayer, Button};
 use crate::fonts::{FontConfig, Pattern};
 use freetype::Library as FtLibrary;
 use input_linux::Key;
@@ -61,7 +61,7 @@ fn load_font(name: &str) -> FontFace {
     FontFace::create_from_ft(&face).unwrap()
 }
 
-fn load_config() -> (Config, [FunctionLayer; 2]) {
+fn load_config(width: u16) -> (Config, [FunctionLayer; 2]) {
     let mut base = toml::from_str::<ConfigProxy>(&read_to_string("/usr/share/tiny-dfr/config.toml").unwrap()).unwrap();
     let user = read_to_string(USER_CFG_PATH).map_err::<Error, _>(|e| e.into())
         .and_then(|r| Ok(toml::from_str::<ConfigProxy>(&r)?));
@@ -77,7 +77,12 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
     };
     let media_layer = FunctionLayer::with_config(base.media_layer_keys.unwrap());
     let fkey_layer = FunctionLayer::with_config(base.primary_layer_keys.unwrap());
-    let layers = if base.media_layer_default.unwrap(){ [media_layer, fkey_layer] } else { [fkey_layer, media_layer] };
+    let mut layers = if base.media_layer_default.unwrap(){ [media_layer, fkey_layer] } else { [fkey_layer, media_layer] };
+    if width >= 2170 {
+        for layer in &mut layers {
+            layer.buttons.insert(0, Button::new_text("esc".to_string(), Key::Esc));
+        }
+    }
     let cfg = Config {
         show_button_outlines: base.show_button_outlines.unwrap(),
         enable_pixel_shift: base.enable_pixel_shift.unwrap(),
@@ -110,10 +115,10 @@ impl ConfigManager {
             inotify_fd, watch_desc
         }
     }
-    pub fn load_config(&self) -> (Config, [FunctionLayer; 2]) {
-        load_config()
+    pub fn load_config(&self, width: u16) -> (Config, [FunctionLayer; 2]) {
+        load_config(width)
     }
-    pub fn update_config(&mut self, cfg: &mut Config, layers: &mut [FunctionLayer; 2]) -> bool {
+    pub fn update_config(&mut self, cfg: &mut Config, layers: &mut [FunctionLayer; 2], width: u16) -> bool {
         if self.watch_desc.is_none() {
             self.watch_desc = arm_inotify(&self.inotify_fd);
             return false;
@@ -128,7 +133,7 @@ impl ConfigManager {
             if evt.wd != self.watch_desc.unwrap() {
                 continue
             }
-            let parts = load_config();
+            let parts = load_config(width);
             *cfg = parts.0;
             *layers = parts.1;
             ret = true;
diff --git a/src/main.rs b/src/main.rs
index 86b0d04..b4467cb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -341,7 +341,7 @@ fn real_main(drm: &mut DrmBackend) {
     let mut uinput = UInputHandle::new(OpenOptions::new().write(true).open("/dev/uinput").unwrap());
     let mut backlight = BacklightManager::new();
     let mut cfg_mgr = ConfigManager::new();
-    let (mut cfg, mut layers) = cfg_mgr.load_config();
+    let (mut cfg, mut layers) = cfg_mgr.load_config(width);
     let mut pixel_shift = PixelShiftManager::new();
 
     // drop privileges to input and video group
@@ -391,7 +391,7 @@ fn real_main(drm: &mut DrmBackend) {
     let mut digitizer: Option<InputDevice> = None;
     let mut touches = HashMap::new();
     loop {
-        if cfg_mgr.update_config(&mut cfg, &mut layers) {
+        if cfg_mgr.update_config(&mut cfg, &mut layers, width) {
             active_layer = 0;
             needs_complete_redraw = true;
         }

From 06b8c8e95a8ec2f1917b1655de111f3d55dc41cf Mon Sep 17 00:00:00 2001
From: Kerem Karabay <kekrby@gmail.com>
Date: Sat, 24 Jun 2023 10:51:38 +0300
Subject: [PATCH 17/24] Respect the maximum brightness level

---
 src/backlight.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/backlight.rs b/src/backlight.rs
index 21f3e03..c605c59 100644
--- a/src/backlight.rs
+++ b/src/backlight.rs
@@ -2,7 +2,8 @@ use std::{
     fs::{File, OpenOptions, self},
     path::{PathBuf, Path},
     time::Instant,
-    io::Write
+    io::Write,
+    cmp::min,
 };
 use anyhow::{Result, anyhow};
 use input::event::{
@@ -51,6 +52,7 @@ fn set_backlight(mut file: &File, value: u32) {
 
 pub struct BacklightManager {
     last_active: Instant,
+    max_bl: u32,
     current_bl: u32,
     lid_state: SwitchState,
     bl_file: File,
@@ -65,6 +67,7 @@ impl BacklightManager {
         BacklightManager {
             bl_file,
             lid_state: SwitchState::Off,
+            max_bl: read_attr(&bl_path, "max_brightness"),
             current_bl: read_attr(&bl_path, "brightness"),
             last_active: Instant::now(),
             display_bl_path
@@ -98,7 +101,7 @@ impl BacklightManager {
     }
     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 {
+        let new_bl = min(self.max_bl, if self.lid_state == SwitchState::On {
             0
         } else if since_last_active < BRIGHTNESS_DIM_TIMEOUT as u64 {
             if cfg.adaptive_brightness {
@@ -110,7 +113,7 @@ impl BacklightManager {
             DIMMED_BRIGHTNESS
         } else {
             0
-        };
+        });
         if self.current_bl != new_bl {
             self.current_bl = new_bl;
             set_backlight(&self.bl_file, self.current_bl);

From 5d62221b353fe50bf28b86d7b861c34cb05b9187 Mon Sep 17 00:00:00 2001
From: Kerem Karabay <kekrby@gmail.com>
Date: Sun, 27 Aug 2023 12:40:09 +0300
Subject: [PATCH 18/24] Recognize the backlight on x86 Macs

---
 src/backlight.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backlight.rs b/src/backlight.rs
index c605c59..c7a51ee 100644
--- a/src/backlight.rs
+++ b/src/backlight.rs
@@ -29,7 +29,10 @@ fn read_attr(path: &Path, attr: &str) -> u32 {
 fn find_backlight() -> Result<PathBuf> {
     for entry in fs::read_dir("/sys/class/backlight/")? {
         let entry = entry?;
-        if entry.file_name().to_string_lossy().contains("display-pipe") {
+        let file_name = entry.file_name();
+        let name = file_name.to_string_lossy();
+
+        if ["display-pipe", "appletb_backlight"].iter().any(|s| name.contains(s)) {
             return Ok(entry.path());
         }
     }
@@ -39,7 +42,7 @@ fn find_backlight() -> Result<PathBuf> {
 fn find_display_backlight() -> Result<PathBuf> {
     for entry in fs::read_dir("/sys/class/backlight/")? {
         let entry = entry?;
-        if entry.file_name().to_string_lossy().eq("apple-panel-bl") {
+        if ["apple-panel-bl", "intel_backlight"].iter().any(|s| entry.file_name().to_string_lossy().contains(s)) {
             return Ok(entry.path());
         }
     }

From 0eadd9a92af4dd32b09de551e60e2281f9e19c78 Mon Sep 17 00:00:00 2001
From: Kerem Karabay <kekrby@gmail.com>
Date: Sat, 24 Jun 2023 10:25:55 +0300
Subject: [PATCH 19/24] Add udev rules/backlight service override for x86 Macs

---
 .../systemd-backlight@backlight:appletb_backlight.service   | 0
 etc/udev/rules.d/99-touchbar-seat.rules                     | 3 ++-
 etc/udev/rules.d/99-touchbar-tiny-dfr.rules                 | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 etc/systemd/system/systemd-backlight@backlight:appletb_backlight.service

diff --git a/etc/systemd/system/systemd-backlight@backlight:appletb_backlight.service b/etc/systemd/system/systemd-backlight@backlight:appletb_backlight.service
new file mode 100644
index 0000000..e69de29
diff --git a/etc/udev/rules.d/99-touchbar-seat.rules b/etc/udev/rules.d/99-touchbar-seat.rules
index f73534a..9b0cbde 100644
--- a/etc/udev/rules.d/99-touchbar-seat.rules
+++ b/etc/udev/rules.d/99-touchbar-seat.rules
@@ -1,4 +1,5 @@
-SUBSYSTEM=="drm", KERNEL=="card*", DRIVERS=="adp", TAG-="master-of-seat", ENV{ID_SEAT}="seat-touchbar"
+SUBSYSTEM=="drm", KERNEL=="card*", DRIVERS=="adp|appletbdrm", TAG-="master-of-seat", ENV{ID_SEAT}="seat-touchbar"
 
+SUBSYSTEM=="input", ATTR{name}=="Apple Inc. Touch Bar Display Touchpad", ENV{ID_SEAT}="seat-touchbar"
 SUBSYSTEM=="input", ATTR{name}=="MacBookPro17,1 Touch Bar", ENV{ID_SEAT}="seat-touchbar"
 SUBSYSTEM=="input", ATTR{name}=="Mac14,7 Touch Bar", ENV{ID_SEAT}="seat-touchbar"
diff --git a/etc/udev/rules.d/99-touchbar-tiny-dfr.rules b/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
index fe16715..bbc1350 100644
--- a/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
+++ b/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
@@ -1,6 +1,10 @@
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="8302", ATTR{bConfigurationValue}=="1", ATTR{bConfigurationValue}="0", ATTR{bConfigurationValue}="2"
+
+SUBSYSTEM=="input", ATTR{name}=="Apple Inc. Touch Bar Display Touchpad", TAG+="systemd", ENV{SYSTEMD_WANTS}="tiny-dfr.service"
 SUBSYSTEM=="input", ATTR{name}=="MacBookPro17,1 Touch Bar", TAG+="systemd", ENV{SYSTEMD_WANTS}="tiny-dfr.service"
 SUBSYSTEM=="input", ATTR{name}=="Mac14,7 Touch Bar", TAG+="systemd", ENV{SYSTEMD_WANTS}="tiny-dfr.service"
 
-SUBSYSTEM=="drm", KERNEL=="card[0-9]*", DRIVERS=="adp", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display"
+SUBSYSTEM=="drm", KERNEL=="card[0-9]*", DRIVERS=="adp|appletbdrm", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display"
 
+SUBSYSTEM=="backlight", KERNEL=="appletb_backlight", DRIVERS=="hid-appletb-bl", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_backlight"
 SUBSYSTEM=="backlight", KERNEL=="228200000.display-pipe.0", DRIVERS=="panel-summit", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_backlight"

From c93cfb40cbfe26300900a9d76d75192be5ea9001 Mon Sep 17 00:00:00 2001
From: LawsOfScience <thesandwichsupreme@gmail.com>
Date: Wed, 27 Mar 2024 13:44:25 -0400
Subject: [PATCH 20/24] Update flake to build for x86_64

---
 flake.nix | 81 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 32 deletions(-)

diff --git a/flake.nix b/flake.nix
index 927180e..c05db68 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,39 +5,56 @@
   };
   outputs = { self, nixpkgs }:
     let
-      pkgs = import nixpkgs { system = "aarch64-linux"; };
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      pkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
     in
     rec {
-      packages.aarch64-linux.default = pkgs.rustPlatform.buildRustPackage {
-        name = "tiny-dfr";
-        version = "0.2.0";
-        src = ./.;
-        cargoLock = {
-          lockFile = ./Cargo.lock;
-        };
-        nativeBuildInputs = [
-          pkgs.pkg-config
-        ];
-        buildInputs = [
-          pkgs.cairo
-          pkgs.libinput
-          pkgs.freetype
-          pkgs.fontconfig
-          pkgs.glib
-          pkgs.pango
-          pkgs.gdk-pixbuf
-          pkgs.libxml2
-        ];
-      };
-      devShells.aarch64-linux.default = pkgs.mkShell {
-        inputsFrom = [
-          packages.aarch64-linux.default
-        ];
-        packages = [
-	  pkgs.rustfmt
-          pkgs.rust-analyzer
-        ];
-        RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
-      };
+      packages = forAllSystems(system: 
+        let
+          pkgs = pkgsFor.${system};
+        in
+        {
+          default = pkgs.rustPlatform.buildRustPackage {
+            name = "tiny-dfr";
+            version = "0.2.0";
+            src = ./.;
+            cargoLock = {
+              lockFile = ./Cargo.lock;
+            };
+            nativeBuildInputs = [
+              pkgs.pkg-config
+            ];
+            buildInputs = [
+              pkgs.cairo
+              pkgs.libinput
+              pkgs.freetype
+              pkgs.fontconfig
+              pkgs.glib
+              pkgs.pango
+              pkgs.gdk-pixbuf
+              pkgs.libxml2
+            ];
+          };
+        }
+      );
+
+      devShells = forAllSystems(system:
+        let
+          pkgs = pkgsFor.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            inputsFrom = [
+              packages.${system}.default
+            ];
+            packages = [
+    	        pkgs.rustfmt
+              pkgs.rust-analyzer
+            ];
+            RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
+          };
+        }
+      );
     };
 }

From a066ded870d8184db81f16b4b55d0954b2ab4c88 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Wed, 27 Mar 2024 19:53:05 -0700
Subject: [PATCH 21/24] Look in `acpi_video0` for display backlight

---
 src/backlight.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backlight.rs b/src/backlight.rs
index c7a51ee..361fb17 100644
--- a/src/backlight.rs
+++ b/src/backlight.rs
@@ -42,7 +42,7 @@ fn find_backlight() -> Result<PathBuf> {
 fn find_display_backlight() -> Result<PathBuf> {
     for entry in fs::read_dir("/sys/class/backlight/")? {
         let entry = entry?;
-        if ["apple-panel-bl", "intel_backlight"].iter().any(|s| entry.file_name().to_string_lossy().contains(s)) {
+        if ["apple-panel-bl", "gmux_backlight", "intel_backlight", "acpi_video0"].iter().any(|s| entry.file_name().to_string_lossy().contains(s)) {
             return Ok(entry.path());
         }
     }

From 1ffc883703f42ec6cc585d927bec2fc65a66e583 Mon Sep 17 00:00:00 2001
From: Cassie Cheung <me@soopy.moe>
Date: Fri, 19 Jul 2024 00:39:38 +0800
Subject: [PATCH 22/24] udev: add retina display backlight rules

---
 etc/udev/rules.d/99-touchbar-tiny-dfr.rules | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/etc/udev/rules.d/99-touchbar-tiny-dfr.rules b/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
index bbc1350..cb75401 100644
--- a/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
+++ b/etc/udev/rules.d/99-touchbar-tiny-dfr.rules
@@ -8,3 +8,8 @@ SUBSYSTEM=="drm", KERNEL=="card[0-9]*", DRIVERS=="adp|appletbdrm", TAG+="systemd
 
 SUBSYSTEM=="backlight", KERNEL=="appletb_backlight", DRIVERS=="hid-appletb-bl", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_backlight"
 SUBSYSTEM=="backlight", KERNEL=="228200000.display-pipe.0", DRIVERS=="panel-summit", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_backlight"
+
+SUBSYSTEM=="backlight", KERNEL=="apple-panel-bl", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display_backlight"
+SUBSYSTEM=="backlight", KERNEL=="gmux_backlight", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display_backlight"
+SUBSYSTEM=="backlight", KERNEL=="intel_backlight", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display_backlight"
+SUBSYSTEM=="backlight", KERNEL=="acpi_video0", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/tiny_dfr_display_backlight"

From 50086402412f640e7da1bcc4fd6d1ae8f9f95c03 Mon Sep 17 00:00:00 2001
From: Cassie Cheung <me@soopy.moe>
Date: Fri, 19 Jul 2024 01:04:32 +0800
Subject: [PATCH 23/24] systemd: add required backlight devices to After and
 BindsTo

---
 etc/systemd/system/tiny-dfr.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/systemd/system/tiny-dfr.service b/etc/systemd/system/tiny-dfr.service
index 78c2392..1a1ae3b 100644
--- a/etc/systemd/system/tiny-dfr.service
+++ b/etc/systemd/system/tiny-dfr.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Tiny Apple silicon touch bar daemon
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-BindsTo=dev-tiny_dfr_display.device dev-tiny_dfr_backlight.device
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service dev-tiny_dfr_display.device dev-tiny_dfr_backlight.device dev-tiny_dfr_display_backlight.device
+BindsTo=dev-tiny_dfr_display.device dev-tiny_dfr_backlight.device dev-tiny_dfr_display_backlight.device
 
 [Service]
 ExecStart=/usr/bin/tiny-dfr

From a022fed1e726c2192c6eb895b402c012fd094405 Mon Sep 17 00:00:00 2001
From: Sasha Finkelstein <fnkl.kernel@gmail.com>
Date: Sat, 27 Jul 2024 12:08:17 +0200
Subject: [PATCH 24/24] Bump version

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d326b46..e837152 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1541,7 +1541,7 @@ dependencies = [
 
 [[package]]
 name = "tiny-dfr"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "anyhow",
  "cairo-rs",
diff --git a/Cargo.toml b/Cargo.toml
index 121a960..7fce02d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tiny-dfr"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 license = "MIT AND Apache-2.0"
 description = "The most basic dynamic function row daemon possible"