implements PLN-0052

This commit is contained in:
2026-05-14 18:27:25 +01:00
parent 28cb21118b
commit ab825d3274
9 changed files with 20 additions and 20 deletions
@@ -1,5 +1,4 @@
#[allow(clippy::module_inception)]
mod prometeu_hub;
mod window_manager;
pub use prometeu_hub::PrometeuHub;
@@ -1,4 +1,3 @@
use crate::programs::prometeu_hub::window_manager::WindowManager;
use crate::{CrashReport, SystemOS};
use prometeu_hal::color::Color;
use prometeu_hal::log::{LogLevel, LogSource};
@@ -7,9 +6,7 @@ use prometeu_hal::{HardwareBridge, InputSignals};
use prometeu_vm::VirtualMachine;
/// PrometeuHub: Launcher and system UI environment.
pub struct PrometeuHub {
pub window_manager: WindowManager,
}
pub struct PrometeuHub;
pub struct SystemProfileUpdate {
pub crash: Option<CrashReport>,
@@ -24,7 +21,7 @@ impl Default for PrometeuHub {
impl PrometeuHub {
pub fn new() -> Self {
Self { window_manager: WindowManager::new() }
Self
}
pub fn init(&mut self) {
@@ -64,14 +61,14 @@ impl PrometeuHub {
}
if let Some((title, rect, color)) = next_window {
self.window_manager.remove_all_windows();
let id = self.window_manager.add_window(title, rect, color);
self.window_manager.set_focus(id);
os.window_manager.remove_all_windows();
let id = os.window_manager.add_window(title, rect, color);
os.window_manager.set_focus(id);
}
}
pub fn render(&mut self, _os: &mut SystemOS, hw: &mut dyn HardwareBridge) {
for window in &self.window_manager.windows {
pub fn render(&mut self, os: &mut SystemOS, hw: &mut dyn HardwareBridge) {
for window in &os.window_manager.windows {
hw.gfx_mut().fill_rect(
window.viewport.x,
window.viewport.y,
@@ -93,9 +90,9 @@ impl PrometeuHub {
self.gui_update(os, hw);
if let Some(focused_id) = self.window_manager.focused {
if let Some(focused_id) = os.window_manager.focused {
if hw.pad().start().down {
self.window_manager.remove_window(focused_id);
os.window_manager.remove_window(focused_id);
} else {
crash = os.vm_runtime.tick(vm, signals, hw);
}
@@ -104,6 +101,6 @@ impl PrometeuHub {
self.render(os, hw);
hw.gfx_mut().present();
SystemProfileUpdate { crash, focused_window_active: self.window_manager.focused.is_some() }
SystemProfileUpdate { crash, focused_window_active: os.window_manager.focused.is_some() }
}
}
@@ -1,83 +0,0 @@
use prometeu_hal::color::Color;
use prometeu_hal::window::{Rect, Window, WindowId};
/// PROMETEU Window Manager.
pub struct WindowManager {
pub windows: Vec<Window>,
pub focused: Option<WindowId>,
}
impl WindowManager {
pub fn new() -> Self {
Self { windows: Vec::new(), focused: None }
}
pub fn add_window(&mut self, title: String, viewport: Rect, color: Color) -> WindowId {
let id = WindowId(self.windows.len() as u32);
let window = Window { id, viewport, has_focus: false, title, color };
self.windows.push(window);
id
}
pub fn remove_window(&mut self, id: WindowId) {
self.windows.retain(|w| w.id != id);
if self.focused == Some(id) {
self.focused = None;
}
}
pub fn remove_all_windows(&mut self) {
self.windows.clear();
self.focused = None;
}
pub fn set_focus(&mut self, id: WindowId) {
self.focused = Some(id);
for window in &mut self.windows {
window.has_focus = window.id == id;
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_window_manager_focus() {
let mut wm = WindowManager::new();
let id1 =
wm.add_window("Window 1".to_string(), Rect { x: 0, y: 0, w: 10, h: 10 }, Color::WHITE);
let id2 = wm.add_window(
"Window 2".to_string(),
Rect { x: 10, y: 10, w: 10, h: 10 },
Color::WHITE,
);
assert_eq!(wm.windows.len(), 2);
assert_eq!(wm.focused, None);
wm.set_focus(id1);
assert_eq!(wm.focused, Some(id1));
assert!(wm.windows[0].has_focus);
assert!(!wm.windows[1].has_focus);
wm.set_focus(id2);
assert_eq!(wm.focused, Some(id2));
assert!(!wm.windows[0].has_focus);
assert!(wm.windows[1].has_focus);
}
#[test]
fn test_window_manager_remove_window() {
let mut wm = WindowManager::new();
let id =
wm.add_window("Window".to_string(), Rect { x: 0, y: 0, w: 10, h: 10 }, Color::WHITE);
wm.set_focus(id);
assert_eq!(wm.focused, Some(id));
wm.remove_window(id);
assert_eq!(wm.windows.len(), 0);
assert_eq!(wm.focused, None);
}
}