From 7a208f4b187f431d689bf4b08cfe30ef17a4d35c Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 6 Mar 2012 03:39:42 +0000 Subject: merge revision(s) 33785: * ext/io/console/console.c (console_cooked, console_set_cooked): new methods to reset cooked mode. [EXPERIMENTAL] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++ ext/io/console/console.c | 58 ++++++++++++++++++++++++++++++++++++-- test/io/console/test_io_console.rb | 15 ++++++++++ version.h | 2 +- 4 files changed, 77 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d520f67530..1527d79b67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 6 12:39:27 2012 Nobuyoshi Nakada + + * ext/io/console/console.c (console_cooked, console_set_cooked): + new methods to reset cooked mode. [EXPERIMENTAL] + Tue Mar 6 12:31:47 2012 Nobuyoshi Nakada * ext/io/console/console.c (io_getch): default delegating method diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 8a5c814dda..9b35c9e54e 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -96,8 +96,7 @@ set_rawmode(conmode *t) { #ifdef HAVE_CFMAKERAW cfmakeraw(t); -#else -#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H +#elif defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); t->c_oflag &= ~OPOST; t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); @@ -109,6 +108,20 @@ set_rawmode(conmode *t) #elif defined _WIN32 *t = 0; #endif +} + +static void +set_cookedmode(conmode *t) +{ +#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H + t->c_iflag |= (BRKINT|ISTRIP|ICRNL|IXON); + t->c_oflag |= OPOST; + t->c_lflag |= (ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN); +#elif defined HAVE_SGTTY_H + t->sg_flags |= ECHO; + t->sg_flags &= ~RAW; +#elif defined _WIN32 + *t |= ENABLE_ECHO_INPUT|ENABLE_LINE_INPUT|ENABLE_PROCESSED_INPUT; #endif } @@ -281,6 +294,45 @@ console_set_raw(VALUE io) return io; } +/* + * call-seq: + * io.cooked {|io| } + * + * Yields +self+ within cooked mode. + * + * STDIN.cooked(&:gets) + * + * will read and return a line with echo back and line editing. + */ +static VALUE +console_cooked(VALUE io) +{ + return ttymode(io, rb_yield, set_cookedmode); +} + +/* + * call-seq: + * io.cooked! + * + * Enables cooked mode. + * + * If the terminal mode needs to be back, use io.cooked { ... }. + */ +static VALUE +console_set_cooked(VALUE io) +{ + conmode t; + rb_io_t *fptr; + int fd; + + GetOpenFile(io, fptr); + fd = GetReadFD(fptr); + if (!getattr(fd, &t)) rb_sys_fail(0); + set_cookedmode(&t); + if (!setattr(fd, &t)) rb_sys_fail(0); + return io; +} + static VALUE getc_call(VALUE io) { @@ -645,6 +697,8 @@ InitVM_console(void) { rb_define_method(rb_cIO, "raw", console_raw, 0); rb_define_method(rb_cIO, "raw!", console_set_raw, 0); + rb_define_method(rb_cIO, "cooked", console_cooked, 0); + rb_define_method(rb_cIO, "cooked!", console_set_cooked, 0); rb_define_method(rb_cIO, "getch", console_getch, 0); rb_define_method(rb_cIO, "echo=", console_set_echo, 1); rb_define_method(rb_cIO, "echo?", console_echo_p, 0); diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb index 9c2fe1ac54..d9868bf040 100644 --- a/test/io/console/test_io_console.rb +++ b/test/io/console/test_io_console.rb @@ -20,6 +20,21 @@ class TestIO_Console < Test::Unit::TestCase } end + def test_cooked + helper {|m, s| + s.raw { + s.print "abc\n" + assert_equal("abc\n", m.gets) + s.cooked { + s.print "def\n" + assert_equal("def\r\n", m.gets) + } + } + s.print "ghi\n" + assert_equal("ghi\r\n", m.gets) + } + end + def test_echo helper {|m, s| assert(s.echo?) diff --git a/version.h b/version.h index 23eadbc2c8..bd468a184d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 159 +#define RUBY_PATCHLEVEL 160 #define RUBY_RELEASE_DATE "2012-03-06" #define RUBY_RELEASE_YEAR 2012 -- cgit v1.2.3