feat: full password editing with cursor navigation

- Add arrow key support (Left/Right/Home/End) for cursor movement
- Add Delete key to remove character at cursor position
- Render cursor between password dots with visual indicator
- Modularize render.rs into separate modules (indicator, media_bar, status_bar, feedback)
- Add cubic ease-in-out for fade-in animation
- Optimize media_rects to use &'static str instead of String allocations

src/input.rs

@@ -61,6 +61,44 @@ impl InputHandler {
             Keysym::Escape => {
                 return InputAction::Cancel;
             }
+            Keysym::Left => {
+                if self.cursor_position > 0 {
+                    self.cursor_position -= 1;
+                    return InputAction::CursorMoved;
+                }
+                return InputAction::None;
+            }
+            Keysym::Right => {
+                if self.cursor_position < self.password_buffer.len() {
+                    self.cursor_position += 1;
+                    return InputAction::CursorMoved;
+                }
+                return InputAction::None;
+            }
+            Keysym::Home => {
+                if self.cursor_position > 0 {
+                    self.cursor_position = 0;
+                    return InputAction::CursorMoved;
+                }
+                return InputAction::None;
+            }
+            Keysym::End => {
+                if self.cursor_position < self.password_buffer.len() {
+                    self.cursor_position = self.password_buffer.len();
+                    return InputAction::CursorMoved;
+                }
+                return InputAction::None;
+            }
+            Keysym::Delete => {
+                if self.cursor_position < self.password_buffer.len() {
+                    self.password_buffer.remove(self.cursor_position);
+                    if self.password_buffer.is_empty() {
+                        return InputAction::PasswordCleared;
+                    }
+                    return InputAction::PasswordChanged;
+                }
+                return InputAction::None;
+            }
             _ => {}
         }
 
@@ -82,6 +120,10 @@ impl InputHandler {
         self.password_buffer.len()
     }
 
+    pub fn cursor_position(&self) -> usize {
+        self.cursor_position
+    }
+
     /// Set wrong password feedback timer
     pub fn set_wrong_password_feedback(&mut self) {
         self.wrong_password_timer = Some(std::time::Instant::now());
@@ -125,6 +167,7 @@ pub enum InputAction {
     None,
     PasswordChanged,
     PasswordCleared,
+    CursorMoved,
     SubmitPassword(Zeroizing<String>),
     Cancel,
 }

src/lock.rs

@@ -84,7 +84,14 @@ impl LockedSurface {
         if self.fade_alpha < 1.0 {
             let elapsed = self.start_time.elapsed();
             let fade_duration = std::time::Duration::from_secs_f32(self.config.fade_in);
-            let new_alpha = (elapsed.as_secs_f64() / fade_duration.as_secs_f64()).min(1.0);
+            // Ease-in-out cubic function
+            let t = (elapsed.as_secs_f64() / fade_duration.as_secs_f64()).clamp(0.0, 1.0);
+            let eased_t = if t < 0.5 {
+                4.0 * t * t * t
+            } else {
+                1.0 - (-2.0 * t + 2.0).powi(3) / 2.0
+            };
+            let new_alpha = eased_t.min(1.0);
             if (new_alpha - self.fade_alpha).abs() > 0.001 {
                 self.fade_alpha = new_alpha;
                 self.renderer.set_fade_alpha(self.fade_alpha);
@@ -121,6 +128,8 @@ impl LockedSurface {
 
         self.renderer
             .set_password_display(self.input_handler.password_length());
+        self.renderer
+            .set_cursor_position(self.input_handler.cursor_position());
         self.renderer.render();
     }
 

src/main.rs

@@ -647,7 +647,7 @@ impl PointerHandler for WaylandLock {
                             if surface.matches_surface(&event.surface) {
                                 for (action, rx, ry, rw, rh) in &surface.renderer.media_rects {
                                     if x >= *rx && x <= rx + rw && y >= *ry && y <= ry + rh {
-                                        match action.as_str() {
+                                        match *action {
                                             "play_pause" => self.system_manager.media_play_pause(),
                                             "stop" => self.system_manager.media_stop(),
                                             "next" => self.system_manager.media_next(),
@@ -823,7 +823,6 @@ fn main() -> Result<(), Box<dyn Error>> {
             }
         }
 
-
         let mut status = state.system_manager.get_status();
         status.keyboard_layout = Some(state.current_layout.to_string());
 

src/render/feedback.rs

@@ -0,0 +1,167 @@
+use crate::render::Renderer;
+use std::time::Instant;
+
+impl Renderer {
+    pub(crate) fn draw_wrong_password_feedback(&self) {
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+        let radius = self.config.indicator_radius as f64;
+        let thickness = self.config.indicator_thickness as f64;
+        let intensity = if let Some(start) = self.wrong_password_start {
+            let elapsed = start.elapsed();
+            let duration = std::time::Duration::from_millis(500);
+            if elapsed < duration {
+                1.0 - (elapsed.as_secs_f64() / duration.as_secs_f64())
+            } else {
+                0.0
+            }
+        } else {
+            0.0
+        };
+
+        if intensity > 0.0 {
+            self.context.new_path();
+            self.context
+                .set_source_rgba(1.0, 0.0, 0.0, intensity * self.fade_alpha);
+            self.context.set_line_width(thickness + 2.0);
+            self.context
+                .arc(center_x, center_y, radius, 0.0, 2.0 * std::f64::consts::PI);
+            self.context.stroke().unwrap();
+        }
+    }
+
+    pub(crate) fn draw_key_highlight_feedback(&self) {
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+        let radius = self.config.indicator_radius as f64;
+        let thickness = self.config.indicator_thickness as f64;
+        let intensity = if let Some(start) = self.key_highlight_start {
+            let elapsed = start.elapsed();
+            let duration = std::time::Duration::from_millis(300);
+            if elapsed < duration {
+                1.0 - (elapsed.as_secs_f64() / duration.as_secs_f64())
+            } else {
+                0.0
+            }
+        } else {
+            0.0
+        };
+
+        if intensity > 0.0 {
+            let (r, g, b, a) = if self.caps_lock {
+                self.config.caps_lock_key_hl_color
+            } else {
+                self.config.key_hl_color
+            };
+            self.context
+                .set_source_rgba(r, g, b, a * intensity * self.fade_alpha);
+            self.context.set_line_width(thickness + 1.5);
+
+            let global_offset = (self.password_display.len() as f64 * 45.0).to_radians();
+            self.context.new_path();
+            let actual_start = global_offset + self.key_highlight_angle;
+            self.context.arc(
+                center_x,
+                center_y,
+                radius,
+                actual_start,
+                actual_start + (40.0_f64).to_radians(),
+            );
+            self.context.stroke().unwrap();
+        }
+    }
+
+    pub(crate) fn draw_cleared_feedback(&self) {
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+        let radius = self.config.indicator_radius as f64;
+        let thickness = self.config.indicator_thickness as f64;
+        let intensity = if let Some(start) = self.cleared_feedback_start {
+            let elapsed = start.elapsed();
+            let duration = std::time::Duration::from_millis(500);
+            if elapsed < duration {
+                1.0 - (elapsed.as_secs_f64() / duration.as_secs_f64())
+            } else {
+                0.0
+            }
+        } else {
+            0.0
+        };
+
+        if intensity > 0.0 {
+            self.context.new_path();
+            self.context
+                .set_source_rgba(1.0, 0.0, 0.0, intensity * self.fade_alpha * 0.5);
+            self.context.arc(
+                center_x,
+                center_y,
+                radius - thickness / 2.0,
+                0.0,
+                2.0 * std::f64::consts::PI,
+            );
+            self.context.fill().unwrap();
+
+            self.context.new_path();
+            self.context
+                .set_source_rgba(1.0, 0.0, 0.0, intensity * self.fade_alpha);
+            self.context.set_line_width(thickness + 4.0);
+            self.context
+                .arc(center_x, center_y, radius, 0.0, 2.0 * std::f64::consts::PI);
+            self.context.stroke().unwrap();
+
+            self.context.new_path();
+            self.context.set_font_size(24.0);
+            self.context
+                .set_source_rgba(1.0, 1.0, 1.0, intensity * self.fade_alpha);
+            let text = "CLEARED";
+            let te = self.context.text_extents(text).unwrap();
+            self.context
+                .move_to(center_x - te.width() / 2.0, center_y - radius - 20.0);
+            self.context.show_text(text).unwrap();
+        }
+    }
+
+    pub(crate) fn update_feedback_timers(&mut self) {
+        self.update_uptime();
+        if let Some(start) = self.wrong_password_start {
+            if start.elapsed() > std::time::Duration::from_millis(500) {
+                self.wrong_password_shown = false;
+                self.wrong_password_start = None;
+            }
+        }
+        if let Some(start) = self.key_highlight_start {
+            if start.elapsed() > std::time::Duration::from_millis(300) {
+                self.key_highlight_shown = false;
+                self.key_highlight_start = None;
+            }
+        }
+        if let Some(start) = self.cleared_feedback_start {
+            if start.elapsed() > std::time::Duration::from_millis(500) {
+                self.cleared_feedback_shown = false;
+                self.cleared_feedback_start = None;
+            }
+        }
+    }
+
+    pub fn show_wrong_password(&mut self) {
+        self.wrong_password_shown = true;
+        self.wrong_password_start = Some(Instant::now());
+    }
+
+    pub fn show_key_highlight(&mut self) {
+        self.key_highlight_shown = true;
+        self.key_highlight_start = Some(Instant::now());
+        use std::time::SystemTime;
+        let seed = SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap()
+            .as_nanos() as u64;
+        let random_val = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+        self.key_highlight_angle = ((random_val % 360) as f64).to_radians();
+    }
+
+    pub fn show_cleared_feedback(&mut self) {
+        self.cleared_feedback_shown = true;
+        self.cleared_feedback_start = Some(Instant::now());
+    }
+}

src/render/indicator.rs

@@ -0,0 +1,122 @@
+use crate::render::Renderer;
+
+impl Renderer {
+    pub(crate) fn draw_indicator(&self) {
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+        let radius = self.config.indicator_radius as f64;
+        let thickness = self.config.indicator_thickness as f64;
+
+        self.context.new_path();
+        let (r, g, b, a) = self.config.inside_color;
+        self.context.set_source_rgba(r, g, b, a * self.fade_alpha);
+        self.context.arc(
+            center_x,
+            center_y,
+            radius - thickness / 2.0,
+            0.0,
+            2.0 * std::f64::consts::PI,
+        );
+        self.context.fill().unwrap();
+
+        let (lr, lg, lb, la) = self.config.line_color;
+        if la > 0.0 {
+            self.context.new_path();
+            self.context
+                .set_source_rgba(lr, lg, lb, la * self.fade_alpha);
+            self.context.set_line_width(1.0);
+            self.context.arc(
+                center_x,
+                center_y,
+                radius - thickness / 2.0,
+                0.0,
+                2.0 * std::f64::consts::PI,
+            );
+            self.context.stroke().unwrap();
+        }
+
+        let (r, g, b, a) = if self.caps_lock {
+            self.config.caps_lock_color
+        } else {
+            self.config.ring_color
+        };
+        self.context.new_path();
+        self.context.set_source_rgba(r, g, b, a * self.fade_alpha);
+        self.context.set_line_width(thickness);
+        self.context
+            .arc(center_x, center_y, radius, 0.0, 2.0 * std::f64::consts::PI);
+        self.context.stroke().unwrap();
+
+        let (r, g, b, a) = self.config.separator_color;
+        if a > 0.0 {
+            self.context.new_path();
+            self.context.set_source_rgba(r, g, b, a * self.fade_alpha);
+            self.context.set_line_width(1.0);
+            self.context.move_to(center_x - radius, center_y);
+            self.context.line_to(center_x + radius, center_y);
+            self.context.stroke().unwrap();
+        }
+    }
+
+    pub(crate) fn draw_password_display(&self) {
+        if self.config.hide_password {
+            return;
+        }
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+        let radius = self.config.indicator_radius as f64;
+        let thickness = self.config.indicator_thickness as f64;
+
+        self.context.new_path();
+        self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+
+        let count = self.password_display.len();
+        if count == 0 {
+            return;
+        }
+
+        let dot_radius = radius - thickness - 10.0;
+        let angle_step = (360.0 / 24.0_f64).to_radians();
+
+        for i in 0..count {
+            let angle = (i as f64 * angle_step) - std::f64::consts::FRAC_PI_2;
+            let x = center_x + dot_radius * angle.cos();
+            let y = center_y + dot_radius * angle.sin();
+
+            self.context.new_path();
+            self.context.arc(x, y, 4.0, 0.0, 2.0 * std::f64::consts::PI);
+            self.context.fill().unwrap();
+        }
+
+        if self.fade_alpha > 0.0 && self.cursor_position > 0 {
+            let cursor_angle =
+                ((self.cursor_position as f64 - 0.5) * angle_step) - std::f64::consts::FRAC_PI_2;
+            let x1 = center_x + (dot_radius - 8.0) * cursor_angle.cos();
+            let y1 = center_y + (dot_radius - 8.0) * cursor_angle.sin();
+            let x2 = center_x + (dot_radius + 8.0) * cursor_angle.cos();
+            let y2 = center_y + (dot_radius + 8.0) * cursor_angle.sin();
+
+            self.context.new_path();
+            self.context.set_source_rgba(0.0, 0.8, 1.0, self.fade_alpha);
+            self.context.set_line_width(2.0);
+            self.context.move_to(x1, y1);
+            self.context.line_to(x2, y2);
+            self.context.stroke().unwrap();
+        }
+    }
+
+    pub(crate) fn draw_caps_lock_indicator(&self) {
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+        let radius = self.config.indicator_radius as f64;
+        self.context.new_path();
+        let (r, g, b, a) = self.config.caps_lock_text_color;
+        self.context.set_source_rgba(r, g, b, a * self.fade_alpha);
+        self.context.set_font_size(24.0);
+        let text = "Caps Lock";
+        let te = self.context.text_extents(text).unwrap();
+        self.context
+            .move_to(center_x - te.width() / 2.0, center_y - radius - 10.0);
+        self.context.show_text(text).unwrap();
+    }
+}

src/render/media_bar.rs

@@ -0,0 +1,132 @@
+use crate::render::Renderer;
+use cairo::{Format, ImageSurface};
+
+impl Renderer {
+    pub(crate) fn draw_media(&mut self) {
+        if let Some(ref title) = self.system_status.media_title {
+            let center_x = self.width as f64 / 2.0;
+            let start_y = self.height as f64 - 120.0;
+            let art_size = 56.0;
+            let spacing = 80.0;
+
+            if self.config.show_album_art && self.system_status.media_art_url != self.last_art_url {
+                self.last_art_url = self.system_status.media_art_url.clone();
+                self.media_art_surface = None;
+                if let Some(ref data) = self.system_status.media_art_data {
+                    if let Ok(img) = image::load_from_memory(data) {
+                        let img = img.to_rgba8();
+                        let (w, h) = img.dimensions();
+                        let mut surface =
+                            ImageSurface::create(Format::ARgb32, w as i32, h as i32).unwrap();
+                        {
+                            let mut surface_data = surface.data().unwrap();
+                            for y in 0..h {
+                                for x in 0..w {
+                                    let pixel = img.get_pixel(x, y);
+                                    let idx = ((y * w + x) * 4) as usize;
+                                    surface_data[idx] = pixel[2];
+                                    surface_data[idx + 1] = pixel[1];
+                                    surface_data[idx + 2] = pixel[0];
+                                    surface_data[idx + 3] = pixel[3];
+                                }
+                            }
+                        }
+                        self.media_art_surface = Some(surface);
+                    }
+                }
+            }
+
+            let has_art = self.config.show_album_art && self.media_art_surface.is_some();
+            let text_x = if has_art {
+                center_x - spacing / 2.0
+            } else {
+                center_x
+            };
+            let art_x = center_x - spacing - art_size / 2.0;
+
+            if has_art {
+                if let Some(ref art) = self.media_art_surface {
+                    self.context.save().unwrap();
+                    let scale = art_size / art.width() as f64;
+                    self.context.translate(art_x, start_y);
+                    self.context.scale(scale, scale);
+                    self.context.set_source_surface(art, 0.0, 0.0).unwrap();
+                    self.context.paint_with_alpha(self.fade_alpha).unwrap();
+                    self.context.restore().unwrap();
+                }
+            }
+
+            self.context.new_path();
+            self.context
+                .set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha * 0.9);
+            self.context.set_font_size(16.0);
+
+            let display_text = if let Some(ref artist) = self.system_status.media_artist {
+                format!("{} - {}", artist, title)
+            } else {
+                title.clone()
+            };
+
+            let te = self.context.text_extents(&display_text).unwrap();
+            self.context
+                .move_to(text_x - te.width() / 2.0, start_y + 20.0);
+            self.context.show_text(&display_text).unwrap();
+
+            if self.system_status.media_playing {
+                if let Some(ref icon) = self.media_pause_icon_surface {
+                    let pause_y = start_y + 40.0;
+                    let rx = center_x - icon.width() as f64 / 2.0;
+                    let ry = pause_y - icon.height() as f64 / 2.0;
+                    self.draw_icon_at(rx, ry, icon);
+                    self.media_rects.push((
+                        "play_pause",
+                        rx,
+                        ry,
+                        icon.width() as f64,
+                        icon.height() as f64,
+                    ));
+                }
+            } else if let Some(ref icon) = self.media_play_icon_surface {
+                let play_y = start_y + 40.0;
+                let rx = center_x - icon.width() as f64 / 2.0;
+                let ry = play_y - icon.height() as f64 / 2.0;
+                self.draw_icon_at(rx, ry, icon);
+                self.media_rects.push((
+                    "play_pause",
+                    rx,
+                    ry,
+                    icon.width() as f64,
+                    icon.height() as f64,
+                ));
+            }
+
+            let controls_y = start_y + 65.0;
+            let icon_size = 20.0;
+            let icon_spacing = 40.0;
+
+            if let Some(ref icon) = self.media_prev_icon_surface {
+                let rx = center_x - icon_spacing - icon_size / 2.0;
+                let ry = controls_y - icon_size / 2.0;
+                self.draw_icon_at(rx, ry, icon);
+                self.media_rects
+                    .push(("prev", rx, ry, icon_size, icon_size));
+            }
+
+            if let Some(ref icon) = self.media_stop_icon_surface {
+                let rx = center_x - icon_size / 2.0;
+                let ry = controls_y - icon_size / 2.0;
+                self.draw_icon_at(rx, ry, icon);
+                self.media_rects
+                    .push(("stop", rx, ry, icon_size, icon_size));
+            }
+
+            if let Some(ref icon) = self.media_next_icon_surface {
+                let rx = center_x + icon_spacing - icon_size / 2.0;
+                let ry = controls_y - icon_size / 2.0;
+                self.draw_icon_at(rx, ry, icon);
+                self.media_rects
+                    .push(("next", rx, ry, icon_size, icon_size));
+            }
+        }
+    }
+}

src/render/mod.rs

@@ -0,0 +1,225 @@
+use cairo::{Context, Format, ImageSurface};
+use std::time::Instant;
+
+use crate::config::Config;
+use crate::system::SystemStatus;
+
+mod feedback;
+mod indicator;
+mod media_bar;
+mod status_bar;
+
+pub struct Renderer {
+    pub(crate) width: i32,
+    pub(crate) height: i32,
+    pub(crate) config: Config,
+    pub(crate) surface: ImageSurface,
+    pub(crate) context: Context,
+    pub(crate) fade_alpha: f64,
+    pub(crate) wrong_password_shown: bool,
+    pub(crate) key_highlight_shown: bool,
+    pub(crate) cleared_feedback_shown: bool,
+    pub(crate) wrong_password_start: Option<Instant>,
+    pub(crate) key_highlight_start: Option<Instant>,
+    pub(crate) cleared_feedback_start: Option<Instant>,
+    pub(crate) key_highlight_angle: f64,
+    pub(crate) background: Option<ImageSurface>,
+    pub(crate) password_display: String,
+    pub(crate) cursor_position: usize,
+    pub(crate) uptime_cache: String,
+    pub(crate) last_uptime_update: Option<Instant>,
+    pub caps_lock: bool,
+    pub system_status: SystemStatus,
+    pub(crate) media_art_surface: Option<ImageSurface>,
+    pub(crate) last_art_url: Option<String>,
+    pub(crate) wifi_icon_surface: Option<ImageSurface>,
+    pub(crate) bluetooth_icon_surface: Option<ImageSurface>,
+    pub(crate) battery_icon_surface: Option<ImageSurface>,
+    pub(crate) media_prev_icon_surface: Option<ImageSurface>,
+    pub(crate) media_stop_icon_surface: Option<ImageSurface>,
+    pub(crate) media_play_icon_surface: Option<ImageSurface>,
+    pub(crate) media_pause_icon_surface: Option<ImageSurface>,
+    pub(crate) media_next_icon_surface: Option<ImageSurface>,
+    pub media_rects: Vec<(&'static str, f64, f64, f64, f64)>,
+}
+
+impl Renderer {
+    pub fn new(width: i32, height: i32, config: Config) -> Self {
+        log::debug!("Renderer::new({}, {}, ...) called", width, height);
+        let surface = ImageSurface::create(Format::ARgb32, width, height)
+            .expect("Failed to create Cairo surface");
+        let context = Context::new(&surface).expect("Failed to create Cairo context");
+
+        let mut renderer = Self {
+            width,
+            height,
+            config: config.clone(),
+            surface,
+            context,
+            fade_alpha: 0.0,
+            wrong_password_shown: false,
+            key_highlight_shown: false,
+            cleared_feedback_shown: false,
+            wrong_password_start: None,
+            key_highlight_start: None,
+            cleared_feedback_start: None,
+            key_highlight_angle: 0.0,
+            background: None,
+            password_display: String::new(),
+            cursor_position: 0,
+            uptime_cache: String::new(),
+            last_uptime_update: None,
+            caps_lock: false,
+            system_status: SystemStatus::default(),
+            media_art_surface: None,
+            last_art_url: None,
+            wifi_icon_surface: None,
+            bluetooth_icon_surface: None,
+            battery_icon_surface: None,
+            media_prev_icon_surface: None,
+            media_stop_icon_surface: None,
+            media_play_icon_surface: None,
+            media_pause_icon_surface: None,
+            media_next_icon_surface: None,
+            media_rects: Vec::new(),
+        };
+
+        renderer.load_icons();
+        renderer
+    }
+
+    pub fn resize(&mut self, width: i32, height: i32) {
+        log::debug!("Renderer::resize({}, {}) called", width, height);
+        self.width = width;
+        self.height = height;
+
+        self.surface = ImageSurface::create(Format::ARgb32, width, height)
+            .expect("Failed to create Cairo surface");
+        self.context = Context::new(&self.surface).expect("Failed to create Cairo context");
+    }
+
+    pub fn set_background(&mut self, background: ImageSurface) {
+        self.background = Some(background);
+    }
+
+    pub fn set_fade_alpha(&mut self, alpha: f64) {
+        self.fade_alpha = alpha.clamp(0.0, 1.0);
+    }
+
+    pub fn set_password_display(&mut self, length: usize) {
+        self.password_display = ".".repeat(length);
+    }
+
+    pub fn set_cursor_position(&mut self, position: usize) {
+        self.cursor_position = position;
+    }
+
+    pub fn get_pixel_data(&self) -> Result<Vec<u8>, cairo::BorrowError> {
+        let stride = self.surface.stride() as usize;
+        let height = self.height as usize;
+        let mut data = vec![0u8; stride * height];
+        self.surface.with_data(|src| {
+            data.copy_from_slice(src);
+        })?;
+        Ok(data)
+    }
+
+    pub fn surface_info(&self) -> (i32, i32, i32) {
+        (self.width, self.height, self.surface.stride())
+    }
+
+    pub fn render(&mut self) {
+        self.media_rects.clear();
+        self.context.new_path();
+        self.context.set_source_rgba(0.0, 0.0, 0.0, 1.0);
+        self.context.paint().expect("Failed to clear surface");
+
+        if let Some(ref background) = self.background {
+            self.context.save().expect("Failed to save context");
+            let bg_width = background.width() as f64;
+            let bg_height = background.height() as f64;
+            let scale_x = self.width as f64 / bg_width;
+            let scale_y = self.height as f64 / bg_height;
+            let scale = scale_x.max(scale_y);
+
+            let offset_x = (self.width as f64 - bg_width * scale) / 2.0;
+            let offset_y = (self.height as f64 - bg_height * scale) / 2.0;
+
+            self.context.translate(offset_x, offset_y);
+            self.context.scale(scale, scale);
+            self.context.new_path();
+            self.context
+                .set_source_surface(background, 0.0, 0.0)
+                .expect("Failed to set source");
+            self.context
+                .paint_with_alpha(self.fade_alpha)
+                .expect("Failed to paint");
+            self.context.restore().expect("Failed to restore context");
+        }
+
+        if self.config.indicator {
+            self.draw_indicator();
+        }
+
+        if self.config.clock {
+            self.draw_clock();
+        }
+
+        if self.config.show_media {
+            self.draw_media();
+        }
+
+        if self.config.show_network {
+            self.draw_network();
+        }
+
+        if self.config.show_battery {
+            self.draw_status();
+        }
+
+        if self.config.show_bluetooth {
+            self.draw_bluetooth();
+        }
+
+        if self.config.show_keyboard_layout {
+            self.draw_keyboard_layout();
+        }
+
+        if !self.password_display.is_empty() {
+            self.draw_password_display();
+        }
+
+        if self.caps_lock && self.config.show_caps_lock_text {
+            self.draw_caps_lock_indicator();
+        }
+
+        if self.wrong_password_shown {
+            self.draw_wrong_password_feedback();
+        }
+
+        if self.key_highlight_shown {
+            self.draw_key_highlight_feedback();
+        }
+
+        if self.cleared_feedback_shown {
+            self.draw_cleared_feedback();
+        }
+
+        self.update_feedback_timers();
+    }
+
+    fn update_uptime(&mut self) {
+        let now = Instant::now();
+        if let Some(last) = self.last_uptime_update {
+            if now.duration_since(last).as_secs() < 10 {
+                return;
+            }
+        }
+        let uptime_secs = std::fs::read_to_string("/proc/uptime")
+            .ok()
+            .and_then(|s| s.split_whitespace().next()?.parse::<f64>().ok())
+            .unwrap_or(0.0) as u64;
+        self.uptime_cache = format!("up {}h {}m", uptime_secs / 3600, (uptime_secs % 3600) / 60);
+        self.last_uptime_update = Some(now);
+    }
+}

src/render/status_bar.rs

@@ -0,0 +1,562 @@
+use crate::render::Renderer;
+use cairo::{Format, ImageSurface};
+
+impl Renderer {
+    pub(crate) fn load_icons(&mut self) {
+        log::info!("Attempting to load status icons...");
+        let wifi_names = [
+            "network-wireless-signal-excellent-symbolic",
+            "network-wireless-signal-excellent",
+            "network-wireless-symbolic",
+            "network-wireless",
+        ];
+        let wifi_path = self
+            .config
+            .wifi_icon
+            .clone()
+            .or_else(|| {
+                for name in &wifi_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+
+        if !wifi_path.is_empty() {
+            log::info!("Resolved WiFi icon path: {}", wifi_path);
+            self.wifi_icon_surface = self.load_icon(&wifi_path);
+        }
+
+        let bt_names = [
+            "bluetooth-active-symbolic",
+            "bluetooth-symbolic",
+            "bluetooth-active",
+            "bluetooth",
+        ];
+        let bt_path = self
+            .config
+            .bluetooth_icon
+            .clone()
+            .or_else(|| {
+                for name in &bt_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+
+        if !bt_path.is_empty() {
+            log::info!("Resolved Bluetooth icon path: {}", bt_path);
+            self.bluetooth_icon_surface = self.load_icon(&bt_path);
+        }
+
+        let batt_names = [
+            "battery-level-100-symbolic",
+            "battery-full-symbolic",
+            "battery-full",
+            "battery-level-100",
+            "battery",
+            "battery-symbolic",
+        ];
+        let batt_path = self
+            .config
+            .battery_icon
+            .clone()
+            .or_else(|| {
+                for name in &batt_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+
+        if !batt_path.is_empty() {
+            log::info!("Resolved Battery icon path: {}", batt_path);
+            self.battery_icon_surface = self.load_icon(&batt_path);
+        }
+
+        let prev_names = [
+            "media-skip-backward-symbolic",
+            "media-skip-backward",
+            "media-playlist-repeat-symbolic",
+        ];
+        let prev_path = self
+            .config
+            .media_prev_icon
+            .clone()
+            .or_else(|| {
+                for name in &prev_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+        if !prev_path.is_empty() {
+            self.media_prev_icon_surface = self.load_icon(&prev_path);
+        }
+
+        let stop_names = ["media-playback-stop-symbolic", "media-playback-stop"];
+        let stop_path = self
+            .config
+            .media_stop_icon
+            .clone()
+            .or_else(|| {
+                for name in &stop_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+        if !stop_path.is_empty() {
+            self.media_stop_icon_surface = self.load_icon(&stop_path);
+        }
+
+        let play_names = ["media-playback-start-symbolic", "media-playback-start"];
+        let play_path = self
+            .config
+            .media_play_icon
+            .clone()
+            .or_else(|| {
+                for name in &play_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+        if !play_path.is_empty() {
+            self.media_play_icon_surface = self.load_icon(&play_path);
+        }
+
+        let pause_names = ["media-playback-pause-symbolic", "media-playback-pause"];
+        let pause_path = self
+            .config
+            .media_pause_icon
+            .clone()
+            .or_else(|| {
+                for name in &pause_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+        if !pause_path.is_empty() {
+            self.media_pause_icon_surface = self.load_icon(&pause_path);
+        }
+
+        let next_names = ["media-skip-forward-symbolic", "media-skip-forward"];
+        let next_path = self
+            .config
+            .media_next_icon
+            .clone()
+            .or_else(|| {
+                for name in &next_names {
+                    if let Some(path) = self.find_system_icon(name) {
+                        return Some(path);
+                    }
+                }
+                None
+            })
+            .unwrap_or_default();
+        if !next_path.is_empty() {
+            self.media_next_icon_surface = self.load_icon(&next_path);
+        }
+    }
+
+    pub(crate) fn find_system_icon(&self, name: &str) -> Option<String> {
+        let data_dirs = std::env::var("XDG_DATA_DIRS").unwrap_or_default();
+        let mut search_paths = Vec::new();
+
+        for dir in data_dirs.split(':') {
+            let p = std::path::PathBuf::from(dir).join("icons");
+            if p.exists() {
+                search_paths.push(p);
+            }
+        }
+        let sys_path = std::path::PathBuf::from("/run/current-system/sw/share/icons");
+        if sys_path.exists() {
+            search_paths.push(sys_path);
+        }
+        let usr_path = std::path::PathBuf::from("/usr/share/icons");
+        if usr_path.exists() {
+            search_paths.push(usr_path);
+        }
+
+        let themes = [
+            "WhiteSur",
+            "WhiteSur-dark",
+            "WhiteSur-light",
+            "Adwaita",
+            "hicolor",
+            "breeze",
+            "Papirus",
+        ];
+        let categories = [
+            "status/symbolic",
+            "actions/symbolic",
+            "devices/symbolic",
+            "status/24",
+            "status/22",
+            "status/16",
+            "status",
+            "actions",
+            "devices",
+            "symbolic/status",
+            "symbolic/actions",
+            "symbolic/devices",
+            "24x24/status",
+            "22x22/status",
+            "16x16/status",
+            "48x48/status",
+        ];
+
+        for base in &search_paths {
+            for theme in &themes {
+                for cat in &categories {
+                    for ext in [".svg", ".png"] {
+                        let icon_path = base.join(theme).join(cat).join(format!("{}{}", name, ext));
+                        if icon_path.exists() {
+                            return Some(icon_path.to_string_lossy().into_owned());
+                        }
+                    }
+                }
+            }
+        }
+
+        for base in &search_paths {
+            for theme in &themes {
+                let theme_root = base.join(theme);
+                if !theme_root.exists() {
+                    continue;
+                }
+
+                if let Ok(entries) = std::fs::read_dir(&theme_root) {
+                    for entry in entries.flatten() {
+                        if entry.path().is_dir() {
+                            for ext in [".svg", ".png"] {
+                                let icon_path = entry.path().join(format!("{}{}", name, ext));
+                                if icon_path.exists() {
+                                    return Some(icon_path.to_string_lossy().into_owned());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        None
+    }
+
+    pub(crate) fn load_icon(&self, identifier: &str) -> Option<ImageSurface> {
+        let path = if identifier.starts_with('~') {
+            let home = std::env::var("HOME").unwrap_or_default();
+            std::path::PathBuf::from(identifier.replacen('~', &home, 1))
+        } else {
+            std::path::PathBuf::from(identifier)
+        };
+
+        if !path.exists() {
+            return None;
+        }
+
+        if path.extension().and_then(|s| s.to_str()) == Some("svg") {
+            if let Some(surface) = self.load_svg_with_resvg(&path) {
+                return Some(surface);
+            }
+        }
+
+        match gdk_pixbuf::Pixbuf::from_file(&path) {
+            Ok(pixbuf) => {
+                let w = pixbuf.width();
+                let h = pixbuf.height();
+                let mut surface = ImageSurface::create(Format::ARgb32, w, h).ok()?;
+                {
+                    let mut surface_data = surface.data().ok()?;
+                    let pix_data = unsafe { pixbuf.pixels() };
+                    let n_channels = pixbuf.n_channels();
+                    let rowstride = pixbuf.rowstride() as usize;
+
+                    for y in 0..h as usize {
+                        for x in 0..w as usize {
+                            let pix_idx = y * rowstride + x * n_channels as usize;
+                            let surf_idx = (y * w as usize + x) * 4;
+
+                            if n_channels == 4 {
+                                surface_data[surf_idx] = pix_data[pix_idx + 2];
+                                surface_data[surf_idx + 1] = pix_data[pix_idx + 1];
+                                surface_data[surf_idx + 2] = pix_data[pix_idx];
+                                surface_data[surf_idx + 3] = pix_data[pix_idx + 3];
+                            } else if n_channels == 3 {
+                                surface_data[surf_idx] = pix_data[pix_idx + 2];
+                                surface_data[surf_idx + 1] = pix_data[pix_idx + 1];
+                                surface_data[surf_idx + 2] = pix_data[pix_idx];
+                                surface_data[surf_idx + 3] = 255;
+                            }
+                        }
+                    }
+                }
+                Some(surface)
+            }
+            Err(_) => None,
+        }
+    }
+
+    pub(crate) fn load_svg_with_resvg(&self, path: &std::path::Path) -> Option<ImageSurface> {
+        use resvg::usvg;
+        let opt = usvg::Options::default();
+        let svg_data = std::fs::read(path).ok()?;
+        let tree = usvg::Tree::from_data(&svg_data, &opt).ok()?;
+        let size = tree.size().to_int_size();
+        let mut pixmap = resvg::tiny_skia::Pixmap::new(size.width(), size.height())?;
+        resvg::render(
+            &tree,
+            resvg::tiny_skia::Transform::default(),
+            &mut pixmap.as_mut(),
+        );
+        let mut surface =
+            ImageSurface::create(Format::ARgb32, size.width() as i32, size.height() as i32).ok()?;
+        {
+            let mut surface_data = surface.data().ok()?;
+            let pix_data = pixmap.data();
+            for i in (0..pix_data.len()).step_by(4) {
+                surface_data[i] = pix_data[i + 2];
+                surface_data[i + 1] = pix_data[i + 1];
+                surface_data[i + 2] = pix_data[i];
+                surface_data[i + 3] = pix_data[i + 3];
+            }
+        }
+        Some(surface)
+    }
+
+    pub(crate) fn draw_clock(&self) {
+        use chrono::Local;
+        let now = Local::now();
+        let time_str = now.format("%H:%M").to_string();
+        let date_str = now.format("%A, %B %d").to_string();
+        let center_x = self.width as f64 / 2.0;
+        let center_y = self.height as f64 / 2.0;
+
+        self.context.new_path();
+        self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+        self.context.set_font_size(48.0);
+        let te = self.context.text_extents(&time_str).unwrap();
+        self.context
+            .move_to(center_x - te.width() / 2.0, center_y + te.height() / 4.0);
+        self.context.show_text(&time_str).unwrap();
+
+        self.context.new_path();
+        self.context.set_font_size(14.0);
+        let de = self.context.text_extents(&date_str).unwrap();
+        self.context.move_to(
+            center_x - de.width() / 2.0,
+            center_y + te.height() / 4.0 + 25.0,
+        );
+        self.context.show_text(&date_str).unwrap();
+
+        self.context.new_path();
+        let ue = self.context.text_extents(&self.uptime_cache).unwrap();
+        self.context.move_to(
+            center_x - ue.width() / 2.0,
+            center_y + te.height() / 4.0 + 43.0,
+        );
+        self.context.show_text(&self.uptime_cache).unwrap();
+    }
+
+    pub(crate) fn draw_network(&self) {
+        if !self.config.show_network {
+            return;
+        }
+        let margin = 20.0;
+        let x = margin;
+        let y = margin + 20.0;
+
+        if let Some(ref ssid) = self.system_status.wifi_ssid {
+            if let Some(ref icon) = self.wifi_icon_surface {
+                self.draw_icon_at(x, y - 15.0, icon);
+                let text_x = x + 24.0 + 10.0;
+                self.context.new_path();
+                self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+                self.context.set_font_size(16.0);
+                self.context.move_to(text_x, y);
+                self.context.show_text(ssid).unwrap();
+            } else {
+                self.context.new_path();
+                self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+                self.context.set_font_size(16.0);
+                self.context.move_to(x, y);
+                self.context.show_text(ssid).unwrap();
+            }
+        }
+    }
+
+    pub(crate) fn draw_status(&self) {
+        if let Some(percent) = self.system_status.battery_percent {
+            let margin = 20.0;
+            let icon_width = 30.0;
+            let x = self.width as f64 - margin - icon_width - 50.0;
+            let y = margin + 20.0;
+
+            if let Some(ref icon) = self.battery_icon_surface {
+                self.draw_icon_at(x, y - 15.0, icon);
+                let text_x = x + 24.0 + 10.0;
+                let battery_text = format!("{:.0}%", percent);
+                self.context.new_path();
+                self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+                self.context.set_font_size(16.0);
+                self.context.move_to(text_x, y);
+                self.context.show_text(&battery_text).unwrap();
+            } else {
+                self.draw_battery_icon_at(
+                    x,
+                    y - 12.0,
+                    icon_width,
+                    15.0,
+                    percent,
+                    self.system_status.is_charging,
+                );
+                let battery_text = format!("{:.0}%", percent);
+                self.context.new_path();
+                self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+                self.context.set_font_size(16.0);
+                self.context.move_to(x + icon_width + 10.0, y);
+                self.context.show_text(&battery_text).unwrap();
+            }
+        }
+    }
+
+    pub(crate) fn draw_bluetooth(&self) {
+        if !self.config.show_bluetooth {
+            return;
+        }
+        let margin = 20.0;
+        let x = margin;
+        let y = margin + 50.0;
+
+        let (status_text, is_off) = if self.system_status.bluetooth_connected {
+            (self.system_status.bluetooth_devices.join(", "), false)
+        } else {
+            ("Bluetooth off".to_string(), true)
+        };
+
+        let alpha_mult = if is_off { 0.5 } else { 1.0 };
+
+        if let Some(ref icon) = self.bluetooth_icon_surface {
+            self.draw_icon_at_with_alpha(x, y - 12.0, icon, alpha_mult);
+            let text_x = x + 24.0 + 10.0;
+            self.context.new_path();
+            self.context
+                .set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha * alpha_mult);
+            self.context.set_font_size(14.0);
+            self.context.move_to(text_x, y);
+            self.context.show_text(&status_text).unwrap();
+        }
+    }
+
+    pub(crate) fn draw_keyboard_layout(&self) {
+        if self.config.show_keyboard_layout {
+            if let Some(ref layout) = self.system_status.keyboard_layout {
+                let margin = 20.0;
+                let x = margin;
+                let y = margin + 80.0;
+
+                self.context.new_path();
+                self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
+                self.context.set_font_size(16.0);
+                let text = format!("Layout: {}", layout);
+                self.context.move_to(x, y);
+                self.context.show_text(&text).unwrap();
+            }
+        }
+    }
+
+    pub(crate) fn draw_icon_at(&self, x: f64, y: f64, surface: &ImageSurface) {
+        self.context.save().unwrap();
+        let target_size = 24.0;
+        let scale =
+            (target_size / surface.width() as f64).min(target_size / surface.height() as f64);
+        self.context.translate(x, y);
+        self.context.scale(scale, scale);
+        self.context.set_source_surface(surface, 0.0, 0.0).unwrap();
+        self.context.paint_with_alpha(self.fade_alpha).unwrap();
+        self.context.restore().unwrap();
+    }
+
+    pub(crate) fn draw_icon_at_with_alpha(
+        &self,
+        x: f64,
+        y: f64,
+        surface: &ImageSurface,
+        alpha: f64,
+    ) {
+        self.context.save().unwrap();
+        let target_size = 24.0;
+        let scale =
+            (target_size / surface.width() as f64).min(target_size / surface.height() as f64);
+        self.context.translate(x, y);
+        self.context.scale(scale, scale);
+        self.context.set_source_surface(surface, 0.0, 0.0).unwrap();
+        self.context
+            .paint_with_alpha(self.fade_alpha * alpha)
+            .unwrap();
+        self.context.restore().unwrap();
+    }
+
+    pub(crate) fn draw_battery_icon_at(
+        &self,
+        x: f64,
+        y: f64,
+        width: f64,
+        height: f64,
+        percent: f64,
+        charging: bool,
+    ) {
+        let alpha = self.fade_alpha;
+        self.context.new_path();
+        self.context.set_source_rgba(1.0, 1.0, 1.0, alpha * 0.5);
+        self.context.set_line_width(2.0);
+        self.context.rectangle(x, y, width, height);
+        self.context.stroke().unwrap();
+        self.context.new_path();
+        self.context
+            .rectangle(x + width, y + height / 4.0, 3.0, height / 2.0);
+        self.context.fill().unwrap();
+        let fill_width = (width - 4.0) * (percent / 100.0);
+        self.context.new_path();
+        if percent < 20.0 {
+            self.context.set_source_rgba(1.0, 0.2, 0.2, alpha);
+        } else {
+            self.context.set_source_rgba(0.2, 1.0, 0.2, alpha * 0.8);
+        }
+        self.context
+            .rectangle(x + 2.0, y + 2.0, fill_width, height - 4.0);
+        self.context.fill().unwrap();
+        if charging {
+            self.context.new_path();
+            self.context.set_source_rgba(1.0, 1.0, 0.0, alpha);
+            let bx = x + width / 2.0;
+            let by = y + height / 2.0;
+            self.context.move_to(bx - 3.0, by + 2.0);
+            self.context.line_to(bx + 1.0, by - 1.0);
+            self.context.line_to(bx - 1.0, by - 1.0);
+            self.context.line_to(bx + 3.0, by - 6.0);
+            self.context.line_to(bx - 1.0, by - 3.0);
+            self.context.line_to(bx + 1.0, by - 3.0);
+            self.context.close_path();
+            self.context.fill().unwrap();
+        }
+    }
+}

src/util.rs

@@ -72,10 +72,7 @@ where
     }
 }
 
-pub fn serialize_blur_effect<S>(
+pub fn serialize_blur_effect<S>(val: &Option<(u32, u32)>, serializer: S) -> Result<S::Ok, S::Error>
-    val: &Option<(u32, u32)>,
-    serializer: S,
-) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
 {