akkartik/lines-and-links - Change JFFUF5ALUWPDM7IEDEZVAYG2SVXO334STONRGKVB3QKY2TT5QGBQC

override mouse state lookups in tests

If I'd had this stuff in my test harness earlier, two recent commits would have failed tests and given me early warning: ff88238ff1 ff88a2a927

Created by Kartik K. Agaram on June 12, 2022

JFFUF5ALUWPDM7IEDEZVAYG2SVXO334STONRGKVB3QKY2TT5QGBQC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 174 [11.2]

B:BD[11.6031] → [11.6031:6100]

  App.run_after_mouserelease(screen_left_margin+8,Margin_top+5, '1')

[11.6031]

[11.6100]

  App.run_after_mouse_release(screen_left_margin+8,Margin_top+5, '1')

Replacement in text_tests.lua at line 193 [11.2]

B:BD[12.40] → [12.40:107]

  App.run_after_mousepress(screen_left_margin+8,Margin_top+5, '1')

[12.40]

[12.107]

  App.run_after_mouse_press(screen_left_margin+8,Margin_top+5, '1')

Replacement in text_tests.lua at line 195 [11.2]

B:BD[12.144] → [12.144:226]

  App.run_after_mouserelease(screen_left_margin+20,Margin_top+Line_height+5, '1')

[12.144]

[12.376]

  App.run_after_mouse_release(screen_left_margin+20,Margin_top+Line_height+5, '1')

Replacement in text_tests.lua at line 214 [11.2]

B:BD[13.610] → [13.610:746]

  App.run_after_mousepress(screen_left_margin+8,Margin_top+5, '1')
  App.run_after_mouserelease(screen_left_margin+8,Margin_top+5, '1')

[13.610]

[13.746]

  App.run_after_mouse_press(screen_left_margin+8,Margin_top+5, '1')
  App.run_after_mouse_release(screen_left_margin+8,Margin_top+5, '1')

Replacement in text_tests.lua at line 217 [11.2]

B:BD[13.792] → [13.792:994]

  App.keypress('lshift')
  App.run_after_mousepress(screen_left_margin+20,Margin_top+5, '1')
  App.run_after_mouserelease(screen_left_margin+20,Margin_top+Line_height+5, '1')
  App.keyrelease('lshift')

[13.792]

[12.1131]

  App.fake_key_press('lshift')
  App.run_after_mouse_press(screen_left_margin+20,Margin_top+5, '1')
  App.run_after_mouse_release(screen_left_margin+20,Margin_top+Line_height+5, '1')
  App.fake_key_release('lshift')

Replacement in text_tests.lua at line 239 [11.2]

B:BD[7.475] → [7.475:611]

  App.run_after_mousepress(screen_left_margin+8,Margin_top+5, '1')
  App.run_after_mouserelease(screen_left_margin+8,Margin_top+5, '1')

[7.475]

[7.611]

  App.run_after_mouse_press(screen_left_margin+8,Margin_top+5, '1')
  App.run_after_mouse_release(screen_left_margin+8,Margin_top+5, '1')

Replacement in text_tests.lua at line 242 [11.2]

B:BD[7.663] → [7.663:838]

  App.keypress('lshift')
  App.run_after_mousepress(screen_left_margin+20,Margin_top+5, '1')
  App.run_after_mouserelease(screen_left_margin+20,Margin_top+Line_height+5, '1')

[7.663]

[7.838]

  App.fake_key_press('lshift')
  App.run_after_mouse_press(screen_left_margin+20,Margin_top+5, '1')
  App.run_after_mouse_release(screen_left_margin+20,Margin_top+Line_height+5, '1')

Replacement in text_tests.lua at line 246 [11.2]

B:BD[7.889] → [7.889:1090]

  App.keypress('lshift')
  App.run_after_mousepress(screen_left_margin+20,Margin_top+5, '1')
  App.run_after_mouserelease(screen_left_margin+8,Margin_top+Line_height+5, '1')
  App.keyrelease('lshift')

[7.889]

[7.1090]

  App.fake_key_press('lshift')
  App.run_after_mouse_press(screen_left_margin+20,Margin_top+5, '1')
  App.run_after_mouse_release(screen_left_margin+8,Margin_top+Line_height+5, '1')
  App.fake_key_release('lshift')

Replacement in text_tests.lua at line 887 [11.2]

B:BD[11.33047] → [11.33047:33130]

  App.run_after_mouserelease(screen_left_margin+8,Margin_top+Line_height*2+5, '1')

[11.33047]

[11.33130]

  App.run_after_mouse_release(screen_left_margin+8,Margin_top+Line_height*2+5, '1')

Replacement in text.lua at line 139 [16.1]
∅:D[14.28] → [15.69:113]
B:BD[15.69] → [15.69:113]
```
  if love.mouse.isDown('1') then return end
```
[14.28]
[17.1]
```
  if App.mouse_down('1') then return end
```
Replacement in select.lua at line 16 [11.43980]
B:BD[11.44671] → [11.44671:44704]
```
  if love.mouse.isDown('1') then
```
[11.44671]
[11.44704]
```
  if App.mouse_down('1') then
```

Replacement in select.lua at line 87 [11.43980]

B:BD[11.46079] → [11.46079:46148]

  local line,pos = Text.to_pos(love.mouse.getX(), love.mouse.getY())

[11.46079]

[11.46148]

  local line,pos = Text.to_pos(App.mouse_x(), App.mouse_y())

Replacement in main.lua at line 449 [20.2]
∅:D[18.265] → [19.3819:3882]
∅:D[21.646] → [19.3819:3882]
∅:D[22.1992] → [19.3819:3882]
∅:D[23.4816] → [19.3819:3882]
B:BD[19.3819] → [19.3819:3882]
```
  elseif love.mouse.isDown('1') or chord:sub(1,2) == 'C-' then
```
[22.1992]
[24.426]
```
  elseif App.mouse_down('1') or chord:sub(1,2) == 'C-' then
```
Replacement in main.lua at line 458 [20.2]
∅:D[25.217] → [26.3:62]
∅:D[10.233] → [26.3:62]
B:BD[15.5015] → [26.3:62]
```
  elseif chord == 'escape' and love.mouse.isDown('1') then
```
[10.233]
[9.8]
```
  elseif chord == 'escape' and App.mouse_down('1') then
```

Replacement in main.lua at line 463 [20.2]

B:BD[3.11] → [3.11:74]

  elseif chord == 'escape' and not love.mouse.isDown('1') then

[3.11]

[3.74]

  elseif chord == 'escape' and not App.mouse_down('1') then

Replacement in drawing.lua at line 8 [28.98]
∅:D[27.66] → [28.179:234]
B:BD[28.179] → [28.179:234]
```
  local pmx,pmy = love.mouse.getX(), love.mouse.getY()
```
[27.66]
[29.316]
```
  local pmx,pmy = App.mouse_x(), App.mouse_y()
```

Replacement in drawing.lua at line 18 [28.98]

B:BD[28.598] → [28.598:663]

    if love.mouse.isDown('1') and love.keyboard.isDown('h') then

[28.598]

[28.663]

    if App.mouse_down('1') and love.keyboard.isDown('h') then

Replacement in drawing.lua at line 119 [28.98]

B:BD[30.1944] → [2.10:104]

    local mx,my = Drawing.coord(love.mouse.getX()-left), Drawing.coord(love.mouse.getY()-top)

[30.1944]

[30.2082]

    local mx,my = Drawing.coord(App.mouse_x()-left), Drawing.coord(App.mouse_y()-top)

Replacement in drawing.lua at line 126 [28.98]

B:BD[30.2327] → [2.105:199]

    local mx,my = Drawing.coord(love.mouse.getX()-left), Drawing.coord(love.mouse.getY()-top)

[30.2327]

[30.2465]

    local mx,my = Drawing.coord(App.mouse_x()-left), Drawing.coord(App.mouse_y()-top)

Replacement in drawing.lua at line 146 [28.98]

B:BD[30.3256] → [30.3256:3372]

    love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, love.mouse.getX(),love.mouse.getY())

[30.3256]

[31.1853]

    love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, App.mouse_x(),App.mouse_y())

Replacement in drawing.lua at line 148 [28.98]

B:BD[31.1893] → [31.1893:1950]

    local pmx,pmy = love.mouse.getX(), love.mouse.getY()

[31.1893]

[31.1950]

    local pmx,pmy = App.mouse_x(), App.mouse_y()

Replacement in drawing.lua at line 162 [28.98]

B:BD[31.2973] → [31.2973:3030]

    local pmx,pmy = love.mouse.getX(), love.mouse.getY()

[31.2973]

[31.3030]

    local pmx,pmy = App.mouse_x(), App.mouse_y()

Replacement in drawing.lua at line 177 [28.98]

B:BD[30.3457] → [2.200:294]

    local mx,my = Drawing.coord(love.mouse.getX()-left), Drawing.coord(love.mouse.getY()-top)

[30.3457]

[30.3555]

    local mx,my = Drawing.coord(App.mouse_x()-left), Drawing.coord(App.mouse_y()-top)

Replacement in drawing.lua at line 182 [28.98]

B:BD[30.3715] → [30.3715:3810]

    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, love.mouse.getX(),love.mouse.getY()))

[30.3715]

[30.3810]

    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, App.mouse_x(),App.mouse_y()))

Replacement in drawing.lua at line 185 [28.98]

B:BD[30.3892] → [2.295:389]

    local mx,my = Drawing.coord(love.mouse.getX()-left), Drawing.coord(love.mouse.getY()-top)

[30.3892]

[30.3990]

    local mx,my = Drawing.coord(App.mouse_x()-left), Drawing.coord(App.mouse_y()-top)

Replacement in drawing.lua at line 235 [28.98]

B:BD[32.254] → [32.254:339]

  local x, y = love.mouse.getX(), love.mouse.getY()
  if love.mouse.isDown('1') then

[32.254]

[32.339]

  local x, y = App.mouse_x(), App.mouse_y()
  if App.mouse_down('1') then

Replacement in drawing.lua at line 239 [28.98]

B:BD[32.433] → [32.433:565]

        table.insert(drawing.pending.points, {x=Drawing.coord(love.mouse.getX()-16), y=Drawing.coord(love.mouse.getY()-drawing.y)})

[32.433]

[32.565]

        table.insert(drawing.pending.points, {x=Drawing.coord(App.mouse_x()-16), y=Drawing.coord(App.mouse_y()-drawing.y)})

Replacement in drawing.lua at line 286 [28.98]

B:BD[33.1032] → [33.1032:1122]

          love.mouse.setPosition(16+Drawing.pixels(p2.x), drawing.y+Drawing.pixels(p2.y))

[33.1032]

[33.1122]

          App.mouse_move(16+Drawing.pixels(p2.x), drawing.y+Drawing.pixels(p2.y))

Replacement in drawing.lua at line 352 [28.98]

B:BD[15.5258] → [5.104:160]

  if chord == 'C-p' and not love.mouse.isDown('1') then

[15.5258]

[15.5820]

  if chord == 'C-p' and not App.mouse_down('1') then

Replacement in drawing.lua at line 354 [28.98]

B:BD[15.5858] → [15.5858:5918]

  elseif chord == 'C-g' and not love.mouse.isDown('1') then

[15.5858]

[15.5918]

  elseif chord == 'C-g' and not App.mouse_down('1') then

Replacement in drawing.lua at line 356 [28.98]

B:BD[15.5955] → [15.5955:6009]

  elseif love.mouse.isDown('1') and chord == 'g' then

[15.5955]

[15.6009]

  elseif App.mouse_down('1') and chord == 'g' then

Replacement in drawing.lua at line 371 [28.98]

B:BD[15.6652] → [31.6407:6467]

  elseif chord == 'C-r' and not love.mouse.isDown('1') then

[15.6652]

[31.6467]

  elseif chord == 'C-r' and not App.mouse_down('1') then

Replacement in drawing.lua at line 373 [28.98]

B:BD[31.6506] → [31.6506:6560]

  elseif love.mouse.isDown('1') and chord == 'r' then

[31.6506]

[31.6560]

  elseif App.mouse_down('1') and chord == 'r' then

Replacement in drawing.lua at line 388 [28.98]

B:BD[31.7207] → [31.7207:7267]

  elseif chord == 'C-s' and not love.mouse.isDown('1') then

[31.7207]

[31.7267]

  elseif chord == 'C-s' and not App.mouse_down('1') then

Replacement in drawing.lua at line 390 [28.98]

B:BD[31.7303] → [31.7303:7357]

  elseif love.mouse.isDown('1') and chord == 's' then

[31.7303]

[31.7357]

  elseif App.mouse_down('1') and chord == 's' then

Replacement in drawing.lua at line 409 [28.98]

B:BD[31.7998] → [31.7998:8167]

  elseif love.mouse.isDown('1') and chord == 'p' and (Current_drawing_mode == 'polygon' or Current_drawing_mode == 'rectangle' or Current_drawing_mode == 'square') then

[31.7998]

[34.163]

  elseif App.mouse_down('1') and chord == 'p' and (Current_drawing_mode == 'polygon' or Current_drawing_mode == 'rectangle' or Current_drawing_mode == 'square') then

Replacement in drawing.lua at line 411 [28.98]

∅:D[34.211] → [15.6790:6888]

B:BD[15.6790] → [15.6790:6888]

    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)

[34.211]

[15.6888]

    local mx,my = Drawing.coord(App.mouse_x()-16), Drawing.coord(App.mouse_y()-drawing.y)

Replacement in drawing.lua at line 414 [28.98]

B:BD[15.6992] → [6.186:246]

  elseif chord == 'C-o' and not love.mouse.isDown('1') then

[15.6992]

[15.7052]

  elseif chord == 'C-o' and not App.mouse_down('1') then

Replacement in drawing.lua at line 416 [28.98]

B:BD[15.7088] → [15.7088:7179]

  elseif love.mouse.isDown('1') and chord == 'a' and Current_drawing_mode == 'circle' then

[15.7088]

[34.212]

  elseif App.mouse_down('1') and chord == 'a' and Current_drawing_mode == 'circle' then

Replacement in drawing.lua at line 419 [28.98]

B:BD[15.7258] → [15.7258:7356]

    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)

[15.7258]

[15.7356]

    local mx,my = Drawing.coord(App.mouse_x()-16), Drawing.coord(App.mouse_y()-drawing.y)

Replacement in drawing.lua at line 424 [28.98]

B:BD[15.7608] → [6.247:301]

  elseif love.mouse.isDown('1') and chord == 'o' then

[15.7608]

[15.7662]

  elseif App.mouse_down('1') and chord == 'o' then

Replacement in drawing.lua at line 435 [28.98]

B:BD[15.8206] → [15.8206:8260]

  elseif love.mouse.isDown('1') and chord == 'l' then

[15.8206]

[15.8260]

  elseif App.mouse_down('1') and chord == 'l' then

Replacement in drawing.lua at line 446 [28.98]

B:BD[15.8788] → [4.11:71]

  elseif chord == 'C-l' and not love.mouse.isDown('1') then

[15.8788]

[15.8817]

  elseif chord == 'C-l' and not App.mouse_down('1') then

Replacement in drawing.lua at line 448 [28.98]

B:BD[15.8974] → [15.8974:9028]

  elseif love.mouse.isDown('1') and chord == 'm' then

[15.8851]

[15.9028]

  elseif App.mouse_down('1') and chord == 'm' then

Replacement in drawing.lua at line 461 [28.98]

B:BD[15.9641] → [15.9641:9701]

  elseif chord == 'C-m' and not love.mouse.isDown('1') then

[15.9641]

[15.9701]

  elseif chord == 'C-m' and not App.mouse_down('1') then

Replacement in drawing.lua at line 463 [28.98]

B:BD[15.9866] → [15.9866:9926]

  elseif chord == 'C-s' and not love.mouse.isDown('1') then

[15.9740]

[15.9926]

  elseif chord == 'C-s' and not App.mouse_down('1') then

Replacement in drawing.lua at line 468 [28.98]

B:BD[15.10036] → [35.213:273]

  elseif chord == 'C-u' and not love.mouse.isDown('1') then

[15.10036]

[8.16]

  elseif chord == 'C-u' and not App.mouse_down('1') then

Replacement in drawing.lua at line 479 [28.98]

B:BD[15.10365] → [15.10365:10419]

  elseif love.mouse.isDown('1') and chord == 'v' then

[15.10365]

[8.138]

  elseif App.mouse_down('1') and chord == 'v' then

Replacement in drawing.lua at line 490 [28.98]

B:BD[14.1826] → [14.1826:1886]

  elseif chord == 'C-n' and not love.mouse.isDown('1') then

[14.1826]

[8.260]

  elseif chord == 'C-n' and not App.mouse_down('1') then

Replacement in drawing.lua at line 503 [28.98]

B:BD[15.10688] → [15.10688:10748]

  elseif chord == 'C-d' and not love.mouse.isDown('1') then

[15.10688]

[34.546]

  elseif chord == 'C-d' and not App.mouse_down('1') then

Replacement in drawing.lua at line 526 [28.98]

B:BD[15.11429] → [15.11429:11489]

  elseif chord == 'C-h' and not love.mouse.isDown('1') then

[15.11429]

[15.11489]

  elseif chord == 'C-h' and not App.mouse_down('1') then

Replacement in drawing.lua at line 583 [28.98]

B:BD[36.19112] → [36.19112:19164]

  local x, y = love.mouse.getX(), love.mouse.getY()

[36.19112]

[34.605]

  local x, y = App.mouse_x(), App.mouse_y()

Replacement in drawing.lua at line 597 [28.98]

B:BD[36.19530] → [36.19530:19586]

      local x, y = love.mouse.getX(), love.mouse.getY()

[36.19530]

[37.702]

      local x, y = App.mouse_x(), App.mouse_y()

Replacement in drawing.lua at line 614 [28.98]

B:BD[36.20133] → [36.20133:20189]

      local x, y = love.mouse.getX(), love.mouse.getY()

[36.20133]

[37.820]

      local x, y = App.mouse_x(), App.mouse_y()

Replacement in drawing.lua at line 631 [28.98]

B:BD[36.20728] → [36.20728:20784]

      local x, y = love.mouse.getX(), love.mouse.getY()

[36.20728]

[37.938]

      local x, y = App.mouse_x(), App.mouse_y()

Insertion in app.lua at line 135 [39.2]

[38.2328]

  App.fake_key_pressed = {}
  App.fake_mouse_state = {x=-1, y=-1}

Replacement in app.lua at line 191 [39.2]

B:BD[13.1976] → [13.1976:2058]

App.modifier_keys = {}
function App.keypress(key)
  App.modifier_keys[key] = true

[13.1976]

[13.2058]

App.fake_key_pressed = {}
function App.fake_key_press(key)
  App.fake_key_pressed[key] = true
end
function App.fake_key_release(key)
  App.fake_key_pressed[key] = nil

Replacement in app.lua at line 198 [39.2]

B:BD[13.2062] → [13.2062:2122]

function App.keyrelease(key)
  App.modifier_keys[key] = nil

[13.2062]

[13.2122]

function App.modifier_down(key)
  return App.fake_key_pressed[key]

Replacement in app.lua at line 202 [39.2]

B:BD[13.2127] → [13.2127:2191]

function App.modifier_down(key)
  return App.modifier_keys[key]

[13.2127]

[40.2948]

App.fake_mouse_state = {x=-1, y=-1}  -- x,y always set
function App.fake_mouse_press(x,y, button)
  App.fake_mouse_state.x = x
  App.fake_mouse_state.y = y
  App.fake_mouse_state[button] = true
end
function App.fake_mouse_release(x,y, button)
  App.fake_mouse_state.x = x
  App.fake_mouse_state.y = y
  App.fake_mouse_state[button] = nil
end
function App.mouse_move(x,y)
  App.fake_mouse_state.x = x
  App.fake_mouse_state.y = y
end
function App.mouse_down(button)
  return App.fake_mouse_state[button]
end
function App.mouse_x()
  return App.fake_mouse_state.x
end
function App.mouse_y()
  return App.fake_mouse_state.y

Replacement in app.lua at line 239 [39.2]

B:BD[41.755] → [41.755:802]

function App.run_after_mousepress(x,y, button)

[41.755]

[41.802]

function App.run_after_mouse_press(x,y, button)
  App.fake_mouse_press(x,y, button)

Replacement in app.lua at line 246 [39.2]

B:BD[42.722] → [42.722:771]

function App.run_after_mouserelease(x,y, button)

[42.722]

[42.771]

function App.run_after_mouse_release(x,y, button)
  App.fake_mouse_release(x,y, button)

Replacement in app.lua at line 314 [39.2]

B:BD[13.2236] → [13.2236:2262]

  App.modifier_keys = nil

[13.2236]

[43.7943]

  App.fake_key_pressed = nil
  App.fake_key_press = nil
  App.fake_key_release = nil
  App.fake_mouse_state = nil
  App.fake_mouse_press = nil
  App.fake_mouse_release = nil

Insertion in app.lua at line 329 [39.2]

[13.2306]

[43.8162]

  App.mouse_move = love.mouse.setPosition
  App.mouse_down = love.mouse.isDown
  App.mouse_x = love.mouse.getX
  App.mouse_y = love.mouse.getY