Merge text0

[?]

Apr 3, 2023, 4:50 PM

G2SVT3ROXEAPJRZA4TFVBAPOXV5RIBIYPQRL3VHLKTWPGXUTZFEQC

Dependencies

[2] PTOMKY7C Merge text0
[3] M7UODV5H Merge text0
[4] HLIF3YQE Merge text0
[5] E3PF2R6Q stray dead code
[6] PBGBRQIX bugfix for merge commit
[7] 4GYPLUDY streamline the interface for Text.draw
[8] A2PRHMXT change cursor bounds check slightly
[9] KWIVKQQ7 Merge lines.love
[10] G4FCGDN6 rename
[11] TKRVYAVO bugfix for merge commit
[12] J2SVGR2E experiment: blinking cursor
[13] WJBZZQE4 fold together two largely similar cases
[14] 3PSFWAIL Merge lines.love
[15] GZ2OYPSH configurable colors and cursor in editor widget
[16] HNRU45ZM inline a function
[17] YJ6ASFBG yet another fork trying to integrate my live framework with everything else
[18] ELJNEPW2 simplify cursor-on-screen check
[19] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[20] BW2IUB3K keep all text cache writes inside text.lua
[21] H2DPLWMV snapshot: wrapping long lines at word boundaries
[22] YCYCQOFC bugfix: on.load_settings when there are none
[23] 3ZSUBI57 drop some redundant args from Text.draw
[24] RHARLLIQ Merge text0
[25] YJJ4X4JG bugfix: avoid scrolling on 'end'
[26] BULPIBEG beginnings of a module for the text editor
[27] 4KC7I3E2 make colors easier to edit
[28] X3F7ECSL add state arg to some functions
[29] 2L5MEZV3 experiment: new edit namespace
[30] MD3W5IRA new fork: rip out drawing support
[31] XNFTJHC4 split keyboard handling between Text and Drawing
[32] LNUHQOGH start passing in Editor_state explicitly
[33] 36Z442IV back to commit 8123959e52f without code editing
[34] 7RDQRRP5 Merge text0
[35] GZ5WULJV switch source side to new screen-line-based render
[36] W3UFZ4FO run on.load_settings after loading defaults
[37] 2CTN2IEF Merge lines.love
[38] 32V6ZHQB Merge lines.love
[39] MPETAKZ2 insert space for loading settings
[40] Y5XAFGMW Merge text.love
[*] OTIBCAUJ love2d scaffold

Change contents

edit in text.lua at line 10

[10.163]→[10.3516:3584](∅→∅),[10.163]→[10.3516:3584](∅→∅),[10.3584]→[4.6:6](∅→∅)

function Text.draw(State, line_index, y, startpos, fg, hide_cursor)
resurrect zombie in text.lua at line 10

[10.91]→[7.3:83](∅→∅),[10.91]→[7.3:83](∅→∅)

-- return y for the next line, and position of start of final screen line drawn
edit in text.lua at line 11

[7.83]

[10.42]

function Text.draw(State, line_index, y, startpos, fg, hide_cursor)
edit in text.lua at line 77

[10.1490]→[10.3977:4004](∅→∅)

App.color(reset_color)
edit in text.lua at line 869

[10.223]→[8.3:22](∅→∅)

edit.draw(State)
resolve order conflict in text.lua at line 869

[10.4065]

[10.224]
edit in main.lua at line 110

[10.735]→[2.406:406](∅→∅),[10.4223]→[6.8:53](∅→∅),[10.4223]→[6.8:53](∅→∅),[10.4223]→[6.8:53](∅→∅)

initialize_window_geometry(App.width('m'))
resolve order conflict in main.lua at line 110

[10.735]

[10.5107]
replacement in main.lua at line 192

[10.378]→[3.156:156](∅→∅),[10.378]→[3.156:156](∅→∅),[10.340]→[3.158:158](∅→∅),[10.340]→[3.158:158](∅→∅)

[10.211]

end
resurrect zombie in edit.lua at line 121

[10.5853]→[10.4284:4377](∅→∅),[10.5853]→[10.4284:4377](∅→∅)

y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor)