akkartik/sokoban.love - Change Z5M23NTKKGEACSQJT27DRNS7NEK6OSLR2IOWVAH2C2PRAIU46BIQC

implement second, 'output' editor

Also its scrollbar.

Created by akkartik on November 18, 2023

Z5M23NTKKGEACSQJT27DRNS7NEK6OSLR2IOWVAH2C2PRAIU46BIQC

Dependencies

In channels

main

Change contents

File deletion: 0037-Editor_scrollbar_top
BF:BFD[5.2] → [6.579:628]
BF:BFD[6.628] → [6.629:629]
B:BD[6.629] → [6.630:692]
```
Editor_scrollbar_top = 0  -- in px
Editor_scrollbar_bottom = 0
```
File addition: 0044-Output_editor_state (----------)
[5.2]
```
Output_editor_state = nil
```

Replacement in 0040-on_editor_scrollbar_area at line 1 [6.55]

B:BD[6.55] → [6.56:97]

B:BD[6.97] → [7.115:207]

∅:D[7.207] → [6.189:274]

B:BD[6.189] → [6.189:274]

on_editor_scrollbar_area = function(x,y)
	if x < Editor_state.right+15 then return end
	if x > Editor_state.right+45 then return end
	if y < Editor_state.top then return end
	if y > Editor_state.bottom then return end

[6.55]

[6.274]

on_editor_scrollbar_area = function(state, x,y)
	if x < state.right+15 then return end
	if x > state.right+45 then return end
	if y < state.top then return end
	if y > state.bottom then return end

Replacement in 0038-on_editor_scrollbar at line 1 [6.340]

B:BD[6.340] → [6.341:377]

B:BD[6.377] → [7.208:300]

∅:D[7.300] → [6.469:562]

B:BD[6.469] → [6.469:562]

on_editor_scrollbar = function(x,y)
	if x < Editor_state.right+15 then return end
	if x > Editor_state.right+45 then return end
	if y < Editor_scrollbar_top then return end
	if y > Editor_scrollbar_bottom then return end

[6.340]

[6.562]

on_editor_scrollbar = function(state, x,y)
	if x < state.right+15 then return end
	if x > state.right+45 then return end
	if y < state.scrollbar_top then return end
	if y > state.scrollbar_bottom then return end

Replacement in 0036-adjust_scrollbar at line 1 [6.739]

B:BD[6.739] → [6.740:898]

adjust_scrollbar = function(y)
	local s = (y-Editor_state.top) / (Editor_state.bottom-Editor_state.top)
	local screen_line = s*Editor_state.screen_line_count

[6.739]

[6.898]

adjust_scrollbar = function(state, y)
	local s = (y-state.top) / (state.bottom-state.top)
	local screen_line = s*state.screen_line_count

Replacement in 0036-adjust_scrollbar at line 5 [6.739]

B:BD[6.914] → [6.914:1021]

	for i=1,#Editor_state.lines do
		if Editor_state.line_cache[i].start_screen_line_index > screen_line then

[6.914]

[6.1021]

	for i=1,#state.lines do
		if state.line_cache[i].start_screen_line_index > screen_line then

Replacement in 0036-adjust_scrollbar at line 11 [6.739]

B:BD[6.1052] → [6.1052:1142]

	Editor_state.screen_top1 = {line=line, pos=1}
	Editor_state.cursor1 = {line=line, pos=1}

[6.1052]

[6.1142]

	state.screen_top1 = {line=line, pos=1}
	state.cursor1 = {line=line, pos=1}

Replacement in 0034-draw_scrollbar at line 1 [8.2397]
B:BD[8.2397] → [8.2398:2438]
```
draw_scrollbar = function(Editor_state)
```
[8.2397]
[8.2438]
```
draw_scrollbar = function(state)
```

Replacement in 0034-draw_scrollbar at line 3 [8.2397]

B:BD[8.2463] → [8.2463:2991]

	love.graphics.line(Editor_state.right+30, Editor_state.top, Editor_state.right+30, Editor_state.bottom)
	love.graphics.line(Editor_state.right+25, Editor_state.top, Editor_state.right+35, Editor_state.top)
	love.graphics.line(Editor_state.right+25, Editor_state.bottom, Editor_state.right+35, Editor_state.bottom)
	local sbtop, sbbot = compute_scrollbar(Editor_state)
	local topy = Editor_state.top + sbtop*(Editor_state.bottom - Editor_state.top)
	local boty = Editor_state.top +sbbot*(Editor_state.bottom - Editor_state.top)

[8.2463]

[3.0]

	love.graphics.line(state.right+30, state.top, state.right+30, state.bottom)
	love.graphics.line(state.right+25, state.top, state.right+35, state.top)
	love.graphics.line(state.right+25, state.bottom, state.right+35, state.bottom)
	local sbtop, sbbot = compute_scrollbar(state)
	local topy = state.top + sbtop*(state.bottom - state.top)
	local boty = state.top +sbbot*(state.bottom - state.top)

Replacement in 0034-draw_scrollbar at line 10 [8.2397]

∅:D[3.32] → [9.32:132]

B:BD[8.3030] → [9.32:132]

∅:D[10.95] → [6.1146:1207]

∅:D[9.132] → [6.1146:1207]

∅:D[7.378] → [6.1146:1207]

B:BD[8.3107] → [6.1146:1207]

	love.graphics.rectangle('fill', Editor_state.right+15, topy+5, 30, math.max(boty-topy-10, 5), 5,5)
	Editor_scrollbar_top = topy
	Editor_scrollbar_bottom = boty

[3.32]

[9.133]

	love.graphics.rectangle('fill', state.right+15, topy+5, 30, math.max(boty-topy-10, 5), 5,5)
	state.scrollbar_top = topy
	state.scrollbar_bottom = boty

Insertion in 0031-on.resize at line 7 [11.1]

[11.246]

	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

Replacement in 0021-draw_menu at line 20 [12.704]

B:BD[4.790] → [4.790:830]

			if not status then
				print(result)

[4.790]

[4.830]

			print(status, result)
			if result then
				-- could be either output or error
				Output_editor_state.lines = {
					{data=tostring(result)},
				}
				Text.redraw_all(Output_editor_state)

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

B:BD[13.2259] → [6.1208:1356]

	if Editor_scrollbar_drag then
		adjust_scrollbar(y)
		Editor_scrollbar_drag = nil
	elseif on_editor_scrollbar_area(x,y) then
		adjust_scrollbar(y)

[13.2259]

[2.47]

	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)

Insertion in 0017-on.mouse_release at line 9 [13.2211]

[6.1416]

	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)

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

B:BD[12.1753] → [6.1422:1530]

	if on_editor_scrollbar(x,y) then
		Editor_scrollbar_drag = true
	elseif on_editor_scrollbar_area(x,y) then

[12.1753]

[6.1530]

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

Insertion in 0016-on.mouse_press at line 11 [13.2363]

[6.1601]

	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
		-- nothing

Insertion in 0012-on.draw at line 10 [13.2899]

[12.1947]

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

Insertion in 0011-on.initialize at line 15 [13.3075]

[13.3410]

[12.2277]

	Output_editor_state = edit.initialize_state(
		Editor_state.bottom+5+10+5,  -- top
		nil,  -- buttom
		Editor_state.left, Editor_state.right,
		love.graphics.getFont():getHeight(), Line_height)
	Text.redraw_all(Output_editor_state)

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

B:BD[14.1760] → [6.1607:1672]

	if Editor_scrollbar_drag then
		adjust_scrollbar(App.mouse_y())

[14.1760]

[6.1672]

	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())