[前][次][番号順一覧][スレッド一覧]

ruby-changes:57698

From: Nobuyoshi <ko1@a...>
Date: Tue, 10 Sep 2019 08:35:43 +0900 (JST)
Subject: [ruby-changes:57698] 3d9c7c2835 (master): [ruby/io-console] Added IO#goto and IO#cursor= for VT

https://git.ruby-lang.org/ruby.git/commit/?id=3d9c7c2835

From 3d9c7c28358110076abb2d77365eef805ddb896c Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 9 Sep 2019 23:48:47 +0900
Subject: [ruby/io-console] Added IO#goto and IO#cursor= for VT

https://github.com/ruby/io-console/commit/7f2b1b473d

diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index 8c30684..db40c1b 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -799,14 +799,6 @@ console_cursor_pos(VALUE io) https://github.com/ruby/ruby/blob/trunk/ext/io/console/console.c#L799
     return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.X), UINT2NUM(ws.dwCursorPosition.Y));
 }
 
-static VALUE
-console_cursor_set(VALUE io, VALUE cpos)
-{
-    cpos = rb_convert_type(cpos, T_ARRAY, "Array", "to_ary");
-    if (RARRAY_LEN(cpos) != 2) rb_raise(rb_eArgError, "expected 2D coordinate");
-    return console_goto(io, RARRAY_AREF(cpos, 0), RARRAY_AREF(cpos, 1));
-}
-
 #include "win32_vk.inc"
 
 static VALUE
@@ -835,8 +827,6 @@ console_key_pressed_p(VALUE io, VALUE k) https://github.com/ruby/ruby/blob/trunk/ext/io/console/console.c#L827
     return GetKeyState(vk) & 0x80 ? Qtrue : Qfalse;
 }
 #else
-# define console_goto rb_f_notimplement
-# define console_cursor_set rb_f_notimplement
 static VALUE
 read_vt_response(VALUE io, VALUE query)
 {
@@ -892,9 +882,24 @@ console_cursor_pos(VALUE io) https://github.com/ruby/ruby/blob/trunk/ext/io/console/console.c#L882
     RARRAY_ASET(resp, 1, row);
     return resp;
 }
+
+static VALUE
+console_goto(VALUE io, VALUE x, VALUE y)
+{
+    rb_io_write(io, rb_sprintf("\x1b[%d;%dH", NUM2UINT(y), NUM2UINT(x)));
+    return io;
+}
 # define console_key_pressed_p rb_f_notimplement
 #endif
 
+static VALUE
+console_cursor_set(VALUE io, VALUE cpos)
+{
+    cpos = rb_convert_type(cpos, T_ARRAY, "Array", "to_ary");
+    if (RARRAY_LEN(cpos) != 2) rb_raise(rb_eArgError, "expected 2D coordinate");
+    return console_goto(io, RARRAY_AREF(cpos, 0), RARRAY_AREF(cpos, 1));
+}
+
 /*
  * call-seq:
  *   IO.console      -> #<File:/dev/tty>
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]