AndrewAltimit
diff --git a/‎crates/oasis-app/src/app_state.rs‎
Lines changed: 1 addition & 0 deletions b/‎crates/oasis-app/src/app_state.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎crates/oasis-app/src/commands.rs‎
Lines changed: 1 addition & 0 deletions b/‎crates/oasis-app/src/commands.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎crates/oasis-app/src/input.rs‎
Lines changed: 28 additions & 1 deletion b/‎crates/oasis-app/src/input.rs‎
Lines changed: 28 additions & 1 deletion
diff --git a/‎crates/oasis-app/src/main.rs‎
Lines changed: 15 additions & 0 deletions b/‎crates/oasis-app/src/main.rs‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎crates/oasis-app/src/render.rs‎
Lines changed: 1 addition & 0 deletions b/‎crates/oasis-app/src/render.rs‎
Lines changed: 1 addition & 0 deletions
@@ -65,6 +65,7 @@ pub struct AppState {
     pub radio_manager: RadioManager,
     pub radio_source: Option<Box<dyn RadioSource>>,
     pub audio_backend: SdlAudioBackend,
+    pub terminal_scroll_offset: usize,
 }
 
 #[cfg(test)]
 
@@ -430,6 +430,7 @@ mod tests {
             radio_manager: RadioManager::new(),
             radio_source: None,
             audio_backend: SdlAudioBackend::new(),
+            terminal_scroll_offset: 0,
         }
     }
 
 
@@ -134,6 +134,13 @@ pub fn handle_desktop_input(
                 bw.handle_input(&InputEvent::Backspace, vfs);
             }
         },
+        InputEvent::MouseWheel { delta } => {
+            if state.wm.active_window() == Some("browser")
+                && let Some(ref mut bw) = state.browser
+            {
+                bw.handle_input(&InputEvent::MouseWheel { delta: *delta }, vfs);
+            }
+        },
         InputEvent::ButtonPress(btn) => {
             if let Some(active_id) = state.wm.active_window().map(|s| s.to_string()) {
                 if active_id == "browser" {
@@ -380,6 +387,7 @@ pub fn handle_default_input(
         InputEvent::ButtonPress(Button::Confirm) if state.mode == Mode::Terminal => {
             let line = state.input_buf.clone();
             state.input_buf.clear();
+            state.terminal_scroll_offset = 0;
             if !line.is_empty() {
                 state.output_lines.push(format!("> {line}"));
                 let pending_skin_swap;
@@ -413,6 +421,24 @@ pub fn handle_default_input(
             state.mode = Mode::Dashboard;
         },
 
+        InputEvent::MouseWheel { delta } if state.mode == Mode::Terminal => {
+            let len = state.output_lines.len();
+            let max_visible = terminal_sdi::VISIBLE_OUTPUT_LINES;
+            if len > max_visible {
+                let max_offset = len - max_visible;
+                if *delta < 0 {
+                    // Scroll up (show older lines).
+                    state.terminal_scroll_offset =
+                        (state.terminal_scroll_offset + (-*delta as usize) * 3).min(max_offset);
+                } else {
+                    // Scroll down (show newer lines).
+                    state.terminal_scroll_offset = state
+                        .terminal_scroll_offset
+                        .saturating_sub(*delta as usize * 3);
+                }
+            }
+        },
+
         _ => {},
     }
     InputResult::Continue
@@ -554,6 +580,7 @@ mod tests {
             radio_manager: RadioManager::new(),
             radio_source: None,
             audio_backend: SdlAudioBackend::new(),
+            terminal_scroll_offset: 0,
         };
         let sdi = SdiRegistry::new();
         let vfs = MemoryVfs::new();
@@ -680,7 +707,7 @@ mod tests {
         let (mut state, mut sdi, mut vfs) = make_test_state();
         state.mode = Mode::Terminal;
         // First create terminal objects so set_terminal_visible can hide them.
-        terminal_sdi::setup_terminal_objects(&mut sdi, &[], "/", "");
+        terminal_sdi::setup_terminal_objects(&mut sdi, &[], "/", "", 0);
         handle_default_input(
             &InputEvent::ButtonPress(Button::Cancel),
             &mut state,
 
@@ -170,6 +170,7 @@ fn main() -> Result<()> {
             ab.init().ok();
             ab
         },
+        terminal_scroll_offset: 0,
     };
 
     // Load radio stations from VFS.
@@ -349,6 +350,11 @@ fn main() -> Result<()> {
         // Update SDI scene graph for the active mode.
         render::update_sdi(&mut state, &mut sdi);
 
+        // Drive browser image streaming (progressive loading).
+        if let Some(ref mut bw) = state.browser {
+            bw.tick(&vfs);
+        }
+
         // -- Render --
         backend.clear(state.bg_color)?;
         if state.mode == Mode::Desktop && state.wm.window_count() > 0 {
@@ -374,6 +380,15 @@ fn main() -> Result<()> {
             sdi.draw(&mut backend)?;
         }
 
+        // Paint terminal scrollbar when in terminal mode.
+        if state.mode == Mode::Terminal {
+            terminal_sdi::paint_terminal_scrollbar(
+                &mut backend,
+                state.output_lines.len(),
+                state.terminal_scroll_offset,
+            )?;
+        }
+
         // Draw transition overlay if active.
         if let Some(ref mut trans) = state.active_transition {
             trans.draw_overlay(&mut backend)?;
 
@@ -47,6 +47,7 @@ pub fn update_sdi(state: &mut AppState, sdi: &mut SdiRegistry) {
                 &state.output_lines,
                 &state.cwd,
                 &state.input_buf,
+                state.terminal_scroll_offset,
             );
         },
         Mode::App => {
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ pub struct AppState {`
`65`	`65`	`pub radio_manager: RadioManager,`
`66`	`66`	`pub radio_source: Option<Box<dyn RadioSource>>,`
`67`	`67`	`pub audio_backend: SdlAudioBackend,`
	`68`	`+ pub terminal_scroll_offset: usize,`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,7 @@ mod tests {`
`430`	`430`	`radio_manager: RadioManager::new(),`
`431`	`431`	`radio_source: None,`
`432`	`432`	`audio_backend: SdlAudioBackend::new(),`
	`433`	`+ terminal_scroll_offset: 0,`
`433`	`434`	`}`
`434`	`435`	`}`
`435`	`436`