idk

TODO.org

@@ -10,6 +10,7 @@
   * [X] Start to end of document
   * [ ] Confine to line unless CTRL is pressed
 - [ ] Mouse input
+- [ ] [[./src/main.rs::ConfigurableInput][Make keyboard input configurable instead of hardcoded]]
 
 * Editing [2/7]
 - [X] Type text

src/input.rs

@@ -16,6 +16,8 @@ mod keybinds {
         Redo,
         NewLines,
         DeleteLines,
+        TabForward,
+        TabBackward,
     }
 
     pub(super) enum Movement {
@@ -53,22 +55,57 @@ pub struct ModifierKeys {
 
 impl ModifierKeys {
     pub fn new() -> ModifierKeys {
-        ModifierKeys { alt: false, ctrl: false, shift: false }
+        ModifierKeys {
+            alt: false,
+            ctrl: false,
+            shift: false,
+        }
+    }
+}
+
+pub fn tab(buffer: &mut String, cursor_position: &mut usize, modifiers: &ModifierKeys) {
+    if modifiers.shift {
+        println!("unimplemented back-tab");
+    } else {
+        // for _ in 0..4 {
+        buffer.insert_str(*cursor_position, "    ");
+        *cursor_position += 4;
+        // }
+    }
+}
+
+pub fn backspace(buffer: &mut String, cursor_position: &mut usize, modifiers: &ModifierKeys) {
+    if modifiers.ctrl {
+        // Word backspace
+        // TODO: Clean up this messy expression
+        let buffer_chars: Vec<char> = buffer.chars().collect();
+        while !(buffer_chars[*cursor_position - 1] == ' '
+            || buffer_chars[*cursor_position - 1] == '\n')
+            && *cursor_position > 1
+        {
+            *cursor_position -= 1;
+            buffer.remove(*cursor_position);
+        }
+        *cursor_position -= 1;
+        buffer.remove(*cursor_position);
+    } else {
+        // Character backspace
+        buffer.remove(*cursor_position - 1);
+        *cursor_position -= 1;
     }
 }
 
 pub fn delete(buffer: &mut String, cursor_position: usize, modifiers: &ModifierKeys) {
     if modifiers.ctrl {
         loop {
-            let buffer_chars: Vec<char> = buffer.chars()
+            let buffer_chars: Vec<char> = buffer.chars().collect();
-                                                .collect();
             if cursor_position == buffer.len() {
-                break
+                break;
             }
             if !buffer_chars[cursor_position].is_whitespace() {
                 buffer.remove(cursor_position);
             } else {
-                break
+                break;
             }
         }
     } else {

src/main.rs

@@ -64,7 +64,7 @@ pub fn main() -> Result<(), String> {
     draw!();
 
     'mainloop: loop {
-        // TODO: Make this completely user-configurable instead of hardcoded
+        // TODO: <<ConfigurableInput>>
         for event in sdl_context.event_pump()?.poll_iter() {
             match event {
                 Event::Window { win_event, .. } => {
@@ -102,6 +102,24 @@ pub fn main() -> Result<(), String> {
                             }
                         }
 
+                        // BACKSPACE key
+                        Some(Keycode::Backspace) => {
+                            if buffer.len() > 0 {
+                                undo_timer = 0;
+                                selection_anchor = None;
+                                input::backspace(&mut buffer, &mut cursor_position, &modifier_keys);
+
+                                draw!();
+                            }
+                        }
+
+                        Some(Keycode::Tab) => {
+                            undo_timer = 0;
+                            input::tab(&mut buffer, &mut cursor_position, &modifier_keys);
+
+                            draw!();
+                        }
+
                         _ => (),
                     };
 
@@ -158,20 +176,6 @@ pub fn main() -> Result<(), String> {
                                     draw!();
                                 }
 
-                                // BACKSPACE key
-                                // Character backspace
-                                Some(Keycode::Backspace) => {
-                                    if buffer.len() > 0 {
-                                        undo_timer = 0;
-                                        selection_anchor = None;
-
-                                        buffer.remove(cursor_position - 1);
-                                        cursor_position -= 1;
-
-                                        draw!();
-                                    }
-                                }
-
                                 _ => (),
                             }
                         }
@@ -220,28 +224,6 @@ pub fn main() -> Result<(), String> {
                                     draw!()
                                 }
 
-                                // BACKSPACE key
-                                // Word backspace
-                                // TODO: Clean up this cursed expression
-                                Some(Keycode::Backspace) => {
-                                    if buffer.len() > 0 {
-                                        undo_timer = 0;
-                                        selection_anchor = None;
-
-                                        let buffer_chars: Vec<char> = buffer.chars().collect();
-                                        while !(buffer_chars[cursor_position - 1] == ' '
-                                            || buffer_chars[cursor_position - 1] == '\n')
-                                            && cursor_position > 1
-                                        {
-                                            buffer.remove(cursor_position - 1);
-                                            cursor_position -= 1;
-                                        }
-                                        buffer.remove(cursor_position - 1);
-                                        cursor_position -= 1;
-
-                                        draw!()
-                                    }
-                                }
                                 _ => (),
                             }
                         }