fix: forward pane cursor shape

fixes #116

1 files changed, 20 insertions, 19 deletions

diff --git a/tests/client_mode.rs b/tests/client_mode.rs
index 150b8733..79dfaae3 100644
--- a/tests/client_mode.rs
+++ b/tests/client_mode.rs
@@ -186,6 +186,7 @@ struct CursorWire {
     x: u16,
     y: u16,
     visible: bool,
+    shape: u8,
 }
 
 fn decode_frame_payload(payload: &[u8]) -> std::io::Result<FrameWire> {
@@ -237,7 +238,7 @@ fn frame_contains_text(frame: &FrameWire, needle: &str) -> bool {
     }
     let _ = (frame.height, frame.graphics.len());
     if let Some(cursor) = frame.cursor.as_ref() {
-        let _ = (cursor.x, cursor.y, cursor.visible);
+        let _ = (cursor.x, cursor.y, cursor.visible, cursor.shape);
     }
 
     text.contains(needle)
@@ -266,8 +267,8 @@ fn client_connects_and_receives_frame() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5, "server should report protocol version 5");
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6, "server should report protocol version 6");
     assert!(
         error.is_none(),
         "handshake should not have error: {:?}",
@@ -334,8 +335,8 @@ fn client_sees_headless_startup_config_diagnostic() {
 
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     stream
@@ -383,8 +384,8 @@ fn client_input_forwarded_to_pane() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     // Send an Input message containing "echo hello\n".
@@ -437,8 +438,8 @@ fn client_resize_sends_message() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain the initial frame(s).
@@ -496,8 +497,8 @@ fn server_shutdown_sends_message_to_client() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     // Send SIGINT so the server takes the graceful shutdown path and
@@ -724,8 +725,8 @@ fn client_receives_frame_after_pane_output() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     read_next_frame_payload(&mut stream, Duration::from_secs(10))
@@ -771,8 +772,8 @@ fn navigate_mode_keybind_dispatch_in_server() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -889,8 +890,8 @@ fn graceful_shutdown_sends_server_shutdown_to_client() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frame(s).
@@ -987,8 +988,8 @@ fn client_receives_notify_on_agent_state_change() {
     // Connect as a client and perform handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect");
     let (version, error) =
-        client_handshake(&mut stream, 5, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 5);
+        client_handshake(&mut stream, 6, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 6);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frame(s).