Merge lines.love

9 files changed, 118 insertions, 110 deletions

diff --git a/edit.lua b/edit.lua
index ac60aa8..2c1b7e1 100644
--- a/edit.lua
+++ b/edit.lua
@@ -115,7 +115,6 @@ function edit.draw(State)
       startpos = State.screen_top1.pos
     end
     y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos)
-    y = y + State.line_height
 --?     print('=> y', y)
   end
   if State.search_term then
@@ -352,7 +351,6 @@ function edit.update_font_settings(State, font_height)
   State.font_height = font_height
   love.graphics.setFont(love.graphics.newFont(State.font_height))
   State.line_height = math.floor(font_height*1.3)
-  Text_cache = {}
 end
 
 --== some methods for tests
diff --git a/icons.lua b/icons.lua
index ddad704..bc4955b 100644
--- a/icons.lua
+++ b/icons.lua
@@ -10,6 +10,8 @@ end
 
 function icon.hyperlink_decoration(button_params)
   local x,y = button_params.x, button_params.y
+  -- hack: set the hyperlink color so that caller can draw the text of the
+  -- hyperlink in the same color
   App.color(Hyperlink_decoration_color)
   love.graphics.line(x,y+Editor_state.line_height, x+button_params.w,y+Editor_state.line_height)
 end
diff --git a/log_browser.lua b/log_browser.lua
index b128ab7..e011886 100644
--- a/log_browser.lua
+++ b/log_browser.lua
@@ -117,7 +117,7 @@ function log_browser.draw(State)
         if type(line.data) == 'string' then
           local old_left, old_right = State.left,State.right
           State.left,State.right = xleft,xright
-          y = Text.draw(State, line_index, y, --[[startpos]] 1)
+          Text.draw(State, line_index, y, --[[startpos]] 1)
           State.left,State.right = old_left,old_right
         else
           height = log_render[line.data.name](line.data, xleft, y, xright-xleft)
diff --git a/run.lua b/run.lua
index eab1f8b..2aba0e9 100644
--- a/run.lua
+++ b/run.lua
@@ -6,9 +6,6 @@ Editor_state = {}
 function run.initialize_globals()
   -- tests currently mostly clear their own state
 
-  -- a few text objects we can avoid recomputing unless the font changes
-  Text_cache = {}
-
   -- blinking cursor
   Cursor_time = 0
 end
diff --git a/source.lua b/source.lua
index c70f125..594ff4a 100644
--- a/source.lua
+++ b/source.lua
@@ -50,9 +50,6 @@ function source.initialize_globals()
 
   Menu_status_bar_height = 5 + --[[line height in tests]] 15 + 5
 
-  -- a few text objects we can avoid recomputing unless the font changes
-  Text_cache = {}
-
   -- blinking cursor
   Cursor_time = 0
 end
diff --git a/source_edit.lua b/source_edit.lua
index 5dabee9..ceb2f43 100644
--- a/source_edit.lua
+++ b/source_edit.lua
@@ -184,7 +184,6 @@ function edit.draw(State, hide_cursor)
         })
       end
       y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)
-      y = y + State.line_height
 --?       print('=> y', y)
     elseif line.mode == 'drawing' then
       y = y+Drawing_padding_top
@@ -508,7 +507,6 @@ function edit.update_font_settings(State, font_height)
   State.font_height = font_height
   love.graphics.setFont(love.graphics.newFont(State.font_height))
   State.line_height = math.floor(font_height*1.3)
-  Text_cache = {}
 end
 
 --== some methods for tests
diff --git a/source_text.lua b/source_text.lua
index b68bf85..d0b4fcc 100644
--- a/source_text.lua
+++ b/source_text.lua
@@ -2,82 +2,82 @@
 Text = {}
 
 -- draw a line starting from startpos to screen at y between State.left and State.right
--- return the final y, and position of start of final screen line drawn
+-- return y for the next line, and position of start of final screen line drawn
 function Text.draw(State, line_index, y, startpos, hide_cursor)
   local line = State.lines[line_index]
   local line_cache = State.line_cache[line_index]
   line_cache.starty = y
   line_cache.startpos = startpos
   -- wrap long lines
-  local x = State.left
-  local pos = 1
-  local screen_line_starting_pos = startpos
+  local final_screen_line_starting_pos = startpos  -- track value to return
   Text.populate_screen_line_starting_pos(State, line_index)
-  local pos = 1
+  Text.populate_link_offsets(State, line_index)
   initialize_color()
-  for _, f in ipairs(line_cache.fragments) do
-    App.color(Text_color)
-    select_color(f)
-    local frag_len = utf8.len(f)
---?     print('text.draw:', f, 'at', line_index,pos, 'after', x,y)
+  assert(#line_cache.screen_line_starting_pos >= 1)
+  for i=1,#line_cache.screen_line_starting_pos do
+    local pos = line_cache.screen_line_starting_pos[i]
     if pos < startpos then
       -- render nothing
 --?       print('skipping', f)
     else
-      -- render fragment
-      local frag_width = App.width(f)
-      if x + frag_width > State.right then
-        assert(x > State.left)  -- no overfull lines
-        y = y + State.line_height
-        if y + State.line_height > App.screen.height then
-          return y, screen_line_starting_pos
-        end
-        screen_line_starting_pos = pos
-        x = State.left
-      end
-      if State.selection1.line then
-        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
-        Text.draw_highlight(State, line, x,y, pos, lo,hi)
-      end
-      -- Make [[WikiWords]] (single word, all in one screen line) clickable.
-      local trimmed_word = rtrim(f)  -- compute_fragments puts whitespace at the end
-      if starts_with(trimmed_word, '[[') and ends_with(trimmed_word, ']]') then
-        local filename = trimmed_word:gsub('^..(.*)..$', '%1')
-        if source.link_exists(State, filename) then
-          button(State, 'link', {x=x+App.width('[['), y=y, w=App.width(filename), h=State.line_height, color={1,1,1},
+      final_screen_line_starting_pos = pos
+      local f = Text.screen_line(line, line_cache, i)
+--?       print('text.draw:', f, 'at', line_index,pos, 'after', x,y)
+      local frag_len = utf8.len(f)
+      -- render any link decorations
+      for _,link_offsets in ipairs(line_cache.link_offsets) do
+        local s,e,filename = unpack(link_offsets)
+        local lo, hi = Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)
+        if lo then
+          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, color={1,1,1},
             icon = icon.hyperlink_decoration,
             onpress1 = function()
-                         source.switch_to_file(filename)
-                        end,
+                         if file_exists(filename) then
+                           source.switch_to_file(filename)
+                         end
+                       end,
           })
         end
       end
-      App.screen.print(f, x,y)
+      -- render fragment
+      if State.selection1.line then
+        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
+        Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
+      end
+      select_color(f)
+      App.screen.print(f, State.left,y)
       -- render cursor if necessary
-      if line_index == State.cursor1.line then
-        if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
+      if not hide_cursor and line_index == State.cursor1.line then
+        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
           if State.search_term then
             if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then
-              local lo_px = Text.draw_highlight(State, line, x,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
+              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
               App.color(Text_color)
-              love.graphics.print(State.search_term, x+lo_px,y)
+              love.graphics.print(State.search_term, State.left+lo_px,y)
             end
           elseif Focus == 'edit' then
-            Text.draw_cursor(State, x+Text.x(f, State.cursor1.pos-pos+1), y)
-            App.color(Text_color)
+            Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y)
           end
         end
       end
-      x = x + frag_width
+      y = y + State.line_height
+      if y >= App.screen.height then
+        break
+      end
     end
-    pos = pos + frag_len
   end
-  if Focus == 'edit' and not hide_cursor and State.search_term == nil then
-    if line_index == State.cursor1.line and State.cursor1.pos == pos then
-      Text.draw_cursor(State, x, y)
-    end
+  return y, final_screen_line_starting_pos
+end
+
+function Text.screen_line(line, line_cache, i)
+  local pos = line_cache.screen_line_starting_pos[i]
+  local offset = Text.offset(line.data, pos)
+  if i >= #line_cache.screen_line_starting_pos then
+    return line.data:sub(offset)
   end
-  return y, screen_line_starting_pos
+  local endpos = line_cache.screen_line_starting_pos[i+1]-1
+  local end_offset = Text.offset(line.data, endpos)
+  return line.data:sub(offset, end_offset)
 end
 
 function Text.draw_cursor(State, x, y)
@@ -97,56 +97,84 @@ function Text.populate_screen_line_starting_pos(State, line_index)
   if line_cache.screen_line_starting_pos then
     return
   end
-  -- duplicate some logic from Text.draw
-  Text.compute_fragments(State, line_index)
   line_cache.screen_line_starting_pos = {1}
-  local x = State.left
+  local x = 0
   local pos = 1
-  for _, f in ipairs(line_cache.fragments) do
-    -- render fragment
-    local frag_width = App.width(f)
-    if x + frag_width > State.right then
-      x = State.left
+  -- try to wrap at word boundaries
+  for frag in line.data:gmatch('%S*%s*') do
+    local frag_width = App.width(frag)
+--?     print('-- frag:', frag, pos, x, frag_width, State.width)
+    while x + frag_width > State.width do
+--?       print('frag:', frag, pos, x, frag_width, State.width)
+      if x < 0.8 * State.width then
+        -- long word; chop it at some letter
+        -- We're not going to reimplement TeX here.
+        local bpos = Text.nearest_pos_less_than(frag, State.width - x)
+        -- everything works if bpos == 0, but is a little inefficient
+        pos = pos + bpos
+        local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos
+        frag = string.sub(frag, boffset)
+--?         if bpos > 0 then
+--?           print('after chop:', frag)
+--?         end
+        frag_width = App.width(frag)
+      end
+--?       print('screen line:', pos)
       table.insert(line_cache.screen_line_starting_pos, pos)
+      x = 0  -- new screen line
     end
     x = x + frag_width
-    pos = pos + utf8.len(f)
+    pos = pos + utf8.len(frag)
   end
 end
 
-function Text.compute_fragments(State, line_index)
+function Text.populate_link_offsets(State, line_index)
   local line = State.lines[line_index]
   if line.mode ~= 'text' then return end
   local line_cache = State.line_cache[line_index]
-  if line_cache.fragments then
+  if line_cache.link_offsets then
     return
   end
-  line_cache.fragments = {}
-  local x = State.left
+  line_cache.link_offsets = {}
+  local pos = 1
   -- try to wrap at word boundaries
-  for frag in line.data:gmatch('%S*%s*') do
-    local frag_width = App.width(frag)
-    while x + frag_width > State.right do
-      if (x-State.left) < 0.8 * (State.right-State.left) then
-        -- long word; chop it at some letter
-        -- We're not going to reimplement TeX here.
-        local bpos = Text.nearest_pos_less_than(frag, State.right - x)
-        if bpos == 0 then break end  -- avoid infinite loop when window is too narrow
-        local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos
-        local frag1 = string.sub(frag, 1, boffset-1)
-        local frag1_width = App.width(frag1)
-        assert(x + frag1_width <= State.right)
-        table.insert(line_cache.fragments, frag1)
-        frag = string.sub(frag, boffset)
-        frag_width = App.width(frag)
-      end
-      x = State.left  -- new line
-    end
-    if #frag > 0 then
-      table.insert(line_cache.fragments, frag)
+  local s, e = 1, 0
+  while s <= #line.data do
+    s, e = line.data:find('%[%[%S+%]%]', s)
+    if s == nil then break end
+    local word = line.data:sub(s+2, e-2)  -- strip out surrounding '[[..]]'
+--?     print('wikiword:', s, e, word)
+    table.insert(line_cache.link_offsets, {s, e, word})
+    s = e + 1
+  end
+end
+
+-- Intersect the filename between byte offsets s,e with the bounds of screen line i.
+-- Return the left/right pixel coordinates of of the intersection,
+-- or nil if it doesn't intersect with screen line i.
+function Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)
+  local spos = line_cache.screen_line_starting_pos[i]
+  local soff = Text.offset(line.data, spos)
+  if e < soff then
+    return
+  end
+  local eoff
+  if i < #line_cache.screen_line_starting_pos then
+    local epos = line_cache.screen_line_starting_pos[i+1]
+    eoff = Text.offset(line.data, epos)
+    if s > eoff then
+      return
     end
-    x = x + frag_width
   end
+  local loff = math.max(s, soff)
+  local hoff
+  if eoff then
+    hoff = math.min(e, eoff)
+  else
+    hoff = e
+  end
+--?   print(s, e, soff, eoff, loff, hoff)
+  return App.width(line.data:sub(1, loff-1)), App.width(line.data:sub(1, hoff))
 end
 
 function Text.text_input(State, t)
@@ -972,7 +1000,7 @@ end
 
 -- slightly expensive since it redraws the screen
 function Text.cursor_out_of_screen(State)
-  App.draw()
+  edit.draw(State)
   return State.cursor_y == nil
   -- this approach is cheaper and almost works, except on the final screen
   -- where file ends above bottom of screen
@@ -981,28 +1009,17 @@ function Text.cursor_out_of_screen(State)
 --?   return Text.lt1(State.screen_bottom1, botline1)
 end
 
-function source.link_exists(State, filename)
-  if State.link_cache == nil then
-    State.link_cache = {}
-  end
-  if State.link_cache[filename] == nil then
-    State.link_cache[filename] = file_exists(filename)
-  end
-  return State.link_cache[filename]
-end
-
 function Text.redraw_all(State)
 --?   print('clearing fragments')
   State.line_cache = {}
   for i=1,#State.lines do
     State.line_cache[i] = {}
   end
-  State.link_cache = {}
 end
 
 function Text.clear_screen_line_cache(State, line_index)
-  State.line_cache[line_index].fragments = nil
   State.line_cache[line_index].screen_line_starting_pos = nil
+  State.line_cache[line_index].link_offsets = nil
 end
 
 function trim(s)
diff --git a/source_text_tests.lua b/source_text_tests.lua
index 9ec7e7f..bb3387f 100644
--- a/source_text_tests.lua
+++ b/source_text_tests.lua
@@ -977,7 +977,7 @@ function test_pagedown_can_start_from_middle_of_long_wrapping_line()
   y = y + Editor_state.line_height
   App.screen.check(y, 'jkl ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno ', 'screen:3')
+  App.screen.check(y, 'mn', 'screen:3')
 end
 
 function test_pagedown_never_moves_up()
diff --git a/text.lua b/text.lua
index 35c98f5..bee05a9 100644
--- a/text.lua
+++ b/text.lua
@@ -2,7 +2,7 @@
 Text = {}
 
 -- draw a line starting from startpos to screen at y between State.left and State.right
--- return the final y, and position of start of final screen line drawn
+-- return y for the next line, and position of start of final screen line drawn
 function Text.draw(State, line_index, y, startpos)
 --?   print('text.draw', line_index, y)
   local line = State.lines[line_index]
@@ -50,7 +50,7 @@ function Text.draw(State, line_index, y, startpos)
       end
     end
   end
-  return y - State.line_height, final_screen_line_starting_pos
+  return y, final_screen_line_starting_pos
 end
 
 function Text.screen_line(line, line_cache, i)
@@ -69,7 +69,6 @@ function Text.draw_cursor(State, x, y)
   if math.floor(Cursor_time*2)%2 == 0 then
     App.color(Cursor_color)
     love.graphics.rectangle('fill', x,y, 3,State.line_height)
-    App.color(Text_color)
   end
   State.cursor_x = x
   State.cursor_y = y+State.line_height
@@ -860,7 +859,7 @@ end
 
 -- slightly expensive since it redraws the screen
 function Text.cursor_out_of_screen(State)
-  App.draw()
+  edit.draw(State)
   return State.cursor_y == nil
   -- this approach is cheaper and almost works, except on the final screen
   -- where file ends above bottom of screen