Merge pull request #95 from a-kenji/examples/improve-cross-platform-support

examples: improve cross platform support

Author: a-kenji

examples/README.md

@@ -26,13 +26,11 @@ The RWLock ensures that multiple threads can read from the pseudoterminal simult
 
 ## `nested_shell`
 
-- Required: `SHELL` environment variable
 - Description: Demonstrates nested shell functionality.
 - Uses a RWLock to manage shared read/write access.
 
 ## `nested_shell_async`
 
-- Required: SHELL environment variable
 - Description: Demonstrates nested shell functionality with asynchronous I/O using Tokio.
 - Uses an RWLock to manage shared read/write access.
 
@@ -43,6 +41,5 @@ The RWLock ensures that multiple threads can read from the pseudoterminal simult
 
 ## `smux`
 
-- Required: SHELL environment variable
 - Description: This example demonstrates a simple terminal multiplexer.
 - Uses: asynchronous I/O using Tokio

examples/nested_shell.rs

@@ -6,7 +6,7 @@ use std::{
 
 use bytes::Bytes;
 use crossterm::{
-    event::{self, DisableMouseCapture, Event, KeyCode, KeyEventKind},
+    event::{self, Event, KeyCode, KeyEventKind},
     execute,
     style::ResetColor,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
@@ -39,8 +39,7 @@ fn main() -> std::io::Result<()> {
 
     let pty_system = NativePtySystem::default();
     let cwd = std::env::current_dir().unwrap();
-    let shell = std::env::var("SHELL").unwrap();
-    let mut cmd = CommandBuilder::new(shell);
+    let mut cmd = CommandBuilder::new_default_prog();
     cmd.cwd(cwd);
 
     let size = Size {
@@ -105,11 +104,7 @@ fn main() -> std::io::Result<()> {
 
     // restore terminal
     disable_raw_mode()?;
-    execute!(
-        terminal.backend_mut(),
-        LeaveAlternateScreen,
-        DisableMouseCapture
-    )?;
+    execute!(terminal.backend_mut(), LeaveAlternateScreen,)?;
     terminal.show_cursor()?;
     println!("{size:?}");
     Ok(())
@@ -138,7 +133,12 @@ fn run<B: Backend>(
                             KeyCode::Backspace => {
                                 sender.send(Bytes::from(vec![8])).unwrap();
                             }
-                            KeyCode::Enter => sender.send(Bytes::from(vec![b'\n'])).unwrap(),
+                            KeyCode::Enter => {
+                                #[cfg(unix)]
+                                sender.send(Bytes::from(vec![b'\n'])).unwrap();
+                                #[cfg(windows)]
+                                sender.send(Bytes::from(vec![b'\r', b'\n'])).unwrap();
+                            }
                             KeyCode::Left => sender.send(Bytes::from(vec![27, 91, 68])).unwrap(),
                             KeyCode::Right => sender.send(Bytes::from(vec![27, 91, 67])).unwrap(),
                             KeyCode::Up => sender.send(Bytes::from(vec![27, 91, 65])).unwrap(),

examples/nested_shell_async.rs

@@ -6,7 +6,7 @@ use std::{
 
 use bytes::Bytes;
 use crossterm::{
-    event::{self, DisableMouseCapture, Event, KeyCode, KeyEventKind},
+    event::{self, Event, KeyCode, KeyEventKind},
     execute,
     style::ResetColor,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
@@ -44,8 +44,7 @@ async fn main() -> io::Result<()> {
 
     let pty_system = NativePtySystem::default();
     let cwd = std::env::current_dir().unwrap();
-    let shell = std::env::var("SHELL").unwrap();
-    let mut cmd = CommandBuilder::new(shell);
+    let mut cmd = CommandBuilder::new_default_prog();
     cmd.cwd(cwd);
 
     let size = Size {
@@ -112,11 +111,7 @@ async fn main() -> io::Result<()> {
 
     // restore terminal
     disable_raw_mode()?;
-    execute!(
-        terminal.backend_mut(),
-        LeaveAlternateScreen,
-        DisableMouseCapture
-    )?;
+    execute!(terminal.backend_mut(), LeaveAlternateScreen,)?;
     terminal.show_cursor()?;
     println!("{size:?}");
     Ok(())

examples/smux.rs

@@ -40,8 +40,7 @@ async fn main() -> io::Result<()> {
     let (mut terminal, mut size) = setup_terminal().unwrap();
 
     let cwd = std::env::current_dir().unwrap();
-    let shell = std::env::var("SHELL").unwrap();
-    let mut cmd = CommandBuilder::new(shell);
+    let mut cmd = CommandBuilder::new_default_prog();
     cmd.cwd(cwd);
 
     let mut panes: Vec<PtyPane> = Vec::new();
@@ -245,7 +244,10 @@ async fn handle_pane_key_event(pane: &mut PtyPane, key: &KeyEvent) -> bool {
             }
             send
         }
+        #[cfg(unix)]
         KeyCode::Enter => vec![b'\n'],
+        #[cfg(windows)]
+        KeyCode::Enter => vec![b'\r', b'\n'],
         KeyCode::Backspace => vec![8],
         KeyCode::Left => vec![27, 91, 68],
         KeyCode::Right => vec![27, 91, 67],