From 41521518a320985926948d5e2bd217d7e3694eb6 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Fri, 10 Jun 2022 13:59:34 -0700
Subject: revert previous commit

---
 main.lua | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'main.lua')

diff --git a/main.lua b/main.lua
index 3af6f77..fc40f99 100644
--- a/main.lua
+++ b/main.lua
@@ -428,13 +428,10 @@ function App.keychord_pressed(chord)
     local before = snapshot(before_line)
     local clipboard_data = App.getClipboardText()
     local num_newlines = 0  -- hack 1
-    local draw_fn = App.draw
-    App.draw = nil  -- disable temporarily
     for _,code in utf8.codes(clipboard_data) do
       local c = utf8.char(code)
       if c == '\n' then
         Text.insert_return()
-        draw_fn()
         if (Cursor_y + Line_height) > App.screen.height then
           Text.snap_cursor_to_bottom_of_screen()
         end
@@ -442,7 +439,6 @@ function App.keychord_pressed(chord)
       else
 --?         print(Screen_top1.line, Screen_top1.pos, Cursor1.line, Cursor1.pos, Screen_bottom1.line, Screen_bottom1.pos)
         Text.insert_at_cursor(c)
-        draw_fn()
         if Cursor_y >= App.screen.height - Line_height then
           Text.populate_screen_line_starting_pos(Cursor1.line)
           Text.snap_cursor_to_bottom_of_screen()
@@ -450,7 +446,21 @@ function App.keychord_pressed(chord)
         end
       end
     end
-    App.draw = draw_fn
+    -- hack 1: if we have too many newlines we definitely need to scroll
+    for i=before_line,Cursor1.line do
+      Lines[i].screen_line_starting_pos = nil
+      Text.populate_screen_line_starting_pos(i)
+    end
+    if Cursor1.line-Screen_top1.line+1 + num_newlines > App.screen.height/Line_height then
+      Text.snap_cursor_to_bottom_of_screen()
+    end
+    -- hack 2: if we have too much text wrapping we definitely need to scroll
+    local clipboard_text = App.newText(love.graphics.getFont(), clipboard_data)
+    local clipboard_width = App.width(clipboard_text)
+--?     print(Cursor_y, Cursor_y*Line_width, Cursor_y*Line_width+Cursor_x, Cursor_y*Line_width+Cursor_x+clipboard_width, Line_width*App.screen.height/Line_height)
+    if Cursor_y*Line_width+Cursor_x + clipboard_width > Line_width*App.screen.height/Line_height then
+      Text.snap_cursor_to_bottom_of_screen()
+    end
     save_to_disk(Lines, Filename)
     record_undo_event({before=before, after=snapshot(before_line, Cursor1.line)})
   -- dispatch to drawing or text
-- 
cgit 1.4.1-2-gfad0

s='hashes'><div class='alt'><pre><span class='oid'><a title='author  Darren Bane &lt;darren.bane@gmail.com&gt;  2021-01-17 00:54:23 +0000
committer  Darren Bane &lt;darren.bane@gmail.com&gt;  2021-01-17 00:54:23 +0000

Making changes' href='/dbane/lsp/commit/cecho.lisp?id=ec33fa3c80f852d60d7e2fcd046cc49c08fad803'>ec33fa3</a></span> <a title='Blame the previous revision' href='/dbane/lsp/blame/cecho.lisp?id=6222836c3b031ce6cf4bc98c3bbf7ff896d23786'>^</a>








</pre></div></td>
<td class='linenumbers'><div class='alt'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
</pre></div></td>
<td class='lines'><div><div><div class='alt'><pre>








                                                                                   </pre></div></div><pre><code>