akkartik/etch.love - Change 5FW7YOFTLKHRND6IOR4HG4X3C5BO2WV5KTEUW3PPKCRU5L5GXKXQC

highlight selection while dragging

Mouse stuff is pretty strenuous. For the first time I have to be careful not to recompute too often. And I ran into a race condition for the first time where resetting line.y within App.draw meant mouse clicks were extremely unlikely to see line.y set.

Created by Kartik K. Agaram on June 3, 2022

5FW7YOFTLKHRND6IOR4HG4X3C5BO2WV5KTEUW3PPKCRU5L5GXKXQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 216 [5.1]

∅:D[2.1240] → [4.1068:1224]

B:BD[4.1068] → [4.1068:1224]

-- Return any intersection of the region from Selection1 to Cursor1 with the
-- region between {line=line_index, pos=apos} and {line=line_index, pos=bpos}.

[2.1240]

[4.1224]

-- Return any intersection of the region from Selection1 to Cursor1 (or
-- current mouse, if mouse is pressed; or recent mouse if mouse is pressed and
-- currently over a drawing) with the region between {line=line_index, pos=apos}
-- and {line=line_index, pos=bpos}.

Replacement in text.lua at line 226 [5.1]

B:BD[4.1556] → [4.1556:1601]

  local maxl,maxp = Cursor1.line,Cursor1.pos

[4.1556]

[4.1601]

  local maxl,maxp
  if love.mouse.isDown('1') then
    maxl,maxp = Text.mouse_pos()
  else
    maxl,maxp = Cursor1.line,Cursor1.pos
  end

Insertion in text.lua at line 261 [5.1]

[4.2613]

  end
end
-- inefficient for some reason, so don't do it on every frame
function Text.mouse_pos()
  local time = love.timer.getTime()
  if Recent_mouse.time and Recent_mouse.time > time-0.1 then
    return Recent_mouse.line, Recent_mouse.pos
  end
  Recent_mouse.time = time
  local line,pos = Text.to_pos(love.mouse.getX(), love.mouse.getY())
  if line then
    Recent_mouse.line = line
    Recent_mouse.pos = pos

Insertion in text.lua at line 276 [5.1]
[4.2619]
[4.2619]
```
  return Recent_mouse.line, Recent_mouse.pos
```

Insertion in text.lua at line 279 [5.1]

[4.2624]

function Text.to_pos(x,y)
  for line_index,line in ipairs(Lines) do
    if line.mode == 'text' then
      if Text.in_line(line, x,y) then
        return line_index, Text.to_pos_on_line(line, x,y)
      end
    end
  end
end

Replacement in text.lua at line 1864 [5.1]

B:BD[6.100] → [7.65:84]

∅:D[7.84] → [8.419:471]

B:BD[6.100] → [8.419:471]

B:BD[8.471] → [9.7425:7453]

-- mx,my in pixels
function Text.move_cursor(line_index, line, mx, my)
  Cursor1.line = line_index

[6.100]

[8.472]

-- convert mx,my in pixels to schema-1 coordinates
function Text.to_pos_on_line(line, mx, my)

Replacement in text.lua at line 1867 [5.1]
B:BD[8.519] → [9.7454:7511]
∅:D[9.7511] → [8.611:622]
B:BD[8.611] → [8.611:622]
```
    Cursor1.pos = Text.nearest_cursor_pos(line.data, mx)
    return
```
[8.519]
[8.622]
```
    return Text.nearest_cursor_pos(line.data, mx)
```

Replacement in text.lua at line 1880 [5.1]

B:BD[10.437] → [9.7512:7585]

∅:D[11.73] → [10.513:528]

∅:D[9.7585] → [10.513:528]

B:BD[10.513] → [10.513:528]

        Cursor1.pos = line.screen_line_starting_pos[screen_line_index+1]
        return

[10.437]

[10.528]

        return line.screen_line_starting_pos[screen_line_index+1]

Replacement in text.lua at line 1883 [5.1]

B:BD[8.1185] → [9.7586:7668]

∅:D[9.7668] → [8.1266:1279]

B:BD[8.1266] → [8.1266:1279]

      Cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, mx) - 1
      return

[8.1185]

[8.1279]

      return screen_line_starting_pos + Text.nearest_cursor_pos(s, mx) - 1

Insertion in main.lua at line 58 [13.2]

[4.10940]

[12.54]

Recent_mouse = {}  -- when selecting text, avoid recomputing some state on every single frame

Deletion in main.lua at line 142 [13.2]

B:BD[13.336] → [14.480:545]

  for line_index,line in ipairs(Lines) do
    line.y = nil
  end

Replacement in main.lua at line 199 [13.2]

∅:D[4.11240] → [8.1788:1837]

B:BD[6.492] → [8.1788:1837]

        Text.move_cursor(line_index, line, x, y)

[6.492]

[3.234]

        Cursor1.line = line_index
        Cursor1.pos = Text.to_pos_on_line(line, x, y)

Replacement in main.lua at line 219 [13.2]

B:BD[3.490] → [3.490:541]

          Text.move_cursor(line_index, line, x, y)

[3.490]

[3.541]

          Cursor1.line = line_index
          Cursor1.pos = Text.to_pos_on_line(line, x, y)

Insertion in main.lua at line 231 [13.2]

[15.1512]

[16.2944]

  for _,line in ipairs(Lines) do line.y = nil end  -- just in case we scroll

Insertion in main.lua at line 247 [13.2]

[15.1550]

[16.3090]

  for _,line in ipairs(Lines) do line.y = nil end  -- just in case we scroll