resolve conflicts

akkartik

May 6, 2025, 11:07 PM

EZ7I57M2W4CFSENSIGLKY4FIM7U7FDXVRHUSOHBIKFFAB5SEBEGAC

Dependencies

• [2] YSSG2JR6 merge bugfix
• [3] FPQJ2CR5 resolve conflicts
• [4] GLLKDEIB support a resize handler
• [5] B2UU3HFM bugfix: don't run a handler when editors are visible
• [6] X5XUIB72 resolve conflicts
• [7] G2SVT3RO Merge text0
• [8] VUAAYL6X handlers for _all_ LÖVE events
• [9] PJ5PQAQE record support for multiple versions
• [10] RVJNNICY bugfix: autosave settings
• [11] OD3WUB5B resolve conflicts
• [12] OLX2RRDI Merge text0
• [13] 2EELKVO2 resolve conflicts
• [14] QF3HGULO Merge text.love
• [15] PTOMKY7C Merge text0
• [16] MPETAKZ2 insert space for loading settings
• [17] 5RUFNRJO start of the visual skeleton
• [18] QW7YRY25 Merge text0
• [19] UFOVVX3Z Merge text0
• [20] CRBLAWBO resolve conflicts
• [21] HVXZLNCC send errors from event handlers to output editor
• [22] TBWAE64A app is now live, can communicate with driver
• [23] 7RDQRRP5 Merge text0
• [24] OC4P6P36 greatly simplify slider implementation
• [25] EBRL7VKR resolve conflicts
• [26] 66S4D75Q pijul bugfix
• [27] JPAF3IDJ support high-DPI devices
• [28] KJLZCK2R resolve conflicts
• [29] EHKB76GO UI improvement: more stable scrollbar movement
• [30] YR7AXEYB add keyboard shortcuts for common operations
• [31] PRE6XPRN responsively increase/decrease font height
• [32] 36Z442IV back to commit 8123959e52f without code editing
• [33] FDYORR2O resolve conflicts
• [34] R2ASHK5C fix a bad merge
• [35] RK2ASPN7 add lots of buttons to the toolbar
• [36] Z5M23NTK implement second, 'output' editor
• [37] LRDM35CE app running again
• [38] QZUFJMD5 resolve conflicts
• [39] FIUQJVL2 first draft of load/save buttons
• [40] JV27LDDK sliders for font size and color settings
• [41] XJX53BE3 bugfix: catch errors in mouse_press handlers
• [42] OV6FE23R Merge text0
• [43] VAVXKWZV aggregate global state inside a 'pane' object
• [44] VEAVIL4X resize handler
• [45] LGIEVJE6 activate buttons for some time
• [46] RXZQUKKR resolve conflicts
• [47] IP4LD33D mouse events for scrollbar
• [48] RXNR3U5E Merge text.love
• [49] ZM7NOBRM new fork: carousel shell
• [50] 6DJMOJKE support event handlers
• [51] 2RWR3GM4 another missed rename
• [52] JSDWXYKO wire up mouse move handler
• [53] 5GHT3LUX copy correct warning message
• [54] BRBXUGRG resolve conflicts
• [55] W4EQ6IW4 simplify state management for menus
• [56] WZZGVKSG a few more renames
• [57] NVZTMKER partition handlers between screen regions
• [58] CMZDG7CJ bugfix: tapping in scrollbar area
• [59] G42WRYFR new handler: mousemoved
• [60] T7QIIGQ6 attempt at better error recovery
• [*] OTIBCAUJ love2d scaffold
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• replacement in main.lua at line 165
  [7.935]→[7.5112:5138](∅→∅),[7.5112]→[7.5112:5138](∅→∅)
  − function App.resize(w, h)
  [7.935]

  [7.5138]
  + function App.resize(w,h)
• resurrect zombie in main.lua at line 195
  [7.181]→[7.572:577](∅→∅),[7.181]→[7.572:577](∅→∅)
  + end

  +
• edit in main.lua at line 195
  [7.7080]

  [7.572]
  + if on.mouse_release then on.mouse_release(x,y, mouse_button, is_touch, presses) end
• edit in main.lua at line 198
  [7.577]→[7.577:685](∅→∅),[7.577]→[7.577:685](∅→∅),[7.685]→[3.14:14](∅→∅),[7.7080]→[6.246:332](∅→∅)
  − function App.mousemoved(x,y, dx,dy, istouch)

  − if on.mouse_move then on.mouse_move(x,y, dx,dy, istouch) end

  −

  − if on.mouse_release then on.mouse_release(x,y, mouse_button, is_touch, presses) end
• resolve order conflict in main.lua at line 198
  [7.577]
• edit in main.lua at line 198
  [0.125]

  [7.310]
  + function App.mousemoved(x,y, dx,dy, is_touch)

  + if on.mouse_move then on.mouse_move(x,y, dx,dy, is_touch) end
• edit in main.lua at line 280
  [7.155]→[6.424:424](∅→∅),[7.423]→[6.334:334](∅→∅),[7.423]→[6.334:334](∅→∅)
  −

  −
• resolve order conflict in main.lua at line 280
  [7.155]
• resurrect zombie in edit.lua at line 381
  [7.610]→[7.7329:7548](∅→∅),[7.610]→[7.7329:7548](∅→∅)
  + end

  + end

  +

  + function Text.insert_text(State, d)

  + for _,code in utf8.codes(d) do

  + local c = utf8.char(code)

  + if c == '\n' then

  + Text.insert_return(State)

  + else

  + Text.insert_at_cursor(State, c)

  + end
• edit in edit.lua at line 381
  [7.10211]

  [7.7329]
  + Text.keychord_press(State, chord, key, scancode, is_repeat, readonly)
• edit in edit.lua at line 393
  [7.10211]→[6.512:586](∅→∅)
  − Text.keychord_press(State, chord, key, scancode, is_repeat, readonly)
• resolve order conflict in edit.lua at line 393
  [7.7548]

  [7.10356]
• replacement in 0154-on.mouse_move at line 1
  [7.1]→[7.2:48](∅→∅)
  − on.mouse_move = function(x,y, dx,dy, istouch)
  [7.1]

  [5.60]
  + on.mouse_move = function(x,y, dx,dy, is_touch)
• replacement in 0154-on.mouse_move at line 4
  [5.108]→[5.108:163](∅→∅)
  − call_protected(car.mousemoved, x,y, dx,dy, istouch)
  [5.108]

  [5.163]
  + call_protected(car.mousemoved, x,y, dx,dy, is_touch)
• replacement in 0154-on.mouse_move at line 7
  [5.194]→[5.194:249](∅→∅)
  − call_protected(car.mouse_move, x,y, dx,dy, istouch)
  [5.194]

  [5.249]
  + call_protected(car.mouse_move, x,y, dx,dy, is_touch)
• replacement in 0031-on.resize at line 1
  [7.1]→[4.135:162](∅→∅)
  − on.resize = function(w, h)
  [7.1]

  [7.25]
  + on.resize = function(w,h)
• replacement in 0017-on.mouse_release at line 1
  [7.2211]→[7.2212:2259](∅→∅)
  − on.mouse_release = function(x,y, mouse_button)
  [7.2211]

  [7.66]
  + on.mouse_release = function(x,y, mouse_button, is_touch, presses)
• replacement in 0017-on.mouse_release at line 23
  [7.780]→[7.780:848](∅→∅)
  − edit.mouse_release(Current_pane.editor_state, x,y, mouse_button)
  [7.780]

  [7.848]
  + edit.mouse_release(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
• replacement in 0017-on.mouse_release at line 34
  [7.1222]→[7.1222:1278](∅→∅)
  − call_protected(car.mouse_release, x,y, mouse_button)
  [7.1222]

  [7.1278]
  + call_protected(car.mouse_release, x,y, mouse_button, is_touch, presses)
• replacement in 0017-on.mouse_release at line 37
  [7.1312]→[7.1312:1368](∅→∅)
  − call_protected(car.mousereleased, x,y, mouse_button)
  [7.1312]

  [7.1368]
  + call_protected(car.mousereleased, x,y, mouse_button, is_touch, presses)
• replacement in 0016-on.mouse_press at line 1
  [7.2363]→[7.2364:2409](∅→∅)
  − on.mouse_press = function(x,y, mouse_button)
  [7.2363]

  [7.240]
  + on.mouse_press = function(x,y, mouse_button, is_touch, presses)
• replacement in 0016-on.mouse_press at line 35
  [7.1696]→[7.1696:1762](∅→∅)
  − edit.mouse_press(Current_pane.editor_state, x,y, mouse_button)
  [7.1696]

  [7.1762]
  + edit.mouse_press(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
• replacement in 0016-on.mouse_press at line 46
  [7.167]→[7.167:221](∅→∅)
  − call_protected(car.mouse_press, x,y, mouse_button)
  [7.167]

  [7.221]
  + call_protected(car.mouse_press, x,y, mouse_button, is_touch, presses)
• replacement in 0016-on.mouse_press at line 49
  [7.254]→[7.254:309](∅→∅)
  − call_protected(car.mousepressed, x,y, mouse_button)
  [7.254]

  [7.309]
  + call_protected(car.mousepressed, x,y, mouse_button, is_touch, presses)
• replacement in 0016-on.mouse_press at line 52
  [7.1606]→[2.216:220](∅→∅)
  − end
  [7.1606]
  + end
• replacement in 0013-on.keychord_press at line 1
  [7.2758]→[7.2759:2800](∅→∅)
  − on.keychord_press = function(chord, key)
  [7.2758]

  [7.4016]
  + on.keychord_press = function(chord, key, scancode, is_repeat)
• replacement in 0013-on.keychord_press at line 24
  [7.2784]→[7.2784:2846](∅→∅)
  − edit.keychord_press(Current_pane.editor_state, chord, key)
  [7.2784]

  [7.2846]
  + edit.keychord_press(Current_pane.editor_state, chord, key, scancode, is_repeat)
• replacement in 0013-on.keychord_press at line 29
  [7.1704]→[7.1704:1754](∅→∅)
  − call_protected(car.keychord_press, chord, key)
  [7.1704]

  [7.1754]
  + call_protected(car.keychord_press, chord, key, scancode, is_repeat)
• replacement in 0013-on.keychord_press at line 32
  [7.1785]→[7.1785:1824](∅→∅)
  − call_protected(car.keypressed, key)
  [7.1785]

  [7.1824]
  + call_protected(car.keypressed, key, scancode, is_repeat)