Merge text.love

[?]

Mar 24, 2023, 4:48 AM

LXFHXL2NSH7KLRNNN66OPNSU4DXZ6UU2CUPXUHCFEISDB6BY7KDAC

Dependencies

[2] QF3HGULO Merge text.love
[3] VOU73AK6 Merge lines.love
[4] GFXWHTE6 mouse wheel support
[5] KMSL74GA support selections in the source editor
[6] AVTNUQYR basic test-enabled framework
[7] 3PSFWAIL Merge lines.love
[8] VP5KC4XZ Merge lines.love
[9] VHQCNMAR several more modules
[10] OTIBCAUJ love2d scaffold
[11] TLOAPLBJ add a license
[12] ZTZOO2OQ Merge lines.love
[13] KKMFQDR4 editing source code from within the app
[14] MD3W5IRA new fork: rip out drawing support
[15] XGHCLIKB Merge lines.love
[16] 2CTN2IEF Merge lines.love
[17] 2Y7YH7UP infrastructure for caching LÖVE text objects
[18] OWPI7Y4Q Merge text.love
[19] 73OCE2MC after much struggle, a brute-force undo
[20] 36Z442IV back to commit 8123959e52f without code editing
[21] CE4LZV4T drop last couple of manual tests
[22] VXORMHME delete experimental REPL
[23] 2TQUKHBC Merge lines.love
[24] EX43CDDI Merge text.love
[25] A4BSGS2C Merge lines.love
[26] GUOQRUL7 Merge lines.love
[27] BULPIBEG beginnings of a module for the text editor
[28] TVCPXAAU rename
[29] UAYCSFSK Merge text.love
[30] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[31] K74U4BAU Merge lines.love
[32] 2L5MEZV3 experiment: new edit namespace
[33] R5QXEHUI somebody stop me
[34] JOPVPUSA editing source code from within the app
[35] VHUNJHXB Merge lines.love
[36] ETXNVRPT Merge lines.love
[37] D2GCFTTT clean up repl functionality
[38] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[39] 4DHGKUMD Merge text.love
[40] RSZD5A7G forgot to add json.lua
[41] FS2ITYYH record a known issue
[42] C3GUE45I Merge text.love
[43] K2X6G75Z start writing some tests for drawings
[44] 3G723RV5 Merge text.love
[45] ECBDENZ4 Merge text.love
[46] ORKN6EOB Merge lines.love
[47] 2CK5QI7W make love event names consistent
[48] LXTTOB33 extract a couple of files
[49] 4YDBYBA4 clean up memory leak experiments
[50] 6LJZN727 handle chords
[51] D4B52CQ2 Merge lines.love
[52] Q7XPSKII Merge lines.love
[53] XX7G2FFJ intermingle freehand line drawings with text
[54] 4SR3Z4Y3 document the version of LÖVE I've been using
[55] 3QNOKBFM beginnings of a test harness
[56] OGUV4HSA remove some memory leaks from rendered fragments
[57] 66X36NZN a little more prose describing manual_tests
[58] JRLBUB6L more intuitive point delete from polygons
[59] T4FRZSYL delete an ancient, unused file
[60] BLWAYPKV extract a module

Change contents

file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)

end
end

function edit.mouse_wheel_move(State, dx,dy)
if dy > 0 then
State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
for i=1,math.floor(dy) do
Text.up(State)
end
elseif dy < 0 then
State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
for i=1,math.floor(-dy) do
Text.down(State)
end
end
file deletion: source.lua (----------)source.lua (----------)

[4.2]→[4.177715:177749](∅→∅),[4.2]→[4.177715:177749](∅→∅),[4.177749]→[4.165829:165829](∅→∅)

function source.mouse_wheel_move(dx,dy)
Cursor_time = 0 -- ensure cursor is visible immediately after it moves
if Focus == 'edit' then
return edit.mouse_wheel_move(Editor_state, dx,dy)
else
return log_browser.mouse_wheel_move(Log_browser_state, dx,dy)
end
end

function source.text_input(t)
file deletion: run.lua (----------)run.lua (----------)

[4.2]→[4.183867:183898](∅→∅),[4.2]→[4.183867:183898](∅→∅),[4.183898]→[4.178107:178107](∅→∅)

function run.mouse_wheel_move(dx,dy)
Cursor_time = 0 -- ensure cursor is visible immediately after it moves
return edit.mouse_wheel_move(Editor_state, dx,dy)
end

function run.text_input(t)
file deletion: log_browser.lua (----------)log_browser.lua (----------)

[4.2]→[4.202684:202723](∅→∅),[4.2]→[4.202684:202723](∅→∅),[4.202723]→[4.191243:191243](∅→∅)

function log_browser.down(State)
while State.screen_top1.line < #State.lines do
State.screen_top1.line = State.screen_top1.line+1
if should_show(State.lines[State.screen_top1.line]) then
break
end
end
end

function log_browser.height(State, line_index)
local line = State.lines[line_index]
if line.data == nil then
-- section header
return State.line_height
elseif type(line.data) == 'string' then
return State.line_height
else
if line.height == nil then
--? print('nil line height! rendering off screen to calculate')
line.height = log_render[line.data.name](line.data, State.left, App.screen.height, State.right-State.left)
end
return line.height
end
end

end
end
end

function log_browser.up(State)
while State.screen_top1.line > 1 do
State.screen_top1.line = State.screen_top1.line-1
if should_show(State.lines[State.screen_top1.line]) then
break
end
end
end

log_browser.down(State)
elseif chord == 'pageup' then
local y = 0
while State.screen_top1.line > 1 and y < App.screen.height - 100 do
State.screen_top1.line = State.screen_top1.line - 1
if should_show(State.lines[State.screen_top1.line]) then
y = y + log_browser.height(State, State.screen_top1.line)
end
end
elseif chord == 'pagedown' then
local y = 0
while State.screen_top1.line < #State.lines and y < App.screen.height - 100 do
if should_show(State.lines[State.screen_top1.line]) then
y = y + log_browser.height(State, State.screen_top1.line)
end
State.screen_top1.line = State.screen_top1.line + 1
log_browser.up(State)
elseif chord == 'down' then
end

function log_browser.mouse_wheel_move(State, dx,dy)
if dy > 0 then
for i=1,math.floor(dy) do
log_browser.up(State)
end
elseif dy < 0 then
for i=1,math.floor(-dy) do
log_browser.down(State)
end
end
end
edit in main.lua at line 185

[4.7147]

[4.7147]

function App.wheelmoved(dx,dy)
Cursor_time = 0 -- ensure cursor is visible immediately after it moves
return edit.mouse_wheel_move(Editor_state, dx,dy)
end
edit in main.lua at line 229

[4.7809]→[4.264:268](∅→∅),[4.191241]→[4.264:268](∅→∅),[4.191780]→[4.264:268](∅→∅),[4.264]→[4.264:268](∅→∅),[4.268]→[4.9:9](∅→∅),[4.102]→[3.1040:1071](∅→∅),[4.102]→[3.1040:1071](∅→∅),[4.190461]→[3.1072:1137](∅→∅),[4.190461]→[3.1072:1137](∅→∅),[4.190572]→[3.1138:1209](∅→∅),[4.190572]→[3.1138:1209](∅→∅),[4.355]→[3.842:842](∅→∅),[4.355]→[3.842:842](∅→∅),[4.355]→[3.842:842](∅→∅),[3.842]→[4.823:889](∅→∅),[4.5101]→[4.823:889](∅→∅),[4.5101]→[4.823:889](∅→∅)

end

function App.wheelmoved(dx,dy)
if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end
if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end

else
assert(false, 'unknown app "'..Current_app..'"')
end
resurrect zombie in main.lua at line 229

[4.889]→[4.889:893](∅→∅),[4.889]→[4.889:893](∅→∅),[4.889]→[4.889:893](∅→∅)

end
resolve order conflict in main.lua at line 229

[4.7809]

[4.889]
edit in main.lua at line 230

[4.893]→[4.893:894](∅→∅),[4.893]→[4.893:894](∅→∅),[4.894]→[3.843:889](∅→∅),[4.894]→[3.843:889](∅→∅),[3.889]→[4.925:956](∅→∅),[4.925]→[4.925:956](∅→∅),[4.925]→[4.925:956](∅→∅),[4.925]→[4.925:956](∅→∅),[4.956]→[3.890:961](∅→∅),[4.956]→[3.890:961](∅→∅),[4.956]→[3.890:961](∅→∅),[3.961]→[4.1021:1059](∅→∅),[4.1021]→[4.1021:1059](∅→∅),[4.1021]→[4.1021:1059](∅→∅),[4.1021]→[4.1021:1059](∅→∅),[4.1059]→[3.962:1039](∅→∅),[4.1059]→[3.962:1039](∅→∅),[4.1059]→[3.962:1039](∅→∅)

function App.mousereleased(x,y, mouse_button)
if Current_app == 'run' then
if run.mouse_release then run.mouse_release(x,y, mouse_button) end
elseif Current_app == 'source' then
if source.mouse_release then source.mouse_release(x,y, mouse_button) end