From e7ab16f0e1cd2aaa1051a8275f4d1b96e4869e50 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sun, 20 Aug 2023 22:01:49 -0700
Subject: [PATCH] terminal: CSI < u defaults param to "1" if not set (pop kitty
 keyboard)

---
 src/terminal/stream.zig | 17 ++++++++++++++++-
 src/termio/Exec.zig     |  8 ++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/terminal/stream.zig b/src/terminal/stream.zig
index ccac4b37e..c57fb3122 100644
--- a/src/terminal/stream.zig
+++ b/src/terminal/stream.zig
@@ -669,7 +669,7 @@ pub fn Stream(comptime Handler: type) type {
                             const number: u16 = if (action.params.len == 1)
                                 action.params[0]
                             else
-                                0;
+                                1;
 
                             try self.handler.popKittyKeyboard(number);
                         },
@@ -1073,3 +1073,18 @@ test "stream: restore mode" {
     for ("\x1B[?42r") |c| try s.next(c);
     try testing.expect(!s.handler.called);
 }
+
+test "stream: pop kitty keyboard with no params defaults to 1" {
+    const H = struct {
+        const Self = @This();
+        n: u16 = 0,
+
+        pub fn popKittyKeyboard(self: *Self, n: u16) !void {
+            self.n = n;
+        }
+    };
+
+    var s: Stream(H) = .{ .handler = .{} };
+    for ("\x1B[<u") |c| try s.next(c);
+    try testing.expectEqual(@as(u16, 1), s.handler.n);
+}
diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig
index d69e4e656..e3aece1db 100644
--- a/src/termio/Exec.zig
+++ b/src/termio/Exec.zig
@@ -1415,7 +1415,7 @@ const StreamHandler = struct {
     pub fn queryKittyKeyboard(self: *StreamHandler) !void {
         if (comptime disable_kitty_keyboard_protocol) return;
 
-        // log.debug("querying kitty keyboard mode", .{});
+        log.debug("querying kitty keyboard mode", .{});
         var data: termio.Message.WriteReq.Small.Array = undefined;
         const resp = try std.fmt.bufPrint(&data, "\x1b[?{}u", .{
             self.terminal.screen.kitty_keyboard.current().int(),
@@ -1435,14 +1435,14 @@ const StreamHandler = struct {
     ) !void {
         if (comptime disable_kitty_keyboard_protocol) return;
 
-        // log.debug("pushing kitty keyboard mode: {}", .{flags});
+        log.debug("pushing kitty keyboard mode: {}", .{flags});
         self.terminal.screen.kitty_keyboard.push(flags);
     }
 
     pub fn popKittyKeyboard(self: *StreamHandler, n: u16) !void {
         if (comptime disable_kitty_keyboard_protocol) return;
 
-        // log.debug("popping kitty keyboard mode", .{});
+        log.debug("popping kitty keyboard mode n={}", .{n});
         self.terminal.screen.kitty_keyboard.pop(@intCast(n));
     }
 
@@ -1453,7 +1453,7 @@ const StreamHandler = struct {
     ) !void {
         if (comptime disable_kitty_keyboard_protocol) return;
 
-        // log.debug("setting kitty keyboard mode: {} {}", .{mode, flags});
+        log.debug("setting kitty keyboard mode: {} {}", .{ mode, flags });
         self.terminal.screen.kitty_keyboard.set(mode, flags);
     }