1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/reline] Get console handle again and retry when Win32API call

Browse Source 
fails
(https://github.com/ruby/reline/pull/734)

https://github.com/ruby/reline/commit/66291b5e3c
This commit is contained in:
tomoya ishida 2024-09-02 23:34:35 +09:00 committed by git
parent bb511c3f10
commit fe2db1bed9
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/reline/io/windows.rb
View File

@ -159,14 +159,24 @@ class Reline::Windows < Reline::IO
FILE_NAME_INFO = 2 FILE_NAME_INFO = 2
ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4 ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
# Calling Win32API with console handle is reported to fail after executing some external command.
# We need to refresh console handle and retry the call again.
private def call_with_console_handle(win32func, *args)
val = win32func.call(@hConsoleHandle, *args)
return val if val != 0
@hConsoleHandle = @GetStdHandle.call(STD_OUTPUT_HANDLE)
win32func.call(@hConsoleHandle, *args)
end
private def getconsolemode private def getconsolemode
mode = "\000\000\000\000" mode = "\000\000\000\000"
@GetConsoleMode.call(@hConsoleHandle, mode) call_with_console_handle(@GetConsoleMode, mode)
mode.unpack1('L') mode.unpack1('L')
end end
private def setconsolemode(mode) private def setconsolemode(mode)
@SetConsoleMode.call(@hConsoleHandle, mode) call_with_console_handle(@SetConsoleMode, mode)
end end
#if @legacy_console #if @legacy_console
@ -334,7 +344,7 @@ class Reline::Windows < Reline::IO
# [18,2] dwMaximumWindowSize.X # [18,2] dwMaximumWindowSize.X
# [20,2] dwMaximumWindowSize.Y # [20,2] dwMaximumWindowSize.Y
csbi = 0.chr * 22 csbi = 0.chr * 22
return if @GetConsoleScreenBufferInfo.call(@hConsoleHandle, csbi) == 0 return if call_with_console_handle(@GetConsoleScreenBufferInfo, csbi) == 0
csbi csbi
end end
@ -355,14 +365,14 @@ class Reline::Windows < Reline::IO
end end
def move_cursor_column(val) def move_cursor_column(val)
@SetConsoleCursorPosition.call(@hConsoleHandle, cursor_pos.y * 65536 + val) call_with_console_handle(@SetConsoleCursorPosition, cursor_pos.y * 65536 + val)
end end
def move_cursor_up(val) def move_cursor_up(val)
if val > 0 if val > 0
y = cursor_pos.y - val y = cursor_pos.y - val
y = 0 if y < 0 y = 0 if y < 0
@SetConsoleCursorPosition.call(@hConsoleHandle, y * 65536 + cursor_pos.x) call_with_console_handle(@SetConsoleCursorPosition, y * 65536 + cursor_pos.x)
elsif val < 0 elsif val < 0
move_cursor_down(-val) move_cursor_down(-val)
end end
@ -374,7 +384,7 @@ class Reline::Windows < Reline::IO
screen_height = get_screen_size.first screen_height = get_screen_size.first
y = cursor_pos.y + val y = cursor_pos.y + val
y = screen_height - 1 if y > (screen_height - 1) y = screen_height - 1 if y > (screen_height - 1)
@SetConsoleCursorPosition.call(@hConsoleHandle, (cursor_pos.y + val) * 65536 + cursor_pos.x) call_with_console_handle(@SetConsoleCursorPosition, (cursor_pos.y + val) * 65536 + cursor_pos.x)
elsif val < 0 elsif val < 0
move_cursor_up(-val) move_cursor_up(-val)
end end
@ -385,8 +395,8 @@ class Reline::Windows < Reline::IO
attributes = csbi[8, 2].unpack1('S') attributes = csbi[8, 2].unpack1('S')
cursor = csbi[4, 4].unpack1('L') cursor = csbi[4, 4].unpack1('L')
written = 0.chr * 4 written = 0.chr * 4
@FillConsoleOutputCharacter.call(@hConsoleHandle, 0x20, get_screen_size.last - cursor_pos.x, cursor, written) call_with_console_handle(@FillConsoleOutputCharacter, 0x20, get_screen_size.last - cursor_pos.x, cursor, written)
@FillConsoleOutputAttribute.call(@hConsoleHandle, attributes, get_screen_size.last - cursor_pos.x, cursor, written) call_with_console_handle(@FillConsoleOutputAttribute, attributes, get_screen_size.last - cursor_pos.x, cursor, written)
end end
def scroll_down(val) def scroll_down(val)
@ -404,7 +414,7 @@ class Reline::Windows < Reline::IO
scroll_rectangle = [0, val, buffer_width, buffer_lines - val].pack('s4') scroll_rectangle = [0, val, buffer_width, buffer_lines - val].pack('s4')
destination_origin = 0 # y * 65536 + x destination_origin = 0 # y * 65536 + x
fill = [' '.ord, attributes].pack('SS') fill = [' '.ord, attributes].pack('SS')
@ScrollConsoleScreenBuffer.call(@hConsoleHandle, scroll_rectangle, nil, destination_origin, fill) call_with_console_handle(@ScrollConsoleScreenBuffer, scroll_rectangle, nil, destination_origin, fill)
else else
origin_x = x + 1 origin_x = x + 1
origin_y = y - window_top + 1 origin_y = y - window_top + 1
@ -423,9 +433,9 @@ class Reline::Windows < Reline::IO
fill_length = buffer_width * (window_bottom - window_top + 1) fill_length = buffer_width * (window_bottom - window_top + 1)
screen_topleft = window_top * 65536 screen_topleft = window_top * 65536
written = 0.chr * 4 written = 0.chr * 4
@FillConsoleOutputCharacter.call(@hConsoleHandle, 0x20, fill_length, screen_topleft, written) call_with_console_handle(@FillConsoleOutputCharacter, 0x20, fill_length, screen_topleft, written)
@FillConsoleOutputAttribute.call(@hConsoleHandle, attributes, fill_length, screen_topleft, written) call_with_console_handle(@FillConsoleOutputAttribute, attributes, fill_length, screen_topleft, written)
@SetConsoleCursorPosition.call(@hConsoleHandle, screen_topleft) call_with_console_handle(@SetConsoleCursorPosition, screen_topleft)
else else
@output.write "\e[2J" "\e[H" @output.write "\e[2J" "\e[H"
end end
@ -439,14 +449,14 @@ class Reline::Windows < Reline::IO
size = 100 size = 100
visible = 0 # 0 means false visible = 0 # 0 means false
cursor_info = [size, visible].pack('Li') cursor_info = [size, visible].pack('Li')
@SetConsoleCursorInfo.call(@hConsoleHandle, cursor_info) call_with_console_handle(@SetConsoleCursorInfo, cursor_info)
end end
def show_cursor def show_cursor
size = 100 size = 100
visible = 1 # 1 means true visible = 1 # 1 means true
cursor_info = [size, visible].pack('Li') cursor_info = [size, visible].pack('Li')
@SetConsoleCursorInfo.call(@hConsoleHandle, cursor_info) call_with_console_handle(@SetConsoleCursorInfo, cursor_info)
end end
def set_winch_handler(&handler) def set_winch_handler(&handler)