akkartik/sokoban.love - Change 6DJMOJKEO5DIOEDV655SPA7C7HN2HXWMDJ7UF2CRDRBAF5YO3UEAC

support event handlers

I've agonized over conflicts between editor and script handlers for a while, but finally the solution occurred to me: to use the script's handlers, hide the editor. To use the editor's handlers, show the editor. The menu and settings are always active. This seems nice and consistent, easy to explain.

Mike Stein would prefer we just supported love.* handlers in scripts to minimize special cases and cognitive load for people. But I'd rather err on the side of being transparent about what's going on inside. As a compromise I'm supporting love.* names at least in addition to my rephrasings (which came about mostly because love.keychordpressed is just too much of a mouthful)

Created by akkartik on November 21, 2023

6DJMOJKEO5DIOEDV655SPA7C7HN2HXWMDJ7UF2CRDRBAF5YO3UEAC

Dependencies

In channels

main

Change contents

File addition: 0101-on.mouse_wheel_move (----------)

[6.2]

on.mouse_wheel_move = function(dx,dy)
	if Show_code then
		-- nothing yet
	else
		-- editors hidden
		if car.mouse_wheel_move then car.mouse_wheel_move(dx,dy) end
		if car.wheelmoved then car.wheelmoved(dx,dy) end
	end
end

File addition: 0100-car (----------)

[6.2]

-- Table where any handlers for the current pane will live.
car = {}

Replacement in 0017-on.mouse_release at line 3 [8.2211]

∅:D[5.5822] → [7.2424:2987]

B:BD[8.2259] → [7.2424:2987]

B:BD[7.2987] → [3.61:117]

∅:D[3.117] → [7.2987:3120]

B:BD[7.2987] → [7.2987:3120]

	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)
		Current_pane.output_editor_state.scrollbar_drag = nil
	elseif on_editor_scrollbar_area(Current_pane.output_editor_state, x,y) then
		adjust_scrollbar(Current_pane.output_editor_state, y)

[5.5822]

[9.1416]

	if Show_code then
		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)
			Current_pane.output_editor_state.scrollbar_drag = nil
		elseif on_editor_scrollbar_area(Current_pane.output_editor_state, x,y) then
			adjust_scrollbar(Current_pane.output_editor_state, y)
		end
	else
		-- editors hidden
		if car.mouse_release then car.mouse_release(x,y, mouse_button) end
		if car.mousereleased then car.mousereleased(x,y, mouse_button) end

Replacement in 0016-on.mouse_press at line 11 [8.2363]

∅:D[5.5962] → [7.3207:3388]

B:BD[10.1753] → [7.3207:3388]

∅:D[11.2314] → [9.1530:1543]

∅:D[7.3388] → [9.1530:1543]

B:BD[9.1530] → [9.1530:1543]

B:BD[9.1543] → [7.3389:3501]

B:BD[7.3501] → [2.62:97]

∅:D[2.97] → [7.3501:3772]

B:BD[7.3501] → [7.3501:3772]

∅:D[7.3772] → [11.2482:2495]

B:BD[11.2482] → [11.2482:2495]

	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
		-- nothing
	elseif x < Current_pane.editor_state.right + 15 - 5 and y < Current_pane.editor_state.bottom + 5 + 10 - 5 then
		love.keyboard.setTextInput(true)
		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
		-- nothing

[5.5962]

[9.1601]

	if Show_code then
		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
			-- nothing
		elseif x < Current_pane.editor_state.right + 15 - 5 and y < Current_pane.editor_state.bottom + 5 + 10 - 5 then
			love.keyboard.setTextInput(true)
			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
			-- nothing
		end
	else
		-- editors hidden
		if car.mouse_press then car.mouse_press(x,y, mouse_button) end
		if car.mousepressed then car.mousepressed(x,y, mouse_button) end

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

B:BD[8.2551] → [4.0:105]

	if Current_pane.editor_state.cursor_x then
		edit.key_release(Current_pane.editor_state, key, scancode)

[8.2551]

[4.105]

	if Show_code then
		if Current_pane.editor_state.cursor_x then
			edit.key_release(Current_pane.editor_state, key, scancode)
		end
	else
		-- editors hidden
		if car.key_release then car.key_release(key, scancode) end
		if car.keyreleased then car.keyreleased(key, scancode) end

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

B:BD[8.2676] → [4.111:203]

	if Current_pane.editor_state.cursor_x then
		edit.text_input(Current_pane.editor_state, t)

[8.2676]

[4.203]

	if Show_code then
		if Current_pane.editor_state.cursor_x then
			edit.text_input(Current_pane.editor_state, t)
		end
	else
		-- editors hidden
		if car.text_input then car.text_input(t) end
		if car.textinput then car.textinput(t) end

Replacement in 0013-on.keychord_press at line 8 [8.2758]

B:BD[12.2244] → [4.209:303]

∅:D[4.303] → [7.4012:4073]

B:BD[12.2250] → [7.4012:4073]

	elseif Current_pane.editor_state.cursor_x then
		-- send keys to editor if cursor is visible
		edit.keychord_press(Current_pane.editor_state, chord, key)

[12.2244]

[12.2298]

	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)
		end
	else
		-- editors hidden
		if car.keychord_press then car.keychord_press(chord, key) end
		if car.keypressed then car.keypressed(key) end

Insertion in 0012-on.draw at line 5 [8.2899]

[13.905]

[14.8224]

	App.color(Foreground_color)
	if car.draw then car.draw() end  -- off canvas

Replacement in 0004-on.update at line 1 [15.1708]
B:BD[15.1708] → [15.1709:1732]
```
on.update = function()
```
[15.1708]
[15.1732]
```
on.update = function(dt)
```
Insertion in 0004-on.update at line 11 [15.1708]
[9.1677]
[9.1677]
```
	if car.update then car.update(dt) end
```