akkartik/sokoban.love - Change X3F7ECSLGXCH6NBSDIH7LY47I4EG2RR5VFPEMM6ZVDYQIGFID4HQC

add state arg to some functions

Text.draw
Text.draw_cursor
Text.draw_search_bar

Created by Kartik K. Agaram on July 12, 2022

X3F7ECSLGXCH6NBSDIH7LY47I4EG2RR5VFPEMM6ZVDYQIGFID4HQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 12 [5.1]

B:BD[3.103] → [4.3:58]

function Text.draw(line, line_index, top, left, right)

[3.103]

[6.1129]

function Text.draw(State, line, line_index, top, left, right)

Replacement in text.lua at line 31 [5.1]

B:BD[7.26] → [8.54100:54396]

--?     print('('..s(x)..','..s(y)..') '..frag..'('..s(frag_width)..' vs '..s(right)..') '..s(line_index)..' vs '..s(Editor_state.screen_top1.line)..'; '..s(pos)..' vs '..s(Editor_state.screen_top1.pos)..'; bottom: '..s(Editor_state.screen_bottom1.line)..'/'..s(Editor_state.screen_bottom1.pos))

[7.26]

[4.337]

--?     print('('..s(x)..','..s(y)..') '..frag..'('..s(frag_width)..' vs '..s(right)..') '..s(line_index)..' vs '..s(State.screen_top1.line)..'; '..s(pos)..' vs '..s(State.screen_top1.pos)..'; bottom: '..s(State.screen_bottom1.line)..'/'..s(State.screen_bottom1.pos))

Replacement in text.lua at line 35 [5.1]

B:BD[9.74] → [8.54397:54580]

      if Text.lt1(Editor_state.screen_top1, {line=line_index, pos=pos}) then
        y = y + Editor_state.line_height
        if y + Editor_state.line_height > App.screen.height then

[9.74]

[10.420]

      if Text.lt1(State.screen_top1, {line=line_index, pos=pos}) then
        y = y + State.line_height
        if y + State.line_height > App.screen.height then

Replacement in text.lua at line 46 [5.1]

B:BD[11.2206] → [8.54581:54650]

--?     print('checking to draw', pos, Editor_state.screen_top1.pos)

[11.2206]

[12.387]

--?     print('checking to draw', pos, State.screen_top1.pos)

Replacement in text.lua at line 48 [5.1]

B:BD[12.427] → [8.54651:54769]

    if Text.le1(Editor_state.screen_top1, {line=line_index, pos=pos}) then
      if Editor_state.selection1.line then

[12.427]

[13.3]

    if Text.le1(State.screen_top1, {line=line_index, pos=pos}) then
      if State.selection1.line then

Replacement in text.lua at line 57 [5.1]

B:BD[11.2288] → [8.54770:55294]

    if line_index == Editor_state.cursor1.line then
      if pos <= Editor_state.cursor1.pos and pos + frag_len > Editor_state.cursor1.pos then
        if Editor_state.search_term then
          if Editor_state.lines[Editor_state.cursor1.line].data:sub(Editor_state.cursor1.pos, Editor_state.cursor1.pos+utf8.len(Editor_state.search_term)-1) == Editor_state.search_term then
            local lo_px = Text.draw_highlight(line, x,y, pos, Editor_state.cursor1.pos, Editor_state.cursor1.pos+utf8.len(Editor_state.search_term))

[11.2288]

[14.28]

    if line_index == State.cursor1.line then
      if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
        if State.search_term then
          if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then
            local lo_px = Text.draw_highlight(line, x,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

Replacement in text.lua at line 63 [5.1]

B:BD[14.62] → [8.55295:55364]

            love.graphics.print(Editor_state.search_term, x+lo_px,y)

[14.62]

[15.530]

            love.graphics.print(State.search_term, x+lo_px,y)

Replacement in text.lua at line 66 [5.1]

B:BD[15.557] → [8.55365:55443]

          Text.draw_cursor(x+Text.x(frag, Editor_state.cursor1.pos-pos+1), y)

[15.557]

[15.622]

          Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y)

Replacement in text.lua at line 73 [5.1]

B:BD[16.37] → [8.55444:55574]

∅:D[8.55574] → [15.726:755]

B:BD[15.726] → [15.726:755]

  if Editor_state.search_term == nil then
    if line_index == Editor_state.cursor1.line and Editor_state.cursor1.pos == pos then
      Text.draw_cursor(x, y)

[16.37]

[15.755]

  if State.search_term == nil then
    if line_index == State.cursor1.line and State.cursor1.pos == pos then
      Text.draw_cursor(State, x, y)

Replacement in text.lua at line 83 [5.1]
∅:D[17.962] → [18.101:133]
B:BD[18.101] → [18.101:133]
```
function Text.draw_cursor(x, y)
```
[17.851]
[19.3]
```
function Text.draw_cursor(State, x, y)
```

Replacement in text.lua at line 87 [5.1]

B:BD[14.91] → [8.55575:55644]

    love.graphics.rectangle('fill', x,y, 3,Editor_state.line_height)

[14.91]

[14.92]

    love.graphics.rectangle('fill', x,y, 3,State.line_height)

Replacement in text.lua at line 90 [5.1]

B:BD[19.198] → [8.55645:55726]

  Editor_state.cursor_x = x
  Editor_state.cursor_y = y+Editor_state.line_height

[19.198]

[18.256]

  State.cursor_x = x
  State.cursor_y = y+State.line_height

Replacement in search.lua at line 3 [20.48846]

B:BD[20.48884] → [20.48884:48916]

B:BD[20.48916] → [8.81797:81836]

function Text.draw_search_bar()
  local h = Editor_state.line_height+2

[20.48884]

[20.48942]

function Text.draw_search_bar(State)
  local h = State.line_height+2

Replacement in search.lua at line 15 [20.48846]

B:BD[14.205] → [8.81837:81890]

  App.screen.print(Editor_state.search_term, 25,y-5)

[14.205]

[14.206]

  App.screen.print(State.search_term, 25,y-5)

Replacement in search.lua at line 17 [20.48846]

B:BD[14.232] → [8.81891:82027]

  if Editor_state.search_text == nil then
    Editor_state.search_text = App.newText(love.graphics.getFont(), Editor_state.search_term)

[14.232]

[20.49593]

  if State.search_text == nil then
    State.search_text = App.newText(love.graphics.getFont(), State.search_term)

Replacement in search.lua at line 20 [20.48846]

B:BD[20.49599] → [8.82028:82108]

  love.graphics.circle('fill', 25+App.width(Editor_state.search_text),y-5+h, 2)

[20.49599]

[14.233]

  love.graphics.circle('fill', 25+App.width(State.search_text),y-5+h, 2)

Replacement in edit.lua at line 147 [21.413]

B:BD[2.3480] → [2.3480:3529]

          Text.draw_cursor(State.margin_left, y)

[2.3480]

[21.5217]

          Text.draw_cursor(State, State.margin_left, y)

Replacement in edit.lua at line 164 [21.413]

B:BD[21.5677] → [2.3824:3957]

      y, State.screen_bottom1.pos = Text.draw(line, line_index, line.starty, State.margin_left, App.screen.width-State.margin_right)

[21.5677]

[2.3957]

      y, State.screen_bottom1.pos = Text.draw(State, line, line_index, line.starty, State.margin_left, App.screen.width-State.margin_right)

Replacement in edit.lua at line 174 [21.413]
∅:D[2.4219] → [21.6057:6084]
∅:D[8.99822] → [21.6057:6084]
B:BD[21.6057] → [21.6057:6084]
```
    Text.draw_search_bar()
```
[2.4219]
[21.6084]
```
    Text.draw_search_bar(State)
```