1 files changed, 46 insertions, 0 deletions

diff --git a/shell/src/lib.rs b/shell/src/lib.rs
index f1addd9..6077f35 100644
--- a/shell/src/lib.rs
+++ b/shell/src/lib.rs
@@ -93,6 +93,30 @@ pub fn run() -> ! {
     }
 }
 
+/// Run a shell instance inside a windowed terminal.  Same as `run()` but
+/// reads from the task's message queue (Fed by the WM input pump) and
+/// writes to the active terminal (set by the caller via `vt::set_active`).
+/// Returns when the window is closed (Close message or ^D on empty line).
+pub fn run_windowed() {
+    term_println(&alloc::format!("rs-dos v{}", env!("CARGO_PKG_VERSION")));
+    loop {
+        rsnix::vt::sync_scroll();
+        term_print("> ");
+        match tty::read_line_from_queue() {
+            None => return, // window closed
+            Some(LineInput::Interrupted) => continue,
+            Some(LineInput::Eof) => return, // ^D in windowed mode = close
+            Some(LineInput::Line(line)) => {
+                let trimmed = line.trim();
+                if trimmed.is_empty() {
+                    continue;
+                }
+                execute(trimmed);
+            }
+        }
+    }
+}
+
 // ---------------------------------------------------------------------------
 // Diagnostics and command output go straight to terminal + serial, never
 // through the filter pipeline and never into a file sink.  These helpers
@@ -741,6 +765,7 @@ write `{} <path> TIL <marker>`",
         "rm" => cmd_rm(&parsed),
         "edit" => cmd_edit(&parsed),
         "draw" => cmd_draw(&parsed),
+        "term" => cmd_term(&parsed),
         "windows" => cmd_windows(&parsed),
         "restore" => cmd_restore(&parsed),
         "bg" => cmd_bg(&parsed),
@@ -800,6 +825,7 @@ fn cmd_help(_p: &Parsed) {
   touch    - create an empty file
   rm       - remove a file or empty dir
   edit     - full-screen editor (^S save, ^X exit, ^W search)
+  term     - spawn a windowed terminal (F1 also works)
   halt     - halt the system (hlt loop)
   poweroff - shut down via ACPI (ResetSystem)
   exit     - alias for poweroff
@@ -1401,6 +1427,26 @@ fn cmd_draw(_p: &Parsed) {
     }
 }
 
+fn cmd_term(_p: &Parsed) {
+    // Debug: check if the callback is registered.
+    let cb_set = unsafe { core::ptr::addr_of!(rsnix::wm::SPAWN_TERMINAL_CB).read().is_some() };
+    term_println(&alloc::format!("term: SPAWN_TERMINAL_CB set = {}", cb_set));
+    if !cb_set {
+        term_err("term: callback not registered — cannot spawn");
+        return;
+    }
+    // Invoke the callback directly (same as F1).
+    let (cw, ch) = rsnix::gop::pixel_dims();
+    let w = 640usize.min(cw);
+    let h = 400usize.min(ch);
+    term_println(&alloc::format!("term: requesting window {}x{}", w, h));
+    unsafe {
+        let cb = core::ptr::addr_of!(rsnix::wm::SPAWN_TERMINAL_CB).read().unwrap();
+        cb("term dbg", w, h);
+    }
+    term_println("term: callback returned (task should be spawning)");
+}
+
 fn cmd_windows(_p: &Parsed) {
     let list = rsnix::wm::list();
     if list.is_empty() {