mui 0.2.0 → 0.3.0

data/lib/mui/window.rb

@@ -2,7 +2,7 @@
 
 module Mui
   class Window
-    attr_accessor :x, :y, :width, :height, :cursor_row, :cursor_col, :scroll_row, :scroll_col
+    attr_accessor :x, :y, :width, :height, :cursor_row, :cursor_col, :scroll_row
     attr_reader :buffer
 
     def initialize(buffer, x: 0, y: 0, width: 80, height: 24, color_scheme: nil)
@@ -14,8 +14,8 @@ module Mui
       @cursor_row = 0
       @cursor_col = 0
       @scroll_row = 0
-      @scroll_col = 0
       @color_scheme = color_scheme
+      @wrap_cache = WrapCache.new
       @syntax_highlighter = Highlighters::SyntaxHighlighter.new(color_scheme, buffer:)
       @line_renderer = create_line_renderer
       @status_line_renderer = StatusLineRenderer.new(buffer, self, color_scheme)
@@ -26,7 +26,7 @@ module Mui
       @cursor_row = 0
       @cursor_col = 0
       @scroll_row = 0
-      @scroll_col = 0
+      @wrap_cache.clear
       @syntax_highlighter.buffer = new_buffer
       @line_renderer = create_line_renderer
       @status_line_renderer = StatusLineRenderer.new(new_buffer, self, @color_scheme)
@@ -41,47 +41,72 @@ module Mui
     end
 
     def ensure_cursor_visible
-      # 縦スクロール
-      if @cursor_row < @scroll_row
-        @scroll_row = @cursor_row
-      elsif @cursor_row >= @scroll_row + visible_height
-        @scroll_row = @cursor_row - visible_height + 1
-      end
+      # Calculate screen row of cursor considering line wrapping
+      cursor_screen_row = screen_rows_from_scroll_to_cursor
+
+      # Scroll up if cursor is above visible area
+      @scroll_row -= 1 while @cursor_row < @scroll_row
 
-      # 横スクロール
-      if @cursor_col < @scroll_col
-        @scroll_col = @cursor_col
-      elsif @cursor_col >= @scroll_col + visible_width
-        @scroll_col = @cursor_col - visible_width + 1
+      # Scroll down if cursor is below visible area
+      while cursor_screen_row >= visible_height
+        @scroll_row += 1
+        cursor_screen_row = screen_rows_from_scroll_to_cursor
       end
     end
 
     def render(screen, selection: nil, search_state: nil)
       options = build_render_options(selection, search_state)
+      screen_row = 0
+      logical_row = @scroll_row
+
+      while screen_row < visible_height && logical_row < @buffer.line_count
+        line = @buffer.line(logical_row)
+        wrapped_lines = WrapHelper.wrap_line(line, visible_width, cache: @wrap_cache)
+
+        wrapped_lines.each do |wrap_info|
+          break if screen_row >= visible_height
+
+          render_wrapped_segment(screen, logical_row, wrap_info, screen_row, options)
+          screen_row += 1
+        end
+
+        logical_row += 1
+      end
 
-      visible_height.times do |i|
-        row = @scroll_row + i
-        render_line(screen, row, i, options)
+      # Clear remaining lines
+      while screen_row < visible_height
+        clear_line(screen, screen_row)
+        screen_row += 1
       end
 
       @status_line_renderer.render(screen, @y + visible_height)
     end
 
-    def render_line(screen, row, screen_row, options)
-      line = prepare_visible_line(row)
-      adjusted_options = adjust_options_for_scroll(options)
-      @line_renderer.render(screen, line, row, @x, @y + screen_row, adjusted_options)
+    def render_wrapped_segment(screen, logical_row, wrap_info, screen_row, options)
+      wrap_options = options.merge(logical_row:)
+      @line_renderer.render_wrapped_line(screen, @y + screen_row, @x, wrap_info, wrap_options)
+
+      # Fill remaining width with spaces if line is shorter
+      text_width = UnicodeWidth.string_width(wrap_info[:text])
+      return unless text_width < visible_width
+
+      remaining_width = visible_width - text_width
+      fill_text = " " * remaining_width
+      if @color_scheme && @color_scheme[:normal]
+        screen.put_with_style(@y + screen_row, @x + text_width, fill_text, @color_scheme[:normal])
+      else
+        screen.put(@y + screen_row, @x + text_width, fill_text)
+      end
     end
 
     def screen_cursor_x
       line = @buffer.line(@cursor_row) || ""
-      # Calculate display width from scroll_col to cursor_col
-      visible_text = line[@scroll_col...@cursor_col] || ""
-      @x + UnicodeWidth.string_width(visible_text)
+      _, screen_col = WrapHelper.logical_to_screen(line, @cursor_col, visible_width, cache: @wrap_cache)
+      @x + screen_col
     end
 
     def screen_cursor_y
-      @y + @cursor_row - @scroll_row
+      @y + screen_rows_from_scroll_to_cursor
     end
 
     # カーソル移動
@@ -115,6 +140,38 @@ module Mui
 
     private
 
+    def clear_line(screen, screen_row)
+      empty_line = " " * visible_width
+      if @color_scheme && @color_scheme[:normal]
+        screen.put_with_style(@y + screen_row, @x, empty_line, @color_scheme[:normal])
+      else
+        screen.put(@y + screen_row, @x, empty_line)
+      end
+    end
+
+    # Calculates screen rows from scroll_row to cursor position
+    def screen_rows_from_scroll_to_cursor
+      screen_rows = 0
+
+      # Add screen lines for rows between scroll_row and cursor_row
+      (@scroll_row...@cursor_row).each do |row|
+        line = @buffer.line(row) || ""
+        screen_rows += WrapHelper.screen_line_count(line, visible_width, cache: @wrap_cache)
+      end
+
+      # Add the row offset within the cursor's line
+      cursor_line = @buffer.line(@cursor_row) || ""
+      row_offset, = WrapHelper.logical_to_screen(cursor_line, @cursor_col, visible_width, cache: @wrap_cache)
+      screen_rows + row_offset
+    end
+
+    # Clear wrap cache when window dimensions change
+    def resize(new_width, new_height)
+      @width = new_width
+      @height = new_height
+      @wrap_cache.clear
+    end
+
     def create_line_renderer
       renderer = LineRenderer.new(@color_scheme)
       renderer.add_highlighter(@syntax_highlighter)
@@ -129,22 +186,8 @@ module Mui
       renderer
     end
 
-    def prepare_visible_line(row)
-      line = @buffer.line(row)
-      visible_line = @scroll_col < line.length ? line[@scroll_col, visible_width] || "" : ""
-      visible_line.ljust(visible_width)
-    end
-
     def build_render_options(selection, search_state)
-      { selection:, search_state:, scroll_col: @scroll_col, buffer: @buffer }
-    end
-
-    def adjust_options_for_scroll(options)
-      return options unless options[:selection] || options[:search_state]
-
-      adjusted = options.dup
-      adjusted[:scroll_col] = @scroll_col
-      adjusted
+      { selection:, search_state:, buffer: @buffer }
     end
 
     def max_cursor_col

data/lib/mui/window_manager.rb

@@ -105,6 +105,13 @@ module Mui
       @active_window = target if target
     end
 
+    def focus_window(window)
+      return false unless windows.include?(window)
+
+      @active_window = window
+      true
+    end
+
     def windows
       return [] unless @layout_root
 

data/lib/mui/wrap_cache.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Mui
+  # Caches wrap calculation results for performance
+  # Cache key: [line_content, width]
+  class WrapCache
+    def initialize
+      @cache = {}
+    end
+
+    def get(line, width)
+      key = cache_key(line, width)
+      @cache[key]
+    end
+
+    def set(line, width, result)
+      key = cache_key(line, width)
+      @cache[key] = result
+    end
+
+    def invalidate(line)
+      # Remove all entries for this line content
+      @cache.delete_if { |k, _| k.start_with?("#{line}\x00") }
+    end
+
+    def clear
+      @cache.clear
+    end
+
+    def size
+      @cache.size
+    end
+
+    private
+
+    def cache_key(line, width)
+      "#{line}\x00#{width}"
+    end
+  end
+end

data/lib/mui/wrap_helper.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Mui
+  # Helper module for line wrapping calculations
+  module WrapHelper
+    class << self
+      # Wraps a line into screen lines based on display width
+      # Returns: [{ text:, start_col:, end_col: }, ...]
+      def wrap_line(line, width, cache: nil)
+        return [{ text: "", start_col: 0, end_col: 0 }] if line.nil? || line.empty?
+        return [{ text: line, start_col: 0, end_col: line.length }] if width <= 0
+
+        if cache
+          cached = cache.get(line, width)
+          return cached if cached
+        end
+
+        result = compute_wrap(line, width)
+        cache&.set(line, width, result)
+        result
+      end
+
+      # Converts logical column to screen position
+      # Returns: [screen_row_offset, screen_col]
+      def logical_to_screen(line, col, width, cache: nil)
+        return [0, 0] if line.nil? || line.empty? || col <= 0
+
+        wrapped = wrap_line(line, width, cache:)
+
+        wrapped.each_with_index do |segment, row|
+          next unless col <= segment[:end_col]
+
+          # Found the segment containing this column
+          relative_col = col - segment[:start_col]
+          prefix = segment[:text][0, relative_col] || ""
+          screen_col = UnicodeWidth.string_width(prefix)
+          return [row, screen_col]
+        end
+
+        # Column is past end of line, return last position
+        last_segment = wrapped.last
+        last_text = last_segment[:text]
+        [wrapped.size - 1, UnicodeWidth.string_width(last_text)]
+      end
+
+      # Returns the number of screen lines for a logical line
+      def screen_line_count(line, width, cache: nil)
+        wrap_line(line, width, cache:).size
+      end
+
+      private
+
+      def compute_wrap(line, width)
+        result = []
+        chars = line.chars
+        current_text = String.new
+        current_width = 0
+        start_col = 0
+        col = 0
+
+        chars.each do |char|
+          char_w = UnicodeWidth.char_width(char)
+
+          # Check if adding this character would exceed width
+          if current_width + char_w > width && !current_text.empty?
+            result << { text: current_text, start_col:, end_col: col }
+            current_text = String.new
+            current_width = 0
+            start_col = col
+          end
+
+          current_text << char
+          current_width += char_w
+          col += 1
+        end
+
+        # Add remaining text
+        result << { text: current_text, start_col:, end_col: col } unless current_text.empty?
+
+        result.empty? ? [{ text: String.new, start_col: 0, end_col: 0 }] : result
+      end
+    end
+  end
+end

data/lib/mui.rb

@@ -3,7 +3,14 @@
 require_relative "mui/version"
 require_relative "mui/error"
 require_relative "mui/key_code"
+require_relative "mui/key_notation_parser"
+require_relative "mui/key_sequence"
+require_relative "mui/key_sequence_buffer"
+require_relative "mui/key_sequence_matcher"
+require_relative "mui/key_sequence_handler"
 require_relative "mui/unicode_width"
+require_relative "mui/wrap_cache"
+require_relative "mui/wrap_helper"
 require_relative "mui/config"
 require_relative "mui/color_scheme"
 require_relative "mui/color_manager"
@@ -22,6 +29,13 @@ require_relative "mui/syntax/token"
 require_relative "mui/syntax/lexer_base"
 require_relative "mui/syntax/lexers/ruby_lexer"
 require_relative "mui/syntax/lexers/c_lexer"
+require_relative "mui/syntax/lexers/go_lexer"
+require_relative "mui/syntax/lexers/rust_lexer"
+require_relative "mui/syntax/lexers/javascript_lexer"
+require_relative "mui/syntax/lexers/typescript_lexer"
+require_relative "mui/syntax/lexers/markdown_lexer"
+require_relative "mui/syntax/lexers/html_lexer"
+require_relative "mui/syntax/lexers/css_lexer"
 require_relative "mui/syntax/token_cache"
 require_relative "mui/syntax/language_detector"
 require_relative "mui/highlighters/syntax_highlighter"
@@ -38,6 +52,7 @@ require_relative "mui/tab_manager"
 require_relative "mui/tab_bar_renderer"
 require_relative "mui/mode"
 require_relative "mui/handler_result"
+require_relative "mui/command_history"
 require_relative "mui/command_line"
 require_relative "mui/completion_state"
 require_relative "mui/insert_completion_state"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mui
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -38,6 +38,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- docs/_config.yml
+- docs/configuration.md
+- docs/getting-started.md
+- docs/index.md
+- docs/jobs.md
+- docs/keybindings.md
+- docs/plugins.md
+- docs/syntax-highlighting.md
 - exe/mui
 - lib/mui.rb
 - lib/mui/autocmd.rb
@@ -48,6 +56,7 @@ files:
 - lib/mui/color_scheme.rb
 - lib/mui/command_completer.rb
 - lib/mui/command_context.rb
+- lib/mui/command_history.rb
 - lib/mui/command_line.rb
 - lib/mui/command_registry.rb
 - lib/mui/completion_renderer.rb
@@ -84,6 +93,11 @@ files:
 - lib/mui/key_handler/visual_line_mode.rb
 - lib/mui/key_handler/visual_mode.rb
 - lib/mui/key_handler/window_command.rb
+- lib/mui/key_notation_parser.rb
+- lib/mui/key_sequence.rb
+- lib/mui/key_sequence_buffer.rb
+- lib/mui/key_sequence_handler.rb
+- lib/mui/key_sequence_matcher.rb
 - lib/mui/layout/calculator.rb
 - lib/mui/layout/leaf_node.rb
 - lib/mui/layout/node.rb
@@ -104,7 +118,14 @@ files:
 - lib/mui/syntax/language_detector.rb
 - lib/mui/syntax/lexer_base.rb
 - lib/mui/syntax/lexers/c_lexer.rb
+- lib/mui/syntax/lexers/css_lexer.rb
+- lib/mui/syntax/lexers/go_lexer.rb
+- lib/mui/syntax/lexers/html_lexer.rb
+- lib/mui/syntax/lexers/javascript_lexer.rb
+- lib/mui/syntax/lexers/markdown_lexer.rb
 - lib/mui/syntax/lexers/ruby_lexer.rb
+- lib/mui/syntax/lexers/rust_lexer.rb
+- lib/mui/syntax/lexers/typescript_lexer.rb
 - lib/mui/syntax/token.rb
 - lib/mui/syntax/token_cache.rb
 - lib/mui/tab_bar_renderer.rb
@@ -120,13 +141,15 @@ files:
 - lib/mui/version.rb
 - lib/mui/window.rb
 - lib/mui/window_manager.rb
+- lib/mui/wrap_cache.rb
+- lib/mui/wrap_helper.rb
 - sig/mui.rbs
-homepage: https://github.com/S-H-GAMELINKS/mui
+homepage: https://s-h-gamelinks.github.io/mui/
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/S-H-GAMELINKS/mui
+  homepage_uri: https://s-h-gamelinks.github.io/mui/
   source_code_uri: https://github.com/S-H-GAMELINKS/mui
   changelog_uri: https://github.com/S-H-GAMELINKS/mui/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'