akkartik/sokoban.love - Change GZ5WULJVEZJJQPQPSQZE7CEPIYPJ2BJDYUJBMZRA5HLOO7TE3DOQC

switch source side to new screen-line-based render

Also copy over the implementation of links from pensieve.love.

Created by Kartik K. Agaram on April 3, 2023

GZ5WULJVEZJJQPQPSQZE7CEPIYPJ2BJDYUJBMZRA5HLOO7TE3DOQC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 72 [7.1]
∅:D[5.1490] → [6.92:118]
∅:D[8.55644] → [6.92:118]
B:BD[9.158] → [6.92:118]
```
    App.color(Text_color)
```
Replacement in source_text_tests.lua at line 980 [10.3498]
B:BD[10.35876] → [11.31723:31765]
```
  App.screen.check(y, 'mno ', 'screen:3')
```
[10.35876]
[10.35980]
```
  App.screen.check(y, 'mn', 'screen:3')
```

Replacement in source_text.lua at line 5 [10.83723]

B:BD[10.83964] → [2.7:79]

-- return the final y, and position of start of final screen line drawn

[10.83964]

[2.79]

-- return y for the next line, and position of start of final screen line drawn

Replacement in source_text.lua at line 12 [10.83723]

B:BD[2.165] → [2.165:204]

∅:D[2.204] → [10.87305:87349]

B:BD[10.87305] → [10.87305:87349]

  local x = State.left
  local pos = 1
  local screen_line_starting_pos = startpos

[2.165]

[4.68]

  local final_screen_line_starting_pos = startpos  -- track value to return

Replacement in source_text.lua at line 14 [10.83723]
∅:D[4.128] → [10.87393:87409]
B:BD[10.87393] → [10.87393:87409]
```
  local pos = 1
```
[4.128]
[10.87409]
```
  Text.populate_link_offsets(State, line_index)
```

Replacement in source_text.lua at line 16 [10.83723]

B:BD[10.87430] → [10.87430:87502]

B:BD[10.87502] → [3.454:574]

  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)

[10.87430]

[10.87674]

  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]

Replacement in source_text.lua at line 23 [10.83723]

B:BD[10.87768] → [10.87768:87793]

B:BD[10.87793] → [3.607:645]

∅:D[12.353] → [10.87839:88027]

∅:D[3.645] → [10.87839:88027]

B:BD[10.87839] → [10.87839:88027]

B:BD[10.88027] → [2.205:250]

      -- 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

[10.87768]

[10.88105]

      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()
                         if file_exists(filename) then
                           source.switch_to_file(filename)
                         end
                       end,
          })

Deletion in source_text.lua at line 41 [10.83723]
B:BD[10.88117] → [10.88117:88179]
```
        screen_line_starting_pos = pos
        x = State.left
```
Insertion in source_text.lua at line 42 [10.83723]
[13.20777]
[13.20777]
```
      -- render fragment
```

Replacement in source_text.lua at line 45 [10.83723]

B:BD[13.20894] → [13.20894:20952]

        Text.draw_highlight(State, line, x,y, pos, lo,hi)

[13.20894]

[10.88179]

        Text.draw_highlight(State, line, State.left,y, pos, lo,hi)

Replacement in source_text.lua at line 47 [10.83723]

B:BD[10.88189] → [14.7:84]

B:BD[14.84] → [3.646:731]

∅:D[15.685] → [14.172:367]

∅:D[3.731] → [14.172:367]

B:BD[14.172] → [14.172:367]

B:BD[14.367] → [16.7:125]

∅:D[16.125] → [14.578:779]

B:BD[14.578] → [14.578:779]

B:BD[14.779] → [3.732:763]

      -- 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},
            icon = icon.hyperlink_decoration,
            onpress1 = function()
                         source.switch_to_file(filename)
                        end,
          })
        end
      end
      App.screen.print(f, x,y)

[10.88189]

[10.88227]

      select_color(f)
      App.screen.print(f, State.left,y)

Replacement in source_text.lua at line 50 [10.83723]

B:BD[10.88263] → [2.251:298]

∅:D[2.298] → [10.88332:88412]

B:BD[10.88332] → [10.88332:88412]

      if line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then

[10.88263]

[10.88412]

      if not hide_cursor and line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then

Replacement in source_text.lua at line 54 [10.83723]

B:BD[10.88598] → [10.88598:88735]

              local lo_px = Text.draw_highlight(State, line, x,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

[10.88598]

[10.88735]

              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

Replacement in source_text.lua at line 56 [10.83723]

B:BD[10.88771] → [10.88771:88835]

              love.graphics.print(State.search_term, x+lo_px,y)

[10.88771]

[10.88835]

              love.graphics.print(State.search_term, State.left+lo_px,y)

Replacement in source_text.lua at line 59 [10.83723]

B:BD[10.88889] → [3.764:841]

∅:D[15.805] → [10.88969:89003]

∅:D[3.841] → [10.88969:89003]

B:BD[10.88969] → [10.88969:89003]

            Text.draw_cursor(State, x+Text.x(f, State.cursor1.pos-pos+1), y)
            App.color(Text_color)

[10.88889]

[10.89003]

            Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y)

Replacement in source_text.lua at line 63 [10.83723]

B:BD[10.89039] → [10.89039:89064]

      x = x + frag_width

[10.89039]

[10.89064]

      y = y + State.line_height
      if y >= App.screen.height then
        break
      end

Deletion in source_text.lua at line 68 [10.83723]
B:BD[10.89072] → [10.89072:89097]
```
    pos = pos + frag_len
```

Replacement in source_text.lua at line 69 [10.83723]

B:BD[10.89103] → [2.299:484]

∅:D[2.484] → [10.91019:91027]

B:BD[10.91019] → [10.91019:91027]

  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

[10.89103]

[10.91052]

  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)

Replacement in source_text.lua at line 78 [10.83723]

B:BD[10.91058] → [2.485:522]

  return y, screen_line_starting_pos

[10.91058]

[10.91109]

  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)

Deletion in source_text.lua at line 100 [10.83723]

B:BD[10.91598] → [10.91598:91683]

  -- duplicate some logic from Text.draw
  Text.compute_fragments(State, line_index)

Replacement in source_text.lua at line 101 [10.83723]
B:BD[10.91727] → [10.91727:91750]
```
  local x = State.left
```
[10.91727]
[10.91750]
```
  local x = 0
```

Replacement in source_text.lua at line 103 [10.83723]

B:BD[10.91766] → [10.91766:91812]

B:BD[10.91855] → [10.91855:91878]

B:BD[10.91878] → [3.842:878]

∅:D[12.395] → [10.91922:91984]

∅:D[3.878] → [10.91922:91984]

B:BD[10.91922] → [10.91922:91984]

  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

[10.91766]

[10.91984]

  -- 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)

Insertion in source_text.lua at line 124 [10.83723]
[10.92045]
[10.92045]
```
      x = 0  -- new screen line
```
Replacement in source_text.lua at line 127 [10.83723]
B:BD[10.92076] → [3.879:907]
```
    pos = pos + utf8.len(f)
```
[10.92076]
[10.92137]
```
    pos = pos + utf8.len(frag)
```
Replacement in source_text.lua at line 131 [10.83723]
B:BD[10.92148] → [10.92148:92199]
```
function Text.compute_fragments(State, line_index)
```
[10.92148]
[10.92280]
```
function Text.populate_link_offsets(State, line_index)
```
Replacement in source_text.lua at line 135 [10.83723]
B:BD[10.92369] → [10.92369:92400]
```
  if line_cache.fragments then
```
[10.92369]
[10.92400]
```
  if line_cache.link_offsets then
```
Replacement in source_text.lua at line 138 [10.83723]
B:BD[10.92417] → [10.92417:92468]
```
  line_cache.fragments = {}
  local x = State.left
```
[10.92417]
[10.92468]
```
  line_cache.link_offsets = {}
  local pos = 1
```

Replacement in source_text.lua at line 141 [10.83723]

B:BD[10.92504] → [10.92504:92548]

B:BD[10.92613] → [12.396:435]

B:BD[10.92774] → [10.92774:92816]

B:BD[10.92940] → [10.92940:93002]

B:BD[10.93033] → [10.93033:93201]

B:BD[10.93233] → [10.93233:93391]

B:BD[10.93486] → [10.93486:93539]

B:BD[10.93610] → [12.436:481]

B:BD[10.93745] → [10.93745:93792]

B:BD[10.93792] → [3.908:958]

∅:D[15.897] → [10.93866:93907]

∅:D[3.958] → [10.93866:93907]

B:BD[10.93866] → [10.93866:93907]

B:BD[10.93970] → [12.482:519]

∅:D[12.519] → [10.94012:94086]

B:BD[10.94012] → [10.94012:94086]

B:BD[10.94086] → [3.959:1006]

  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)

[10.92504]

[10.94236]

  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

Replacement in source_text.lua at line 168 [10.83723]

B:BD[10.94244] → [10.94244:94267]

    x = x + frag_width

[10.94244]

[10.94267]

  end
  local loff = math.max(s, soff)
  local hoff
  if eoff then
    hoff = math.min(e, eoff)
  else
    hoff = e

Insertion in source_text.lua at line 176 [10.83723]

[10.94273]

--?   print(s, e, soff, eoff, loff, hoff)
  return App.width(line.data:sub(1, loff-1)), App.width(line.data:sub(1, hoff))

Replacement in source_text.lua at line 1003 [10.83723]
B:BD[10.146096] → [10.146096:146109]
```
  App.draw()
```
[10.146096]
[10.146109]
```
  edit.draw(State)
```

Deletion in source_text.lua at line 1012 [10.83723]

B:BD[10.146455] → [14.780:1037]

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

Deletion in source_text.lua at line 1018 [10.83723]
B:BD[10.146606] → [14.1038:1062]
```
  State.link_cache = {}
```
Deletion in source_text.lua at line 1021 [10.83723]
B:BD[10.146668] → [10.146668:146715]
```
  State.line_cache[line_index].fragments = nil
```
Insertion in source_text.lua at line 1022 [10.83723]
[10.146825]
[10.146888]
```
  State.line_cache[line_index].link_offsets = nil
```
Deletion in source_edit.lua at line 187 [10.152440]
∅:D[17.368] → [18.21213:21245]
∅:D[2.6810] → [18.21213:21245]
B:BD[18.21213] → [18.21213:21245]
```
      y = y + State.line_height
```
Deletion in source_edit.lua at line 510 [10.152440]
B:BD[10.164170] → [10.164170:164188]
```
  Text_cache = {}
```

Deletion in source.lua at line 53 [10.165766]

B:BD[10.166573] → [10.166573:166665]

  -- a few text objects we can avoid recomputing unless the font changes
  Text_cache = {}

Deletion in run.lua at line 9 [10.178044]

B:BD[10.178196] → [10.178196:178288]

  -- a few text objects we can avoid recomputing unless the font changes
  Text_cache = {}

Replacement in log_browser.lua at line 120 [10.191782]

B:BD[10.196574] → [10.196574:196638]

          y = Text.draw(State, line_index, y, --[[startpos]] 1)

[10.196574]

[10.196638]

          Text.draw(State, line_index, y, --[[startpos]] 1)

Insertion in icons.lua at line 13 [19.5323]

[14.1420]

  -- hack: set the hyperlink color so that caller can draw the text of the
  -- hyperlink in the same color

Deletion in edit.lua at line 509 [22.413]
B:BD[20.442] → [21.311:329]
```
  Text_cache = {}
```

switch source side to new screen-line-based render

Dependencies

In channels

Change contents

Deletion in text.lua at line 72 [7.1]

Replacement in source_text_tests.lua at line 980 [10.3498]

Replacement in source_text.lua at line 5 [10.83723]

Replacement in source_text.lua at line 12 [10.83723]

Replacement in source_text.lua at line 14 [10.83723]

Replacement in source_text.lua at line 16 [10.83723]

Replacement in source_text.lua at line 23 [10.83723]

Deletion in source_text.lua at line 41 [10.83723]

Insertion in source_text.lua at line 42 [10.83723]

Replacement in source_text.lua at line 45 [10.83723]

Replacement in source_text.lua at line 47 [10.83723]

Replacement in source_text.lua at line 50 [10.83723]

Replacement in source_text.lua at line 54 [10.83723]

Replacement in source_text.lua at line 56 [10.83723]

Replacement in source_text.lua at line 59 [10.83723]

Replacement in source_text.lua at line 63 [10.83723]

Deletion in source_text.lua at line 68 [10.83723]

Replacement in source_text.lua at line 69 [10.83723]

Replacement in source_text.lua at line 78 [10.83723]

Deletion in source_text.lua at line 100 [10.83723]

Replacement in source_text.lua at line 101 [10.83723]

Replacement in source_text.lua at line 103 [10.83723]

Insertion in source_text.lua at line 124 [10.83723]

Replacement in source_text.lua at line 127 [10.83723]

Replacement in source_text.lua at line 131 [10.83723]

Replacement in source_text.lua at line 135 [10.83723]

Replacement in source_text.lua at line 138 [10.83723]

Replacement in source_text.lua at line 141 [10.83723]

Replacement in source_text.lua at line 168 [10.83723]

Insertion in source_text.lua at line 176 [10.83723]

Replacement in source_text.lua at line 1003 [10.83723]

Deletion in source_text.lua at line 1012 [10.83723]

Deletion in source_text.lua at line 1018 [10.83723]

Deletion in source_text.lua at line 1021 [10.83723]

Insertion in source_text.lua at line 1022 [10.83723]

Deletion in source_edit.lua at line 187 [10.152440]

Deletion in source_edit.lua at line 510 [10.152440]

Deletion in source.lua at line 53 [10.165766]

Deletion in run.lua at line 9 [10.178044]

Replacement in log_browser.lua at line 120 [10.191782]

Insertion in icons.lua at line 13 [19.5323]

Deletion in edit.lua at line 509 [22.413]