io-console 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8485f98825214ba70388cfaf023a5380201fc1de70b87ffddb36a9a2603115c
-  data.tar.gz: db5deeb27f6bc90121cdb8ad6005aca2615f5a81976f97f09f25e63caed7070e
+  metadata.gz: 0ab38381fd5d6bef3376d2595a67edac67ef212198692b5f884624e28f592e11
+  data.tar.gz: 48437c0bceff0ca47aea6425123d9733804fdd9e4fc232971a5ea53e39a60066
 SHA512:
-  metadata.gz: fcafaead8dd6a72e82e852ad8cf57bff49fb8fd8959520b8522c3fbf79bd97f1b218dd341f1e66656500c2a5ccd34045260655af948d86031e8f01ce19887df7
-  data.tar.gz: f8ebf55a9fef2383adda797b62824cc7b9cc9458c98fd9025bab2945111851651df9a44469ec10549d4ea063469870ba2cc32a4a25d3e68dc57206531bce6c54
+  metadata.gz: c9afdd89ddcb3f8fc3afa906368b2bab7c46feac3b68bae363f5c4e09fc1e3df65d124839257528776b920ba1287b9944d5fa56e0126aedfc4d9224e2ca7272a
+  data.tar.gz: e62f4dc698b9add150b3a546ff72fa7842459978edf58346c98929e6fd33e860729e709a29756d69cab08505f2234bda468daa6534d8d4c8aa67a717fec90106

data/ext/io/console/console.c

@@ -4,7 +4,7 @@
  */
 
 static const char *const
-IO_CONSOLE_VERSION = "0.8.0";
+IO_CONSOLE_VERSION = "0.8.2";
 
 #include "ruby.h"
 #include "ruby/io.h"
@@ -840,6 +840,9 @@ console_winsize(VALUE io)
     return rb_assoc_new(INT2NUM(winsize_row(&ws)), INT2NUM(winsize_col(&ws)));
 }
 
+static VALUE console_scroll(VALUE io, int line);
+static VALUE console_goto(VALUE io, VALUE y, VALUE x);
+
 /*
  * call-seq:
  *   io.winsize = [rows, columns]
@@ -856,6 +859,8 @@ console_set_winsize(VALUE io, VALUE size)
 #if defined _WIN32
     HANDLE wh;
     int newrow, newcol;
+    COORD oldsize;
+    SMALL_RECT oldwindow;
     BOOL ret;
 #endif
     VALUE row, col, xpixel, ypixel;
@@ -891,18 +896,62 @@ console_set_winsize(VALUE io, VALUE size)
     if (!GetConsoleScreenBufferInfo(wh, &ws)) {
 	rb_syserr_fail(LAST_ERROR, "GetConsoleScreenBufferInfo");
     }
+    oldsize = ws.dwSize;
+    oldwindow = ws.srWindow;
+    if (ws.srWindow.Right + 1 < newcol) {
+        ws.dwSize.X = newcol;
+    }
+    if (ws.dwSize.Y < newrow) {
+        ws.dwSize.Y = newrow;
+    }
+    /* expand screen buffer first if needed */
+    if (!SetConsoleScreenBufferSize(wh, ws.dwSize)) {
+        rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
+    }
+    /* refresh ws for new dwMaximumWindowSize */
+    if (!GetConsoleScreenBufferInfo(wh, &ws)) {
+        rb_syserr_fail(LAST_ERROR, "GetConsoleScreenBufferInfo");
+    }
+    /* check new size before modifying buffer content */
+    if (newrow <= 0 || newcol <= 0 ||
+        newrow > ws.dwMaximumWindowSize.Y ||
+        newcol > ws.dwMaximumWindowSize.X) {
+        SetConsoleScreenBufferSize(wh, oldsize);
+        /* remove scrollbar if possible */
+        SetConsoleWindowInfo(wh, TRUE, &oldwindow);
+        rb_raise(rb_eArgError, "out of range winsize: [%d, %d]", newrow, newcol);
+    }
+    /* shrink screen buffer width */
     ws.dwSize.X = newcol;
-    ret = SetConsoleScreenBufferSize(wh, ws.dwSize);
+    /* shrink screen buffer height if window height were the same */
+    if (oldsize.Y == ws.srWindow.Bottom - ws.srWindow.Top + 1) {
+        ws.dwSize.Y = newrow;
+    }
     ws.srWindow.Left = 0;
-    ws.srWindow.Top = 0;
-    ws.srWindow.Right = newcol-1;
-    ws.srWindow.Bottom = newrow-1;
+    ws.srWindow.Right = newcol - 1;
+    ws.srWindow.Bottom = ws.srWindow.Top + newrow -1;
+    if (ws.dwCursorPosition.Y > ws.srWindow.Bottom) {
+        console_scroll(io, ws.dwCursorPosition.Y - ws.srWindow.Bottom);
+        ws.dwCursorPosition.Y = ws.srWindow.Bottom;
+        console_goto(io, INT2FIX(ws.dwCursorPosition.Y), INT2FIX(ws.dwCursorPosition.X));
+    }
+    if (ws.srWindow.Bottom > ws.dwSize.Y - 1) {
+        console_scroll(io, ws.srWindow.Bottom - (ws.dwSize.Y - 1));
+        ws.dwCursorPosition.Y -= ws.srWindow.Bottom - (ws.dwSize.Y - 1);
+        console_goto(io, INT2FIX(ws.dwCursorPosition.Y), INT2FIX(ws.dwCursorPosition.X));
+	ws.srWindow.Bottom = ws.dwSize.Y - 1;
+    }
+    ws.srWindow.Top = ws.srWindow.Bottom - (newrow - 1);
+    /* perform changes to winsize */
     if (!SetConsoleWindowInfo(wh, TRUE, &ws.srWindow)) {
-	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
+        int last_error = LAST_ERROR;
+        SetConsoleScreenBufferSize(wh, oldsize);
+	rb_syserr_fail(last_error, "SetConsoleWindowInfo");
     }
-    /* retry when shrinking buffer after shrunk window */
-    if (!ret && !SetConsoleScreenBufferSize(wh, ws.dwSize)) {
-	rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
+    /* perform screen buffer shrinking if necessary */
+    if ((ws.dwSize.Y < oldsize.Y || ws.dwSize.X < oldsize.X) &&
+        !SetConsoleScreenBufferSize(wh, ws.dwSize)) {
+        rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
     }
     /* remove scrollbar if possible */
     if (!SetConsoleWindowInfo(wh, TRUE, &ws.srWindow)) {
@@ -1221,7 +1270,7 @@ console_cursor_pos(VALUE io)
     if (!GetConsoleScreenBufferInfo((HANDLE)rb_w32_get_osfhandle(fd), &ws)) {
 	rb_syserr_fail(LAST_ERROR, 0);
     }
-    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.Y), UINT2NUM(ws.dwCursorPosition.X));
+    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.Y - ws.srWindow.Top), UINT2NUM(ws.dwCursorPosition.X));
 #else
     static const struct query_args query = {"\033[6n", 0};
     VALUE resp = console_vt_response(0, 0, io, &query);
@@ -1254,11 +1303,17 @@ static VALUE
 console_goto(VALUE io, VALUE y, VALUE x)
 {
 #ifdef _WIN32
-    COORD pos;
-    int fd = GetWriteFD(io);
-    pos.X = NUM2UINT(x);
-    pos.Y = NUM2UINT(y);
-    if (!SetConsoleCursorPosition((HANDLE)rb_w32_get_osfhandle(fd), pos)) {
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X = NUM2UINT(x);
+    pos->Y = ws.srWindow.Top + NUM2UINT(y);
+    if (!SetConsoleCursorPosition(h, *pos)) {
 	rb_syserr_fail(LAST_ERROR, 0);
     }
 #else
@@ -1651,8 +1706,6 @@ console_dev(int argc, VALUE *argv, VALUE klass)
     VALUE con = 0;
     VALUE sym = 0;
 
-    rb_check_arity(argc, 0, UNLIMITED_ARGUMENTS);
-
     if (argc) {
         Check_Type(sym = argv[0], T_SYMBOL);
     }

data/ext/io/console/extconf.rb

@@ -10,11 +10,11 @@ have_func("rb_syserr_new_str(0, Qnil)") or
   abort
 
 have_func("rb_interned_str_cstr")
-have_func("rb_io_path")
-have_func("rb_io_descriptor")
-have_func("rb_io_get_write_io")
-have_func("rb_io_closed_p")
-have_func("rb_io_open_descriptor")
+have_func("rb_io_path", "ruby/io.h")
+have_func("rb_io_descriptor", "ruby/io.h")
+have_func("rb_io_get_write_io", "ruby/io.h")
+have_func("rb_io_closed_p", "ruby/io.h")
+have_func("rb_io_open_descriptor", "ruby/io.h")
 have_func("rb_ractor_local_storage_value_newkey")
 
 is_wasi = /wasi/ =~ MakeMakefile::RbConfig::CONFIG["platform"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: io-console
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Nobu Nakada
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-12-14 00:00:00.000000000 Z
 dependencies: []
 description: add console capabilities to IO instances.
 email: nobu@ruby-lang.org
@@ -32,7 +31,6 @@ licenses:
 metadata:
   source_code_url: https://github.com/ruby/io-console
   changelog_uri: https://github.com/ruby/io-console/releases
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -47,8 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Console interface
 test_files: []