akkartik/pothi.love - Change UGWH4VEHN5G6REWZU6BCXZ57AFU7PGK4MULMMHMJCMEMVVEDH2KAC

new fork: pothi

Second attempt based on driver.love

Created by Kartik K. Agaram on June 18, 2023

UGWH4VEHN5G6REWZU6BCXZ57AFU7PGK4MULMMHMJCMEMVVEDH2KAC

Dependencies

In channels

main

Change contents

File deletion: 0101-draw_ticks, 0097-draw_ticks

BF:BFD[11.2] → [6.1224:1263]

BF:BFD[6.1263] → [12.6209:6209]

BFD:BFD[11.2] → [12.7477:7516]

BF:BFD[12.7516] → [12.6209:6209]

B:BD[12.6209] → [12.6210:7476]

draw_ticks = function()
	if App.fake_key_press then return end  -- disable in tests
	local old_font = love.graphics.getFont()
	love.graphics.setFont(Ticks_font)
	love.graphics.setColor(0.6,0.6,0.6)
	-- x axis
	local anchorlo, anchorhi, scale = tick_spec(Viewport.x, Viewport.x+iscale(App.screen.width))
--	print('x ticks', Viewport.x, App.screen.width, iscale(App.screen.width), anchorlo, anchorhi, scale)
	for x=anchorlo,anchorhi,scale do
		local vx = vx(x)
		love.graphics.line(vx, Menu_bar_height, vx, Menu_bar_height+5)
		love.graphics.print(('%2.0f'):format(x), vx+2, Menu_bar_height+5)
		love.graphics.line(vx, App.screen.height, vx, App.screen.height-5)
		love.graphics.print(('%2.0f'):format(x), vx+2, App.screen.height-15)
	end
	-- y axis
	local anchorlo, anchorhi, scale = tick_spec(Viewport.y, Viewport.y+iscale(App.screen.height))
--	print('y ticks', Viewport.y, App.screen.height, iscale(App.screen.height), anchorlo, anchorhi, scale)
	for y=anchorlo,anchorhi,scale do
		local vy = vy(y)
		love.graphics.line(0, vy, 5, vy)
		love.graphics.print(('%2.0f'):format(y), 5, vy+2)
		love.graphics.line(App.screen.width, vy, App.screen.width-5, vy)
		love.graphics.print(('%2.0f'):format(y), App.screen.width-40, vy+2)
	end
	love.graphics.setFont(old_font)
end

File deletion: 0093-draw_test_failure_indicator, 0085-draw_test_failure_indicator

BF:BFD[11.2] → [6.1554:1610]

BF:BFD[6.1610] → [12.11080:11080]

BFD:BFD[11.2] → [12.11630:11686]

BF:BFD[12.11686] → [12.11080:11080]

B:BD[12.11080] → [12.11081:11629]

draw_test_failure_indicator = function()
	if Client_app_test_failures == nil then
		return
	end
	if next(Client_app_test_failures, nil) == nil then
		return
	end
	App.color(Failing_test_definition_background_color)
	local border_width = App.screen.width/40, App.screen.height
	love.graphics.rectangle('fill', 0,0, border_width,App.screen.height)
	love.graphics.rectangle('fill', App.screen.width-border_width, 0, border_width, App.screen.height)
	love.graphics.rectangle('fill', 0,App.screen.height-border_width, App.screen.width, border_width)
end

File deletion: 0092-draw_load_time_error, 0084-draw_load_time_error

BF:BFD[11.2] → [6.1612:1661]

BF:BFD[6.1661] → [12.11688:11688]

BFD:BFD[11.2] → [12.12129:12178]

BF:BFD[12.12178] → [12.11688:11688]

B:BD[12.11688] → [12.11689:12128]

draw_load_time_error = function(obj)
	if not obj.editor.load_time_error then return end
	love.graphics.setColor(0.8,0,0)
	local error_y = math.min(vy(obj.y+obj.h), App.screen.height-20*5*Viewport.zoom)
	error_y = math.max(error_y, vy(obj.y))
	love.graphics.rectangle('fill', vx(obj.x), error_y, scale(obj.w), scale(5*20*Viewport.zoom))
	love.graphics.setColor(0,0,0)
	love.graphics.print(obj.editor.load_time_error, vx(obj.x), error_y)
end

File deletion: 0070-draw_run_time_error, 0058-draw_run_time_error

BF:BFD[11.2] → [6.2651:2699]

BF:BFD[6.2699] → [12.19818:19818]

BFD:BFD[11.2] → [12.20181:20229]

BF:BFD[12.20229] → [12.19818:19818]

B:BD[12.19818] → [12.19819:20180]

draw_run_time_error = function()
	if Run_time_error == nil then return end
	local height = math.min(20*HUD_line_height, App.screen.height*0.2)
	App.color{r=0.8,g=0,b=0}
	love.graphics.rectangle('fill', 0, App.screen.height - height-10, App.screen.width, height+10)
	App.color{r=0,g=0,b=0}
	love.graphics.print(Run_time_error, 30, App.screen.height - height)
end

Insertion in text.lua at line 106 [14.1]

[13.205]

  if line_cache == nil then
    -- about to crash; dump some debug info
    print(State.filename, line_index)
  end

Replacement in main.lua at line 89 [17.2]
B:BD[15.102] → [16.10:48]
```
  love.window.setTitle('driver.love')
```
[15.102]
[18.7]
```
  love.window.setTitle('pothi.love')
```
Deletion in live.lua at line 42 [20.722]
B:BD[19.247] → [3.8:54]
```
  Live.previous_run_time_error_check_time = 0
```

Deletion in live.lua at line 101 [20.722]

∅:D[19.609] → [20.5059:5065]

B:BD[20.5059] → [20.5059:5065]

B:BD[20.5065] → [3.55:228]

  end
  if Current_time - Live.previous_run_time_error_check_time > 0.1 then
    live.receive_run_time_error_from_app()
    Live.previous_run_time_error_check_time = Current_time

Replacement in live.lua at line 106 [20.722]

∅:D[21.89] → [22.9:102]

B:BD[20.5164] → [22.9:102]

  local f = io.open(love.filesystem.getAppdataDirectory()..'/_love_akkartik_driver2_driver')

[21.89]

[23.16]

  local f = io.open(love.filesystem.getAppdataDirectory()..'/_love_akkartik_driver_app')

Replacement in live.lua at line 114 [20.722]

B:BD[20.5475] → [4.11:96]

  os.remove(love.filesystem.getAppdataDirectory()..'/_love_akkartik_driver2_driver')

[20.5475]

[20.5626]

  os.remove(love.filesystem.getAppdataDirectory()..'/_love_akkartik_driver_app')

Replacement in live.lua at line 119 [20.722]

∅:D[21.124] → [22.206:304]

B:BD[20.5671] → [22.206:304]

  local f = io.open(love.filesystem.getAppdataDirectory()..'/_love_akkartik_driver_driver2', 'w')

[21.124]

[23.18]

  local f = io.open(love.filesystem.getAppdataDirectory()..'/_love_akkartik_app_driver', 'w')

Replacement in live.lua at line 129 [20.722]

∅:D[21.174] → [22.305:418]

B:BD[24.367] → [22.305:418]

  local f = io.open(love.filesystem.getAppdataDirectory()..'/_love_akkartik_driver_driver2_run_time_error', 'w')

[21.174]

[2.9]

  local f = io.open(love.filesystem.getAppdataDirectory()..'/_love_akkartik_app_driver_run_time_error', 'w')

Replacement in live.lua at line 313 [20.722]

B:BD[25.1813] → [5.11:137]

    '- run a meta copy of driver.love to try to fix it yourself. As you do, feel free to ask me questions: ak@akkartik.com\n'

[25.1813]

[25.1924]

    '- run driver.love to try to fix it yourself. As you do, feel free to ask me questions: ak@akkartik.com\n'

File addition: 0110-Border_color (----------)
[11.2]
```
Border_color = {r=0.5, g=0.5, b=0.5}
```
Deletion in 0106-on.load_settings at line 2 [12.1352]
B:BD[12.1391] → [12.1391:1458]
```
	App_name = load_manifest()
	print('app name', App_name, settings)
```

Deletion in 0106-on.load_settings at line 7 [12.1352]

B:BD[12.1629] → [12.1629:1964]

	end
	if Settings[App_name] == nil then
		Settings[App_name] = {}
		Settings[App_name].viewport = Viewport
		Settings[App_name].definitions = get_default_map()
	end
	Viewport = Settings[App_name].viewport
	Definitions = Settings[App_name].definitions
	local names = {}
	for name, _ in pairs(Definitions) do
		table.insert(names, name)

Replacement in 0106-on.load_settings at line 8 [12.1352]

B:BD[12.1969] → [12.1969:2551]

	local defs = get_multiple_definitions_from_app(names)
	for name, def_editor in pairs(Definitions) do
		if def_editor.type == nil then
			def_editor.type = 'text'
		end
		if def_editor.bg == nil then
			def_editor.bg = definition_background_color(name)
		end
		if def_editor.width == nil then
			def_editor.width = 600
		end
		if defs[name] then
			def_editor.data = load_from_iterator(defs[name]:gmatch("[^\r\n]+"))
		else
			-- app doesn't know about this definition
			-- just delete it from the driver for now
			print('deleting', name)
			Definitions[name] = nil
		end
	end
end

[12.1969]

end

Replacement in 0077-new_definition at line 10 [12.17854]
B:BD[12.18049] → [12.18049:18083]
```
		bg=Definition_background_color,
```
[12.18049]
[12.18083]
```
		bg=Border_color,  -- TODO: bg isn't accurate if obj.drawmode = 'line'
```
Replacement in 0077-new_definition at line 16 [12.17854]
B:BD[12.18222] → [12.18222:18225]
```
end
```
[12.18222]
```
end
```

Deletion in 0062-on.save_settings at line 4 [12.22904]

B:BD[12.23014] → [12.23014:23337]

	end
	for key,node in pairs(Definitions) do
		if type(key) == 'number' then
			-- can't save the array side for now because of a limitation in the 
			Definitions[key] = nil
		else
			node.data = nil  -- don't save uncommitted data for now
			node.show_cursor = nil
			node.editor = nil  -- TODO: check for hierarchy
		end

Deletion in 0062-on.save_settings at line 5 [12.22904]
B:BD[12.23342] → [12.23342:23417]
```
	Settings[App_name] = {
		viewport=Viewport,
		definitions=Definitions,
	}
```
Replacement in 0062-on.save_settings at line 6 [12.22904]
B:BD[12.23434] → [12.23434:23437]
```
end
```
[12.23434]
```
end
```
Replacement in 0030-update_editor_box at line 16 [26.26]
∅:D[9.209] → [12.24019:24097]
B:BD[26.449] → [12.24019:24097]
```
	node.editor.left = math.floor(vx(node.x)) + Line_number_width*App.width('m')
```
[9.209]
[26.492]
```
	node.editor.left = math.floor(vx(node.x))
```

Replacement in 0026-on.draw at line 11 [27.238692]

B:BD[27.238842] → [28.218:317]

			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h))

[27.238842]

[27.238950]

			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h), scale(obj.rx or 2), scale(obj.ry or 2))

Deletion in 0026-on.draw at line 26 [27.238692]

B:BD[28.447] → [12.7889:8018]

				love.graphics.setColor(0.5,0.5,0.5)
				love.graphics.rectangle('fill', vx(obj.x),vy(obj.y-30), scale(obj.w/2-5), scale(20))

Deletion in 0026-on.draw at line 27 [27.238692]
B:BD[12.8073] → [12.8073:8103]
```
				draw_load_time_error(obj)
```
Deletion in 0026-on.draw at line 30 [27.238692]
B:BD[27.241398] → [12.8104:8172]
```
	draw_run_time_error()
	draw_test_failure_indicator()
	draw_ticks()
```
Replacement in 0026-on.draw at line 31 [27.238692]
B:BD[12.8189] → [10.1259:1263]
```
end
```
[12.8189]
```
end
```

Replacement in 0021-compute_layout at line 11 [29.4307]

B:BD[29.4701] → [30.777:889]

			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y, key=node.key}

[29.4701]

[29.4799]

			node_to_render = {type='rectangle', drawmode='line', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y, key=node.key}

Replacement in 0021-compute_layout at line 97 [29.4307]
B:BD[29.6986] → [7.91:95]
```
end
```
[29.6986]
```
end
```
Deletion in 0010-initialize_editor at line 6 [31.542]
B:BD[31.724] → [12.25186:25241]
```
		-- HACK: modify obj.editor.left after initialization
```

Deletion in 0010-initialize_editor at line 7 [31.542]

B:BD[12.25394] → [12.25394:25465]

B:BD[12.25465] → [10.1279:1335]

		obj.editor.left = obj.editor.left + Line_number_width*App.width('m')
		obj.editor.width = obj.editor.right - obj.editor.left

Replacement in 0010-initialize_editor at line 10 [31.542]
B:BD[31.936] → [12.25524:25528]
```
end
```
[31.936]
```
end
```

new fork: pothi

Dependencies

In channels

Change contents

File deletion: 0101-draw_ticks, 0097-draw_ticks

File deletion: 0093-draw_test_failure_indicator, 0085-draw_test_failure_indicator

File deletion: 0092-draw_load_time_error, 0084-draw_load_time_error

File deletion: 0070-draw_run_time_error, 0058-draw_run_time_error

Insertion in text.lua at line 106 [14.1]

Replacement in main.lua at line 89 [17.2]

Deletion in live.lua at line 42 [20.722]

Deletion in live.lua at line 101 [20.722]

Replacement in live.lua at line 106 [20.722]

Replacement in live.lua at line 114 [20.722]

Replacement in live.lua at line 119 [20.722]

Replacement in live.lua at line 129 [20.722]

Replacement in live.lua at line 313 [20.722]

File addition: 0110-Border_color (----------)

Deletion in 0106-on.load_settings at line 2 [12.1352]

Deletion in 0106-on.load_settings at line 7 [12.1352]

Replacement in 0106-on.load_settings at line 8 [12.1352]

Replacement in 0077-new_definition at line 10 [12.17854]

Replacement in 0077-new_definition at line 16 [12.17854]

Deletion in 0062-on.save_settings at line 4 [12.22904]

Deletion in 0062-on.save_settings at line 5 [12.22904]

Replacement in 0062-on.save_settings at line 6 [12.22904]

Replacement in 0030-update_editor_box at line 16 [26.26]

Replacement in 0026-on.draw at line 11 [27.238692]

Deletion in 0026-on.draw at line 26 [27.238692]

Deletion in 0026-on.draw at line 27 [27.238692]

Deletion in 0026-on.draw at line 30 [27.238692]

Replacement in 0026-on.draw at line 31 [27.238692]

Replacement in 0021-compute_layout at line 11 [29.4307]

Replacement in 0021-compute_layout at line 97 [29.4307]

Deletion in 0010-initialize_editor at line 6 [31.542]

Deletion in 0010-initialize_editor at line 7 [31.542]

Replacement in 0010-initialize_editor at line 10 [31.542]