akkartik/pothi.love - Change R5HNWYMH47LWVHS5VVXNR6TCBDXDURVXZ6RCUNFTTTMIXF275ULQC

start rendering file picker on the surface as well

This will make things more consistent in the long term, but I realize one major cost: our button abstraction doesn't work well with luaML and compute_layout. So we need something to replace it.

Created by Kartik K. Agaram on June 22, 2023

R5HNWYMH47LWVHS5VVXNR6TCBDXDURVXZ6RCUNFTTTMIXF275ULQC

Dependencies

In channels

main

Change contents

File deletion: 0126-keychord_press_on_surface

BF:BFD[7.2] → [8.1529:1583]

BF:BFD[8.1583] → [8.29:29]

B:BD[8.29] → [8.30:123]

∅:D[5.80] → [8.123:1524]

∅:D[9.145] → [8.123:1524]

B:BD[8.123] → [8.123:1524]

B:BD[8.1524] → [9.146:149]

B:BD[8.123] → [9.29:145]

B:BD[9.145] → [5.29:80]

keychord_press_on_surface = function(chord, key)
	if chord == 'C-o' then
		Global_state = {}
	elseif Cursor_node then
		local old_top = {line=Cursor_node.editor.screen_top1.line, pos=Cursor_node.editor.screen_top1.pos}
		edit.keychord_press(Cursor_node.editor, chord, key)
		if not eq(Cursor_node.editor.screen_top1, old_top) then
			Viewport.y = Cursor_node.y + y_of_schema1(Cursor_node.editor, Cursor_node.editor.screen_top1)
		end
		if chord == 'return' then
			A(--[[preserve screen_top of cursor node]] true)
		else
			B(--[[preserve screen_top of cursor node]] true)
		end
	else
		if chord == 'up' then
			Viewport.y = Viewport.y - scale(20)
			B()
		elseif chord == 'down' then
			Viewport.y = Viewport.y + scale(20)
			B()
		elseif chord == 'left' then
			Viewport.x = Viewport.x - scale(50)
			B()
		elseif chord == 'right' then
			Viewport.x = Viewport.x + scale(50)
			B()
		elseif chord == 'pageup' then
			Viewport.y = Viewport.y - App.screen.height/Viewport.zoom
			B()
		elseif chord == 'S-up' then
			Viewport.y = Viewport.y - App.screen.height/Viewport.zoom
			B()
		elseif chord == 'pagedown' then
			Viewport.y = Viewport.y + App.screen.height/Viewport.zoom
			B()
		elseif chord == 'S-down' then
			Viewport.y = Viewport.y + App.screen.height/Viewport.zoom
			B()
		elseif chord == 'S-left' then
			Viewport.x = Viewport.x - App.screen.width/Viewport.zoom
			B()
		elseif chord == 'S-right' then
			Viewport.x = Viewport.x + App.screen.width/Viewport.zoom
			B()
		end
	end
end
		love.graphics.setFont(love.graphics.newFont(20))
		local font = love.graphics.getFont()
		font:setLineHeight(1.3)
		Viewport = {x=-50, y=-50, w=800,h=600, zoom=1.0}

File addition: 0131-File_picker_margin (----------)

[7.2]

File_picker_margin = 20  -- around each file button in all directions

File addition: 0130-lay_out_file_picker (----------)

[7.2]

lay_out_file_picker = function()
	local x,y = 0,0
	for _,n in ipairs(Global_state.file_picker) do
		local x2,y2 = compute_layout(n, x,y, Surface)
		if x2 < 1000 then
			x = x2 + File_picker_margin
		else
			x,y = 0,y2+File_picker_margin
		end
	end
end

File addition: 0129-initialize_file_picker (----------)

[7.2]

initialize_file_picker = function()
	Files = love.filesystem.getDirectoryItems('data')
	for i=#Files,1,-1 do
		if (not Files[i]:match('%.md$')) or Files[i]:match('%-%d+.md$') then
			table.remove(Files, i)
		end
	end
	table.sort(Files)
	Global_state.file_picker = {}
	for _,f in ipairs(Files) do
		table.insert(Global_state.file_picker, {
			type='text',
			data={{data=f}},
			rx=5,
			bg={r=0.7, g=0.7, b=1.0},
			border={r=0.4, g=0.4, b=0.7}
		})
	end
end

File addition: 0128-reset_viewport (----------)

[7.2]

reset_viewport = function()
	Viewport = {x=-50, y=-50, w=800,h=600, zoom=1.0}
end

Replacement in 0117-open_thread at line 2 [10.1551]

B:BD[10.1585] → [11.507:586]

	Global_state.root = rows()
	load_subtree(filename, Global_state.root.data, 0)

[10.1585]

[12.600]

	Global_state.thread = rows()
	load_subtree(filename, Global_state.thread.data, 0)

Replacement in 0113-draw_surface at line 25 [10.3616]
B:BD[10.4720] → [4.191:195]
```
end
```
[10.4720]
```
end
```

Replacement in 0112-Global_state at line 2 [10.4767]

B:BD[10.4786] → [10.4786:4865]

	-- button_handlers: for the file picker
	-- root: when reading a single thread

[10.4786]

	-- contains screens to render
	-- * file_picker: array of nodes to render on startup
	-- * thread: single node containing a single post and its comments

Replacement in 0030-update_editor_box at line 19 [14.26]
∅:D[2.164] → [13.24157:24161]
B:BD[13.24157] → [13.24157:24161]
```
end
```
[2.164]
```
end
```

Replacement in 0028-A at line 4 [13.2646]

B:BD[13.2820] → [11.621:664]

	-- translate Global_state.root to Surface

[13.2820]

[13.2857]

	-- translate some page in Global_state to Surface

Replacement in 0028-A at line 6 [13.2646]

B:BD[13.2871] → [11.665:750]

	compute_layout(Global_state.root, 0,0, Surface, preserve_screen_top_of_cursor_node)

[13.2871]

[13.2996]

	if Global_state.file_picker then
		lay_out_file_picker()
	elseif Global_state.thread then
		compute_layout(Global_state.thread, 0,0, Surface, preserve_screen_top_of_cursor_node)
	end

Replacement in 0027-Surface at line 1 [15.12612]

B:BD[15.12612] → [15.12613:12625]

B:BD[15.12625] → [16.423:933]

Surface = {
	-- test data
	{type='line', data={0,-1000, 0,1000}},
	{type='line', data={-10000,0, 10000,0}},
	{type='text', data={'0'}, x=-20,y=-30},
	{type='rectangle', x=50,y=50, w=20,h=80, r=1,g=0,b=0},
	{type='text', data={'abc', 'def'}, x=150, y=50, w=50,h=50, fg={r=0,g=0.4, b=0.9}},
	{type='circle', x=300,y=200, radius=40, r=1,g=0,b=1},
	{type='arc', x=0,y=0, radius=50, angle1=0, angle2=math.pi*2/3},
	{type='ellipse', x=100,y=100, radiusx=10, radiusy=50},
	{type='bezier', data={25,25, 25,125, 75,25, 125,25}},
}

[15.12612]

Surface = {}

Replacement in 0026-on.draw at line 2 [17.238692]

B:BD[17.238714] → [10.5048:5083]

B:BD[10.5083] → [11.753:787]

∅:D[11.787] → [10.5180:5271]

∅:D[12.839] → [10.5180:5271]

B:BD[10.5180] → [10.5180:5271]

	Global_state.button_handlers = {}
	if Global_state.root == nil then
		-- TODO: use surface for file picker as well
		draw_file_picker()
	else
		draw_surface()

[17.238714]

[4.224]

	for _,obj in ipairs(Surface) do
		love.graphics.setColor(obj.r or 0, obj.g or 0, obj.b or 0)
		if obj.type == 'rectangle' then
			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h), scale(obj.rx or 5), scale(obj.rx or obj.ry or 5))
		elseif obj.type == 'line' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'circle' then
			love.graphics.circle(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radius))
		elseif obj.type == 'arc' then
			love.graphics.arc(obj.drawmode or 'line', obj.arctype or 'open', vx(obj.x), vy(obj.y), scale(obj.radius), obj.angle1, obj.angle2, obj.segments)
		elseif obj.type == 'ellipse' then
			love.graphics.ellipse(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radiusx), scale(obj.radiusy))
		elseif obj.type == 'bezier' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'text' then
			if obj.w == nil then
				love.graphics.draw(obj.text, vx(obj.x), vy(obj.y))
			else
				edit.draw(obj.editor, obj.fg, not obj.show_cursor)
			end
		end

Replacement in 0026-on.draw at line 24 [17.238692]
∅:D[18.118] → [19.380:384]
B:BD[17.241398] → [19.380:384]
```
end
```
[17.241398]
```
	draw_menu_bar()
end
```

Replacement in 0023-on.keychord_press at line 3 [20.26]

B:BD[13.102] → [8.1626:1686]

∅:D[13.215] → [20.68:92]

∅:D[8.1686] → [20.68:92]

B:BD[20.68] → [20.68:92]

	-- a little weird that zoom works even in file picker mode
	if chord == 'C-=' then

[13.102]

[20.92]

	if Global_state.thread and chord == 'C-o' then
		Global_state.thread = nil
		reset_viewport()
	elseif chord == 'C-=' then

Replacement in 0023-on.keychord_press at line 20 [20.26]

B:BD[20.303] → [8.1687:1758]

	elseif Global_state.root then
		keychord_press_on_surface(chord, key)

[20.303]

[20.1605]

	elseif Cursor_node then
		local old_top = {line=Cursor_node.editor.screen_top1.line, pos=Cursor_node.editor.screen_top1.pos}
		edit.keychord_press(Cursor_node.editor, chord, key)
		if not eq(Cursor_node.editor.screen_top1, old_top) then
			Viewport.y = Cursor_node.y + y_of_schema1(Cursor_node.editor, Cursor_node.editor.screen_top1)
		end
		if chord == 'return' then
			A(--[[preserve screen_top of cursor node]] true)
		else
			B(--[[preserve screen_top of cursor node]] true)
		end
	else
		if chord == 'up' then
			Viewport.y = Viewport.y - scale(20)
			B()
		elseif chord == 'down' then
			Viewport.y = Viewport.y + scale(20)
			B()
		elseif chord == 'left' then
			Viewport.x = Viewport.x - scale(50)
			B()
		elseif chord == 'right' then
			Viewport.x = Viewport.x + scale(50)
			B()
		elseif chord == 'pageup' then
			Viewport.y = Viewport.y - App.screen.height/Viewport.zoom
			B()
		elseif chord == 'S-up' then
			Viewport.y = Viewport.y - App.screen.height/Viewport.zoom
			B()
		elseif chord == 'pagedown' then
			Viewport.y = Viewport.y + App.screen.height/Viewport.zoom
			B()
		elseif chord == 'S-down' then
			Viewport.y = Viewport.y + App.screen.height/Viewport.zoom
			B()
		elseif chord == 'S-left' then
			Viewport.x = Viewport.x - App.screen.width/Viewport.zoom
			B()
		elseif chord == 'S-right' then
			Viewport.x = Viewport.x + App.screen.width/Viewport.zoom
			B()
		end

Replacement in 0023-on.keychord_press at line 64 [20.26]
B:BD[20.1610] → [8.1759:1763]
```
end
```
[20.1610]
```
end
```

Replacement in 0021-compute_layout at line 26 [21.4307]

B:BD[21.4940] → [21.4940:4975]

B:BD[21.4975] → [6.39:107]

			for i,s in ipairs(node.data) do
				local width = love.graphics.getFont():getWidth(s)/Viewport.zoom

[21.4940]

[21.5069]

			for i,line in ipairs(node.data) do
				local width = love.graphics.getFont():getWidth(line.data)/Viewport.zoom

Replacement in 0021-compute_layout at line 104 [21.4307]
B:BD[21.6986] → [3.46:50]
```
end
```
[21.6986]
```
end
```
Insertion in 0012-on.initialize at line 2 [22.2104]
[22.2132]
[9.202]
```
	reset_viewport()
```

Replacement in 0012-on.initialize at line 6 [22.2104]

∅:D[11.869] → [10.5285:5485]

B:BD[22.2132] → [10.5285:5485]

	Files = love.filesystem.getDirectoryItems('data')
	for i=#Files,1,-1 do
		if (not Files[i]:match('%.md$')) or Files[i]:match('%-%d+.md$') then
			table.remove(Files, i)
		end
	end
	table.sort(Files)

[11.869]

[9.253]

	initialize_file_picker()
	A()

Replacement in 0009-on.code_change at line 3 [23.13874]
B:BD[23.13927] → [11.909:947]
```
	if Global_state.root then
		A()
	end
```
[23.13927]
[23.13964]
```
	A()
```
Replacement in 0008-Viewport at line 1 [24.445]
B:BD[24.445] → [24.446:494]
```
Viewport = {x=-50, y=-50, w=800,h=600, zoom=1.0}
```
[24.445]
```
Viewport = {}
```

Replacement in 0006-on.mouse_press at line 2 [26.703]

B:BD[25.58905] → [10.5492:5577]

	if mouse_press_consumed_by_any_button_handler(Global_state, x,y, mouse_button) then

[25.58905]

[13.13275]

	if Cursor_node then
		Cursor_node.show_cursor = nil
		Cursor_node = nil
	end
	if mouse_press_consumed_by_any_button_handler(HUD, x,y, mouse_button) then

Replacement in 0006-on.mouse_press at line 9 [26.703]

B:BD[13.13289] → [11.951:978]

∅:D[12.887] → [10.5605:5649]

∅:D[11.978] → [10.5605:5649]

B:BD[10.5605] → [10.5605:5649]

	if Global_state.root then
		mouse_press_on_surface(x,y, mouse_button)

[13.13289]

[13.13356]

	local node = on_text(x,y)
	if node then
		-- position cursor in node
		Cursor_node = node
		edit.mouse_press(node.editor, x,y, mouse_button)
		return

Insertion in 0006-on.mouse_press at line 16 [26.703]

[13.13361]

[27.535]

	-- pan surface
	Pan = {x=Viewport.x+x/Viewport.zoom,y=Viewport.y+y/Viewport.zoom}

start rendering file picker on the surface as well

Dependencies

In channels

Change contents

File deletion: 0126-keychord_press_on_surface

File addition: 0131-File_picker_margin (----------)

File addition: 0130-lay_out_file_picker (----------)

File addition: 0129-initialize_file_picker (----------)

File addition: 0128-reset_viewport (----------)

Replacement in 0117-open_thread at line 2 [10.1551]

Replacement in 0113-draw_surface at line 25 [10.3616]

Replacement in 0112-Global_state at line 2 [10.4767]

Replacement in 0030-update_editor_box at line 19 [14.26]

Replacement in 0028-A at line 4 [13.2646]

Replacement in 0028-A at line 6 [13.2646]

Replacement in 0027-Surface at line 1 [15.12612]

Replacement in 0026-on.draw at line 2 [17.238692]

Replacement in 0026-on.draw at line 24 [17.238692]

Replacement in 0023-on.keychord_press at line 3 [20.26]

Replacement in 0023-on.keychord_press at line 20 [20.26]

Replacement in 0023-on.keychord_press at line 64 [20.26]

Replacement in 0021-compute_layout at line 26 [21.4307]

Replacement in 0021-compute_layout at line 104 [21.4307]

Insertion in 0012-on.initialize at line 2 [22.2104]

Replacement in 0012-on.initialize at line 6 [22.2104]

Replacement in 0009-on.code_change at line 3 [23.13874]

Replacement in 0008-Viewport at line 1 [24.445]

Replacement in 0006-on.mouse_press at line 2 [26.703]

Replacement in 0006-on.mouse_press at line 9 [26.703]

Insertion in 0006-on.mouse_press at line 16 [26.703]