akkartik/sokoban.love - Change 6RYG2FQJETRSB4HAZCURFUWAQXGMQHJPMEDWXO5LOY7HEPZNRPAAC

switch all handlers to run either the app or editor

Created by akkartik on December 31, 2023

6RYG2FQJETRSB4HAZCURFUWAQXGMQHJPMEDWXO5LOY7HEPZNRPAAC

Dependencies

In channels

main

Change contents

File deletion: 0106-stop_button
BF:BFD[8.2] → [9.0:40]
BF:BFD[9.40] → [9.41:41]
B:BD[9.41] → [10.1333:1362]
B:BD[10.1362] → [11.132:173]
∅:D[6.56] → [12.188:207]
B:BD[11.173] → [12.188:207]
∅:D[12.207] → [11.223:250]
B:BD[11.223] → [11.223:250]
B:BD[11.173] → [6.0:56]
∅:D[11.250] → [9.68:100]
∅:D[13.654] → [9.68:100]
∅:D[10.1362] → [9.68:100]
B:BD[9.68] → [9.68:100]
B:BD[9.386] → [10.1451:1469]
B:BD[10.1469] → [6.57:60]
```
stop_button = function(x, y)
	styled_button('stop', x,y,
		function()
			Show_menu = nil
			clear_handlers()
		end)
			if car.quit then
				call_protected(car.quit)
			end
	local w = App.width('stop')+10
	return x+w+10, y
end
```
File deletion: 0065-hide_code_button
BF:BFD[8.2] → [14.5120:5165]
BF:BFD[14.5165] → [14.4728:4728]
B:BD[14.4728] → [10.3061:3098]
B:BD[10.3098] → [15.918:976]
B:BD[15.976] → [12.472:491]
∅:D[12.491] → [14.5069:5090]
∅:D[11.575] → [14.5069:5090]
∅:D[15.976] → [14.5069:5090]
B:BD[14.5069] → [14.5069:5090]
B:BD[14.5090] → [15.977:984]
B:BD[15.984] → [12.492:496]
```
hide_code_button = function(x, y, r)
	return overflowable_button('hide', x, y, r,
		function()
			Show_menu = nil
			Show_code = false
		end)
end
```
File deletion: 0064-show_code_button
BF:BFD[8.2] → [14.5558:5603]
BF:BFD[14.5603] → [14.5167:5167]
B:BD[14.5167] → [16.72:109]
B:BD[16.109] → [15.985:1043]
B:BD[15.1043] → [12.497:516]
∅:D[12.516] → [14.5508:5528]
∅:D[11.626] → [14.5508:5528]
∅:D[15.1043] → [14.5508:5528]
B:BD[14.5508] → [14.5508:5528]
B:BD[14.5528] → [15.1044:1051]
B:BD[15.1051] → [12.517:521]
```
show_code_button = function(x, y, r)
	return overflowable_button('show', x, y, r,
		function()
			Show_menu = nil
			Show_code = true
		end)
end
```

File addition: 0158-on.quit (----------)

[8.2]

on.quit = function()
	call_protected(car.quit)
end

Replacement in 0101-on.mouse_wheel_move at line 2 [17.49]

B:BD[17.88] → [17.88:107]

B:BD[17.107] → [3.71:268]

∅:D[3.268] → [17.124:150]

B:BD[17.124] → [17.124:150]

	if Show_code then
		if App.mouse_y() < Current_pane.editor_state.bottom then
			edit.mouse_wheel_move(Current_pane.editor_state, dx,dy)
		else
			edit.mouse_wheel_move(Current_pane.output_editor_state, dx,dy)
		end
	else
		-- editors hidden

[17.88]

[18.915]

	if not Show_code then

Insertion in 0101-on.mouse_wheel_move at line 9 [17.49]

[18.1071]

[17.264]

	else
		if App.mouse_y() < Current_pane.editor_state.bottom then
			edit.mouse_wheel_move(Current_pane.editor_state, dx,dy)
		else
			edit.mouse_wheel_move(Current_pane.output_editor_state, dx,dy)
		end

Deletion in 0021-draw_menu at line 14 [19.704]
B:BD[16.166] → [16.166:189]
∅:D[16.189] → [10.4375:4455]
B:BD[9.605] → [10.4375:4455]
B:BD[10.4455] → [20.284:501]
∅:D[20.501] → [14.7838:7857]
∅:D[9.605] → [14.7838:7857]
∅:D[10.4455] → [14.7838:7857]
B:BD[21.398] → [14.7838:7857]
B:BD[14.7857] → [10.4456:4491]
∅:D[10.4491] → [14.7883:7889]
B:BD[14.7883] → [14.7883:7889]
B:BD[14.7889] → [10.4492:4527]
∅:D[10.4527] → [14.7915:7920]
B:BD[14.7915] → [14.7915:7920]
```
	x = stop_button(x, y)
	-- assume screen will always be wide enough to print this far without overflow
	if not Overflow_button then
		local w = App.width('code')+10
		local w2 = App.width('>>')+10
		if x+w+10+w2+10 < r then
			App.color{r=0.5, g=0.5, b=0.5}
			love.graphics.print('code', x, y)
			x = x+w+10
		end
	end
	if Show_code then
		x, y = hide_code_button(x, y, r)
	else
		x, y = show_code_button(x, y, r)
	end
```

Deletion in 0021-draw_menu at line 18 [19.704]

B:BD[10.4587] → [10.4587:4818]

B:BD[10.4818] → [20.502:516]

∅:D[20.516] → [10.4850:4861]

B:BD[10.4850] → [10.4850:4861]

	x, y = clear_pane_button(x, y, r)
	if not Overflow_button then
		local w = App.width('screen')+10
		local w2 = App.width('>>')+10
		if x+w+10+w2+10 < r then
			App.color{r=0.5, g=0.5, b=0.5}
			love.graphics.print('screen', x, y)
			x = x+w+10
		end
	end

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

B:BD[22.2259] → [23.66:83]

B:BD[24.5822] → [23.84:166]

B:BD[23.166] → [4.1313:1349]

∅:D[4.1349] → [12.661:694]

B:BD[23.166] → [12.661:694]

∅:D[12.694] → [25.23:66]

B:BD[25.23] → [25.23:66]

	-- == menu area
	if Button_pressed then
		Button_pressed = nil
		return
	end
	-- == settings area
	Global_state.selected_slider = nil
	if Show_menu == 'settings' then
		if on_area(Settings_menu_area, x,y) then

[22.2259]

[25.66]

	if not Show_code then
		if car.mouse_release then
			call_protected(car.mouse_release, x,y, mouse_button)
		end
		if car.mousereleased then
			call_protected(car.mousereleased, x,y, mouse_button)
		end
	else
		-- == menu area
		if Button_pressed then
			Button_pressed = nil

Replacement in 0017-on.mouse_release at line 15 [22.2211]

∅:D[25.82] → [23.217:239]

B:BD[23.217] → [23.217:239]

∅:D[23.239] → [17.376:395]

B:BD[24.5822] → [17.376:395]

	end
	-- == main area
	if Show_code then

[25.82]

[17.395]

		-- == settings area
		Global_state.selected_slider = nil
		if Show_menu == 'settings' then
			if on_area(Settings_menu_area, x,y) then
				return
			end
		end
		-- == main area

Deletion in 0017-on.mouse_release at line 38 [22.2211]

B:BD[17.1165] → [17.1165:1191]

B:BD[17.1191] → [18.1194:1374]

	else
		-- editors hidden
		if car.mouse_release then
			call_protected(car.mouse_release, x,y, mouse_button)
		end
		if car.mousereleased then
			call_protected(car.mousereleased, x,y, mouse_button)
		end

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

B:BD[22.2409] → [23.240:257]

∅:D[23.257] → [26.520:612]

B:BD[22.2409] → [26.520:612]

B:BD[26.612] → [5.138:215]

∅:D[5.215] → [23.258:282]

B:BD[27.3206] → [23.258:282]

∅:D[23.282] → [24.5824:5838]

B:BD[27.3206] → [24.5824:5838]

B:BD[10.4958] → [23.283:304]

B:BD[23.304] → [4.1354:1431]

∅:D[4.1431] → [12.700:733]

B:BD[23.304] → [12.700:733]

∅:D[12.733] → [23.327:370]

B:BD[23.327] → [23.327:370]

B:BD[23.370] → [4.1432:1497]

∅:D[28.822] → [23.412:419]

∅:D[4.1497] → [23.412:419]

B:BD[23.412] → [23.412:419]

B:BD[23.419] → [12.734:753]

∅:D[12.753] → [23.444:589]

B:BD[23.444] → [23.444:589]

∅:D[23.589] → [29.106:166]

B:BD[29.106] → [29.106:166]

	-- == menu area
	-- some hysteresis right after a button has been pressed
	if Active_button then return end
	if mouse_press_consumed_by_any_button(Global_state, x,y, mouse_button) then
		Button_pressed = true
		return
	end
	-- == settings area
	if mouse_press_consumed_by_any_slider(Global_state, x,y) then
		return
	end
	if Show_menu == 'settings' then
		if on_area(Settings_menu_area, x,y) then
			-- nothing atm in settings menu that isn't a button or slider
		else
			Show_menu = nil
			-- On mobile devices, we can't depend on on.save_settings() triggering on quit.
			-- So save settings every time we close the settings menu.
			love.filesystem.write('config', json.encode(settings()))

[22.2409]

[29.166]

	if not Show_code then
		if car.mouse_press then
			call_protected(car.mouse_press, x,y, mouse_button)
		end
		if car.mousepressed then
			call_protected(car.mousepressed, x,y, mouse_button)
		end
	else
		-- == menu area
		-- some hysteresis right after a button has been pressed
		if Active_button then return end
		if mouse_press_consumed_by_any_button(Global_state, x,y, mouse_button) then
			Button_pressed = true
			return
		end
		-- == settings area
		if mouse_press_consumed_by_any_slider(Global_state, x,y) then
			return
		end
		if Show_menu == 'settings' then
			if on_area(Settings_menu_area, x,y) then
				-- nothing atm in settings menu that isn't a button or slider
			else
				Show_menu = nil
				-- On mobile devices, we can't depend on on.save_settings() triggering on quit.
				-- So save settings every time we close the settings menu.
				love.filesystem.write('config', json.encode(settings()))
			end
			return

Replacement in 0016-on.mouse_press at line 32 [22.2363]
B:BD[29.172] → [23.590:599]
∅:D[23.599] → [24.5957:5962]
B:BD[24.5957] → [24.5957:5962]
B:BD[24.5962] → [23.600:617]
B:BD[23.617] → [12.754:771]
∅:D[23.617] → [17.1330:1349]
∅:D[12.771] → [17.1330:1349]
B:BD[24.5962] → [17.1330:1349]
```
		return
	end
	-- == main area
	Show_menu = nil
	if Show_code then
```
[29.172]
[17.1349]
```
		-- == main area
		Show_menu = nil
```

Deletion in 0016-on.mouse_press at line 49 [22.2363]

B:BD[17.1985] → [17.1985:2017]

B:BD[17.2017] → [30.141:309]

		end
	else
		-- editors hidden
		if car.mouse_press then
			call_protected(car.mouse_press, x,y, mouse_button)
		end
		if car.mousepressed then
			call_protected(car.mousepressed, x,y, mouse_button)

Replacement in 0016-on.mouse_press at line 51 [22.2363]
B:BD[31.1606] → [5.216:220]
```
end
```
[31.1606]
```
end
```
Deletion in 0015-on.key_release at line 7 [22.2509]
B:BD[17.2288] → [17.2288:2308]
```
		-- editors hidden
```

Replacement in 0014-on.text_input at line 2 [22.2647]

B:BD[22.2676] → [2.2912:2992]

∅:D[2.2992] → [17.2450:2495]

B:BD[17.2450] → [17.2450:2495]

	if Show_file_dialog then
		text_input_on_file_dialog(t)
	elseif Show_code then
		if Current_pane.editor_state.cursor_x then

[22.2676]

[17.2495]

	if Show_code then
		if Show_file_dialog then
			text_input_on_file_dialog(t)
		elseif Current_pane.editor_state.cursor_x then

Deletion in 0014-on.text_input at line 9 [22.2647]
B:BD[17.2556] → [17.2556:2576]
```
		-- editors hidden
```

Replacement in 0013-on.keychord_press at line 2 [22.2758]

B:BD[22.2800] → [32.4016:4042]

B:BD[32.4042] → [2.2994:3038]

∅:D[2.3038] → [32.4069:4083]

B:BD[32.4069] → [32.4069:4083]

∅:D[32.4083] → [33.2035:2059]

B:BD[22.2800] → [33.2035:2059]

B:BD[33.2059] → [27.3882:3946]

∅:D[27.3946] → [33.2110:2138]

B:BD[33.2110] → [33.2110:2138]

B:BD[33.2138] → [27.3947:4011]

∅:D[27.4011] → [33.2189:2244]

B:BD[33.2189] → [33.2189:2244]

B:BD[33.2244] → [17.2669:2846]

	if Show_file_dialog then
		keychord_press_on_file_dialog(chord, key)
		return
	end
	if chord == 'C-=' then
		update_font_settings(Current_pane.editor_state.font_height+2)
	elseif chord == 'C--' then
		update_font_settings(Current_pane.editor_state.font_height-2)
	elseif chord == 'C-0' then
		update_font_settings(20)
	elseif Show_code then
		if Current_pane.editor_state.cursor_x then
			-- send keys to editor if cursor is visible
			edit.keychord_press(Current_pane.editor_state, chord, key)

[22.2800]

[17.2846]

	if Show_code then
		if Show_file_dialog then
			keychord_press_on_file_dialog(chord, key)
			return
		end
		if chord == 'C-=' then
			update_font_settings(Current_pane.editor_state.font_height+2)
		elseif chord == 'C--' then
			update_font_settings(Current_pane.editor_state.font_height-2)
		elseif chord == 'C-0' then
			update_font_settings(20)
		else
			if Current_pane.editor_state.cursor_x then
				-- send keys to editor if cursor is visible
				edit.keychord_press(Current_pane.editor_state, chord, key)
			end

Deletion in 0013-on.keychord_press at line 20 [22.2758]
B:BD[17.2858] → [17.2858:2878]
```
		-- editors hidden
```

Replacement in 0012-on.draw at line 4 [22.2899]

∅:D[4.1533] → [32.4084:4162]

B:BD[27.4113] → [32.4084:4162]

∅:D[32.4162] → [10.4963:4986]

B:BD[27.4113] → [10.4963:4986]

∅:D[10.4986] → [34.44:138]

B:BD[27.4113] → [34.44:138]

B:BD[35.905] → [17.2992:3021]

B:BD[17.3021] → [7.0:47]

∅:D[7.47] → [36.73:102]

B:BD[18.1893] → [36.73:102]

∅:D[36.102] → [37.0:56]

∅:D[38.182] → [37.0:56]

B:BD[18.1893] → [37.0:56]

∅:D[37.56] → [14.8224:8243]

∅:D[18.1893] → [14.8224:8243]

∅:D[17.3069] → [14.8224:8243]

B:BD[35.905] → [14.8224:8243]

	-- modal dialog
	if Show_file_dialog then
		draw_file_dialog()
		return
	end
	Overflow_button = nil
	love.graphics.setBackgroundColor(Background_color.r, Background_color.g, Background_color.b)
	App.color(Foreground_color)
	if car.draw then call_protected(car.draw) end
	love.graphics.setFont(Font)
	App.color(Normal_color)
	love.graphics.setLineWidth(1)
	if Show_code then

[4.1533]

[14.8243]

	if not Show_code then
		if car.draw then call_protected(car.draw) end
	else
		-- modal dialog
		if Show_file_dialog then
			draw_file_dialog()
			return
		end
		Overflow_button = nil
		love.graphics.setBackgroundColor(Background_color.r, Background_color.g, Background_color.b)
		App.color(Foreground_color)
		-- code editor
		love.graphics.setFont(Font)
		App.color(Normal_color)
		love.graphics.setLineWidth(1)

Insertion in 0012-on.draw at line 22 [22.2899]
[14.8416]
[14.8416]
```
		-- output
```

Insertion in 0012-on.draw at line 26 [22.2899]

[14.8574]

		-- menu and debug UI
		draw_menu()
		draw_next_frames_of_animations()

Deletion in 0012-on.draw at line 30 [22.2899]
∅:D[39.2603] → [19.1947:1960]
∅:D[27.4329] → [19.1947:1960]
∅:D[14.8579] → [19.1947:1960]
B:BD[19.1947] → [19.1947:1960]
B:BD[19.1960] → [40.2189:2223]
```
	draw_menu()
	draw_next_frames_of_animations()
```

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

B:BD[41.1760] → [23.618:635]

∅:D[23.635] → [26.613:699]

B:BD[41.1760] → [26.613:699]

	-- == menu area
	if Active_button and Active_button.expire <= Current_time then
		Active_button = nil

[41.1760]

[26.699]

	if not Show_code then
		if car.update then call_protected(car.update, dt) end
	else
		-- == menu area
		if Active_button and Active_button.expire <= Current_time then
			Active_button = nil
		end
		-- == settings area
		update_sliders(Global_state, App.mouse_x())
		-- == main area
		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())
		end

Deletion in 0004-on.update at line 19 [41.1708]

B:BD[26.704] → [23.636:657]

B:BD[23.657] → [4.1534:1596]

∅:D[23.672] → [27.4658:4898]

∅:D[4.1596] → [27.4658:4898]

∅:D[24.6266] → [27.4658:4898]

B:BD[41.1760] → [27.4658:4898]

∅:D[39.3026] → [31.1672:1677]

∅:D[27.4898] → [31.1672:1677]

B:BD[31.1672] → [31.1672:1677]

B:BD[31.1677] → [18.1894:1949]

	-- == settings area
	update_sliders(Global_state, App.mouse_x())
	-- == main area
	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())
	end
	if car.update then call_protected(car.update, dt) end

switch all handlers to run either the app or editor

Dependencies

In channels

Change contents

File deletion: 0106-stop_button

File deletion: 0065-hide_code_button

File deletion: 0064-show_code_button

File addition: 0158-on.quit (----------)

Replacement in 0101-on.mouse_wheel_move at line 2 [17.49]

Insertion in 0101-on.mouse_wheel_move at line 9 [17.49]

Deletion in 0021-draw_menu at line 14 [19.704]

Deletion in 0021-draw_menu at line 18 [19.704]

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

Replacement in 0017-on.mouse_release at line 15 [22.2211]

Deletion in 0017-on.mouse_release at line 38 [22.2211]

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

Replacement in 0016-on.mouse_press at line 32 [22.2363]

Deletion in 0016-on.mouse_press at line 49 [22.2363]

Replacement in 0016-on.mouse_press at line 51 [22.2363]

Deletion in 0015-on.key_release at line 7 [22.2509]

Replacement in 0014-on.text_input at line 2 [22.2647]

Deletion in 0014-on.text_input at line 9 [22.2647]

Replacement in 0013-on.keychord_press at line 2 [22.2758]

Deletion in 0013-on.keychord_press at line 20 [22.2758]

Replacement in 0012-on.draw at line 4 [22.2899]

Insertion in 0012-on.draw at line 22 [22.2899]

Insertion in 0012-on.draw at line 26 [22.2899]

Deletion in 0012-on.draw at line 30 [22.2899]

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

Deletion in 0004-on.update at line 19 [41.1708]