kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/io-console] Made cursor position 0-origin

Browse source 
https://github.com/ruby/io-console/commit/9377e37295
This commit is contained in:
Nobuyoshi Nakada 2019-09-24 15:53:58 +09:00
parent 244f7ec204
commit 10e3267c31
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/io/console/console.c
View file

@ -1109,6 +1109,7 @@ console_cursor_pos(VALUE io)
VALUE query = rb_str_new_cstr("\e[6n"); VALUE query = rb_str_new_cstr("\e[6n");
VALUE resp = console_vt_response(1, &query, io); VALUE resp = console_vt_response(1, &query, io);
VALUE row, column, term; VALUE row, column, term;
unsigned int r, c;
if (!RB_TYPE_P(resp, T_ARRAY) || RARRAY_LEN(resp) != 3) return Qnil; if (!RB_TYPE_P(resp, T_ARRAY) || RARRAY_LEN(resp) != 3) return Qnil;
term = RARRAY_AREF(resp, 2); term = RARRAY_AREF(resp, 2);
if (!RB_TYPE_P(term, T_STRING) || RSTRING_LEN(term) != 1) return Qnil; if (!RB_TYPE_P(term, T_STRING) || RSTRING_LEN(term) != 1) return Qnil;
@ -1116,13 +1117,17 @@ console_cursor_pos(VALUE io)
row = RARRAY_AREF(resp, 0); row = RARRAY_AREF(resp, 0);
column = RARRAY_AREF(resp, 1); column = RARRAY_AREF(resp, 1);
rb_ary_resize(resp, 2); rb_ary_resize(resp, 2);
r = NUM2UINT(row) - 1;
c = NUM2UINT(column) - 1;
RARRAY_ASET(resp, 0, INT2NUM(r));
RARRAY_ASET(resp, 1, INT2NUM(c));
return resp; return resp;
} }
static VALUE static VALUE
console_goto(VALUE io, VALUE y, VALUE x) console_goto(VALUE io, VALUE y, VALUE x)
{ {
rb_io_write(io, rb_sprintf("\x1b[%d;%dH", NUM2UINT(y), NUM2UINT(x))); rb_io_write(io, rb_sprintf("\x1b[%d;%dH", NUM2UINT(y)+1, NUM2UINT(x)+1));
return io; return io;
} }
@ -1223,7 +1228,7 @@ static VALUE
console_clear_screen(VALUE io) console_clear_screen(VALUE io)
{ {
console_erase_screen(io, INT2FIX(2)); console_erase_screen(io, INT2FIX(2));
console_goto(io, INT2FIX(1), INT2FIX(1)); console_goto(io, INT2FIX(0), INT2FIX(0));
return io; return io;
} }

20
test/io/console/test_io_console.rb
View file

@ -281,6 +281,26 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do
set_winsize_teardown set_winsize_teardown
end end
def test_cursor_position
run_pty("#{<<~"begin;"}\n#{<<~'end;'}") do |r, w, _|
begin;
con = IO.console
p con.cursor
con.cursor_down(3); con.puts
con.cursor_right(4); con.puts
con.cursor_left(2); con.puts
con.cursor_up(1); con.puts
end;
assert_equal("\e[6n", r.readpartial(5))
w.print("\e[12;34R"); w.flush
assert_equal([11, 33], eval(r.gets))
assert_equal("\e[3B", r.gets.chomp)
assert_equal("\e[4C", r.gets.chomp)
assert_equal("\e[2D", r.gets.chomp)
assert_equal("\e[1A", r.gets.chomp)
end
end
unless IO.console unless IO.console
def test_close def test_close
assert_equal(["true"], run_pty("IO.console.close; p IO.console.fileno >= 0")) assert_equal(["true"], run_pty("IO.console.close; p IO.console.fileno >= 0"))