akkartik/snap.love - Change MU5W6A35USV3OPXIVGGY5FXC55KCIRQXOFHAGXMTOKCIL4MSQZ4AC

clean up all the mess since commit fe4e1395d0

In the process we find a new bug. Scrolling with keyboard is overly eager to clamp screen_top to bottom of screen when the top used to be within the viewport.

Until recently, scrolling past the bottom when the margin was visible would move the cursor correctly but pan the surface to the top of the viewport. Slightly jarring, but good enough.

Created by Kartik K. Agaram on October 25, 2023

MU5W6A35USV3OPXIVGGY5FXC55KCIRQXOFHAGXMTOKCIL4MSQZ4AC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 207 [4.1]

B:BD[3.1585] → [2.4:344]

        -- join lines
        State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1
        State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data
        table.remove(State.lines, State.cursor1.line)
        table.remove(State.line_cache, State.cursor1.line)

[3.1585]

[5.2406]

      -- join lines
      State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1
      State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data
      table.remove(State.lines, State.cursor1.line)
      table.remove(State.line_cache, State.cursor1.line)

Replacement in text.lua at line 253 [4.1]

B:BD[5.3907] → [2.345:491]

        -- join lines
        State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data

[5.3907]

[6.4335]

      -- join lines
      State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data

Replacement in text.lua at line 366 [4.1]
B:BD[7.2828] → [2.492:524]
```
      y = y - State.line_height
```
[7.2828]
[8.486]
```
    y = y - State.line_height
```

Replacement in text.lua at line 438 [4.1]

B:BD[8.1280] → [2.525:680]

  print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[8.1280]

[9.3]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Replacement in text.lua at line 442 [4.1]

B:BD[10.2960] → [2.681:734]

    print('cursor at final screen line of its line')

[10.2960]

[11.5428]

--?     print('cursor at final screen line of its line')

Replacement in text.lua at line 447 [4.1]
B:BD[12.4544] → [2.735:766]
```
      print(State.cursor1.pos)
```
[12.4544]
[13.6]
```
--?       print(State.cursor1.pos)
```

Replacement in text.lua at line 450 [4.1]

B:BD[7.6537] → [2.767:891]

      print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
      print('scroll up preserving cursor')

[7.6537]

[8.1451]

--?       print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
--?       print('scroll up preserving cursor')

Replacement in text.lua at line 453 [4.1]

B:BD[8.1501] → [2.892:972]

      print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

[8.1501]

[10.3680]

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

Replacement in text.lua at line 458 [4.1]

B:BD[14.73] → [2.973:1033]

    print('cursor is NOT at final screen line of its line')

[14.73]

[15.113]

--?     print('cursor is NOT at final screen line of its line')

Replacement in text.lua at line 462 [4.1]

B:BD[16.252] → [2.1034:1176]

    print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))

[16.252]

[12.4545]

--?     print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))

Replacement in text.lua at line 466 [4.1]

B:BD[8.1720] → [2.1177:1247]

    print('cursor pos is now', State.cursor1.line, State.cursor1.pos)

[8.1720]

[17.130]

--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)

Replacement in text.lua at line 468 [4.1]

B:BD[17.154] → [2.1248:1291]

      print('scroll up preserving cursor')

[17.154]

[8.1721]

--?       print('scroll up preserving cursor')

Replacement in text.lua at line 470 [4.1]

B:BD[8.1771] → [2.1292:1372]

      print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

[8.1771]

[10.4796]

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

Replacement in text.lua at line 473 [4.1]

B:BD[10.4810] → [2.1373:1526]

  print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[10.4810]

[18.6091]

--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Replacement in text.lua at line 635 [4.1]

B:BD[19.394] → [2.1527:1633]

      local h = State.line_height
      if y - h < State.top then
        break
      end
      y = y - h

[19.394]

[8.2833]

    local h = State.line_height
    if y - h < State.top then
      break
    end
    y = y - h

Deletion in text.lua at line 909 [4.1]
B:BD[20.4065] → [2.1634:1690]
```
  print('cursor out of screen?', State.cursor_y == nil)
```

Deletion in 0030-update_editor_box at line 3 [21.26]

B:BD[21.137] → [2.1719:1806]

	print('update box', node, node.editor.screen_top1.line, skip_updating_screen_top_for)

Deletion in 0030-update_editor_box at line 5 [21.26]
B:BD[22.144] → [2.1807:1882]
```
		print('update box: refreshing screen top', node.editor.screen_top1.line)
```

Deletion in 0030-update_editor_box at line 12 [21.26]

B:BD[21.315] → [2.1883:1968]

	else
		print('update box: NOT refreshing screen top', node.editor.screen_top1.line)

Deletion in 0030-update_editor_box at line 17 [21.26]
B:BD[21.623] → [2.1969:2030]
```
	print('end update box', node, skip_updating_screen_top_for)
```

Insertion in 0029-Page2 at line 6 [23.155]

[23.223]

[24.139]

"Call me Ishmael.  Some years ago--never mind how long precisely--having little or no money in my purse, and nothing particular to interest me on shore, I thought I would sail about a little and see the watery part of the world.  It is a way I have of driving off the spleen and regulating the circulation.  Whenever I find myself growing grim about the mouth; whenever it is a damp, drizzly November in my soul; whenever I find myself involuntarily pausing before coffin warehouses, and bringing up the rear of every funeral I meet; and especially whenever my hypos get such an upper hand of me, that it requires a strong moral principle to prevent me from deliberately stepping into the street, and methodically knocking people's hats off--then, I account it high time to get to sea as soon as I can.  This is my substitute for pistol and ball.  With a philosophical flourish Cato throws himself upon his sword; I quietly take to the ship.  There is nothing surprising in this.  If they but knew it, almost all men in their degree, some time or other, cherish very nearly the same feelings towards the ocean with me.",

Deletion in 0029-Page2 at line 67 [23.155]
B:BD[24.490] → [24.490:491]
Deletion in 0028-A at line 2 [25.6019]
B:BD[22.358] → [2.2033:2075]
```
	print('A', skip_updating_screen_top_for)
```
Insertion in 0028-A at line 3 [25.6019]
[23.1534]
[26.522]
```
	-- translate Page and Page2 to Surface
```

Replacement in 0028-A at line 5 [25.6019]

B:BD[26.536] → [2.2076:2169]

	print('calling compute_layout', Page, Page.x,Page.y, Surface, skip_updating_screen_top_for)

[26.536]

[22.359]

	local red = false
	for x=-1000,2000,300 do
		for y=-10000,10000,200 do
			add_thick_line({type='line', data={x,y, x+200,y+200, x,y+400}, r=red and 1 or 0,g=red and 0 or 0.5,b=0}, 10)
			red = not red
		end
	end

Insertion in 0028-A at line 13 [25.6019]

[22.435]

[23.1929]

	compute_layout(Page2, Page2.x,Page2.y, Surface, skip_updating_screen_top_for)

Deletion in 0028-A at line 17 [25.6019]
B:BD[23.2020] → [2.2170:2216]
```
	print('end A', skip_updating_screen_top_for)
```

Deletion in 0026-on.draw at line 35 [28.238692]

B:BD[27.447] → [2.2219:2298]

--? 				print('edit.draw', obj.y, obj.editor.top, obj.editor.screen_top1.line)

Deletion in 0023-on.keychord_press at line 23 [29.26]

B:BD[29.541] → [30.39:160]

			print('==', old_top.line, old_top.pos, '=>', Cursor_node.editor.screen_top1.line, Cursor_node.editor.screen_top1.pos)

Deletion in 0023-on.keychord_press at line 24 [29.26]

B:BD[29.638] → [2.2307:2395]

			print('->', Viewport.y, Cursor_node.editor.top, Cursor_node.editor.screen_top1.line)

Deletion in 0023-on.keychord_press at line 25 [29.26]

B:BD[22.528] → [2.2396:2484]

			print('=>', Viewport.y, Cursor_node.editor.top, Cursor_node.editor.screen_top1.line)

Deletion in 0021-compute_layout at line 2 [31.4307]

B:BD[22.713] → [2.2487:2612]

if node.editor then
print('compute_layout', node, node.type, node.editor.screen_top1.line, skip_updating_screen_top_for)
end

Deletion in 0021-compute_layout at line 103 [31.4307]
B:BD[31.6960] → [2.2799:2864]
```
	print('end compute_layout', skip_updating_screen_top_for, node)
```

Replacement in 0020-Page at line 12 [32.55929]

B:BD[32.56184] → [24.558:909]

'1',
'2',
'3',
'4',
'5',
'6',
'7',
'8',
'9',
'10',
'11',
'12',
'13',
'14',
'15',
'16',
'17',
'18',
'19',
'20',
'21',
'22',
'23',
'24',
'25',
'26',
'27',
'28',
'29',
'30',
'31',
'32',
'33',
'34',
'35',
'36',
'37',
'38',
'39',
'40',
'41',
'42',
'43',
'44',
'45',
'46',
'47',
'48',
'49',
'50',
'51',
'52',
'53',
'54',
'55',
'56',
'57',
'58',
'59',
'60',

[32.56184]

[32.56772]

			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',

Replacement in 0020-Page at line 23 [32.55929]
B:BD[32.56777] → [26.872:910]
```
        width=400, bg={r=0,g=0.8,b=0}
```
[32.56777]
[32.56813]
```
        width=400, bg={r=1,g=1,b=0}
```

Insertion in 0020-Page at line 25 [32.55929]

[32.56822]

[32.57526]

      -- a table on the right
      { type='rows', name='searches', margin=50, data={
        { type='text', data={''},},
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},

Deletion in 0019-B at line 2 [33.6168]
B:BD[22.817] → [2.2867:2908]
```
print('B', skip_updating_screen_top_for)
```
Deletion in 0019-B at line 25 [33.6168]
B:BD[23.5188] → [2.2909:2955]
```
	print('end B', skip_updating_screen_top_for)
```

clean up all the mess since commit fe4e1395d0

Dependencies

In channels

Change contents

Replacement in text.lua at line 207 [4.1]

Replacement in text.lua at line 253 [4.1]

Replacement in text.lua at line 366 [4.1]

Replacement in text.lua at line 438 [4.1]

Replacement in text.lua at line 442 [4.1]

Replacement in text.lua at line 447 [4.1]

Replacement in text.lua at line 450 [4.1]

Replacement in text.lua at line 453 [4.1]

Replacement in text.lua at line 458 [4.1]

Replacement in text.lua at line 462 [4.1]

Replacement in text.lua at line 466 [4.1]

Replacement in text.lua at line 468 [4.1]

Replacement in text.lua at line 470 [4.1]

Replacement in text.lua at line 473 [4.1]

Replacement in text.lua at line 635 [4.1]

Deletion in text.lua at line 909 [4.1]

Deletion in 0030-update_editor_box at line 3 [21.26]

Deletion in 0030-update_editor_box at line 5 [21.26]

Deletion in 0030-update_editor_box at line 12 [21.26]

Deletion in 0030-update_editor_box at line 17 [21.26]

Insertion in 0029-Page2 at line 6 [23.155]

Deletion in 0029-Page2 at line 67 [23.155]

Deletion in 0028-A at line 2 [25.6019]

Insertion in 0028-A at line 3 [25.6019]

Replacement in 0028-A at line 5 [25.6019]

Insertion in 0028-A at line 13 [25.6019]

Deletion in 0028-A at line 17 [25.6019]

Deletion in 0026-on.draw at line 35 [28.238692]

Deletion in 0023-on.keychord_press at line 23 [29.26]

Deletion in 0023-on.keychord_press at line 24 [29.26]

Deletion in 0023-on.keychord_press at line 25 [29.26]

Deletion in 0021-compute_layout at line 2 [31.4307]

Deletion in 0021-compute_layout at line 103 [31.4307]

Replacement in 0020-Page at line 12 [32.55929]

Replacement in 0020-Page at line 23 [32.55929]

Insertion in 0020-Page at line 25 [32.55929]

Deletion in 0019-B at line 2 [33.6168]

Deletion in 0019-B at line 25 [33.6168]