From b09f642fd6890c341289fec1e305af149b28ff74 Mon Sep 17 00:00:00 2001
From: Kenny Levinsen <kl@kl.wtf>
Date: Mon, 13 Feb 2023 19:43:36 +0100
Subject: [PATCH] Avoid panic on very long prompt lines

---
 src/draw.rs             | 16 ++++++++++++----
 src/widgets/launcher.rs |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/draw.rs b/src/draw.rs
index 5f46a1d..1de21ae 100644
--- a/src/draw.rs
+++ b/src/draw.rs
@@ -47,10 +47,15 @@ impl CachedGlyph {
     }
 
     fn draw(&self, buf: &mut BufferView, pos: (i32, i32), c: Color) {
+        let bounds = buf.get_bounds();
+        if pos.0 as u32 + self.dimensions.0 > bounds.2 {
+            return;
+        }
+
+        let offset = (bounds.0 as i32, bounds.1 as i32);
+        let width = self.dimensions.0 as i32 - 1;
         let mut x = 0;
         let mut y = 0;
-        let bounds = buf.get_bounds();
-        let offset = (bounds.0 as i32, bounds.1 as i32);
         for v in &self.render {
             buf.put_raw(
                 (
@@ -60,7 +65,7 @@ impl CachedGlyph {
                 c.alpha(*v),
             );
 
-            if x == self.dimensions.0 as i32 - 1 {
+            if x == width {
                 y += 1;
                 x = 0;
             } else {
@@ -173,7 +178,7 @@ impl<'a> Font<'a> {
         Ok((x_off as u32, self.size as u32))
     }
 
-    pub fn draw_cursor(
+    fn draw_cursor(
         &self,
         buf: &mut BufferView,
         c: Color,
@@ -182,6 +187,9 @@ impl<'a> Font<'a> {
     ) -> Result<(), ::std::io::Error> {
         // draw cursor
         let bounds = buf.get_bounds();
+        if offset + 1 > bounds.2 {
+            return Ok(());
+        }
         for i in bounds.1 + 1..height + bounds.1 {
             buf.put_raw((bounds.0 + offset, i), c);
         }
diff --git a/src/widgets/launcher.rs b/src/widgets/launcher.rs
index 118626a..43ac8de 100644
--- a/src/widgets/launcher.rs
+++ b/src/widgets/launcher.rs
@@ -356,10 +356,11 @@ impl InterfaceWidget for Launcher {
             intf.geometry.height,
             (self.matches.len() + 1) as u32 * line_height + 8,
         );
+        let content_width = min(intf.geometry.width, x_max.0 + 1);
         Geometry {
             x: intf.geometry.x,
             y: intf.geometry.y + intf.geometry.height - content_height,
-            width: x_max.0 + 1,
+            width: content_width,
             height: content_height,
         }
     }