akkartik/sokoban.love - Change AMSESRTH4T7EIEMXEFPMZFC55QAOVSWAN2XOQUUEB5ECHRDZUAYQC

move some code

I had this idea originally to keep text.lua oblivious to drawings. But that hasn't been true for some time. Losing battle.

Created by Kartik K. Agaram on May 29, 2022

AMSESRTH4T7EIEMXEFPMZFC55QAOVSWAN2XOQUUEB5ECHRDZUAYQC

Dependencies

In channels

main

Change contents

Insertion in text.lua at line 995 [5.1]

[4.77]

  elseif chord == 'pageup' then
    -- duplicate some logic from love.draw
    local top2 = Text.to2(Screen_top1)
--?     print(App.screen.height)
    local y = App.screen.height - math.floor(15*Zoom)
    while y >= 15 do
--?       print(y, top2.line)
      if Screen_top1.line == 1 and Screen_top1.pos == 1 then break end
      if Lines[Screen_top1.line].mode == 'text' then
        y = y - math.floor(15*Zoom)
      elseif Lines[Screen_top1.line].mode == 'drawing' then
        y = y - 20 - Drawing.pixels(Lines[Screen_top1.line].h)
      end
      top2 = Text.previous_screen_line(top2)
    end
    Screen_top1 = Text.to1(top2)
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary()
--?     print(Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos)
  elseif chord == 'pagedown' then
    Screen_top1.line = Screen_bottom1.line
    Screen_top1.pos = Screen_bottom1.pos
--?     print('setting top to', Screen_top1.line, Screen_top1.pos)
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary()
--?     print('top now', Screen_top1.line)

Deletion in main.lua at line 233 [8.2]

∅:D[6.941] → [7.1593:1627]

B:BD[7.1593] → [7.1593:1627]

∅:D[9.2544] → [10.9490:9533]

B:BD[7.1627] → [10.9490:9533]

B:BD[10.9533] → [11.521:562]

B:BD[11.562] → [3.2403:2470]

∅:D[11.562] → [10.9557:9627]

∅:D[12.1083] → [10.9557:9627]

∅:D[13.1635] → [10.9557:9627]

∅:D[3.2470] → [10.9557:9627]

B:BD[10.9557] → [10.9557:9627]

∅:D[14.845] → [15.939:1020]

∅:D[10.9627] → [15.939:1020]

B:BD[7.1721] → [15.939:1020]

B:BD[15.1020] → [13.1636:1679]

∅:D[15.1020] → [7.1721:1796]

∅:D[12.1123] → [7.1721:1796]

∅:D[13.1679] → [7.1721:1796]

B:BD[7.1721] → [7.1721:1796]

B:BD[7.1796] → [2.4240:4700]

∅:D[2.4700] → [7.2033:2043]

∅:D[10.9789] → [7.2033:2043]

B:BD[7.2033] → [7.2033:2043]

B:BD[7.2043] → [2.4701:4746]

∅:D[2.4746] → [7.2087:2095]

∅:D[10.9836] → [7.2087:2095]

B:BD[7.2087] → [7.2087:2095]

B:BD[7.2095] → [2.4747:4780]

∅:D[2.4780] → [10.9905:9941]

B:BD[16.163] → [10.9905:9941]

B:BD[10.9941] → [2.4781:4815]

∅:D[2.4815] → [15.1099:1180]

∅:D[10.9941] → [15.1099:1180]

B:BD[7.2194] → [15.1099:1180]

B:BD[15.1180] → [2.4816:4892]

  elseif chord == 'pagedown' then
    Screen_top1.line = Screen_bottom1.line
    Screen_top1.pos = Screen_bottom1.pos
--?     print('setting top to', Screen_top1.line, Screen_top1.pos)
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary()
--?     print('top now', Screen_top1.line)
  elseif chord == 'pageup' then
    -- duplicate some logic from love.draw
    local top2 = Text.to2(Screen_top1)
--?     print(App.screen.height)
    local y = App.screen.height - math.floor(15*Zoom)
    while y >= 15 do
--?       print(y, top2.line)
      if Screen_top1.line == 1 and Screen_top1.pos == 1 then break end
      if Lines[Screen_top1.line].mode == 'text' then
        y = y - math.floor(15*Zoom)
      elseif Lines[Screen_top1.line].mode == 'drawing' then
        y = y - 20 - Drawing.pixels(Lines[Screen_top1.line].h)
      end
      top2 = Text.previous_screen_line(top2)
    end
    Screen_top1 = Text.to1(top2)
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary()
--?     print(Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos)