2 files changed, 18 insertions, 6 deletions

diff --git a/rsnix/src/tty.rs b/rsnix/src/tty.rs
index 918f6e0..c44dca8 100644
--- a/rsnix/src/tty.rs
+++ b/rsnix/src/tty.rs
@@ -139,7 +139,14 @@ pub fn read_line() -> LineInput {
 /// windowed shells).  Same semantics as `read_line` but keys arrive as
 /// `TaskMsg::Key` instead of from the global PS/2 queue.  Returns `None`
 /// on `TaskMsg::Close` (window was closed).
-pub fn read_line_from_queue() -> Option<LineInput> {
+/// Read one line in canonical mode from the task's message queue (for
+/// windowed shells).  Same semantics as `read_line` but keys arrive as
+/// `TaskMsg::Key` instead of from the global PS/2 queue.  Returns `None`
+/// on `TaskMsg::Close` (window was closed).
+///
+/// Handles `TaskMsg::Focus` to toggle the global `ACTIVE` redirect so
+/// gop_print! goes to the right terminal buffer.
+pub fn read_line_from_queue(term: &mut crate::vt::Terminal) -> Option<LineInput> {
     crate::vt::sync_scroll();
     let mut buf = strbuf::String::<LINE_BUF_SIZE>::new();
     loop {
@@ -191,6 +198,13 @@ pub fn read_line_from_queue() -> Option<LineInput> {
                 }
                 _ => {}
             },
+            crate::sched::TaskMsg::Focus(gained) => {
+                if gained {
+                    crate::vt::set_active(term as *mut crate::vt::Terminal);
+                } else {
+                    crate::vt::set_active(core::ptr::null_mut());
+                }
+            }
             crate::sched::TaskMsg::Close => return None,
             _ => {}
         }
diff --git a/rsnix/src/wm.rs b/rsnix/src/wm.rs
index 05781e8..71c310f 100644
--- a/rsnix/src/wm.rs
+++ b/rsnix/src/wm.rs
@@ -617,12 +617,10 @@ pub fn spawn_input_pump() -> Option<usize> {
 
 fn pump_main() {
     loop {
-        if focused().is_some() {
+        if let Some(id) = focused() {
+            let o = owner(id).unwrap_or(0);
             while let Some(ev) = crate::ps2::try_poll_key().or_else(crate::uhci::try_poll_key) {
-                if !handle_key(ev)
-                    && let Some(id) = focused()
-                    && let Some(o) = owner(id)
-                {
+                if !handle_key(ev) {
                     let _ = crate::sched::send(o, TaskMsg::Key(ev));
                 }
             }