checkpoint, no idea what's happening

Mikayla Maki created 3 years ago

Change summary

crates/gpui/src/platform/mac/window.rs | 6 +++++-
crates/terminal/src/mappings/keys.rs   | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)

Detailed changes

crates/gpui/src/platform/mac/window.rs

@@ -292,6 +292,7 @@ struct WindowState {
     previous_modifiers_changed_event: Option<Event>,
 }
 
+#[derive(Debug)]
 struct InsertText {
     replacement_range: Option<Range<usize>>,
     text: String,
@@ -742,6 +743,8 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
         let function_is_held;
         window_state_borrow.pending_key_down = match event {
             Event::KeyDown(event) => {
+                dbg!(&event);
+
                 let keydown = event.keystroke.clone();
                 // Ignore events from held-down keys after some of the initially-pressed keys
                 // were released.
@@ -752,12 +755,12 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                 } else {
                     window_state_borrow.last_fresh_keydown = Some(keydown);
                 }
-
                 function_is_held = event.keystroke.function;
                 Some((event, None))
             }
             _ => return NO,
         };
+
         drop(window_state_borrow);
 
         if !function_is_held {
@@ -782,6 +785,7 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                 }
 
                 if !handled {
+                    println!("not handling, {:?}", insert_text);
                     if let Some(insert) = insert_text {
                         handled = true;
                         with_input_handler(this, |input_handler| {

crates/terminal/src/mappings/keys.rs

@@ -243,7 +243,7 @@ pub fn to_esc_str(keystroke: &Keystroke, mode: &TermMode) -> Option<String> {
         }
     }
 
-    None
+    Some(keystroke.key.to_string())
 }
 
 ///   Code     Modifiers