akkartik/etch.love - Change GK47BBCYVEZ3OEQ7ISE2WCJULAFZ35WC6EYJ5CTBYNM26RSAELOQC

start passing left/right margins everywhere

I have a set of changes that passes all tests, but I'm going to commit them very carefully to ensure I don't miss any call-sites. In this commit I'm adding the args to:

Text.draw
Text.tweak_screen_top_and_cursor

But calls within them don't yet pass them where they should. In this manner I'm going to progress systematically from the top down.

Created by Kartik K. Agaram on July 8, 2022

GK47BBCYVEZ3OEQ7ISE2WCJULAFZ35WC6EYJ5CTBYNM26RSAELOQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 14 [7.1]

B:BD[5.103] → [6.705:742]

function Text.draw(line, line_index)

[5.103]

[8.1129]

function Text.draw(line, line_index, top, left, right)

Replacement in text.lua at line 18 [7.1]
B:BD[9.1768] → [10.2178:2202]
B:BD[10.2202] → [11.989:1013]
```
  local x = Margin_left
  local y = line.starty
```
[9.1768]
[9.1802]
```
  local x = left
  local y = top
```

Replacement in text.lua at line 33 [7.1]

B:BD[12.26] → [2.3411:3738]

∅:D[6.1078] → [10.2203:2255]

∅:D[2.3738] → [10.2203:2255]

B:BD[9.2108] → [10.2203:2255]

--?     print('('..s(x)..','..s(y)..') '..frag..'('..s(frag_width)..' vs '..s(App.screen.width-Margin_right)..') '..s(line_index)..' vs '..s(Screen_top1.line)..'; '..s(pos)..' vs '..s(Screen_top1.pos)..'; bottom: '..s(Screen_bottom1.line)..'/'..s(Screen_bottom1.pos))
    if x + frag_width > App.screen.width-Margin_right then
      assert(x > Margin_left)  -- no overfull lines

[12.26]

[13.1]

--?     print('('..s(x)..','..s(y)..') '..frag..'('..s(frag_width)..' vs '..s(right)..') '..s(line_index)..' vs '..s(Screen_top1.line)..'; '..s(pos)..' vs '..s(Screen_top1.pos)..'; bottom: '..s(Screen_bottom1.line)..'/'..s(Screen_bottom1.pos))
    if x + frag_width > right then
      assert(x > left)  -- no overfull lines

Replacement in text.lua at line 46 [7.1]
B:BD[14.129] → [10.2256:2278]
```
      x = Margin_left
```
[14.129]
[9.2198]
```
      x = left
```

Replacement in text.lua at line 920 [7.1]

B:BD[15.3998] → [3.3:47]

function Text.tweak_screen_top_and_cursor()

[15.3998]

[3.47]

function Text.tweak_screen_top_and_cursor(left, right)

Replacement in main.lua at line 194 [16.2]

B:BD[3.1343] → [3.1343:1380]

  Text.tweak_screen_top_and_cursor()

[3.1343]

[17.154]

  Text.tweak_screen_top_and_cursor(Margin_left, App.screen.height-Margin_right)

Replacement in main.lua at line 275 [16.2]

B:BD[4.1416] → [4.1416:1474]

      y, Screen_bottom1.pos = Text.draw(line, line_index)

[4.1416]

[4.1474]

      y, Screen_bottom1.pos = Text.draw(line, line_index, line.starty, Margin_left, App.screen.width-Margin_right)