Merge upstream into main

Dependencies

• [2] 27DROQW2 Merge upstream into main
• [3] IWYLK45K clicking to the right of a line within line width
• [4] DRFE3B3Z mouse buttons are integers, not strings
• [5] FYS7TCDW bugfix
• [6] 4VKEE43Z bugfix
• [7] EMHRPJ3R no, that's not right
• [8] CZB4CK2R bugfix
• [*] LXTTOB33 extract a couple of files

Change contents

• edit in text_tests.lua at line 238
  [4.7]→[2.3:3](∅→∅),[4.1122]→[3.2:7](∅→∅),[4.1122]→[3.2:7](∅→∅)
  −

  − end

  −
• resurrect zombie in text_tests.lua at line 238
  [3.7]→[3.7:927](∅→∅),[3.7]→[3.7:927](∅→∅)
  + function test_click_past_end_of_word_wrapping_line()

  + io.write('\ntest_click_past_end_of_word_wrapping_line')

  + -- display a long line wrapping at a word boundary on a screen of more realistic length

  + App.screen.init{width=200, height=80}

  + -- 0 1 2

  + -- 123456789012345678901

  + Lines = load_array{'the quick brown fox jumped over the lazy dog'}

  + Line_width = 160

  + Cursor1 = {line=1, pos=1}

  + Screen_top1 = {line=1, pos=1}

  + Screen_bottom1 = {}

  + App.draw()

  + local y = Margin_top

  + App.screen.check(y, 'the quick brown fox ', 'F - test_click_past_end_of_word_wrapping_line/baseline/screen:1')

  + y = y + Line_height

  + -- click past the end of the screen line but within Line_width

  + App.draw()

  + App.run_after_mouse_click(Line_width-2,y-2, 1)

  + -- cursor moves to end of screen line

  + check_eq(Cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')
• resolve order conflict in text_tests.lua at line 238
  [4.7]

  [3.7]
• edit in text_tests.lua at line 258
  [3.927]

  [4.7]
  + end

  +