From 1f9a5c31ccc47db33e350a9c22fac94185f9e450 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 16 Dec 2024 13:03:32 -0500
Subject: [PATCH] Add `query_keyboard_enhancement_flags` to read enabled flags

This is mostly a refactor of `supports_keyboard_enhancement` and its
helper functions. We previously discarded the response to the `CSI ? u`
query but this returns the currently active flags. This response value
can be useful for a client to know which flags to emit to disable the
keyboard enhancement protocol or to know which flags a terminal supports
(after the client has pushed flags).
---
 src/terminal/sys/unix.rs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/terminal/sys/unix.rs b/src/terminal/sys/unix.rs
index 7129730a..2cb1cf69 100644
--- a/src/terminal/sys/unix.rs
+++ b/src/terminal/sys/unix.rs
@@ -1,5 +1,7 @@
 //! UNIX related logic for terminal manipulation.
 
+#[cfg(feature = "events")]
+use crate::event::KeyboardEnhancementFlags;
 use crate::terminal::{
     sys::file_descriptor::{tty_fd, FileDesc},
     WindowSize,
@@ -184,23 +186,28 @@ fn set_terminal_attr(fd: impl AsFd, termios: &Termios) -> io::Result<()> {
 /// [`crossterm::event::read`](crate::event::read) or [`crossterm::event::poll`](crate::event::poll) are being called.
 #[cfg(feature = "events")]
 pub fn supports_keyboard_enhancement() -> io::Result<bool> {
+    query_keyboard_enhancement_flags().map(|flags| flags.is_some())
+}
+
+#[cfg(feature = "events")]
+pub fn query_keyboard_enhancement_flags() -> io::Result<Option<KeyboardEnhancementFlags>> {
     if is_raw_mode_enabled() {
-        read_supports_keyboard_enhancement_raw()
+        query_keyboard_enhancement_flags_raw()
     } else {
-        read_supports_keyboard_enhancement_flags()
+        query_keyboard_enhancement_flags_nonraw()
     }
 }
 
 #[cfg(feature = "events")]
-fn read_supports_keyboard_enhancement_flags() -> io::Result<bool> {
+fn query_keyboard_enhancement_flags_nonraw() -> io::Result<Option<KeyboardEnhancementFlags>> {
     enable_raw_mode()?;
-    let flags = read_supports_keyboard_enhancement_raw();
+    let flags = query_keyboard_enhancement_flags_raw();
     disable_raw_mode()?;
     flags
 }
 
 #[cfg(feature = "events")]
-fn read_supports_keyboard_enhancement_raw() -> io::Result<bool> {
+fn query_keyboard_enhancement_flags_raw() -> io::Result<Option<KeyboardEnhancementFlags>> {
     use crate::event::{
         filter::{KeyboardEnhancementFlagsFilter, PrimaryDeviceAttributesFilter},
         poll_internal, read_internal, InternalEvent,
@@ -236,12 +243,12 @@ fn read_supports_keyboard_enhancement_raw() -> io::Result<bool> {
         ) {
             Ok(true) => {
                 match read_internal(&KeyboardEnhancementFlagsFilter) {
-                    Ok(InternalEvent::KeyboardEnhancementFlags(_current_flags)) => {
+                    Ok(InternalEvent::KeyboardEnhancementFlags(current_flags)) => {
                         // Flush the PrimaryDeviceAttributes out of the event queue.
                         read_internal(&PrimaryDeviceAttributesFilter).ok();
-                        return Ok(true);
+                        return Ok(Some(current_flags));
                     }
-                    _ => return Ok(false),
+                    _ => return Ok(None),
                 }
             }
             Ok(false) => {