version 0.33.0

Author: Canop

CHANGELOG.md

@@ -1,5 +1,9 @@
 *If you're reading this because you try make sense of some new API or a breaking change, you might also be interested in coming to the chat for explanations or guidance.*
 
+<a name="v0.33.0"></a>
+### v0.33.0 - 2025-05-30
+- InputField: select_non_space_around, get_pos, set_cursor_pos, get_mouse_event_pos
+
 <a name="v0.32.0"></a>
 ### v0.32.0 - 2025-05-09
 - update crokey to 1.2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "termimad"
-version = "0.32.0"
+version = "0.33.0"
 authors = ["dystroy <[email protected]>"]
 repository = "https://github.com/Canop/termimad"
 description = "Markdown Renderer for the Terminal"

src/views/input_field.rs

@@ -247,6 +247,7 @@ impl InputField {
     wrap_content_fun!(move_current_line_up);
     wrap_content_fun!(move_current_line_down);
     wrap_content_fun!(select_word_around);
+    wrap_content_fun!(select_non_space_around);
 
     pub fn page_up(&mut self) -> bool {
         if self.content.move_lines_up(self.area.height as usize) {
@@ -372,6 +373,34 @@ impl InputField {
         }
     }
 
+    /// Get the position in the input field from row, column
+    pub fn get_pos(&self, row: u16, column: u16) -> Option<Pos> {
+        if self.area.contains(column, row) {
+            let y = ((row - self.area.top) as usize + self.scroll.y)
+                .min(self.content.line_count() - 1);
+            let line = &self.content.lines()[y];
+            let x = line
+                .col_to_char_idx((column - self.area.left) as usize + self.scroll.x)
+                .unwrap_or(line.chars.len());
+            Some(Pos { x, y })
+        } else {
+            None
+        }
+    }
+
+    /// Set the cursor position in the input field
+    ///
+    /// The position set may be different to ensure consistency
+    /// (for example if it's after the end, it will be set back).
+    pub fn set_cursor_pos(&mut self, pos: Pos) {
+        self.content.set_cursor_pos(pos);
+    }
+
+    /// Get the position in the input field from a mouse event
+    pub fn get_mouse_event_pos(&self, mouse_event: MouseEvent) -> Option<Pos> {
+        self.get_pos(mouse_event.row, mouse_event.column)
+    }
+
     /// Apply a mouse event
     pub fn apply_mouse_event(&mut self, mouse_event: MouseEvent, is_double_click: bool) -> bool {
         let MouseEvent {
@@ -380,50 +409,43 @@ impl InputField {
             row,
             modifiers,
         } = mouse_event;
-        if self.area.contains(column, row) {
-            if self.focused {
-                let y = ((row - self.area.top) as usize + self.scroll.y)
-                    .min(self.content.line_count() - 1);
-                let line = &self.content.lines()[y];
-                let x = line
-                    .col_to_char_idx((column - self.area.left) as usize + self.scroll.x)
-                    .unwrap_or(line.chars.len());
-                // We handle the selection click on down, so that it's set at the
-                // start of drag.
-                match kind {
-                    MouseEventKind::Down(MouseButton::Left) => {
-                        // FIXME Crossterm doesn't seem to send shift modifier
-                        // with up or down mouse events
-                        if modifiers == KeyModifiers::SHIFT {
-                            self.content.make_selection();
-                        } else {
-                            self.content.unselect();
-                        }
-                        self.content.set_cursor_pos(Pos { x, y });
-                    }
-                    MouseEventKind::Up(MouseButton::Left) if is_double_click => {
-                        self.content.set_cursor_pos(Pos { x, y });
-                        self.content.select_word_around();
-                    }
-                    MouseEventKind::Drag(MouseButton::Left) => {
+        let Some(Pos { x, y }) = self.get_pos(row, column) else {
+            return false;
+        };
+        if self.focused {
+            // We handle the selection click on down, so that it's set at the
+            // start of drag.
+            match kind {
+                MouseEventKind::Down(MouseButton::Left) => {
+                    // FIXME Crossterm doesn't seem to send shift modifier
+                    // with up or down mouse events
+                    if modifiers == KeyModifiers::SHIFT {
                         self.content.make_selection();
-                        self.content.set_cursor_pos(Pos { x, y });
-                    }
-                    MouseEventKind::ScrollDown => {
-                        self.scroll_down();
-                    }
-                    MouseEventKind::ScrollUp => {
-                        self.scroll_up();
+                    } else {
+                        self.content.unselect();
                     }
-                    _ => {}
+                    self.content.set_cursor_pos(Pos { x, y });
                 }
-            } else if matches!(kind, MouseEventKind::Down(MouseButton::Left)) {
-                self.focused = true;
+                MouseEventKind::Up(MouseButton::Left) if is_double_click => {
+                    self.content.set_cursor_pos(Pos { x, y });
+                    self.content.select_word_around();
+                }
+                MouseEventKind::Drag(MouseButton::Left) => {
+                    self.content.make_selection();
+                    self.content.set_cursor_pos(Pos { x, y });
+                }
+                MouseEventKind::ScrollDown => {
+                    self.scroll_down();
+                }
+                MouseEventKind::ScrollUp => {
+                    self.scroll_up();
+                }
+                _ => {}
             }
-            true
-        } else {
-            false
+        } else if matches!(kind, MouseEventKind::Down(MouseButton::Left)) {
+            self.focused = true;
         }
+        true
     }
 
     /// apply the event to change the state (content, cursor)

src/views/input_field_content.rs

@@ -373,6 +373,25 @@ impl InputFieldContent {
         true
     }
 
+    /// make all the non-space characters around the current pos, if any, the current selection
+    pub fn select_non_space_around(&mut self) -> bool {
+        let chars = &self.lines[self.pos.y].chars;
+        let mut start = self.pos.x;
+        if start >= chars.len() || !is_non_space_char(chars[start]) {
+            return false;
+        }
+        while start > 0 && is_non_space_char(chars[start - 1]) {
+            start -= 1;
+        }
+        let mut end = self.pos.x;
+        while end + 1 < chars.len() && is_non_space_char(chars[end + 1]) {
+            end += 1;
+        }
+        self.selection_tail = Some(Pos::new(start, self.pos.y));
+        self.pos.x = end;
+        true
+    }
+
     /// Remove the char at cursor position, if any.
     ///
     /// Cursor position is unchanged
@@ -673,6 +692,9 @@ fn test_char_iterator() {
 fn is_word_char(c: char) -> bool {
     c.is_alphanumeric() || c == '_'
 }
+fn is_non_space_char(c: char) -> bool {
+    !c.is_whitespace()
+}
 
 #[cfg(test)]
 mod input_content_edit_monoline_tests {

src/views/list_view.rs

@@ -350,22 +350,14 @@ impl<'t, T> ListView<'t, T> {
     /// ensure the last line is visible
     pub fn scroll_to_bottom(&mut self) {
         let body_height = self.tbody_height() as usize;
-        self.scroll = if self.displayed_rows_count > body_height {
-            self.displayed_rows_count - body_height
-        } else {
-            0
-        }
+        self.scroll = self.displayed_rows_count.saturating_sub(body_height);
     }
     /// set the scroll amount.
     /// lines_count can be negative
     pub fn try_scroll_lines(&mut self, lines_count: i32) {
         if lines_count < 0 {
             let lines_count = -lines_count as usize;
-            self.scroll = if lines_count >= self.scroll {
-                0
-            } else {
-                self.scroll - lines_count
-            };
+            self.scroll = self.scroll.saturating_sub(lines_count);
         } else {
             self.scroll = (self.scroll + lines_count as usize)
                 .min(self.displayed_rows_count - self.tbody_height() as usize + 1);
@@ -435,7 +427,7 @@ impl<'t, T> ListView<'t, T> {
         }
         if let Some(sel) = self.selection {
             if sel <= self.scroll {
-                self.scroll = if sel > 2 { sel - 2 } else { 0 };
+                self.scroll = sel.saturating_sub(2);
             } else if sel + 1 >= self.scroll + tbody_height {
                 self.scroll = sel - tbody_height + 2;
             }

src/views/text_view.rs

@@ -144,11 +144,7 @@ impl<'a, 't> TextView<'a, 't> {
     pub fn try_scroll_lines(&mut self, lines_count: i32) {
         if lines_count < 0 {
             let lines_count = -lines_count as usize;
-            self.scroll = if lines_count >= self.scroll {
-                0
-            } else {
-                self.scroll - lines_count
-            };
+            self.scroll = self.scroll.saturating_sub(lines_count);
         } else {
             self.set_scroll(self.scroll + lines_count as usize);
         }