[ruby/reline] Support longer than screen height on Windows

ruby/reline@2a97ca9362
ruby · Dec 17, 2020 · cdf2790 · cdf2790
1 parent 0158ba7
commit cdf2790
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb
@@ -233,14 +233,19 @@ def self.move_cursor_column(val)
 
   def self.move_cursor_up(val)
     if val > 0
-      @@SetConsoleCursorPosition.call(@@hConsoleHandle, (cursor_pos.y - val) * 65536 + cursor_pos.x)
+      y = cursor_pos.y - val
+      y = 0 if y < 0
+      @@SetConsoleCursorPosition.call(@@hConsoleHandle, y * 65536 + cursor_pos.x)
     elsif val < 0
       move_cursor_down(-val)
     end
   end
 
   def self.move_cursor_down(val)
     if val > 0
+      screen_height = get_screen_size.first
+      y = cursor_pos.y + val
+      y = screen_height - 1 if y > (screen_height - 1)
       @@SetConsoleCursorPosition.call(@@hConsoleHandle, (cursor_pos.y + val) * 65536 + cursor_pos.x)
     elsif val < 0
       move_cursor_up(-val)
@@ -257,6 +262,8 @@ def self.erase_after_cursor
 
   def self.scroll_down(val)
     return if val.zero?
+    screen_height = get_screen_size.first
+    val = screen_height - 1 if val > (screen_height - 1)
     scroll_rectangle = [0, val, get_screen_size.last, get_screen_size.first].pack('s4')
     destination_origin = 0 # y * 65536 + x
     fill = [' '.ord, 0].pack('SS')

diff --git a/test/reline/yamatanooroti/test_rendering.rb b/test/reline/yamatanooroti/test_rendering.rb
@@ -426,6 +426,7 @@ def test_prompt_list_caching
     end
 
     def test_enable_bracketed_paste
+      omit if Reline::IOGate.win?
       write_inputrc <<~LINES
         set enable-bracketed-paste on
       LINES