Bump version to 0.3.4

CHANGELOG.md

@@ -13,6 +13,17 @@ Procedure when bumping the version number:
 
 ## Unreleased
 
+## v0.3.4 - 2025-03-8
+
+### Added
+- `Frame::set_bell` to print a bell character when the frame is displayed
+- `widgets::bell`
+
+## v0.3.3 - 2025-02-28
+
+### Fixed
+- Rendering glitches in unicode-based with estimation
+
 ## v0.3.2 - 2025-02-23
 
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "toss"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 
 [dependencies]

src/frame.rs

@@ -8,6 +8,7 @@ pub struct Frame {
     pub(crate) widthdb: WidthDb,
     pub(crate) buffer: Buffer,
     pub(crate) title: Option<String>,
+    pub(crate) bell: bool,
 }
 
 impl Frame {
@@ -48,6 +49,10 @@ impl Frame {
         self.title = title;
     }
 
+    pub fn set_bell(&mut self, bell: bool) {
+        self.bell = bell;
+    }
+
     pub fn widthdb(&mut self) -> &mut WidthDb {
         &mut self.widthdb
     }

src/terminal.rs

@@ -8,7 +8,7 @@ use crossterm::event::{
     DisableBracketedPaste, EnableBracketedPaste, KeyboardEnhancementFlags,
     PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags,
 };
-use crossterm::style::{PrintStyledContent, StyledContent};
+use crossterm::style::{Print, PrintStyledContent, StyledContent};
 use crossterm::terminal::{
     BeginSynchronizedUpdate, Clear, ClearType, EndSynchronizedUpdate, EnterAlternateScreen,
     LeaveAlternateScreen, SetTitle,
@@ -274,6 +274,7 @@ impl Terminal {
         self.draw_differences()?;
         self.update_cursor()?;
         self.update_title()?;
+        self.ring_bell()?;
 
         Ok(())
     }
@@ -315,4 +316,12 @@ impl Terminal {
         }
         Ok(())
     }
+
+    fn ring_bell(&mut self) -> io::Result<()> {
+        if self.frame.bell {
+            self.out.queue(Print('\x07'))?;
+        }
+        self.frame.bell = false;
+        Ok(())
+    }
 }

src/widgets.rs

@@ -1,4 +1,5 @@
 pub mod background;
+pub mod bell;
 pub mod border;
 pub mod boxed;
 pub mod cursor;
@@ -16,6 +17,7 @@ pub mod text;
 pub mod title;
 
 pub use background::*;
+pub use bell::*;
 pub use border::*;
 pub use boxed::*;
 pub use cursor::*;

src/widgets/bell.rs

@@ -0,0 +1,55 @@
+use crate::{Frame, Size, Widget, WidthDb};
+
+///////////
+// State //
+///////////
+
+#[derive(Debug, Default, Clone)]
+pub struct BellState {
+    // Whether the bell should be rung the next time the widget is displayed.
+    pub ring: bool,
+}
+
+impl BellState {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn widget(&mut self) -> Bell<'_> {
+        Bell { state: self }
+    }
+}
+
+////////////
+// Widget //
+////////////
+
+#[derive(Debug)]
+pub struct Bell<'a> {
+    state: &'a mut BellState,
+}
+
+impl Bell<'_> {
+    pub fn state(&mut self) -> &mut BellState {
+        self.state
+    }
+}
+
+impl<E> Widget<E> for Bell<'_> {
+    fn size(
+        &self,
+        _widthdb: &mut WidthDb,
+        _max_width: Option<u16>,
+        _max_height: Option<u16>,
+    ) -> Result<Size, E> {
+        Ok(Size::ZERO)
+    }
+
+    fn draw(self, frame: &mut Frame) -> Result<(), E> {
+        if self.state.ring {
+            frame.set_bell(true);
+            self.state.ring = false
+        }
+        Ok(())
+    }
+}

src/widthdb.rs

@@ -88,10 +88,10 @@ impl WidthDb {
                 .try_into()
                 .unwrap_or(u8::MAX),
 
-            // The unicode width crate considers newlines to have a width of 1
+            // The unicode width crate considers control chars to have a width
-            // while the rendering code expects it to have a width of 0.
+            // of 1 even though they usually have a width of 0 when displayed.
             WidthEstimationMethod::Unicode => grapheme
-                .split('\n')
+                .split(|c: char| c.is_ascii_control())
                 .map(|s| s.width())
                 .sum::<usize>()
                 .try_into()