akkartik/sokoban.love - Change VAVXKWZVOFJGWHCWYLTPDKSKKMSJEBKXNKXUW3T6IZAC3HE6HOIQC

aggregate global state inside a 'pane' object

We're soon going to start juggling multiple of these.

Created by akkartik on November 19, 2023

VAVXKWZVOFJGWHCWYLTPDKSKKMSJEBKXNKXUW3T6IZAC3HE6HOIQC

Dependencies

In channels

main

Change contents

File deletion: 0044-Output_editor_state
BF:BFD[4.2] → [3.0:48]
BF:BFD[3.48] → [3.49:49]
B:BD[3.49] → [3.50:75]
```
Output_editor_state = nil
```
File deletion: 0041-Canvas
BF:BFD[4.2] → [5.425:460]
BF:BFD[5.460] → [5.461:461]
B:BD[5.461] → [5.462:474]
```
Canvas = nil
```
File deletion: 0009-Editor_state
BF:BFD[4.2] → [6.3537:3578]
BF:BFD[6.3578] → [6.3517:3517]
B:BD[6.3517] → [6.3518:3536]
```
Editor_state = nil
```
File addition: 0046-Global_state (----------)
[4.2]
```
Global_state = {}
```

File addition: 0045-Current_pane (----------)

[4.2]

Current_pane = {
	canvas = nil,
	editor_state = nil,
	output_editor_state = nil,
}

Replacement in 0042-draw_canvas at line 2 [5.204]
B:BD[5.230] → [5.230:264]
```
	if Canvas == nil then return end
```
[5.230]
[5.264]
```
	if Current_pane.canvas == nil then return end
```
Replacement in 0042-draw_canvas at line 5 [5.204]
B:BD[5.351] → [5.351:384]
```
	love.graphics.draw(Canvas, 0,0)
```
[5.351]
[5.384]
```
	love.graphics.draw(Current_pane.canvas, 0,0)
```

Replacement in 0032-update_font_settings at line 7 [7.50]

B:BD[7.351] → [7.351:662]

	Editor_state.top = Menu_bottom + 20
	Editor_state.left = Menu_left + 50 + Line_number_padding
	Editor_state.right = math.min(100+30*App.width('m'), Safe_width*2/3)
	Editor_state.width = Editor_state.right - Editor_state.left
	edit.update_font_settings(Editor_state, font_height)
	Text.redraw_all(Editor_state)

[7.351]

[7.662]

	Current_pane.editor_state.top = Menu_bottom + 20
	Current_pane.editor_state.left = Menu_left + 50 + Line_number_padding
	Current_pane.editor_state.right = math.min(100+30*App.width('m'), Safe_width*2/3)
	Current_pane.editor_state.width = Current_pane.editor_state.right - Current_pane.editor_state.left
	edit.update_font_settings(Current_pane.editor_state, font_height)
	Text.redraw_all(Current_pane.editor_state)

Replacement in 0031-on.resize at line 3 [8.1]

B:BD[8.84] → [8.84:215]

B:BD[8.215] → [7.666:705]

∅:D[7.705] → [8.215:246]

B:BD[8.215] → [8.215:246]

B:BD[8.246] → [3.1379:1575]

	Editor_state.right = math.min(100+30*App.width('m'), Safe_width*2/3)
	Editor_state.width = Editor_state.right - Editor_state.left
	Editor_state.bottom = Safe_height/2-5
	Text.redraw_all(Editor_state)
	Output_editor_state.top = Editor_state.bottom+5+10+5
	Output_editor_state.right = Editor_state.right
	Output_editor_state.width = Editor_state.width
	Output_editor_state.bottom = Safe_height - 5

[8.84]

[8.246]

	Current_pane.editor_state.right = math.min(100+30*App.width('m'), Safe_width*2/3)
	Current_pane.editor_state.width = Current_pane.editor_state.right - Current_pane.editor_state.left
	Current_pane.editor_state.bottom = Safe_height/2-5
	Text.redraw_all(Current_pane.editor_state)
	Current_pane.output_editor_state.top = Current_pane.editor_state.bottom+5+10+5
	Current_pane.output_editor_state.right = Current_pane.editor_state.right
	Current_pane.output_editor_state.width = Current_pane.editor_state.width
	Current_pane.output_editor_state.bottom = Safe_height - 5

Replacement in 0028-draw_output_border at line 4 [9.1]

B:BD[9.91] → [9.91:213]

	local x1 = Editor_state.left-5-Line_number_padding
	local x2 = Editor_state.right+5
	local y1 = Editor_state.bottom+5+10

[9.91]

[9.213]

	local x1 = Current_pane.editor_state.left-5-Line_number_padding
	local x2 = Current_pane.editor_state.right+5
	local y1 = Current_pane.editor_state.bottom+5+10

Replacement in 0021-draw_menu at line 5 [9.704]

B:BD[7.763] → [7.763:886]

	button(Editor_state, 'run', {x=Menu_left+5, y=Menu_top+5, w=App.width('Run')+10, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[7.763]

[9.948]

	button(Global_state, 'run', {x=Menu_left+5, y=Menu_top+5, w=App.width('Run')+10, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0021-draw_menu at line 13 [9.704]

B:BD[9.1085] → [5.475:644]

			local buf = table.concat(map(Editor_state.lines, function(line) return line.data end), '\n')
			Canvas = love.graphics.newCanvas()
			love.graphics.setCanvas(Canvas)

[9.1085]

[5.644]

			local buf = table.concat(map(Current_pane.editor_state.lines, function(line) return line.data end), '\n')
			Current_pane.canvas = love.graphics.newCanvas()
			love.graphics.setCanvas(Current_pane.canvas)

Replacement in 0021-draw_menu at line 23 [9.704]
B:BD[3.1658] → [3.1658:1692]
```
				Output_editor_state.lines = {
```
[3.1658]
[3.1692]
```
				Current_pane.output_editor_state.lines = {
```

Replacement in 0021-draw_menu at line 26 [9.704]

B:BD[3.1728] → [3.1728:1769]

				Text.redraw_all(Output_editor_state)

[3.1728]

[5.830]

				Text.redraw_all(Current_pane.output_editor_state)

Replacement in 0021-draw_menu at line 34 [9.704]

B:BD[7.1019] → [7.1019:1138]

	button(Editor_state, 'settings', {x=Safe_width-w-10-5, y=Menu_top+5, w=w+10, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[7.1019]

[7.1138]

	button(Global_state, 'settings', {x=Safe_width-w-10-5, y=Menu_top+5, w=w+10, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0021-draw_menu at line 45 [9.704]

B:BD[7.1372] → [7.1372:1493]

	button(Editor_state, 'left', {x=0, y=Menu_bottom, w=Menu_left+30, h=App.screen.height, bg={r=0.5, g=0.5, b=0.5, a=0.2},

[7.1372]

[7.1493]

	button(Global_state, 'left', {x=0, y=Menu_bottom, w=Menu_left+30, h=App.screen.height, bg={r=0.5, g=0.5, b=0.5, a=0.2},

Replacement in 0021-draw_menu at line 52 [9.704]

B:BD[7.1734] → [7.1734:1849]

	button(Editor_state, 'left', {x=r-30, y=Menu_bottom, w=100, h=App.screen.height, bg={r=0.5, g=0.5, b=0.5, a=0.2},

[7.1734]

[7.1849]

	button(Global_state, 'left', {x=r-30, y=Menu_bottom, w=100, h=App.screen.height, bg={r=0.5, g=0.5, b=0.5, a=0.2},

Replacement in 0020-draw_editor_border at line 3 [9.1140]

∅:D[2.220] → [9.1173:1323]

B:BD[9.1173] → [9.1173:1323]

	local x1 = Editor_state.left-5-Line_number_padding
	local y1 = Editor_state.top-5
	local x2 = Editor_state.right+5
	local y2 = Editor_state.bottom+5

[2.220]

[9.1323]

	local x1 = Current_pane.editor_state.left-5-Line_number_padding
	local y1 = Current_pane.editor_state.top-5
	local x2 = Current_pane.editor_state.right+5
	local y2 = Current_pane.editor_state.bottom+5

Replacement in 0017-on.mouse_release at line 2 [6.2211]

B:BD[6.2259] → [3.1770:1972]

∅:D[3.1972] → [10.47:133]

B:BD[11.1356] → [10.47:133]

∅:D[10.133] → [11.1362:1416]

B:BD[11.1362] → [11.1362:1416]

B:BD[11.1416] → [3.1973:2171]

	if Editor_state.scrollbar_drag then
		adjust_scrollbar(Editor_state, y)
		Editor_state.scrollbar_drag = nil
	elseif on_editor_scrollbar_area(Editor_state, x,y) then
		adjust_scrollbar(Editor_state, y)
	elseif x < Editor_state.right + 15 - 5 and y < Editor_state.bottom + 5 + 10 - 5 then
		edit.mouse_release(Editor_state, x,y, mouse_button)
	elseif Output_editor_state.scrollbar_drag then
		adjust_scrollbar(Output_editor_state, y)
	elseif on_editor_scrollbar_area(Output_editor_state, x,y) then
		adjust_scrollbar(Output_editor_state, y)

[6.2259]

[11.1416]

	if Current_pane.editor_state.scrollbar_drag then
		adjust_scrollbar(Current_pane.editor_state, y)
		Current_pane.editor_state.scrollbar_drag = nil
	elseif on_editor_scrollbar_area(Current_pane.editor_state, x,y) then
		adjust_scrollbar(Current_pane.editor_state, y)
	elseif x < Current_pane.editor_state.right + 15 - 5 and y < Current_pane.editor_state.bottom + 5 + 10 - 5 then
		edit.mouse_release(Current_pane.editor_state, x,y, mouse_button)
	elseif Current_pane.output_editor_state.scrollbar_drag then
		adjust_scrollbar(Current_pane.output_editor_state, y)
	elseif on_editor_scrollbar_area(Current_pane.output_editor_state, x,y) then
		adjust_scrollbar(Current_pane.output_editor_state, y)

Replacement in 0016-on.mouse_press at line 2 [6.2363]

B:BD[6.2409] → [9.1654:1739]

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

[6.2409]

[9.1739]

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

Replacement in 0016-on.mouse_press at line 5 [6.2363]

B:BD[9.1753] → [3.2172:2314]

	if on_editor_scrollbar(Editor_state, x,y) then
		Editor_state.scrollbar_drag = true
	elseif on_editor_scrollbar_area(Editor_state, x,y) then

[9.1753]

[11.1530]

	if on_editor_scrollbar(Current_pane.editor_state, x,y) then
		Current_pane.editor_state.scrollbar_drag = true
	elseif on_editor_scrollbar_area(Current_pane.editor_state, x,y) then

Replacement in 0016-on.mouse_press at line 9 [6.2363]

B:BD[11.1543] → [10.135:221]

∅:D[10.221] → [11.1549:1601]

B:BD[11.1549] → [11.1549:1601]

B:BD[11.1601] → [3.2315:2482]

	elseif x < Editor_state.right + 15 - 5 and y < Editor_state.bottom + 5 + 10 - 5 then
		edit.mouse_press(Editor_state, x,y, mouse_button)
	elseif on_editor_scrollbar(Output_editor_state, x,y) then
		Output_editor_state.scrollbar_drag = true
	elseif on_editor_scrollbar_area(Output_editor_state, x,y) then

[11.1543]

[3.2482]

	elseif x < Current_pane.editor_state.right + 15 - 5 and y < Current_pane.editor_state.bottom + 5 + 10 - 5 then
		edit.mouse_press(Current_pane.editor_state, x,y, mouse_button)
	elseif on_editor_scrollbar(Current_pane.output_editor_state, x,y) then
		Current_pane.output_editor_state.scrollbar_drag = true
	elseif on_editor_scrollbar_area(Current_pane.output_editor_state, x,y) then

Replacement in 0015-on.key_release at line 2 [6.2509]

B:BD[6.2551] → [6.2551:2598]

	edit.key_release(Editor_state, key, scancode)

[6.2551]

[6.2598]

	edit.key_release(Current_pane.editor_state, key, scancode)

Replacement in 0014-on.text_input at line 2 [6.2647]
B:BD[6.2676] → [6.2676:2710]
```
	edit.text_input(Editor_state, t)
```
[6.2676]
[6.2710]
```
	edit.text_input(Current_pane.editor_state, t)
```

Replacement in 0013-on.keychord_press at line 3 [6.2758]

B:BD[7.2059] → [7.2059:2110]

		update_font_settings(Editor_state.font_height+2)

[7.2059]

[7.2110]

		update_font_settings(Current_pane.editor_state.font_height+2)

Replacement in 0013-on.keychord_press at line 5 [6.2758]

B:BD[7.2138] → [7.2138:2189]

		update_font_settings(Editor_state.font_height-2)

[7.2138]

[7.2189]

		update_font_settings(Current_pane.editor_state.font_height-2)

Replacement in 0013-on.keychord_press at line 9 [6.2758]

B:BD[7.2250] → [7.2250:2298]

		edit.keychord_press(Editor_state, chord, key)

[7.2250]

[7.2298]

		edit.keychord_press(Current_pane.editor_state, chord, key)

Replacement in 0013-on.keychord_press at line 11 [6.2758]
B:BD[7.2303] → [12.3111:3115]
```
end
```
[7.2303]
```
end
```
Replacement in 0012-on.draw at line 2 [6.2899]
B:BD[6.2921] → [9.1758:1793]
```
	Editor_state.button_handlers = {}
```
[6.2921]
[5.890]
```
	Global_state.button_handlers = {}
```
Replacement in 0012-on.draw at line 7 [6.2899]
∅:D[9.1924] → [6.3008:3033]
B:BD[6.3008] → [6.3008:3033]
B:BD[6.3033] → [12.3116:3146]
```
	edit.draw(Editor_state)
	draw_scrollbar(Editor_state)
```
[9.1924]
[9.1925]
```
	edit.draw(Current_pane.editor_state)
	draw_scrollbar(Current_pane.editor_state)
```

Replacement in 0012-on.draw at line 10 [6.2899]

B:BD[9.1947] → [3.2496:2603]

	edit.draw(Output_editor_state, Normal_color, --[[hide cursor]] true)
	draw_scrollbar(Output_editor_state)

[9.1947]

	edit.draw(Current_pane.output_editor_state, Normal_color, --[[hide cursor]] true)
	draw_scrollbar(Current_pane.output_editor_state)

Replacement in 0011-on.initialize at line 8 [6.3075]
B:BD[9.2084] → [9.2084:2123]
```
	Editor_state = edit.initialize_state(
```
[9.2084]
[8.522]
```
	Current_pane.editor_state = edit.initialize_state(
```

Replacement in 0011-on.initialize at line 14 [6.3075]

∅:D[13.800] → [6.3379:3410]

∅:D[9.2276] → [6.3379:3410]

B:BD[6.3379] → [6.3379:3410]

B:BD[6.3410] → [3.2604:2688]

	Text.redraw_all(Editor_state)
	Output_editor_state = edit.initialize_state(
		Editor_state.bottom+5+10+5,  -- top

[9.2276]

[3.2688]

	Text.redraw_all(Current_pane.editor_state)
	Current_pane.output_editor_state = edit.initialize_state(
		Current_pane.editor_state.bottom+5+10+5,  -- top

Replacement in 0011-on.initialize at line 18 [6.3075]

B:BD[3.2706] → [3.2706:2747]

		Editor_state.left, Editor_state.right,

[3.2706]

[3.2747]

		Current_pane.editor_state.left, Current_pane.editor_state.right,

Replacement in 0011-on.initialize at line 20 [6.3075]
B:BD[3.2799] → [3.2799:2837]
```
	Text.redraw_all(Output_editor_state)
```
[3.2799]
[9.2277]
```
	Text.redraw_all(Current_pane.output_editor_state)
```

Replacement in 0004-on.update at line 3 [14.1708]

B:BD[14.1760] → [3.2838:3026]

	if Editor_state.scrollbar_drag then
		adjust_scrollbar(Editor_state, App.mouse_y())
	elseif Output_editor_state.scrollbar_drag then
		adjust_scrollbar(Output_editor_state, App.mouse_y())

[14.1760]

[11.1672]

	if Current_pane.editor_state.scrollbar_drag then
		adjust_scrollbar(Current_pane.editor_state, App.mouse_y())
	elseif Current_pane.output_editor_state.scrollbar_drag then
		adjust_scrollbar(Current_pane.output_editor_state, App.mouse_y())

aggregate global state inside a 'pane' object

Dependencies

In channels

Change contents

File deletion: 0044-Output_editor_state

File deletion: 0041-Canvas

File deletion: 0009-Editor_state

File addition: 0046-Global_state (----------)