1 files changed, 28 insertions, 5 deletions

diff --git a/src/app.rs b/src/app.rs
index 9ba93f4..3571436 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,7 +1,7 @@
 use crate::{
     bitmap::{MapPoint, Pixmap},
     command::CommandBox,
-    consts::colors::*,
+    consts::{colors::*, FONT_PATH},
     dither, rect,
     symmetry::Symmetry,
     undo::{ModifyRecord, OpKind, Operation, UndoStack},
@@ -352,6 +352,20 @@ impl<'ctx> AppState<'ctx> {
             BLACK,
             (0, winsize_y - cmd_height),
         );
+
+        self.canvas.set_draw_color(PINK);
+        let mut font = self.ttf_context.load_font(FONT_PATH, 17).unwrap();
+        font.set_style(sdl2::ttf::FontStyle::NORMAL);
+        font.set_hinting(sdl2::ttf::Hinting::Mono);
+        let prev_text = &self.command_box.text[..self.command_box.cursor];
+        let prev_text_dim = font.size_of_latin1(prev_text.as_bytes()).unwrap();
+        let cursor = rect!(
+            prev_text_dim.0,
+            winsize_y - cmd_height + 2,
+            2,
+            cmd_height - 4
+        );
+        self.canvas.fill_rect(cursor).unwrap();
     }
 
     fn draw_mouse(&mut self) {
@@ -641,7 +655,9 @@ impl<'ctx> AppState<'ctx> {
                             }
                         }
                         if let Event::KeyDown {
-                            keycode: Some(k), ..
+                            keycode: Some(k),
+                            keymod,
+                            ..
                         } = event
                         {
                             match k {
@@ -651,9 +667,16 @@ impl<'ctx> AppState<'ctx> {
                                 Keycode::Right => self.command_box.forward(),
                                 Keycode::Up => self.command_box.hist_prev(),
                                 Keycode::Down => self.command_box.hist_next(),
-                                Keycode::Return => {
-                                    self.eval_command();
-                                }
+                                _ if keymod == Mod::LCTRLMOD => match k {
+                                    Keycode::A => self.command_box.cursor_start(),
+                                    Keycode::E => self.command_box.cursor_end(),
+                                    Keycode::F => self.command_box.forward(),
+                                    Keycode::B => self.command_box.backward(),
+                                    Keycode::K => self.command_box.delete_to_end(),
+                                    Keycode::U => self.command_box.delete_to_start(),
+                                    _ => (),
+                                },
+                                Keycode::Return => self.eval_command(),
                                 Keycode::Escape => {
                                     self.command_box.clear();
                                     self.mode = Mode::Draw;