resolve conflicts

akkartik

May 6, 2025, 10:37 PM

X5XUIB72LUUBXFEN37FDAFVFBPTMY5UHDQZ7675SRLI52YB6AUOQC

Dependencies

• [2] JSDWXYKO wire up mouse move handler
• [3] OD3WUB5B resolve conflicts
• [4] MPLM5UH7 resolve conflicts
• [5] 4LSZFSOQ resolve conflicts
• [6] AL35KAHB standardize name
• [7] VV7BOZ35 pijul bug
• [8] JXI7KJSL Merge text0
• [9] VUAAYL6X handlers for _all_ LÖVE events
• [10] 7LXXQBNE resolve conflicts
• [11] TKRVYAVO bugfix for merge commit
• [12] LRDM35CE app running again
• [13] KJLZCK2R resolve conflicts
• [14] QRUFNFPP Merge text0
• [15] 2RWR3GM4 another missed rename
• [16] D2TYFYG2 Merge text.love
• [17] TUTDZZOO resolve conflicts
• [18] CRBLAWBO resolve conflicts
• [19] KKMFQDR4 editing source code from within the app
• [20] 4L3UAM75 experiment: knob for readonly editor
• [21] SPSW74Y5 add state arg to Text.keychord_pressed
• [22] 36Z442IV back to commit 8123959e52f without code editing
• [23] R2ASHK5C fix a bad merge
• [24] PJ5PQAQE record support for multiple versions
• [25] LF3FPBGA move
• [26] RXZQUKKR resolve conflicts
• [27] QZUFJMD5 resolve conflicts
• [28] ULKNZUZK resolve conflicts
• [29] 5RLCALX5 Merge text0
• [30] A42EMHOQ plumb through all supported args in LÖVE handlers
• [31] F2P336NO resolve conflicts
• [32] ORKN6EOB Merge lines.love
• [33] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [34] QMTFHF3S bugfix: chords with modifiers
• [35] E3PF2R6Q stray dead code
• [36] XNFTJHC4 split keyboard handling between Text and Drawing
• [37] Y5XAFGMW Merge text.love
• [38] WZZGVKSG a few more renames
• [39] T7QIIGQ6 attempt at better error recovery
• [40] 2ZCXBDLY Merge text.love
• [41] 2EELKVO2 resolve conflicts
• [42] YJ6ASFBG yet another fork trying to integrate my live framework with everything else
• [43] RHARLLIQ Merge text0
• [44] BRBXUGRG resolve conflicts
• [45] ORRSP7FV deduce test names on failures
• [46] M7UODV5H Merge text0
• [47] 66S4D75Q pijul bugfix
• [48] CYGNFOA5 Merge text0
• [49] AVTNUQYR basic test-enabled framework
• [50] ZM6AON3A resolve conflicts
• [51] AFDLKNAP resolve conflicts
• [52] OV6FE23R Merge text0
• [53] 3AU3KLEU resolve conflicts
• [54] APX2PY6G stop tracking wallclock time
• [55] JZTUZQ35 resolve conflicts
• [56] KE4T63TS stop using keyboard.isDown
• [57] UZHSWA3D Merge text0
• [58] VPRGENLA hide some details within the 'warning' state
• [59] EBRL7VKR resolve conflicts
• [60] OLX2RRDI Merge text0
• [61] 5GHT3LUX copy correct warning message
• [62] KVHUFUFV reorg
• [63] 2IOWGOPG mousemoved handler
• [64] 2CTN2IEF Merge lines.love
• [65] GFXWHTE6 mouse wheel support
• [66] JOPVPUSA editing source code from within the app
• [67] G2SVT3RO Merge text0
• [68] GQBMVYD4 Merge text.love
• [69] C3GUE45I Merge text.love
• [70] 2CK5QI7W make love event names consistent
• [*] BULPIBEG beginnings of a module for the text editor
• [*] OTIBCAUJ love2d scaffold
• [*] 2L5MEZV3 experiment: new edit namespace
• [*] 3QNOKBFM beginnings of a test harness

Change contents

• replacement in text.lua at line 168
  [8.1137]→[8.271:324](∅→∅),[8.1137]→[8.0:69](∅→∅)
  − function Text.keychord_press(State, chord, readonly)

  − function Text.keychord_press(State, chord, key, scancode, is_repeat)
  [8.1137]

  [8.48]
  + function Text.keychord_press(State, chord, key, scancode, is_repeat, readonly)
• resurrect zombie in main.lua at line 184
  [8.6775]→[8.59:123](∅→∅),[8.6775]→[8.59:123](∅→∅)
  + function App.mousepressed(x,y, mouse_button, is_touch, presses)
• replacement in main.lua at line 186
  [8.6894]→[8.50:113](∅→∅),[8.113]→[5.11:11](∅→∅),[8.84]→[8.124:202](∅→∅),[8.84]→[8.124:202](∅→∅)
  − if on.mouse_press then on.mouse_press(x,y, mouse_button) end

  −

  − return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
  [8.6894]

  [8.6955]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen

  + if on.mouse_press then on.mouse_press(x,y, mouse_button, is_touch, presses) end
• replacement in main.lua at line 192
  [8.7080]→[8.114:181](∅→∅)
  − if on.mouse_release then on.mouse_release(x,y, mouse_button) end
  [8.7080]

  [2.310]
  + if on.mouse_release then on.mouse_release(x,y, mouse_button, is_touch, presses) end
• edit in main.lua at line 197
  [2.423]→[8.13:13](∅→∅),[8.181]→[8.13:13](∅→∅),[8.7080]→[8.269:349](∅→∅)
  −

  − return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
• resolve order conflict in main.lua at line 197
  [2.423]

  [8.7142]
• edit in main.lua at line 223
  [8.524]→[8.1220:1220](∅→∅),[8.524]→[8.1220:1220](∅→∅)
  −
• resolve order conflict in main.lua at line 223
  [8.524]

  [8.2031]
• replacement in main.lua at line 229
  [8.7306]→[8.1221:1283](∅→∅),[8.1283]→[8.11:11](∅→∅),[8.7306]→[8.350:426](∅→∅),[8.7306]→[8.350:426](∅→∅),[8.426]→[8.12:12](∅→∅),[8.67]→[8.12:12](∅→∅)
  − if on.keychord_press then on.keychord_press(chord, key) end

  −

  − return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)

  −
  [8.7306]

  [8.223]
  + if on.keychord_press then on.keychord_press(chord, key, scancode, is_repeat) end
• edit in main.lua at line 246
  [8.889]→[8.428:428](∅→∅),[8.889]→[8.428:428](∅→∅),[8.336]→[7.12:12](∅→∅),[8.336]→[7.12:12](∅→∅),[7.12]→[8.359:363](∅→∅),[8.359]→[8.359:363](∅→∅),[8.359]→[8.359:363](∅→∅),[8.466]→[8.72:78](∅→∅)
  −

  −

  − end

  − end
• resolve order conflict in main.lua at line 246
  [8.889]

  [8.78]
• edit in main.lua at line 257
  [8.243]→[3.476:476](∅→∅),[8.243]→[3.476:476](∅→∅)
  −
• resurrect zombie in main.lua at line 257
  [8.12]→[8.151:155](∅→∅),[3.476]→[8.151:155](∅→∅),[8.589]→[8.151:155](∅→∅),[8.151]→[8.151:155](∅→∅),[8.12]→[8.151:155](∅→∅),[8.12]→[8.151:155](∅→∅),[8.12]→[8.151:155](∅→∅),[8.151]→[8.151:155](∅→∅)
  + end
• edit in main.lua at line 258
  [8.2567]→[8.58:58](∅→∅),[8.2567]→[8.58:58](∅→∅)
  −
• resolve order conflict in main.lua at line 258
  [8.155]
• replacement in edit.lua at line 264
  [8.5460]→[8.267:325](∅→∅)
  − function edit.keychord_press(State, chord, key, readonly)
  [8.5460]

  [8.325]
  + function edit.keychord_press(State, chord, key, scancode, is_repeat, readonly)
• edit in edit.lua at line 266
  [8.5460]→[8.3134:3203](∅→∅),[8.5460]→[8.3134:3203](∅→∅)
  − function edit.keychord_press(State, chord, key, scancode, is_repeat)
• resolve order conflict in edit.lua at line 266
  [8.373]

  [8.5539]
• replacement in edit.lua at line 374
  [8.10318]→[8.562:610](∅→∅),[8.10211]→[8.3204:3268](∅→∅)
  − Text.keychord_press(State, chord, readonly)

  − Text.keychord_press(State, chord, key, scancode, is_repeat)
  [8.10211]

  [8.10356]
  + Text.keychord_press(State, chord, key, scancode, is_repeat, readonly)
• edit in app.lua at line 585
  [8.212]→[6.86:151](∅→∅),[8.212]→[6.86:151](∅→∅),[8.330]→[6.152:232](∅→∅),[8.330]→[6.152:232](∅→∅)
  − love.handlers[name] = function(key, scancode, is_repeat)

  − return App.keypressed(key, scancode, is_repeat)