akkartik/bf.love - Change 2EELKVO233KIH36SRY6LHYCDGARR52V62QPGONRZIKHXGV4RSNEQC

resolve conflicts

Created by akkartik on May 6, 2025

2EELKVO233KIH36SRY6LHYCDGARR52V62QPGONRZIKHXGV4RSNEQC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua
BFD:BFD[9.2] → [10.147062:147101]
BFD:BFD[9.2] → [10.147062:147101]
BFD:BFD[10.147101] → [10.83723:83723]
B:BD[11.2319] → [8.70:139]
∅:D[8.139] → [12.21139:21212]
```
function Text.keychord_press(State, chord, key, scancode, is_repeat)
--?   print('chord', chord, State.selection1.line, State.selection1.pos)
```

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[9.2] → [10.165725:165764]

BFD:BFD[10.165764] → [10.152440:152440]

B:BD[10.157058] → [8.140:211]

B:BD[13.22192] → [8.212:297]

B:BD[10.157698] → [8.298:371]

B:BD[13.22385] → [8.372:443]

B:BD[10.158096] → [8.444:513]

B:BD[13.23489] → [8.514:583]

B:BD[10.163128] → [8.584:648]

∅:D[8.648] → [10.163275:163286]

∅:D[8.583] → [13.23534:23840]

∅:D[8.513] → [12.32160:32463]

∅:D[8.443] → [13.22463:22639]

∅:D[8.371] → [13.22285:22324]

∅:D[8.297] → [14.5203:5218]

∅:D[8.211] → [10.157112:157151]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)
        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
function edit.keychord_press(State, chord, key, scancode, is_repeat)
      Drawing.keychord_press(State, chord, key, scancode, is_repeat)
    Text.keychord_press(State, chord, key, scancode, is_repeat)
  end
end
      record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})
      schedule_save(State)
    end
  elseif chord == 'escape' and not App.mouse_down(1) then
    for _,line in ipairs(State.lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end
  if State.selection1.line and
      not State.lines.current_drawing and
      -- printable character created using shift key => delete selection
      -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
      (not App.shift_down() or utf8.len(key) == 1) and
    if Drawing.before then
      record_undo_event(State, {before=Drawing.before, after=snapshot(State, State.lines.current_drawing_index)})
      Drawing.before = nil
    end
  if State.search_term then return end
        return
  if State.search_term then return end

File deletion: source.lua, source.lua

BFD:BFD[9.2] → [10.177652:177686]

BFD:BFD[10.177686] → [10.165766:165766]

B:BD[10.166737] → [8.649:697]

B:BD[10.171215] → [8.698:726]

B:BD[10.174570] → [8.727:793]

B:BD[15.157] → [8.794:867]

B:BD[10.174991] → [8.868:941]

B:BD[10.175261] → [8.942:1027]

B:BD[10.175454] → [8.1028:1096]

B:BD[10.175604] → [8.1097:1179]

B:BD[10.175675] → [8.1180:1274]

B:BD[10.176007] → [8.1275:1339]

B:BD[10.177038] → [8.1340:1418]

B:BD[10.177104] → [8.1419:1509]

B:BD[10.177395] → [7.13:82]

∅:D[7.82] → [10.177618:177624]

∅:D[8.1509] → [10.177175:177186]

∅:D[8.1418] → [10.177097:177104]

∅:D[8.1339] → [10.176052:176187]

∅:D[8.1274] → [10.175751:175762]

∅:D[8.1179] → [10.175668:175675]

∅:D[8.1096] → [10.175504:175604]

∅:D[8.1027] → [10.175443:175454]

∅:D[8.941] → [10.175047:175253]

∅:D[8.867] → [15.213:230]

∅:D[8.793] → [10.174619:174693]

∅:D[8.726] → [10.171244:171934]

∅:D[8.697] → [16.27:47]

function source.initialize(arg, unfiltered_arg)
function source.resize(w,h)
function source.mouse_press(x,y, mouse_button, is_touch, presses)
    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
    log_browser.mouse_press(Log_browser_state, x,y, mouse_button, is_touch, presses)
function source.mouse_release(x,y, mouse_button, is_touch, presses)
    return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button, is_touch, presses)
function source.keychord_press(chord, key, scancode, is_repeat)
    return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
    return log_browser.keychord_press(Log_browser_state, chord, key, scancode, is_repeat)
    return log_browser.key_release(Log_browser_state, key, scancode)
  end
  end
end
  else
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print('source keychord')
  if Show_file_navigator then
  end
end
  else
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
  end
end
  elseif Show_log_browser_side and Log_browser_state.left <= x and x < Log_browser_state.right then
--?     print('click on log_browser side')
    if Focus ~= 'log_browser' then
      Focus = 'log_browser'
    return
  end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  if Show_log_browser_side then
    Editor_state.right = App.screen.width/2 - Margin_right
  else
    Editor_state.right = App.screen.width-Margin_right
  end
  Log_browser_state.left = App.screen.width/2 + Margin_right
  Log_browser_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
--?   print('end resize')
end
  log_new('source')

File deletion: run.lua, run.lua

BFD:BFD[9.2] → [10.184046:184077]

BFD:BFD[10.184077] → [10.178044:178044]

B:BD[10.178360] → [8.1510:1555]

B:BD[10.181355] → [8.1556:1581]

B:BD[17.314] → [8.1582:1645]

B:BD[18.73] → [8.1646:1724]

B:BD[10.183191] → [8.1725:1790]

B:BD[10.183312] → [8.1791:1871]

B:BD[10.183525] → [8.1872:1933]

B:BD[10.183641] → [8.1934:2010]

∅:D[8.2010] → [10.183698:183703]

∅:D[8.1933] → [10.183567:183641]

∅:D[8.1871] → [10.183374:183379]

∅:D[8.1790] → [10.183238:183312]

∅:D[8.1724] → [10.183186:183191]

∅:D[8.1645] → [10.183051:183125]

∅:D[8.1581] → [10.181381:181820]

∅:D[8.1555] → [16.52:69]

function run.initialize(arg, unfiltered_arg)
function run.resize(w,h)
function run.mouse_press(x,y, mouse_button, is_touch, presses)
  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
function run.mouse_release(x,y, mouse_button, is_touch, presses)
  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
function run.keychord_press(chord, key, scancode, is_repeat)
  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  Editor_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
end
  log_new('run')

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[9.2] → [10.203223:203262]

BFD:BFD[10.203262] → [10.191782:191782]

B:BD[10.199163] → [8.3029:3107]

B:BD[10.201364] → [8.3108:3188]

B:BD[10.201477] → [8.3189:3265]

∅:D[8.3265] → [10.201534:201568]

∅:D[8.3188] → [20.1132:1272]

∅:D[8.3107] → [10.199224:200648]

function log_browser.mouse_press(State, x,y, mouse_button, is_touch, presses)
function log_browser.mouse_release(State, x,y, mouse_button, is_touch, presses)
function log_browser.keychord_press(State, chord, key, scancode, is_repeat)
  -- move
  if chord == 'up' 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
  local line_index = log_browser.line_index(State, x,y)
  if line_index == nil then
    -- below lower margin
    return
  end
  -- leave some space to click without focusing
  local line = State.lines[line_index]
  local xleft = log_browser.left_margin(State, line)
  local xright = log_browser.right_margin(State, line)
  if x < xleft or x > xright then
    return
  end
  -- if it's a section begin/end and the section is collapsed, expand it
  -- TODO: how to collapse?
  if line.section_begin or line.section_end then
    -- HACK: get section reference from next/previous line
    local new_section
    if line.section_begin then
      if line_index < #State.lines then
        local next_section_stack = State.lines[line_index+1].section_stack
        if next_section_stack then
          new_section = next_section_stack[#next_section_stack]
        end
      end
    elseif line.section_end then
      if line_index > 1 then
        local previous_section_stack = State.lines[line_index-1].section_stack
        if previous_section_stack then
          new_section = previous_section_stack[#previous_section_stack]
        end
      end
    end
    if new_section and new_section.expanded == nil then
      new_section.expanded = true
      return
    end
  end
  -- open appropriate file in source side
  if line.filename ~= Editor_state.filename then
    source.switch_to_file(line.filename)
  end
  -- set cursor

Replacement in source_text.lua at line 226 [22.83786]

B:BD[21.5515] → [21.5515:5558]

function Text.keychord_press(State, chord)

[21.5515]

[23.21139]

function Text.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in source_edit.lua at line 235 [22.152503]

B:BD[22.157121] → [21.5563:5615]

function edit.mouse_press(State, x,y, mouse_button)

[22.157121]

[22.157175]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 282 [22.152503]

B:BD[24.20742] → [21.5683:5749]

        Drawing.mouse_press(State, line_index, x,y, mouse_button)

[24.20742]

[25.4943]

        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 295 [22.152503]

B:BD[22.157761] → [21.5750:5804]

function edit.mouse_release(State, x,y, mouse_button)

[22.157761]

[24.20835]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 300 [22.152503]

B:BD[24.20935] → [21.5805:5857]

    Drawing.mouse_release(State, x,y, mouse_button)

[24.20935]

[24.21013]

    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 386 [22.152503]

B:BD[22.158159] → [21.5927:5975]

function edit.keychord_press(State, chord, key)

[22.158159]

[23.25356]

function edit.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in source_edit.lua at line 505 [22.152503]

B:BD[24.22039] → [21.5976:6019]

      Drawing.keychord_press(State, chord)

[24.22039]

[24.22084]

      Drawing.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in source_edit.lua at line 538 [22.152503]
B:BD[22.163298] → [21.6020:6058]
```
    Text.keychord_press(State, chord)
```
[22.163191]
[22.163338]
```
    Text.keychord_press(State, chord, key, scancode, is_repeat)
```
Replacement in source.lua at line 59 [22.165829]
B:BD[22.166800] → [22.166800:166829]
```
function source.initialize()
```
[22.166800]
[26.517]
```
function source.initialize(arg, unfiltered_arg)
```
Replacement in source.lua at line 176 [22.165829]
B:BD[22.171278] → [22.171278:171307]
```
function source.resize(w, h)
```
[22.171278]
[22.171307]
```
function source.resize(w,h)
```

Replacement in source.lua at line 286 [22.165829]

B:BD[22.174633] → [21.6666:6713]

function source.mouse_press(x,y, mouse_button)

[22.174633]

[22.174682]

function source.mouse_press(x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 294 [22.165829]

B:BD[27.2826] → [21.6714:6768]

    edit.mouse_press(Editor_state, x,y, mouse_button)

[27.2826]

[27.2882]

    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 303 [22.165829]

B:BD[22.175054] → [21.6769:6823]

    edit.mouse_press(Editor_state, x,y, mouse_button)

[22.175054]

[22.175110]

    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 310 [22.165829]

B:BD[22.175324] → [21.6824:6890]

    log_browser.mouse_press(Log_browser_state, x,y, mouse_button)

[22.175324]

[22.175506]

    log_browser.mouse_press(Log_browser_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 314 [22.165829]

B:BD[22.175517] → [21.6891:6940]

function source.mouse_release(x,y, mouse_button)

[22.175517]

[22.175567]

function source.mouse_release(x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 317 [22.165829]

B:BD[22.175667] → [21.6941:7004]

    return edit.mouse_release(Editor_state, x,y, mouse_button)

[22.175667]

[22.175731]

    return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 319 [22.165829]

B:BD[22.175738] → [21.7005:7080]

    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button)

[22.175738]

[22.175814]

    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 345 [22.165829]

B:BD[22.176070] → [21.7251:7294]

function source.keychord_press(chord, key)

[22.176070]

[22.176115]

function source.keychord_press(chord, key, scancode, is_repeat)

Replacement in source.lua at line 385 [22.165829]

B:BD[22.177101] → [21.7345:7402]

    return edit.keychord_press(Editor_state, chord, key)

[22.177101]

[22.177160]

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

Replacement in source.lua at line 387 [22.165829]

B:BD[22.177167] → [21.7403:7472]

    return log_browser.keychord_press(Log_browser_state, chord, key)

[22.177167]

[22.177238]

    return log_browser.keychord_press(Log_browser_state, chord, key, scancode, is_repeat)

Replacement in source.lua at line 396 [22.165829]

B:BD[22.177458] → [21.7575:7652]

    return log_browser.keychord_press(Log_browser_state, chordkey, scancode)

[22.177458]

[22.177681]

    return log_browser.key_release(Log_browser_state, key, scancode)

Replacement in run.lua at line 14 [22.178107]
B:BD[22.178423] → [22.178423:178452]
```
function run.initialize(arg)
```
[22.178423]
[26.718]
```
function run.initialize(arg, unfiltered_arg)
```
Replacement in run.lua at line 103 [22.178107]
B:BD[22.181211] → [22.181211:181237]
```
function run.resize(w, h)
```
[22.181211]
[22.181237]
```
function run.resize(w,h)
```
Replacement in run.lua at line 169 [22.178107]
∅:D[28.314] → [29.16:60]
B:BD[22.182826] → [29.16:60]
```
function run.mouse_press(x,y, mouse_button)
```
[28.314]
[22.182872]
```
function run.mouse_press(x,y, mouse_button, is_touch, presses)
```

Replacement in run.lua at line 172 [22.178107]

∅:D[4.164] → [29.61:120]

B:BD[22.182946] → [29.61:120]

  return edit.mouse_press(Editor_state, x,y, mouse_button)

[4.164]

[22.183007]

  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in run.lua at line 175 [22.178107]

B:BD[22.183012] → [21.7687:7733]

function run.mouse_release(x,y, mouse_button)

[22.183012]

[22.183059]

function run.mouse_release(x,y, mouse_button, is_touch, presses)

Replacement in run.lua at line 177 [22.178107]

B:BD[22.183133] → [21.7734:7795]

  return edit.mouse_release(Editor_state, x,y, mouse_button)

[22.183133]

[22.183195]

  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in run.lua at line 190 [22.178107]
B:BD[22.183346] → [21.7867:7907]
```
function run.keychord_press(chord, key)
```
[22.183346]
[22.183388]
```
function run.keychord_press(chord, key, scancode, is_repeat)
```

Replacement in run.lua at line 192 [22.178107]

B:BD[22.183462] → [21.7908:7963]

  return edit.keychord_press(Editor_state, chord, key)

[22.183462]

[22.183519]

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

Replacement in main.lua at line 210 [31.2]

B:BD[30.8] → [21.8133:8173]

function App.keychord_press(chord, key)

[30.8]

[22.188176]

function App.keychord_press(chord, key, scancode, is_repeat)

Deletion in main.lua at line 291 [31.2]
B:BD[32.213] → [33.899:899]
B:BD[10.190572] → [8.2386:2450]
BD:BD[10.190572] → [8.2386:2450]
BD:BD[10.190572] → [8.2386:2450]
B:BD[10.190680] → [8.2451:2537]
BD:BD[10.190680] → [8.2451:2537]
B:BD[10.190789] → [8.2538:2630]
BD:BD[10.190789] → [8.2538:2630]
```
function App.mousepressed(x,y, mouse_button, is_touch, presses)
    if run.mouse_press then run.mouse_press(x,y, mouse_button, is_touch, presses) end
    if source.mouse_press then source.mouse_press(x,y, mouse_button, is_touch, presses) end
```
Solving an order conflict in main.lua at line 291 [31.2]
[32.213]
[10.190866]

Replacement in main.lua at line 296 [31.2]

B:BD[36.361] → [22.190029:190074]

function App.mousepressed(x,y, mouse_button)

[36.361]

[35.1272]

function App.mousepressed(x,y, mouse_button, is_touch, presses)

Replacement in main.lua at line 300 [31.2]

B:BD[22.190137] → [32.214:281]

    if run.mouse_press then run.mouse_press(x,y, mouse_button) end

[22.190137]

[22.190208]

    if run.mouse_press then run.mouse_press(x,y, mouse_button, is_touch, presses) end

Deletion in main.lua at line 302 [31.2]

B:BD[22.190246] → [32.282:355]

B:BD[32.355] → [33.946:946]

B:BD[36.361] → [8.2631:2696]

BD:BD[36.361] → [8.2631:2696]

B:BD[10.191010] → [8.2697:2787]

BD:BD[10.191010] → [8.2697:2787]

B:BD[10.191121] → [8.2788:2884]

BD:BD[10.191121] → [8.2788:2884]

    if source.mouse_press then source.mouse_press(x,y, mouse_button) end
function App.mousereleased(x,y, mouse_button, is_touch, presses)
    if run.mouse_release then run.mouse_release(x,y, mouse_button, is_touch, presses) end
    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end

Resurrecting zombie bytes in main.lua at line 302 [31.2]
∅:∅[37.842] → [20.823:894]
∅:∅[33.946] → [20.823:894]
∅:∅[8.2884] → [20.823:894]
B:B[11.5101] → [20.823:894]
BD:B[11.5101] → [20.823:894]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```
Solving an order conflict in main.lua at line 302 [31.2]
[22.190246]

Insertion in main.lua at line 302 [31.2]

[0.2248]

[20.823]

    if source.mouse_press then source.mouse_press(x,y, mouse_button, is_touch, presses) end

Replacement in main.lua at line 308 [31.2]

B:BD[20.894] → [37.843:889]

function App.mousereleased(x,y, mouse_button)

[20.894]

[38.21]

function App.mousereleased(x,y, mouse_button, is_touch, presses)

Deletion in main.lua at line 311 [31.2]

B:BD[39.143] → [38.22:93]

B:BD[39.143] → [8.2885:2953]

    if run.mouse_release then run.mouse_release(x,y, mouse_button) end
    if run.mouse_move then run.mouse_move(x,y, dx,dy, is_touch) end

Resurrecting zombie bytes in main.lua at line 311 [31.2]
∅:∅[38.93] → [39.196:234]
∅:∅[8.2953] → [39.196:234]
B:B[39.196] → [39.196:234]
BD:B[39.196] → [39.196:234]
```
  elseif Current_app == 'source' then
```

Insertion in main.lua at line 311 [31.2]

[39.143]

[39.196]

    if run.mouse_release then run.mouse_release(x,y, mouse_button, is_touch, presses) end

Deletion in main.lua at line 313 [31.2]

B:BD[39.234] → [38.94:171]

B:BD[39.234] → [8.2954:3028]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
    if source.mouse_move then source.mouse_move(x,y, dx,dy, is_touch) end

Resurrecting zombie bytes in main.lua at line 313 [31.2]
∅:∅[38.171] → [39.293:364]
∅:∅[8.3028] → [39.293:364]
B:B[39.293] → [39.293:364]
BD:B[39.293] → [39.293:364]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```

Insertion in main.lua at line 313 [31.2]

[39.234]

[39.293]

    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end

Resurrecting zombie bytes in main.lua at line 321 [31.2]
∅:∅[37.889] → [20.925:956]
∅:∅[41.1144] → [20.925:956]
∅:∅[42.1404] → [20.925:956]
B:B[20.925] → [20.925:956]
BD:B[20.925] → [20.925:956]
```
  if Current_app == 'run' then
```
Deletion in main.lua at line 322 [31.2]
B:BD[20.956] → [38.219:272]
```
    if run.mouse_move then run.mouse_move(dx,dy) end
```
Resurrecting zombie bytes in main.lua at line 322 [31.2]
∅:∅[38.272] → [20.1021:1059]
∅:∅[37.961] → [20.1021:1059]
B:B[20.1021] → [20.1021:1059]
BD:B[20.1021] → [20.1021:1059]
```
  elseif Current_app == 'source' then
```

Insertion in main.lua at line 322 [31.2]

[20.956]

[20.1021]

    if run.mouse_move then run.mouse_move(x,y, dx,dy, is_touch) end

Replacement in main.lua at line 324 [31.2]

B:BD[20.1059] → [38.273:332]

    if source.mouse_move then source.mouse_move(dx,dy) end

[20.1059]

[10.191200]

    if source.mouse_move then source.mouse_move(x,y, dx,dy, is_touch) end

Deletion in main.lua at line 395 [31.2]
B:BD[30.8] → [8.2142:2203]
BD:BD[30.8] → [8.2142:2203]
```
function App.keychord_press(chord, key, scancode, is_repeat)
```
Solving an order conflict in main.lua at line 395 [31.2]
[2.155]

Replacement in log_browser.lua at line 186 [22.191243]

B:BD[22.198624] → [21.8475:8534]

function log_browser.mouse_press(State, x,y, mouse_button)

[22.198624]

[22.198685]

function log_browser.mouse_press(State, x,y, mouse_button, is_touch, presses)

Replacement in log_browser.lua at line 252 [22.191243]

B:BD[22.200825] → [21.8535:8596]

function log_browser.mouse_release(State, x,y, mouse_button)

[22.200825]

[37.1211]

function log_browser.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in log_browser.lua at line 270 [22.191243]

B:BD[22.200938] → [21.8640:8695]

function log_browser.keychord_press(State, chord, key)

[22.200938]

[22.200995]

function log_browser.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in edit.lua at line 148 [44.413]

B:BD[43.1770] → [43.1770:1822]

function edit.mouse_press(State, x,y, mouse_button)

[43.1770]

[43.1822]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)

Replacement in edit.lua at line 193 [44.413]

B:BD[43.3515] → [43.3515:3569]

function edit.mouse_release(State, x,y, mouse_button)

[43.3515]

[43.3569]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in edit.lua at line 260 [44.413]

B:BD[43.5460] → [43.5460:5508]

function edit.keychord_press(State, chord, key)

[43.5460]

[43.5508]

function edit.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in edit.lua at line 370 [44.413]

B:BD[43.10318] → [43.10318:10356]

    Text.keychord_press(State, chord)

[43.10211]

[43.10356]

    Text.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in edit.lua at line 447 [44.413]
B:BD[43.12430] → [6.285:285]
B:BD[44.15878] → [8.3786:3850]
BD:BD[44.15878] → [8.3786:3850]
B:BD[45.2865] → [8.3716:3785]
BD:BD[45.2865] → [8.3716:3785]
B:BD[44.10343] → [8.3646:3715]
BD:BD[44.10343] → [8.3646:3715]
B:BD[47.5377] → [8.3574:3645]
BD:BD[47.5377] → [8.3574:3645]
B:BD[44.8364] → [8.3500:3573]
BD:BD[44.8364] → [8.3500:3573]
B:BD[45.2295] → [8.3414:3499]
BD:BD[45.2295] → [8.3414:3499]
BD:BD[45.2295] → [8.3414:3499]
B:BD[44.6757] → [8.3342:3413]
BD:BD[44.6757] → [8.3342:3413]
```
    Text.keychord_press(State, chord, key, scancode, is_repeat)
      Drawing.keychord_press(State, chord, key, scancode, is_repeat)
function edit.keychord_press(State, chord, key, scancode, is_repeat)
    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in edit.lua at line 447 [44.413]
[43.12430]

Resurrecting zombie bytes in drawing.lua at line 127 [48.98]

B:B[11.7422] → [21.14880:17584]

BD:B[11.7422] → [21.14880:17584]

  pmx,pmy = px(mx), py(my)
  local shape = drawing.pending
  if shape.mode == nil then
    -- nothing pending
  elseif shape.mode == 'freehand' then
    local shape_copy = deepcopy(shape)
    Drawing.smoothen(shape_copy)
    Drawing.draw_shape(drawing, shape_copy, top, left,right)
  elseif shape.mode == 'line' then
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local p1 = drawing.points[shape.p1]
    love.graphics.line(px(p1.x),py(p1.y), pmx,pmy)
  elseif shape.mode == 'manhattan' then
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local p1 = drawing.points[shape.p1]
    if math.abs(mx-p1.x) > math.abs(my-p1.y) then
      love.graphics.line(px(p1.x),py(p1.y), pmx,     py(p1.y))
    else
      love.graphics.line(px(p1.x),py(p1.y), px(p1.x),pmy)
    end
  elseif shape.mode == 'polygon' then
    -- don't close the loop on a pending polygon
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))
      end
      prev = curr
    end
    love.graphics.line(px(prev.x),py(prev.y), pmx,pmy)
  elseif shape.mode == 'rectangle' then
    local first = drawing.points[shape.vertices[1]]
    if #shape.vertices == 1 then
      love.graphics.line(px(first.x),py(first.y), pmx,pmy)
      return
    end
    local second = drawing.points[shape.vertices[2]]
    local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)
    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))
  elseif shape.mode == 'square' then
    local first = drawing.points[shape.vertices[1]]
    if #shape.vertices == 1 then
      love.graphics.line(px(first.x),py(first.y), pmx,pmy)
      return
    end
    local second = drawing.points[shape.vertices[2]]
    local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)
    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end

Resurrecting zombie bytes in drawing.lua at line 192 [48.98]
∅:∅[49.1410] → [21.17584:17629]
B:B[21.17584] → [21.17584:17629]
BD:B[21.17584] → [21.17584:17629]
```
    local cx,cy = px(center.x), py(center.y)
```

Resurrecting zombie bytes in drawing.lua at line 194 [48.98]

∅:∅[49.1477] → [21.17716:18327]

B:B[21.17716] → [21.17716:18327]

BD:B[21.17716] → [21.17716:18327]

  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    shape.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, shape.end_angle)
    local cx,cy = px(center.x), py(center.y)
    love.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius, width), shape.start_angle, shape.end_angle, 360)
  elseif shape.mode == 'move' then
    -- nothing pending; changes are immediately committed
  elseif shape.mode == 'name' then
    -- nothing pending; changes are immediately committed
  else

Resurrecting zombie bytes in drawing.lua at line 208 [48.98]
∅:∅[50.8904] → [21.18367:18373]
B:B[21.18367] → [21.18367:18373]
BD:B[21.18367] → [21.18367:18373]
B:B[21.18669] → [21.18669:18674]
BD:B[21.18669] → [21.18669:18674]
```
  end
end
```
Resurrecting zombie bytes in drawing.lua at line 222 [48.98]
B:B[51.6250] → [52.10765:10770]
BD:B[51.6250] → [52.10765:10770]
B:B[53.953] → [21.18675:18720]
BD:B[53.953] → [21.18675:18720]
```
end
  local drawing = State.lines[drawing_index]
```
Replacement in drawing.lua at line 224 [48.98]
∅:D[49.1479] → [53.883:953]
∅:D[50.8906] → [53.883:953]
∅:D[52.10770] → [53.883:953]
∅:D[21.18674] → [53.883:953]
B:BD[54.800] → [53.883:953]
BD:BD[54.800] → [53.883:953]
```
function Drawing.mouse_press(State, drawing_index, x,y, mouse_button)
```
[52.10770]
[21.18675]
```
function Drawing.mouse_press(State, drawing_index, x,y, mouse_button, is_touch, presses)
```
Resurrecting zombie bytes in drawing.lua at line 227 [48.98]
∅:∅[52.10822] → [21.18773:18827]
B:B[21.18773] → [21.18773:18827]
BD:B[21.18773] → [21.18773:18827]
```
  local cx = Drawing.coord(x-State.left, State.width)
```

Resurrecting zombie bytes in drawing.lua at line 229 [48.98]

∅:∅[52.10873] → [21.18888:19797]

B:B[21.18888] → [21.18888:19797]

BD:B[21.18888] → [21.18888:19797]

  if State.current_drawing_mode == 'freehand' then
    drawing.pending = {mode=State.current_drawing_mode, points={{x=cx, y=cy}}}
  elseif State.current_drawing_mode == 'line' or State.current_drawing_mode == 'manhattan' then
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
    drawing.pending = {mode=State.current_drawing_mode, p1=j}
  elseif State.current_drawing_mode == 'polygon' or State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square' then
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
    drawing.pending = {mode=State.current_drawing_mode, vertices={j}}
  elseif State.current_drawing_mode == 'circle' then
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
    drawing.pending = {mode=State.current_drawing_mode, center=j}
  elseif State.current_drawing_mode == 'move' then

Resurrecting zombie bytes in drawing.lua at line 242 [48.98]
B:B[11.7465] → [21.19798:19871]
BD:B[11.7465] → [21.19798:19871]
```
  elseif State.current_drawing_mode == 'name' then
    -- nothing
  else
```

Resurrecting zombie bytes in drawing.lua at line 246 [48.98]

∅:∅[50.8989] → [21.19927:20157]

B:B[21.19927] → [21.19927:20157]

BD:B[21.19927] → [21.19927:20157]

  end
end
-- a couple of operations on drawings need to constantly check the state of the mouse
function Drawing.update(State)
  if State.lines.current_drawing == nil then return end
  local drawing = State.lines.current_drawing

Resurrecting zombie bytes in drawing.lua at line 261 [48.98]
∅:∅[50.9067] → [21.20266:20370]
B:B[21.20266] → [21.20266:20370]
BD:B[21.20266] → [21.20266:20370]
```
  local pmx, pmy = App.mouse_x(), App.mouse_y()
  local mx = Drawing.coord(pmx-State.left, State.width)
```
Resurrecting zombie bytes in drawing.lua at line 264 [48.98]
∅:∅[52.11024] → [21.20433:20461]
B:B[21.20433] → [21.20433:20461]
BD:B[21.20433] → [21.20433:20461]
```
  if App.mouse_down(1) then
```

Resurrecting zombie bytes in drawing.lua at line 266 [48.98]

∅:∅[52.11104] → [21.20546:20939]

B:B[21.20546] → [21.20546:20939]

BD:B[21.20546] → [21.20546:20939]

      if drawing.pending.mode == 'freehand' then
        table.insert(drawing.pending.points, {x=mx, y=my})
      elseif drawing.pending.mode == 'move' then
        drawing.pending.target_point.x = mx
        drawing.pending.target_point.y = my
        Drawing.relax_constraints(drawing, drawing.pending.target_point_index)
      end
    end
  elseif State.current_drawing_mode == 'move' then

Resurrecting zombie bytes in drawing.lua at line 276 [48.98]

∅:∅[52.11185] → [21.21025:21692]

B:B[21.21025] → [21.21025:21692]

BD:B[21.21025] → [21.21025:21692]

B:B[11.7523] → [21.21693:22064]

BD:B[11.7523] → [21.21693:22064]

      drawing.pending.target_point.x = mx
      drawing.pending.target_point.y = my
      Drawing.relax_constraints(drawing, drawing.pending.target_point_index)
    end
  else
    -- do nothing
  end
end
function Drawing.relax_constraints(drawing, p)
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'manhattan' then
      if shape.p1 == p then
        shape.mode = 'line'
      elseif shape.p2 == p then
        shape.mode = 'line'
      end
    elseif shape.mode == 'rectangle' or shape.mode == 'square' then
      for _,v in ipairs(shape.vertices) do
        if v == p then
          shape.mode = 'polygon'
        end
      end
    end
  end
end
  if State.current_drawing_mode == 'move' then
    State.current_drawing_mode = State.previous_drawing_mode
    State.previous_drawing_mode = nil
    if State.lines.current_drawing then
      State.lines.current_drawing.pending = {}
      State.lines.current_drawing = nil
    end
  elseif State.lines.current_drawing then
    local drawing = State.lines.current_drawing

Replacement in drawing.lua at line 303 [48.98]
B:BD[21.21692] → [52.11187:11187]
BD:BD[21.21692] → [52.11187:11187]
∅:D[49.1658] → [11.7466:7523]
∅:D[50.9069] → [11.7466:7523]
∅:D[52.11187] → [11.7466:7523]
∅:D[21.21692] → [11.7466:7523]
B:BD[55.1875] → [11.7466:7523]
BD:BD[55.1875] → [11.7466:7523]
```
function Drawing.mouse_release(State, x,y, mouse_button)
```
[21.21692]
[21.21693]
```
function Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
```

Resurrecting zombie bytes in drawing.lua at line 314 [48.98]

∅:∅[52.11261] → [21.22139:22495]

B:B[21.22139] → [21.22139:22495]

BD:B[21.22139] → [21.22139:22495]

    if drawing.pending then
      if drawing.pending.mode == nil then
        -- nothing pending
      elseif drawing.pending.mode == 'freehand' then
        -- the last point added during update is good enough
        Drawing.smoothen(drawing.pending)
        table.insert(drawing.shapes, drawing.pending)
      elseif drawing.pending.mode == 'line' then

Resurrecting zombie bytes in drawing.lua at line 323 [48.98]

∅:∅[52.11363] → [21.22607:22947]

B:B[21.22607] → [21.22607:22947]

BD:B[21.22607] → [21.22607:22947]

        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'manhattan' then
        local p1 = drawing.points[drawing.pending.p1]

Resurrecting zombie bytes in drawing.lua at line 330 [48.98]

∅:∅[52.11465] → [21.23059:23470]

B:B[21.23059] → [21.23059:23470]

BD:B[21.23059] → [21.23059:23470]

        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          if math.abs(mx-p1.x) > math.abs(my-p1.y) then
            drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx, p1.y, State.width)
          else
            drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, p1.x, my, State.width)
          end
          local p2 = drawing.points[drawing.pending.p2]

Resurrecting zombie bytes in drawing.lua at line 338 [48.98]
∅:∅[52.11579] → [21.23594:23714]
B:B[21.23594] → [21.23594:23714]
BD:B[21.23594] → [21.23594:23714]
```
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'polygon' then
```

Resurrecting zombie bytes in drawing.lua at line 342 [48.98]

∅:∅[52.11681] → [21.23826:24131]

B:B[21.23826] → [21.23826:24131]

BD:B[21.23826] → [21.23826:24131]

        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, mx,my, State.width))
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'rectangle' then

Resurrecting zombie bytes in drawing.lua at line 348 [48.98]
∅:∅[50.9183] → [21.24178:24225]
B:B[21.24178] → [21.24178:24225]
BD:B[21.24178] → [21.24178:24225]
```
        if #drawing.pending.vertices == 2 then
```

Resurrecting zombie bytes in drawing.lua at line 350 [48.98]

∅:∅[52.11785] → [21.24339:25113]

B:B[21.24339] → [21.24339:25113]

BD:B[21.24339] → [21.24339:25113]

          if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
            local first = drawing.points[drawing.pending.vertices[1]]
            local second = drawing.points[drawing.pending.vertices[2]]
            local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))
            table.insert(drawing.shapes, drawing.pending)
          end
        else
          -- too few points; draw nothing
        end
      elseif drawing.pending.mode == 'square' then

Resurrecting zombie bytes in drawing.lua at line 363 [48.98]
∅:∅[50.9294] → [21.25160:25207]
B:B[21.25160] → [21.25160:25207]
BD:B[21.25160] → [21.25160:25207]
```
        if #drawing.pending.vertices == 2 then
```

Resurrecting zombie bytes in drawing.lua at line 365 [48.98]

∅:∅[52.11889] → [21.25321:26037]

B:B[21.25321] → [21.25321:26037]

BD:B[21.25321] → [21.25321:26037]

          if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
            local first = drawing.points[drawing.pending.vertices[1]]
            local second = drawing.points[drawing.pending.vertices[2]]
            local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))
            table.insert(drawing.shapes, drawing.pending)
          end
        end
      elseif drawing.pending.mode == 'circle' then

Resurrecting zombie bytes in drawing.lua at line 376 [48.98]

∅:∅[52.11991] → [21.26149:26475]

B:B[21.26149] → [21.26149:26475]

BD:B[21.26149] → [21.26149:26475]

        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          local center = drawing.points[drawing.pending.center]
          drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'arc' then

Resurrecting zombie bytes in drawing.lua at line 383 [48.98]

∅:∅[52.12093] → [21.26587:26978]

B:B[21.26587] → [21.26587:26978]

BD:B[21.26587] → [21.26587:26978]

        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          local center = drawing.points[drawing.pending.center]
          drawing.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, drawing.pending.end_angle)
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'name' then
        -- drop it
      else

Resurrecting zombie bytes in drawing.lua at line 392 [48.98]

∅:∅[50.9375] → [21.27036:27152]

B:B[21.27036] → [21.27036:27152]

BD:B[21.27036] → [21.27036:27152]

B:B[11.7570] → [21.27153:31955]

BD:B[11.7570] → [21.27153:31955]

      end
      State.lines.current_drawing.pending = {}
      State.lines.current_drawing = nil
    end
  end
end
  if chord == 'C-p' and not App.mouse_down(1) then
    State.current_drawing_mode = 'freehand'
  elseif App.mouse_down(1) and chord == 'l' then
    State.current_drawing_mode = 'line'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'line'
  elseif chord == 'C-l' and not App.mouse_down(1) then
    State.current_drawing_mode = 'line'
  elseif App.mouse_down(1) and chord == 'm' then
    State.current_drawing_mode = 'manhattan'
    local drawing = Drawing.select_drawing_at_mouse(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
    elseif drawing.pending.mode == 'line' then
      -- do nothing
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'manhattan'
  elseif chord == 'C-m' and not App.mouse_down(1) then
    State.current_drawing_mode = 'manhattan'
  elseif chord == 'C-g' and not App.mouse_down(1) then
    State.current_drawing_mode = 'polygon'
  elseif App.mouse_down(1) and chord == 'g' then
    State.current_drawing_mode = 'polygon'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      -- reuse existing vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'polygon'
  elseif chord == 'C-r' and not App.mouse_down(1) then
    State.current_drawing_mode = 'rectangle'
  elseif App.mouse_down(1) and chord == 'r' then
    State.current_drawing_mode = 'rectangle'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'square' then
      -- reuse existing (1-2) vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'rectangle'
  elseif chord == 'C-s' and not App.mouse_down(1) then
    State.current_drawing_mode = 'square'
  elseif App.mouse_down(1) and chord == 's' then
    State.current_drawing_mode = 'square'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'polygon' then
      while #drawing.pending.vertices > 2 do
        table.remove(drawing.pending.vertices)
      end
    elseif drawing.pending.mode == 'rectangle' then
      -- reuse existing (1-2) vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'square'
  elseif App.mouse_down(1) and chord == 'p' and State.current_drawing_mode == 'polygon' then

Replacement in drawing.lua at line 399 [48.98]
B:BD[21.27152] → [52.12095:12095]
BD:BD[21.27152] → [52.12095:12095]
∅:D[50.9377] → [11.7524:7570]
∅:D[52.12095] → [11.7524:7570]
∅:D[21.27152] → [11.7524:7570]
B:BD[56.19077] → [11.7524:7570]
BD:BD[56.19077] → [11.7524:7570]
```
function Drawing.keychord_press(State, chord)
```
[21.27152]
[21.27153]
```
function Drawing.keychord_press(State, chord, key, scancode, is_repeat)
```

Resurrecting zombie bytes in drawing.lua at line 489 [48.98]

∅:∅[52.12335] → [21.32151:32415]

B:B[21.32151] → [21.32151:32415]

BD:B[21.32151] → [21.32151:32415]

    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
    table.insert(drawing.pending.vertices, j)
  elseif App.mouse_down(1) and chord == 'p' and (State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square') then

Resurrecting zombie bytes in drawing.lua at line 495 [48.98]

∅:∅[52.12575] → [21.32611:33022]

B:B[21.32611] → [21.32611:33022]

BD:B[21.32611] → [21.32611:33022]

    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
    while #drawing.pending.vertices >= 2 do
      table.remove(drawing.pending.vertices)
    end
    table.insert(drawing.pending.vertices, j)
  elseif chord == 'C-o' and not App.mouse_down(1) then
    State.current_drawing_mode = 'circle'
  elseif App.mouse_down(1) and chord == 'a' and State.current_drawing_mode == 'circle' then

Resurrecting zombie bytes in drawing.lua at line 505 [48.98]
∅:∅[52.12694] → [21.33086:33119]
B:B[21.33086] → [21.33086:33119]
BD:B[21.33086] → [21.33086:33119]
```
    drawing.pending.mode = 'arc'
```

Resurrecting zombie bytes in drawing.lua at line 507 [48.98]

∅:∅[52.12816] → [21.33251:34209]

B:B[21.33251] → [21.33251:34209]

BD:B[21.33251] → [21.33251:34209]

    local center = drawing.points[drawing.pending.center]
    drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))
    drawing.pending.start_angle = geom.angle(center.x,center.y, mx,my)
  elseif App.mouse_down(1) and chord == 'o' then
    State.current_drawing_mode = 'circle'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.center = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      drawing.pending.center = drawing.pending.p1
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.center = drawing.pending.vertices[1]
    end
    drawing.pending.mode = 'circle'
  elseif chord == 'C-u' and not App.mouse_down(1) then

Resurrecting zombie bytes in drawing.lua at line 523 [48.98]

∅:∅[52.12894] → [21.34295:34740]

B:B[21.34295] → [21.34295:34740]

BD:B[21.34295] → [21.34295:34740]

    if drawing then
      if State.previous_drawing_mode == nil then
        State.previous_drawing_mode = State.current_drawing_mode
      end
      State.current_drawing_mode = 'move'
      drawing.pending = {mode=State.current_drawing_mode, target_point=p, target_point_index=i}
      State.lines.current_drawing_index = drawing_index
      State.lines.current_drawing = drawing
    end
  elseif chord == 'C-n' and not App.mouse_down(1) then

Resurrecting zombie bytes in drawing.lua at line 534 [48.98]

∅:∅[52.12982] → [21.34836:35589]

B:B[21.34836] → [21.34836:35589]

BD:B[21.34836] → [21.34836:35589]

    if drawing then
      if State.previous_drawing_mode == nil then
        -- don't clobber
        State.previous_drawing_mode = State.current_drawing_mode
      end
      State.current_drawing_mode = 'name'
      p.name = ''
      drawing.pending = {mode=State.current_drawing_mode, target_point=point_index}
      State.lines.current_drawing_index = drawing_index
      State.lines.current_drawing = drawing
    end
  elseif chord == 'C-d' and not App.mouse_down(1) then
    local _,drawing,_,i,p = Drawing.select_point_at_mouse(State)
    if drawing then
      for _,shape in ipairs(drawing.shapes) do
        if Drawing.contains_point(shape, i) then
          if shape.mode == 'polygon' then
            local idx = table.find(shape.vertices, i)

Resurrecting zombie bytes in drawing.lua at line 553 [48.98]

∅:∅[50.9440] → [21.35613:38422]

B:B[21.35613] → [21.35613:38422]

BD:B[21.35613] → [21.35613:38422]

            table.remove(shape.vertices, idx)
            if #shape.vertices < 3 then
              shape.mode = 'deleted'
            end
          else
            shape.mode = 'deleted'
          end
        end
      end
      drawing.points[i].deleted = true
    end
    local drawing,_,_,shape = Drawing.select_shape_at_mouse(State)
    if drawing then
      shape.mode = 'deleted'
    end
  elseif chord == 'C-h' and not App.mouse_down(1) then
    local drawing = Drawing.select_drawing_at_mouse(State)
    if drawing then
      drawing.show_help = true
    end
  elseif chord == 'escape' and App.mouse_down(1) then
    local _,drawing = Drawing.current_drawing(State)
    drawing.pending = {}
  end
end
function Drawing.complete_rectangle(firstx,firsty, secondx,secondy, x,y)
  if firstx == secondx then
    return x,secondy, x,firsty
  end
  if firsty == secondy then
    return secondx,y, firstx,y
  end
  local first_slope = (secondy-firsty)/(secondx-firstx)
  -- slope of second edge:
  --    -1/first_slope
  -- equation of line containing the second edge:
  --    y-secondy = -1/first_slope*(x-secondx)
  -- => 1/first_slope*x + y + (- secondy - secondx/first_slope) = 0
  -- now we want to find the point on this line that's closest to the mouse pointer.
  -- https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line#Line_defined_by_an_equation
  local a = 1/first_slope
  local c = -secondy - secondx/first_slope
  local thirdx = round(((x-a*y) - a*c) / (a*a + 1))
  local thirdy = round((a*(-x + a*y) - c) / (a*a + 1))
  -- slope of third edge = first_slope
  -- equation of line containing third edge:
  --     y - thirdy = first_slope*(x-thirdx)
  --  => -first_slope*x + y + (-thirdy + thirdx*first_slope) = 0
  -- now we want to find the point on this line that's closest to the first point
  local a = -first_slope
  local c = -thirdy + thirdx*first_slope
  local fourthx = round(((firstx-a*firsty) - a*c) / (a*a + 1))
  local fourthy = round((a*(-firstx + a*firsty) - c) / (a*a + 1))
  return thirdx,thirdy, fourthx,fourthy
end
function Drawing.complete_square(firstx,firsty, secondx,secondy, x,y)
  -- use x,y only to decide which side of the first edge to complete the square on
  local deltax = secondx-firstx
  local deltay = secondy-firsty
  local thirdx = secondx+deltay
  local thirdy = secondy-deltax
  if not geom.same_side(firstx,firsty, secondx,secondy, thirdx,thirdy, x,y) then
    deltax = -deltax
    deltay = -deltay
    thirdx = secondx+deltay
    thirdy = secondy-deltax
  end
  local fourthx = firstx+deltay
  local fourthy = firsty-deltax
  return thirdx,thirdy, fourthx,fourthy
end
function Drawing.current_drawing(State)
  local x, y = App.mouse_x(), App.mouse_y()
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then

Resurrecting zombie bytes in drawing.lua at line 633 [48.98]

∅:∅[52.13104] → [21.38610:38838]

B:B[21.38610] → [21.38610:38838]

BD:B[21.38610] → [21.38610:38838]

      end
    end
  end
  return nil
end
function Drawing.select_shape_at_mouse(State)
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      local x, y = App.mouse_x(), App.mouse_y()

Resurrecting zombie bytes in drawing.lua at line 646 [48.98]
∅:∅[52.13345] → [21.39090:39139]
B:B[21.39090] → [21.39090:39139]
BD:B[21.39090] → [21.39090:39139]
B:B[21.39163] → [21.39163:39218]
BD:B[21.39163] → [21.39163:39218]
```
        for i,shape in ipairs(drawing.shapes) do
          if geom.on_shape(mx,my, drawing, shape) then
```

Resurrecting zombie bytes in drawing.lua at line 649 [48.98]

∅:∅[52.13388] → [21.39264:39505]

B:B[21.39264] → [21.39264:39505]

BD:B[21.39264] → [21.39264:39505]

          end
        end
      end
    end
  end
end
function Drawing.select_point_at_mouse(State)
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      local x, y = App.mouse_x(), App.mouse_y()

Resurrecting zombie bytes in drawing.lua at line 663 [48.98]
∅:∅[52.13629] → [21.39757:39806]
B:B[21.39757] → [21.39757:39806]
BD:B[21.39757] → [21.39757:39806]
B:B[21.39830] → [21.39830:39888]
BD:B[21.39830] → [21.39830:39888]
```
        for i,point in ipairs(drawing.points) do
          if Drawing.near(point, mx,my, State.width) then
```

Resurrecting zombie bytes in drawing.lua at line 666 [48.98]

∅:∅[52.13686] → [21.39948:40191]

B:B[21.39948] → [21.39948:40191]

BD:B[21.39948] → [21.39948:40191]

          end
        end
      end
    end
  end
end
function Drawing.select_drawing_at_mouse(State)
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      local x, y = App.mouse_x(), App.mouse_y()

Resurrecting zombie bytes in drawing.lua at line 678 [48.98]

∅:∅[52.13771] → [21.40331:40949]

B:B[21.40331] → [21.40331:40949]

BD:B[21.40331] → [21.40331:40949]

        return drawing
      end
    end
  end
end
function Drawing.contains_point(shape, p)
  if shape.mode == 'freehand' then
    -- not supported
  elseif shape.mode == 'line' or shape.mode == 'manhattan' then
    return shape.p1 == p or shape.p2 == p
  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
    return table.find(shape.vertices, p)
  elseif shape.mode == 'circle' then
    return shape.center == p
  elseif shape.mode == 'arc' then
    return shape.center == p
    -- ugh, how to support angles
  elseif shape.mode == 'deleted' then
    -- already done
  else

Resurrecting zombie bytes in drawing.lua at line 700 [48.98]
∅:∅[50.9507] → [21.40989:41033]
B:B[21.40989] → [21.40989:41033]
BD:B[21.40989] → [21.40989:41033]
```
  end
end
function Drawing.smoothen(shape)
```

Resurrecting zombie bytes in drawing.lua at line 705 [48.98]

∅:∅[50.9580] → [21.41068:42200]

B:B[21.41068] → [21.41068:42200]

BD:B[21.41068] → [21.41068:42200]

  for _=1,7 do
    for i=2,#shape.points-1 do
      local a = shape.points[i-1]
      local b = shape.points[i]
      local c = shape.points[i+1]
      b.x = round((a.x + b.x + c.x)/3)
      b.y = round((a.y + b.y + c.y)/3)
    end
  end
end
function round(num)
  return math.floor(num+.5)
end
function Drawing.find_or_insert_point(points, x,y, width)
  -- check if UI would snap the two points together
  for i,point in ipairs(points) do
    if Drawing.near(point, x,y, width) then
      return i
    end
  end
  table.insert(points, {x=x, y=y})
  return #points
end
function Drawing.near(point, x,y, width)
  local px,py = Drawing.pixels(x, width),Drawing.pixels(y, width)
  local cx,cy = Drawing.pixels(point.x, width), Drawing.pixels(point.y, width)
  return (cx-px)*(cx-px) + (cy-py)*(cy-py) < Same_point_distance*Same_point_distance
end
function Drawing.pixels(n, width)  -- parts to pixels
  return math.floor(n*width/256)
end
function Drawing.coord(n, width)  -- pixels to parts
  return math.floor(n*256/width)
end
function table.find(h, x)
  for k,v in pairs(h) do
    if v == x then
      return k
    end
  end
end

Deletion in drawing.lua at line 751 [48.98]
B:BD[21.42200] → [52.13773:13773]
B:BD[54.800] → [8.3851:3940]
BD:BD[54.800] → [8.3851:3940]
B:BD[55.1875] → [8.3941:4017]
BD:BD[55.1875] → [8.3941:4017]
B:BD[56.19077] → [8.4018:4090]
BD:BD[56.19077] → [8.4018:4090]
```
function Drawing.mouse_press(State, drawing_index, x,y, mouse_button, is_touch, presses)
function Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
function Drawing.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in drawing.lua at line 751 [48.98]
[21.42200]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

Replacement in source_text.lua at line 226 [22.83786]

Replacement in source_edit.lua at line 235 [22.152503]

Replacement in source_edit.lua at line 282 [22.152503]

Replacement in source_edit.lua at line 295 [22.152503]

Replacement in source_edit.lua at line 300 [22.152503]

Replacement in source_edit.lua at line 386 [22.152503]

Replacement in source_edit.lua at line 505 [22.152503]

Replacement in source_edit.lua at line 538 [22.152503]

Replacement in source.lua at line 59 [22.165829]

Replacement in source.lua at line 176 [22.165829]

Replacement in source.lua at line 286 [22.165829]

Replacement in source.lua at line 294 [22.165829]

Replacement in source.lua at line 303 [22.165829]

Replacement in source.lua at line 310 [22.165829]

Replacement in source.lua at line 314 [22.165829]

Replacement in source.lua at line 317 [22.165829]

Replacement in source.lua at line 319 [22.165829]

Replacement in source.lua at line 345 [22.165829]

Replacement in source.lua at line 385 [22.165829]

Replacement in source.lua at line 387 [22.165829]

Replacement in source.lua at line 396 [22.165829]

Replacement in run.lua at line 14 [22.178107]

Replacement in run.lua at line 103 [22.178107]

Replacement in run.lua at line 169 [22.178107]

Replacement in run.lua at line 172 [22.178107]

Replacement in run.lua at line 175 [22.178107]

Replacement in run.lua at line 177 [22.178107]

Replacement in run.lua at line 190 [22.178107]

Replacement in run.lua at line 192 [22.178107]

Replacement in main.lua at line 210 [31.2]

Deletion in main.lua at line 291 [31.2]

Solving an order conflict in main.lua at line 291 [31.2]

Replacement in main.lua at line 296 [31.2]

Replacement in main.lua at line 300 [31.2]

Deletion in main.lua at line 302 [31.2]

Resurrecting zombie bytes in main.lua at line 302 [31.2]

Solving an order conflict in main.lua at line 302 [31.2]

Insertion in main.lua at line 302 [31.2]

Replacement in main.lua at line 308 [31.2]

Deletion in main.lua at line 311 [31.2]

Resurrecting zombie bytes in main.lua at line 311 [31.2]

Insertion in main.lua at line 311 [31.2]

Deletion in main.lua at line 313 [31.2]

Resurrecting zombie bytes in main.lua at line 313 [31.2]

Insertion in main.lua at line 313 [31.2]

Resurrecting zombie bytes in main.lua at line 321 [31.2]

Deletion in main.lua at line 322 [31.2]

Resurrecting zombie bytes in main.lua at line 322 [31.2]

Insertion in main.lua at line 322 [31.2]

Replacement in main.lua at line 324 [31.2]

Deletion in main.lua at line 395 [31.2]

Solving an order conflict in main.lua at line 395 [31.2]

Replacement in log_browser.lua at line 186 [22.191243]

Replacement in log_browser.lua at line 252 [22.191243]

Replacement in log_browser.lua at line 270 [22.191243]

Replacement in edit.lua at line 148 [44.413]

Replacement in edit.lua at line 193 [44.413]

Replacement in edit.lua at line 260 [44.413]

Replacement in edit.lua at line 370 [44.413]

Deletion in edit.lua at line 447 [44.413]

Solving an order conflict in edit.lua at line 447 [44.413]

Resurrecting zombie bytes in drawing.lua at line 127 [48.98]

Resurrecting zombie bytes in drawing.lua at line 192 [48.98]

Resurrecting zombie bytes in drawing.lua at line 194 [48.98]

Resurrecting zombie bytes in drawing.lua at line 208 [48.98]

Resurrecting zombie bytes in drawing.lua at line 222 [48.98]

Replacement in drawing.lua at line 224 [48.98]

Resurrecting zombie bytes in drawing.lua at line 227 [48.98]

Resurrecting zombie bytes in drawing.lua at line 229 [48.98]

Resurrecting zombie bytes in drawing.lua at line 242 [48.98]

Resurrecting zombie bytes in drawing.lua at line 246 [48.98]