custom backgrounds, audio player better

src/essential/desktop_background.rs

@@ -1,13 +1,19 @@
 use std::vec;
 use std::vec::Vec;
+use std::fs::File;
+use std::io::Read;
+
+use dirs::config_dir;
 
 use crate::window_manager::{ DrawInstructions, WindowLike, WindowLikeType, TASKBAR_HEIGHT, INDICATOR_HEIGHT };
-use crate::messages::{ WindowMessage, WindowMessageResponse };
+use crate::messages::{ WindowMessage, WindowMessageResponse, ShortcutType };
 use crate::framebuffer::Dimensions;
 use crate::themes::ThemeInfo;
+use crate::utils::{ hex_to_u8, is_hex };
 
 pub struct DesktopBackground {
   dimensions: Dimensions,
+  current_workspace: u8,
 }
 
 impl WindowLike for DesktopBackground {
@@ -17,12 +23,41 @@ impl WindowLike for DesktopBackground {
         self.dimensions = dimensions;
         WindowMessageResponse::JustRerender
       },
+      WindowMessage::Shortcut(shortcut) => {
+        match shortcut {
+          ShortcutType::SwitchWorkspace(workspace) => {
+            self.current_workspace = workspace;
+            WindowMessageResponse::JustRerender
+          },
+          _ => WindowMessageResponse::DoNothing,
+        }
+      },
       _ => WindowMessageResponse::DoNothing,
     }
   }
 
   //simple
   fn draw(&self, _theme_info: &ThemeInfo) -> Vec<DrawInstructions> {
+    if let Ok(mut file) = File::open(format!("{}/ming-wm/desktop-background", config_dir().unwrap().into_os_string().into_string().unwrap())) {
+      let mut contents = String::new();
+      file.read_to_string(&mut contents).unwrap();
+      let lines: Vec<&str> = contents.split("\n").collect();
+      if lines.len() > self.current_workspace.into() {
+        let line = lines[self.current_workspace as usize];
+        if line.starts_with("#") && line.len() == 7 {
+          let line_hex = &line[1..];
+          //if all characters are valid hex
+          if line_hex.find(|c| !is_hex(c)).is_none() {
+            let mut chars = line_hex.chars();
+            let color = [hex_to_u8(chars.next().unwrap(), chars.next().unwrap()), hex_to_u8(chars.next().unwrap(), chars.next().unwrap()), hex_to_u8(chars.next().unwrap(), chars.next().unwrap())];
+            return vec![DrawInstructions::Rect([0, 0], self.dimensions, color)];
+          }
+        } else {
+          //first character of line is either r or any other character, but is not part of the path
+          return vec![DrawInstructions::Bmp([0, 0], line[1..].to_string(), line.chars().next().unwrap() == 'r')];
+        }
+      }
+    }
     vec![DrawInstructions::Rect([0, 0], self.dimensions, [0, 128, 128])]
   }
 
@@ -38,7 +73,10 @@ impl WindowLike for DesktopBackground {
 
 impl DesktopBackground {
   pub fn new() -> Self {
-    Self { dimensions: [0, 0] }
+    Self {
+      dimensions: [0, 0],
+      current_workspace: 0,
+    }
   }
 }
 

src/essential/lock_screen.rs

@@ -50,11 +50,11 @@ impl WindowLike for LockScreen {
   fn draw(&self, _theme_info: &ThemeInfo) -> Vec<DrawInstructions> {
     vec![
       DrawInstructions::Rect([0, 0], self.dimensions, [0, 0, 0]),
-      DrawInstructions::Text([4, 4], "times-new-roman".to_string(), "The bulldozer outside the kitchen window was quite a big one.".to_string(), [255, 255, 255], [0, 0, 0], None, None),
-      DrawInstructions::Text([4, 4 + 16], "times-new-roman".to_string(), "\"Yellow,\" he thought, and stomped off back to his bedroom to get dressed.".to_string(), [255, 255, 255], [0, 0, 0], None, None),
-      DrawInstructions::Text([4, 4 + 16 * 2], "times-new-roman".to_string(), "He stared at it.".to_string(), [255, 255, 255], [0, 0, 0], None, None),
-      DrawInstructions::Text([4, 4 + 16 * 3], "times-new-roman".to_string(), "Password: ".to_string(), [255, 255, 255], [0, 0, 0], None, None),
-      DrawInstructions::Text([77, 4 + 16 * 3], "times-new-roman".to_string(), "*".repeat(self.input_password.len()), [255, 255, 255], [0, 0, 0], None, None),
+      DrawInstructions::Text([4, 4], vec!["times-new-roman".to_string()], "The bulldozer outside the kitchen window was quite a big one.".to_string(), [255, 255, 255], [0, 0, 0], None, None),
+      DrawInstructions::Text([4, 4 + 16], vec!["times-new-roman".to_string()], "\"Yellow,\" he thought, and stomped off back to his bedroom to get dressed.".to_string(), [255, 255, 255], [0, 0, 0], None, None),
+      DrawInstructions::Text([4, 4 + 16 * 2], vec!["times-new-roman".to_string()], "He stared at it.".to_string(), [255, 255, 255], [0, 0, 0], None, None),
+      DrawInstructions::Text([4, 4 + 16 * 3], vec!["times-new-roman".to_string()], "Password: ".to_string(), [255, 255, 255], [0, 0, 0], None, None),
+      DrawInstructions::Text([77, 4 + 16 * 3], vec!["times-new-roman".to_string()], "*".repeat(self.input_password.len()), [255, 255, 255], [0, 0, 0], None, None),
     ]
   }
   

src/essential/start_menu.rs

@@ -98,7 +98,7 @@ impl WindowLike for StartMenu {
       //background
       DrawInstructions::Rect([0, 1], [self.dimensions[0] - 1, self.dimensions[1] - 1], theme_info.background),
       //mingde logo
-      DrawInstructions::Mingde([2, 2]),
+      DrawInstructions::Bmp([2, 2], "./bmps/mingde.bmp".to_string(), false),
       //I truly don't know why, it should be - 44 but - 30 seems to work better :shrug:
       DrawInstructions::Gradient([2, 42], [40, self.dimensions[1] - 30], [255, 201, 14], [225, 219, 77], 15),
     ];

src/essential/workspace_indicator.rs

@@ -29,7 +29,7 @@ impl WindowLike for WorkspaceIndicator {
           ShortcutType::SwitchWorkspace(workspace) => {
             self.current_workspace = workspace;
             WindowMessageResponse::JustRerender
-          }
+          },
           _ => WindowMessageResponse::DoNothing,
         }
       },
@@ -48,9 +48,9 @@ impl WindowLike for WorkspaceIndicator {
     for w in 0..9 {
       if w == self.current_workspace as usize {
         instructions.push(DrawInstructions::Rect([w * WIDTH, 0], [WIDTH, self.dimensions[1]], theme_info.top));
-        instructions.push(DrawInstructions::Text([w * WIDTH + 5, 4], "times-new-roman".to_string(), (w + 1).to_string(), theme_info.top_text, theme_info.top, None, None));
+        instructions.push(DrawInstructions::Text([w * WIDTH + 5, 4], vec!["times-new-roman".to_string()], (w + 1).to_string(), theme_info.top_text, theme_info.top, None, None));
       } else {
-        instructions.push(DrawInstructions::Text([w * WIDTH + 5, 4], "times-new-roman".to_string(), (w + 1).to_string(), theme_info.text, theme_info.background, None, None));
+        instructions.push(DrawInstructions::Text([w * WIDTH + 5, 4], vec!["times-new-roman".to_string()], (w + 1).to_string(), theme_info.text, theme_info.background, None, None));
       }
     }
     //also add the utc time in the right edge
@@ -58,7 +58,7 @@ impl WindowLike for WorkspaceIndicator {
     let hours = (today_secs / ONE_HOUR).to_string();
     let minutes = ((today_secs % ONE_HOUR) / ONE_MINUTE).to_string();
     let time_string = format!("{}:{}~ UTC", if hours.len() == 1 { "0".to_string() + &hours } else { hours }, if minutes.len() == 1 { "0".to_string() + &minutes } else { minutes });
-    instructions.push(DrawInstructions::Text([self.dimensions[0] - 90, 4], "times-new-roman".to_string(), time_string, theme_info.text, theme_info.background, None, None));
+    instructions.push(DrawInstructions::Text([self.dimensions[0] - 90, 4], vec!["times-new-roman".to_string()], time_string, theme_info.text, theme_info.background, None, None));
     instructions
   }