rufio 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78138156eb9ae86f5a57696e3b0170417da3c7b2c8a2d0dba4af3460efe69ddd
-  data.tar.gz: b8c184800c8e26955663e0404654e50973407441ac61658511b15fc2bbf6c96f
+  metadata.gz: f6a5acef1da176c0bfb0c96f4dacc64e6ab519095b9e282a0c2558ca2594cd34
+  data.tar.gz: 5be4e0fe22abcd6d866842ab61436605e940d38d5c3b43f477fc3afea0323413
 SHA512:
-  metadata.gz: 572569248e94a4456f20bcbf7a8235b26bbae55aadc24c911ae528ebcb23b08f2cd0ec1cb9f97c6781308b6856e676b4983e42728bd21ae4a21e0820b0eb0e28
-  data.tar.gz: 65d4deb78ca48dc9e892b63e42bd98827a50d1b0168f7df198957c476696d67999268f4e2021bbc4beb6edad5be96e8acbac6a087bfe5855e25ac63bb23be102
+  metadata.gz: 40f7a8c8dc30211dd09ec1c047c2ca52f4f9854020e41e6a56d56d531f84e87dbf920c7f01df213d9d67c4085edf634e7e6b2c924b0b3a8fcb2da3ab56765d54
+  data.tar.gz: bc5b4458b71cdd85287f141ea8c8fff2cc66a6ba6a972cca558f1bf6bbd81c6a74a0e46fd1acaf413f2771e4170752fab4bb10838c45791d40c61e76c43c0f89

data/lib/rufio/screen.rb

@@ -24,12 +24,16 @@ module Rufio
   # - Minimal ANSI stripping (only once in put_string)
   #
   class Screen
+    # Pre-allocated mutable cell. Struct supports [] access like Hash,
+    # so callers using cell[:char] etc. need no changes.
+    Cell = Struct.new(:char, :fg, :bg, :width)
+
     attr_reader :width, :height
 
     def initialize(width, height)
       @width = width
       @height = height
-      @cells = Array.new(height) { Array.new(width) { default_cell } }
+      @cells = Array.new(height) { Array.new(width) { Cell.new(' ', nil, nil, 1) } }
       @overlay_cells = nil  # オーバーレイレイヤー（ダイアログ用）
       @dirty_rows = Set.new  # Phase1: Dirty row tracking
     end
@@ -47,12 +51,11 @@ module Rufio
 
       # Phase1: Width is calculated once here (not in rendering loop)
       char_width = width || TextUtils.display_width(char)
-      @cells[y][x] = {
-        char: char,
-        fg: fg,
-        bg: bg,
-        width: char_width
-      }
+      cell = @cells[y][x]
+      cell.char  = char
+      cell.fg    = fg
+      cell.bg    = bg
+      cell.width = char_width
 
       # Phase1: Mark row as dirty
       @dirty_rows.add(y)
@@ -62,12 +65,11 @@ module Rufio
         (char_width - 1).times do |offset|
           next_x = x + 1 + offset
           break if next_x >= @width
-          @cells[y][next_x] = {
-            char: '',
-            fg: nil,
-            bg: nil,
-            width: 0
-          }
+          marker = @cells[y][next_x]
+          marker.char  = ''
+          marker.fg    = nil
+          marker.bg    = nil
+          marker.width = 0
         end
       end
     end
@@ -156,7 +158,12 @@ module Rufio
     # Clear the entire screen
     def clear
       @cells.each do |row|
-        row.fill { default_cell }
+        row.each do |cell|
+          cell.char  = ' '
+          cell.fg    = nil
+          cell.bg    = nil
+          cell.width = 1
+        end
       end
       # Phase1: Clear dirty rows after full clear
       @dirty_rows.clear
@@ -266,7 +273,7 @@ module Rufio
     private
 
     def default_cell
-      { char: ' ', fg: nil, bg: nil, width: 1 }
+      Cell.new(' ', nil, nil, 1)
     end
 
     def out_of_bounds?(x, y)

data/lib/rufio/terminal_ui.rb

@@ -192,10 +192,12 @@ module Rufio
       # getch を使用し、受信した各バイトをキューに積む。
       if windows?
         @input_queue = Queue.new
+        @stop_input_thread = false
         @input_thread = Thread.new do
           loop do
+            break if @stop_input_thread
             ch = STDIN.getch(min: 1)
-            break if ch.nil?
+            break if ch.nil? || @stop_input_thread
             ch.bytes.each { |b| @input_queue << b }
           end
         rescue
@@ -291,11 +293,22 @@ module Rufio
     end
 
     def cleanup_terminal
-      # Windows 入力スレッドを停止（raw! 解除前に kill）
+      # マウスレポートを先に無効化して新しいイベントの流入を止める
+      if windows?
+        print "\e[?1000l\e[?1006l"
+      else
+        print "\e[?1003l\e[?1006l"
+      end
+      STDOUT.flush
+
+      # Windows 入力スレッドを停止
       if windows? && @input_thread
+        @stop_input_thread = true
         @input_thread.kill rescue nil
         @input_thread.join(0.5) rescue nil
         @input_thread = nil
+        # コンソール入力バッファをフラッシュして残留イベントによる不正出力を防ぐ
+        windows_flush_console_input_buffer
       end
 
       # rawモードを解除
@@ -303,20 +316,31 @@ module Rufio
         STDIN.cooked!
       end
 
-      # マウスレポートを無効化（setup_terminal と対称）
-      if windows?
-        print "\e[?1000l\e[?1006l"
-      else
-        print "\e[?1003l\e[?1006l"
-      end
-      STDOUT.flush
-
       print "\e[?25h"    # cursor visible
       print "\e[?1049l"  # restore normal screen buffer
       STDOUT.flush
       puts ConfigLoader.message('app.terminated')
     end
 
+    def windows_flush_console_input_buffer
+      require 'fiddle'
+      kernel32 = Fiddle.dlopen('kernel32')
+      get_std_handle = Fiddle::Function.new(
+        kernel32['GetStdHandle'],
+        [Fiddle::TYPE_LONG],
+        Fiddle::TYPE_VOIDP
+      )
+      flush = Fiddle::Function.new(
+        kernel32['FlushConsoleInputBuffer'],
+        [Fiddle::TYPE_VOIDP],
+        Fiddle::TYPE_INT
+      )
+      handle = get_std_handle.call(-10)  # STD_INPUT_HANDLE = -10
+      flush.call(handle)
+    rescue
+      # Windows API が使えない場合は無視して続行
+    end
+
     # ゲームループパターンのmain_loop（CPU最適化版：フレームスキップ対応）
     # UPDATE → DRAW → RENDER → SLEEP のサイクル
     # 変更がない場合は描画をスキップしてCPU使用率を削減

data/lib/rufio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufio
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufio
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - masisz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-29 00:00:00.000000000 Z
+date: 2026-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console