akkartik/sokoban.love - Change 2RXZ3PGOTTZ6M4R372JXIKPLBQKPVBMAXNPIEO2HZDN4EMYW4GNAC

beginning of a new approach to scroll+wrap

So far I've just changed how existing variables are organized, and put some scaffolding in place for dealing with the new types. Next up: rewriting the code for scrolling to something that feels more obviously correct.

Created by Kartik K. Agaram on May 21, 2022

2RXZ3PGOTTZ6M4R372JXIKPLBQKPVBMAXNPIEO2HZDN4EMYW4GNAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 25 [9.1]

B:BD[7.2151] → [8.1:82]

      if line_index > Screen_top_line or pos > Top_screen_line_starting_pos then

[7.2151]

[10.83]

      if line_index > Screen_top1.line or pos > Screen_top1.pos then

Replacement in text.lua at line 36 [9.1]

B:BD[7.2206] → [11.128:222]

∅:D[12.199] → [10.130:210]

∅:D[11.222] → [10.130:210]

B:BD[7.2206] → [10.130:210]

    if Debug_new_render then print('checking to draw', pos, Top_screen_line_starting_pos) end
    if line_index > Screen_top_line or pos >= Top_screen_line_starting_pos then

[7.2206]

[11.223]

    if Debug_new_render then print('checking to draw', pos, Screen_top1.pos) end
    if line_index > Screen_top1.line or pos >= Screen_top1.pos then

Replacement in text.lua at line 43 [9.1]

B:BD[7.2324] → [5.51:223]

    if line_index == Cursor_line then
      if pos <= Cursor_pos and pos + frag_len > Cursor_pos then
        Text.draw_cursor(x+Text.cursor_x2(frag, Cursor_pos-pos+1), y)

[7.2324]

[7.2594]

    if line_index == Cursor1.line then
      if pos <= Cursor1.pos and pos + frag_len > Cursor1.pos then
        Text.draw_cursor(x+Text.cursor_x2(frag, Cursor1.pos-pos+1), y)

Replacement in text.lua at line 51 [9.1]

B:BD[13.37] → [5.224:282]

  if line_index == Cursor_line and Cursor_pos == pos then

[13.37]

[14.72]

  if line_index == Cursor1.line and Cursor1.pos == pos then

Replacement in text.lua at line 112 [9.1]

B:BD[13.191] → [13.191:285]

  if Cursor_pos > 1 then
    byte_offset = utf8.offset(Lines[Cursor_line].data, Cursor_pos-1)

[13.191]

[13.285]

  if Cursor1.pos > 1 then
    byte_offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos-1)

Replacement in text.lua at line 117 [9.1]

B:BD[13.318] → [13.318:453]

B:BD[13.453] → [7.2797:2834]

∅:D[7.2834] → [13.453:481]

B:BD[13.453] → [13.453:481]

  Lines[Cursor_line].data = string.sub(Lines[Cursor_line].data, 1, byte_offset)..t..string.sub(Lines[Cursor_line].data, byte_offset+1)
  Lines[Cursor_line].fragments = nil
  Cursor_pos = Cursor_pos+1

[13.318]

[13.513]

  Lines[Cursor1.line].data = string.sub(Lines[Cursor1.line].data, 1, byte_offset)..t..string.sub(Lines[Cursor1.line].data, byte_offset+1)
  Lines[Cursor1.line].fragments = nil
  Cursor1.pos = Cursor1.pos+1

Replacement in text.lua at line 126 [9.1]

B:BD[13.655] → [13.655:921]

B:BD[13.921] → [7.2835:2874]

∅:D[7.2874] → [13.921:972]

B:BD[13.921] → [13.921:972]

    local byte_offset = utf8.offset(Lines[Cursor_line].data, Cursor_pos)
    table.insert(Lines, Cursor_line+1, {mode='text', data=string.sub(Lines[Cursor_line].data, byte_offset)})
    Lines[Cursor_line].data = string.sub(Lines[Cursor_line].data, 1, byte_offset-1)
    Lines[Cursor_line].fragments = nil
    Cursor_line = Cursor_line+1
    Cursor_pos = 1

[13.655]

[3.100]

    local byte_offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
    table.insert(Lines, Cursor1.line+1, {mode='text', data=string.sub(Lines[Cursor1.line].data, byte_offset)})
    Lines[Cursor1.line].data = string.sub(Lines[Cursor1.line].data, 1, byte_offset-1)
    Lines[Cursor1.line].fragments = nil
    Cursor1.line = Cursor1.line+1
    Cursor1.pos = 1

Replacement in text.lua at line 137 [9.1]

B:BD[13.1036] → [13.1036:1141]

    assert(Lines[Cursor_line].mode == 'text')
    if Cursor_pos > 1 then
      Cursor_pos = Cursor_pos-1

[13.1036]

[13.1141]

    assert(Lines[Cursor1.line].mode == 'text')
    if Cursor1.pos > 1 then
      Cursor1.pos = Cursor1.pos-1

Replacement in text.lua at line 141 [9.1]

B:BD[13.1150] → [13.1150:1192]

      local new_cursor_line = Cursor_line

[13.1150]

[13.1192]

      local new_cursor_line = Cursor1.line

Replacement in text.lua at line 145 [9.1]

B:BD[13.1325] → [13.1325:1365]

B:BD[13.1365] → [15.114:175]

          Cursor_line = new_cursor_line
          Cursor_pos = utf8.len(Lines[Cursor_line].data) + 1

[13.1325]

[13.1415]

          Cursor1.line = new_cursor_line
          Cursor1.pos = utf8.len(Lines[Cursor1.line].data) + 1

Replacement in text.lua at line 150 [9.1]

B:BD[16.11] → [16.11:93]

      if Cursor_line < Screen_top_line then
        Screen_top_line = Cursor_line

[16.11]

[13.1443]

      if Cursor1.line < Screen_top1.line then
        Screen_top1.line = Cursor1.line

Replacement in text.lua at line 155 [9.1]

B:BD[13.1492] → [13.1492:1538]

B:BD[13.1538] → [15.176:236]

∅:D[15.236] → [13.1589:1621]

B:BD[13.1589] → [13.1589:1621]

    assert(Lines[Cursor_line].mode == 'text')
    if Cursor_pos <= utf8.len(Lines[Cursor_line].data) then
      Cursor_pos = Cursor_pos+1

[13.1492]

[13.1621]

    assert(Lines[Cursor1.line].mode == 'text')
    if Cursor1.pos <= utf8.len(Lines[Cursor1.line].data) then
      Cursor1.pos = Cursor1.pos+1

Replacement in text.lua at line 159 [9.1]

B:BD[13.1630] → [13.1630:1672]

      local new_cursor_line = Cursor_line

[13.1630]

[13.1672]

      local new_cursor_line = Cursor1.line

Replacement in text.lua at line 163 [9.1]

B:BD[13.1813] → [13.1813:1878]

          Cursor_line = new_cursor_line
          Cursor_pos = 1

[13.1813]

[13.1878]

          Cursor1.line = new_cursor_line
          Cursor1.pos = 1

Replacement in text.lua at line 168 [9.1]

B:BD[13.1916] → [16.94:179]

      if Cursor_line > Screen_bottom_line then
        Screen_top_line = Cursor_line

[13.1916]

[16.179]

      if Cursor1.line > Screen_bottom1.line then
        Screen_top1.line = Cursor1.line

Replacement in text.lua at line 173 [9.1]
B:BD[13.1954] → [13.1954:1973]
```
    Cursor_pos = 1
```
[13.1954]
[13.1973]
```
    Cursor1.pos = 1
```

Replacement in text.lua at line 175 [9.1]

B:BD[13.2002] → [15.237:292]

    Cursor_pos = utf8.len(Lines[Cursor_line].data) + 1

[13.2002]

[13.2046]

    Cursor1.pos = utf8.len(Lines[Cursor1.line].data) + 1

Replacement in text.lua at line 177 [9.1]

B:BD[13.2081] → [13.2081:2256]

    if Cursor_pos > 1 then
      local byte_start = utf8.offset(Lines[Cursor_line].data, Cursor_pos-1)
      local byte_end = utf8.offset(Lines[Cursor_line].data, Cursor_pos)

[13.2081]

[13.2256]

    if Cursor1.pos > 1 then
      local byte_start = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos-1)
      local byte_end = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)

Replacement in text.lua at line 182 [9.1]

B:BD[13.2306] → [13.2306:2442]

          Lines[Cursor_line].data = string.sub(Lines[Cursor_line].data, 1, byte_start-1)..string.sub(Lines[Cursor_line].data, byte_end)

[13.2306]

[13.2442]

          Lines[Cursor1.line].data = string.sub(Lines[Cursor1.line].data, 1, byte_start-1)..string.sub(Lines[Cursor1.line].data, byte_end)

Replacement in text.lua at line 184 [9.1]

B:BD[13.2455] → [13.2455:2544]

          Lines[Cursor_line].data = string.sub(Lines[Cursor_line].data, 1, byte_start-1)

[13.2455]

[13.2544]

          Lines[Cursor1.line].data = string.sub(Lines[Cursor1.line].data, 1, byte_start-1)

Replacement in text.lua at line 186 [9.1]

B:BD[13.2556] → [7.2875:2918]

∅:D[7.2918] → [13.2556:2590]

B:BD[13.2556] → [13.2556:2590]

        Lines[Cursor_line].fragments = nil
        Cursor_pos = Cursor_pos-1

[13.2556]

[13.2590]

        Lines[Cursor1.line].fragments = nil
        Cursor1.pos = Cursor1.pos-1

Replacement in text.lua at line 189 [9.1]

B:BD[13.2600] → [13.2600:2728]

    elseif Cursor_line > 1 then
      if Lines[Cursor_line-1].mode == 'drawing' then
        table.remove(Lines, Cursor_line-1)

[13.2600]

[13.2728]

    elseif Cursor1.line > 1 then
      if Lines[Cursor1.line-1].mode == 'drawing' then
        table.remove(Lines, Cursor1.line-1)

Replacement in text.lua at line 194 [9.1]

B:BD[13.2761] → [13.2761:2907]

B:BD[13.2907] → [7.2919:2964]

∅:D[7.2964] → [13.2907:2948]

B:BD[13.2907] → [13.2907:2948]

        Cursor_pos = utf8.len(Lines[Cursor_line-1].data)+1
        Lines[Cursor_line-1].data = Lines[Cursor_line-1].data..Lines[Cursor_line].data
        Lines[Cursor_line-1].fragments = nil
        table.remove(Lines, Cursor_line)

[13.2761]

[13.2948]

        Cursor1.pos = utf8.len(Lines[Cursor1.line-1].data)+1
        Lines[Cursor1.line-1].data = Lines[Cursor1.line-1].data..Lines[Cursor1.line].data
        Lines[Cursor1.line-1].fragments = nil
        table.remove(Lines, Cursor1.line)

Replacement in text.lua at line 199 [9.1]
B:BD[13.2958] → [13.2958:2992]
```
      Cursor_line = Cursor_line-1
```
[13.2958]
[13.2992]
```
      Cursor1.line = Cursor1.line-1
```

Replacement in text.lua at line 203 [9.1]

B:BD[13.3066] → [15.293:353]

∅:D[15.353] → [13.3117:3265]

B:BD[13.3117] → [13.3117:3265]

    if Cursor_pos <= utf8.len(Lines[Cursor_line].data) then
      local byte_start = utf8.offset(Lines[Cursor_line].data, Cursor_pos)
      local byte_end = utf8.offset(Lines[Cursor_line].data, Cursor_pos+1)

[13.3066]

[13.3265]

    if Cursor1.pos <= utf8.len(Lines[Cursor1.line].data) then
      local byte_start = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
      local byte_end = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos+1)

Replacement in text.lua at line 208 [9.1]

B:BD[13.3315] → [13.3315:3451]

          Lines[Cursor_line].data = string.sub(Lines[Cursor_line].data, 1, byte_start-1)..string.sub(Lines[Cursor_line].data, byte_end)

[13.3315]

[13.3451]

          Lines[Cursor1.line].data = string.sub(Lines[Cursor1.line].data, 1, byte_start-1)..string.sub(Lines[Cursor1.line].data, byte_end)

Replacement in text.lua at line 210 [9.1]

B:BD[13.3464] → [13.3464:3553]

          Lines[Cursor_line].data = string.sub(Lines[Cursor_line].data, 1, byte_start-1)

[13.3464]

[13.3553]

          Lines[Cursor1.line].data = string.sub(Lines[Cursor1.line].data, 1, byte_start-1)

Replacement in text.lua at line 212 [9.1]

B:BD[13.3565] → [7.2965:3008]

∅:D[7.3008] → [13.3565:3600]

B:BD[13.3565] → [13.3565:3600]

        Lines[Cursor_line].fragments = nil
        -- no change to Cursor_pos

[13.3565]

[13.3600]

        Lines[Cursor1.line].fragments = nil
        -- no change to Cursor1.pos

Replacement in text.lua at line 215 [9.1]

B:BD[13.3610] → [13.3610:3743]

    elseif Cursor_line < #Lines then
      if Lines[Cursor_line+1].mode == 'drawing' then
        table.remove(Lines, Cursor_line+1)

[13.3610]

[13.3743]

    elseif Cursor1.line < #Lines then
      if Lines[Cursor1.line+1].mode == 'drawing' then
        table.remove(Lines, Cursor1.line+1)

Replacement in text.lua at line 220 [9.1]

B:BD[13.3776] → [13.3776:3861]

B:BD[13.3861] → [7.3009:3052]

∅:D[7.3052] → [13.3861:3904]

B:BD[13.3861] → [13.3861:3904]

        Lines[Cursor_line].data = Lines[Cursor_line].data..Lines[Cursor_line+1].data
        Lines[Cursor_line].fragments = nil
        table.remove(Lines, Cursor_line+1)

[13.3776]

[13.3904]

        Lines[Cursor1.line].data = Lines[Cursor1.line].data..Lines[Cursor1.line+1].data
        Lines[Cursor1.line].fragments = nil
        table.remove(Lines, Cursor1.line+1)

Replacement in text.lua at line 227 [9.1]

B:BD[13.3984] → [13.3984:4030]

B:BD[13.4030] → [6.1:63]

    assert(Lines[Cursor_line].mode == 'text')
--?     print('up', Cursor_pos, Top_screen_line_starting_pos)

[13.3984]

[17.1]

    assert(Lines[Cursor1.line].mode == 'text')
--?     print('up', Cursor1.pos, Screen_top1.pos)

Replacement in text.lua at line 233 [9.1]
∅:D[18.51] → [8.183:225]
B:BD[8.183] → [8.183:225]
```
      local new_cursor_line = Cursor_line
```
[18.51]
[8.225]
```
      local new_cursor_line = Cursor1.line
```

Replacement in text.lua at line 237 [9.1]

B:BD[8.437] → [8.437:477]

B:BD[8.477] → [19.1:70]

B:BD[19.70] → [20.1:85]

          Cursor_line = new_cursor_line
          if Lines[Cursor_line].screen_line_starting_pos == nil then
            Cursor_pos = Text.nearest_cursor_pos(Lines[Cursor_line].data, Cursor_x)

[8.358]

[19.151]

          Cursor1.line = new_cursor_line
          if Lines[Cursor1.line].screen_line_starting_pos == nil then
            Cursor1.pos = Text.nearest_cursor_pos(Lines[Cursor1.line].data, Cursor_x)

Replacement in text.lua at line 243 [9.1]

∅:D[18.118] → [19.183:270]

B:BD[19.183] → [19.183:270]

          local screen_line_starting_pos = Lines[Cursor_line].screen_line_starting_pos

[18.118]

[19.270]

          local screen_line_starting_pos = Lines[Cursor1.line].screen_line_starting_pos

Replacement in text.lua at line 246 [9.1]

∅:D[6.238] → [17.302:480]

∅:D[12.463] → [17.302:480]

B:BD[17.302] → [17.302:480]

B:BD[17.480] → [6.239:355]

          if Screen_top_line == Cursor_line and Top_screen_line_starting_pos == screen_line_starting_pos then
            Top_screen_line_starting_pos = screen_line_starting_pos
--?             print('pos of top of screen is also '..tostring(Top_screen_line_starting_pos)..' of the same line')

[6.238]

[17.480]

          if Screen_top1.line == Cursor1.line and Screen_top1.pos == screen_line_starting_pos then
            Screen_top1.pos = screen_line_starting_pos
--?             print('pos of top of screen is also '..tostring(Screen_top1.pos)..' of the same line')

Replacement in text.lua at line 250 [9.1]

∅:D[17.494] → [19.425:507]

B:BD[19.425] → [19.425:507]

B:BD[19.507] → [20.86:177]

          local s = string.sub(Lines[Cursor_line].data, screen_line_starting_pos)
          Cursor_pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1

[17.494]

[8.556]

          local s = string.sub(Lines[Cursor1.line].data, screen_line_starting_pos)
          Cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1

Replacement in text.lua at line 255 [9.1]

B:BD[8.594] → [8.594:676]

      if Cursor_line < Screen_top_line then
        Screen_top_line = Cursor_line

[8.594]

[13.4415]

      if Cursor1.line < Screen_top1.line then
        Screen_top1.line = Cursor1.line

Replacement in text.lua at line 262 [9.1]

B:BD[8.896] → [17.558:660]

      new_screen_line_starting_pos = Lines[Cursor_line].screen_line_starting_pos[screen_line_index-1]

[8.896]

[6.423]

      new_screen_line_starting_pos = Lines[Cursor1.line].screen_line_starting_pos[screen_line_index-1]

Replacement in text.lua at line 264 [9.1]

∅:D[6.571] → [17.804:978]

B:BD[17.804] → [17.804:978]

B:BD[17.978] → [6.572:671]

      if Screen_top_line == Cursor_line and Top_screen_line_starting_pos == screen_line_starting_pos then
        Top_screen_line_starting_pos = new_screen_line_starting_pos
--?         print('also setting pos of top of screen to '..tostring(Top_screen_line_starting_pos))

[6.571]

[17.1073]

      if Screen_top1.line == Cursor1.line and Screen_top1.pos == screen_line_starting_pos then
        Screen_top1.pos = new_screen_line_starting_pos
--?         print('also setting pos of top of screen to '..tostring(Screen_top1.pos))

Replacement in text.lua at line 268 [9.1]

B:BD[17.1083] → [17.1083:1256]

B:BD[17.1256] → [6.672:732]

      local s = string.sub(Lines[Cursor_line].data, new_screen_line_starting_pos)
      Cursor_pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?       print('cursor pos is now '..tostring(Cursor_pos))

[17.1083]

[16.268]

      local s = string.sub(Lines[Cursor1.line].data, new_screen_line_starting_pos)
      Cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?       print('cursor pos is now '..tostring(Cursor1.pos))

Replacement in text.lua at line 273 [9.1]

B:BD[13.4463] → [13.4463:4509]

    assert(Lines[Cursor_line].mode == 'text')

[13.4463]

[21.267]

    assert(Lines[Cursor1.line].mode == 'text')

Replacement in text.lua at line 277 [9.1]
∅:D[6.798] → [21.421:463]
B:BD[21.421] → [21.421:463]
```
      local new_cursor_line = Cursor_line
```
[6.798]
[21.463]
```
      local new_cursor_line = Cursor1.line
```

Replacement in text.lua at line 281 [9.1]

B:BD[21.601] → [21.601:723]

B:BD[21.723] → [6.799:831]

          Cursor_line = new_cursor_line
          Cursor_pos = Text.nearest_cursor_pos(Lines[Cursor_line].data, Cursor_x)
--?           print(Cursor_pos)

[21.601]

[21.751]

          Cursor1.line = new_cursor_line
          Cursor1.pos = Text.nearest_cursor_pos(Lines[Cursor1.line].data, Cursor_x)
--?           print(Cursor1.pos)

Replacement in text.lua at line 287 [9.1]

B:BD[21.789] → [6.832:893]

∅:D[22.121] → [21.789:836]

∅:D[6.893] → [21.789:836]

B:BD[21.789] → [21.789:836]

B:BD[21.836] → [6.894:981]

∅:D[23.84] → [21.836:874]

∅:D[6.981] → [21.836:874]

B:BD[21.836] → [21.836:874]

--?       print(Cursor_line, Cursor_pos, Screen_bottom_line)
      if Cursor_line > Screen_bottom_line then
--?         print('screen top before:', Screen_top_line, Top_screen_line_starting_pos)
        Screen_top_line = Cursor_line

[21.789]

[6.982]

--?       print(Cursor1.line, Cursor1.pos, Screen_bottom1.line)
      if Cursor1.line > Screen_bottom1.line then
--?         print('screen top before:', Screen_top1.line, Screen_top1.pos)
        Screen_top1.line = Cursor1.line

Replacement in text.lua at line 293 [9.1]

B:BD[21.922] → [6.1032:1118]

--?         print('screen top after:', Screen_top_line, Top_screen_line_starting_pos)

[21.922]

[13.4899]

--?         print('screen top after:', Screen_top1.line, Screen_top1.pos)

Replacement in text.lua at line 295 [9.1]

B:BD[13.4909] → [6.1119:1186]

--?       print('=>', Cursor_line, Cursor_pos, Screen_bottom_line)

[13.4909]

[21.923]

--?       print('=>', Cursor1.line, Cursor1.pos, Screen_bottom1.line)

Replacement in text.lua at line 300 [9.1]

B:BD[21.1145] → [21.1145:1247]

      new_screen_line_starting_pos = Lines[Cursor_line].screen_line_starting_pos[screen_line_index+1]

[21.1145]

[6.1254]

      new_screen_line_starting_pos = Lines[Cursor1.line].screen_line_starting_pos[screen_line_index+1]

Replacement in text.lua at line 302 [9.1]

∅:D[6.1402] → [21.1391:1564]

B:BD[21.1391] → [21.1391:1564]

B:BD[21.1564] → [6.1403:1463]

∅:D[6.1463] → [22.122:158]

B:BD[21.1620] → [22.122:158]

      local s = string.sub(Lines[Cursor_line].data, new_screen_line_starting_pos)
      Cursor_pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?       print('cursor pos is now '..tostring(Cursor_pos))
      Screen_top_line = Cursor_line

[6.1402]

[6.1464]

      local s = string.sub(Lines[Cursor1.line].data, new_screen_line_starting_pos)
      Cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?       print('cursor pos is now '..tostring(Cursor1.pos))
      Screen_top1.line = Cursor1.line

Replacement in text.lua at line 308 [9.1]

B:BD[21.1666] → [6.1512:1596]

--?       print('screen top after:', Screen_top_line, Top_screen_line_starting_pos)

[21.1666]

[17.1313]

--?       print('screen top after:', Screen_top1.line, Screen_top1.pos)

Replacement in text.lua at line 314 [9.1]

B:BD[17.1383] → [17.1383:1444]

  if Lines[Cursor_line].screen_line_starting_pos == nil then

[17.1383]

[17.1444]

  if Lines[Cursor1.line].screen_line_starting_pos == nil then

Replacement in text.lua at line 317 [9.1]

B:BD[17.1465] → [17.1465:1621]

  for i=#Lines[Cursor_line].screen_line_starting_pos,1,-1 do
    local spos = Lines[Cursor_line].screen_line_starting_pos[i]
    if spos <= Cursor_pos then

[17.1465]

[17.1621]

  for i=#Lines[Cursor1.line].screen_line_starting_pos,1,-1 do
    local spos = Lines[Cursor1.line].screen_line_starting_pos[i]
    if spos <= Cursor1.pos then

Replacement in text.lua at line 327 [9.1]

B:BD[21.1711] → [21.1711:1772]

  if Lines[Cursor_line].screen_line_starting_pos == nil then

[21.1711]

[21.1772]

  if Lines[Cursor1.line].screen_line_starting_pos == nil then

Replacement in text.lua at line 330 [9.1]

B:BD[21.1794] → [21.1794:1933]

  i=#Lines[Cursor_line].screen_line_starting_pos
  local spos = Lines[Cursor_line].screen_line_starting_pos[i]
  return spos <= Cursor_pos

[21.1794]

[21.1933]

  i=#Lines[Cursor1.line].screen_line_starting_pos
  local spos = Lines[Cursor1.line].screen_line_starting_pos[i]
  return spos <= Cursor1.pos

Replacement in text.lua at line 336 [9.1]

B:BD[24.87] → [24.87:166]

  while Cursor_line <= #Lines do
    if Lines[Cursor_line].mode == 'text' then

[24.87]

[24.166]

  while Cursor1.line <= #Lines do
    if Lines[Cursor1.line].mode == 'text' then

Replacement in text.lua at line 340 [9.1]
B:BD[24.186] → [24.186:220]
```
    Cursor_line = Cursor_line + 1
```
[24.186]
[24.220]
```
    Cursor1.line = Cursor1.line + 1
```

Replacement in text.lua at line 343 [9.1]

B:BD[24.287] → [24.287:354]

  if Cursor_line > #Lines then
    assert(Cursor_line == #Lines+1)

[24.287]

[24.354]

  if Cursor1.line > #Lines then
    assert(Cursor1.line == #Lines+1)

Replacement in text.lua at line 347 [9.1]

B:BD[24.408] → [24.408:485]

  if Cursor_line > Screen_bottom_line then
    Screen_top_line = Cursor_line

[24.408]

[24.485]

  if Cursor1.line > Screen_bottom1.line then
    Screen_top1.line = Cursor1.line

Replacement in text.lua at line 355 [9.1]

B:BD[25.266] → [6.1597:1718]

--?   print('cursor pos '..tostring(Cursor_pos)..' is on the #'..tostring(cursor_pos_screen_lines)..' screen line down')

[25.266]

[25.383]

--?   print('cursor pos '..tostring(Cursor1.pos)..' is on the #'..tostring(cursor_pos_screen_lines)..' screen line down')

Replacement in text.lua at line 359 [9.1]

B:BD[24.660] → [24.660:703]

    if Screen_top_line == 1 then break end

[24.660]

[6.1719]

    if Screen_top1.line == 1 then break end

Replacement in text.lua at line 362 [9.1]

B:BD[25.531] → [25.531:717]

    if Lines[Screen_top_line-1].mode == 'drawing' then
      h = 20 + Drawing.pixels(Lines[Screen_top_line-1].h)
    elseif Lines[Screen_top_line-1].screen_line_starting_pos == nil then

[25.531]

[25.717]

    if Lines[Screen_top1.line-1].mode == 'drawing' then
      h = 20 + Drawing.pixels(Lines[Screen_top1.line-1].h)
    elseif Lines[Screen_top1.line-1].screen_line_starting_pos == nil then

Replacement in text.lua at line 367 [9.1]

B:BD[25.776] → [25.776:843]

      local n = #Lines[Screen_top_line-1].screen_line_starting_pos

[25.776]

[25.843]

      local n = #Lines[Screen_top1.line-1].screen_line_starting_pos

Replacement in text.lua at line 378 [9.1]

B:BD[24.883] → [24.883:925]

    Screen_top_line = Screen_top_line - 1

[24.883]

[24.925]

    Screen_top1.line = Screen_top1.line - 1

Replacement in text.lua at line 391 [9.1]
∅:D[26.48] → [27.153:180]
∅:D[28.49] → [27.153:180]
∅:D[29.471] → [27.153:180]
B:BD[27.153] → [27.153:180]
```
  Cursor_line = line_index
```
[29.471]
[29.472]
```
  Cursor1.line = line_index
```

Replacement in text.lua at line 393 [9.1]

B:BD[29.555] → [29.555:611]

    Cursor_pos = Text.nearest_cursor_pos(line.data, mx)

[29.519]

[29.611]

    Cursor1.pos = Text.nearest_cursor_pos(line.data, mx)

Replacement in text.lua at line 407 [9.1]

B:BD[30.437] → [4.1:73]

        Cursor_pos = line.screen_line_starting_pos[screen_line_index+1]

[30.437]

[30.513]

        Cursor1.pos = line.screen_line_starting_pos[screen_line_index+1]

Replacement in text.lua at line 411 [9.1]

B:BD[29.1185] → [29.1185:1266]

      Cursor_pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, mx) - 1

[29.1185]

[29.1266]

      Cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, mx) - 1

Replacement in text.lua at line 426 [9.1]
B:BD[29.1502] → [29.1502:1533]
```
--  Cursor_pos = 4 + 2 - 1 = 5
```
[29.1502]
[29.1533]
```
--  Cursor1.pos = 4 + 2 - 1 = 5
```
Replacement in text.lua at line 431 [9.1]
B:BD[29.1643] → [29.1643:1674]
```
--  Cursor_pos = 7 + 2 - 1 = 8
```
[29.1643]
[9.468]
```
--  Cursor1.pos = 7 + 2 - 1 = 8
```

Insertion in text.lua at line 476 [9.1]

[7.3295]

[9.1438]

function Text.to2(pos1)
  local result = {line=pos1.line, screen_line=1}
  if Line[pos1.line].screen_line_starting_pos == nil then
    result.screen_pos = pos1.pos
  else
    for i=#Lines[pos1.line].screen_line_starting_pos,1,-1 do
      local spos = Lines[pos1.line].screen_line_starting_pos[i]
      if spos <= Cursor1.pos then
        result.screen_line = i
        result.screen_pos = spos
        break
      end
    end
  end
  assert(result.screen_pos)
  return result
end
function Text.to1(pos2)
  local result = {line=pos2.line, pos=pos2.screen_pos}
  if pos2.screen_line > 1 then
    result.pos = Lines[pos2.line].screen_line_starting_pos[pos2.screen_line] + pos2.screen_pos
  end
  return result
end

Replacement in main.lua at line 40 [32.2]

∅:D[16.479] → [31.2:18]

B:BD[33.35] → [31.2:18]

B:BD[31.18] → [23.216:287]

Cursor_line = 1
Cursor_pos = 1  -- in Unicode codepoints, from 1 to utf8.len(line) + 1

[33.35]

[34.1238]


-- Lines can be too long to fit on screen, in which case they _wrap_ into
-- multiple _screen lines_.
--
-- Therefore, any potential location for the cursor can be described in two ways:
-- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units)
-- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line.
--
-- Most of the time we'll only persist positions in schema 1, translating to
-- schema 2 when that's convenient.
Cursor1 = {line=1, pos=1}  -- position of cursor
Screen_top1 = {line=1, pos=1}  -- position of start of screen line at top of screen
Screen_bottom1 = {line=1, pos=1}  -- position of start of screen line at bottom of screen

Deletion in main.lua at line 58 [32.2]
B:BD[35.4] → [35.4:68]
B:BD[35.68] → [23.288:377]
∅:D[35.68] → [34.1240:1241]
∅:D[36.95] → [34.1240:1241]
∅:D[31.114] → [34.1240:1241]
∅:D[23.377] → [34.1240:1241]
∅:D[10.455] → [34.1240:1241]
B:BD[37.45] → [34.1240:1241]
```
-- scrolling support
Screen_top_line = 1
Screen_bottom_line = 1
Top_screen_line_starting_pos = 1  -- when top of screen starts in between a wrapped line
```
Replacement in main.lua at line 89 [32.2]
B:BD[38.430] → [31.668:690]
```
      Cursor_line = i
```
[38.430]
[2.3]
```
      Cursor1.line = i
```
Replacement in main.lua at line 103 [32.2]
B:BD[38.532] → [31.780:802]
```
      Cursor_line = i
```
[38.532]
[2.16]
```
      Cursor1.line = i
```

Replacement in main.lua at line 121 [32.2]

∅:D[39.43] → [16.546:588]

∅:D[22.223] → [16.546:588]

B:BD[40.44] → [16.546:588]

B:BD[16.650] → [16.650:688]

    if line_index >= Screen_top_line then
      Screen_bottom_line = line_index

[22.223]

[16.705]

    if line_index >= Screen_top1.line then
      Screen_bottom1.line = line_index

Replacement in main.lua at line 129 [32.2]

B:BD[16.1011] → [16.1011:1121]

                       if Cursor_line >= line_index then
                         Cursor_line = Cursor_line+1

[16.1011]

[16.1121]

                       if Cursor1.line >= line_index then
                         Cursor1.line = Cursor1.line+1

Replacement in main.lua at line 133 [32.2]

B:BD[16.1175] → [16.1175:1219]

          if line_index == Cursor_line then

[16.1175]

[14.263]

          if line_index == Cursor1.line then

Replacement in main.lua at line 218 [32.2]

B:BD[16.1627] → [16.1627:1702]

B:BD[16.1702] → [23.762:845]

    Screen_top_line = Screen_bottom_line
    Cursor_line = Screen_top_line
    Top_screen_line_starting_pos = 1
    Cursor_pos = Top_screen_line_starting_pos

[16.1627]

[24.939]

    Screen_top1.line = Screen_bottom1.line
    Screen_top1.pos = 1
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos

Replacement in main.lua at line 227 [32.2]

B:BD[16.1844] → [16.1844:1889]

      if Screen_top_line == 1 then break end

[16.1844]

[41.274]

      if Screen_top1.line == 1 then break end

Replacement in main.lua at line 229 [32.2]

∅:D[41.308] → [24.1043:1098]

B:BD[24.1043] → [24.1043:1098]

∅:D[24.1098] → [16.1976:2033]

B:BD[16.1976] → [16.1976:2033]

      if Lines[Screen_top_line].mode == 'drawing' then
        y = y - Drawing.pixels(Lines[Screen_top_line].h)

[41.308]

[16.2033]

      if Lines[Screen_top1.line].mode == 'drawing' then
        y = y - Drawing.pixels(Lines[Screen_top1.line].h)

Replacement in main.lua at line 232 [32.2]

B:BD[16.2043] → [16.2043:2087]

      Screen_top_line = Screen_top_line - 1

[16.2043]

[16.2087]

      Screen_top1.line = Screen_top1.line - 1

Replacement in main.lua at line 234 [32.2]

B:BD[16.2095] → [16.2095:2159]

    if Cursor_line ~= Screen_top_line then
      Cursor_pos = 1

[16.2095]

[42.155]

    if Cursor1.line ~= Screen_top1.line then
      Cursor1.pos = 1

Replacement in main.lua at line 237 [32.2]
B:BD[42.163] → [16.2160:2194]
```
    Cursor_line = Screen_top_line
```
[42.163]
[24.1099]
```
    Cursor1.line = Screen_top1.line
```