textbringer 22 → 24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75bc23a6bf83f87be572ca81acfb29c2171d99d07d0fc48c5a50fac711b12ecb
-  data.tar.gz: 5811dd657e36666831c26b9212494138c815629fe24997bb939c375c6d4a7944
+  metadata.gz: d7426dda13275f37439bdcc360a55971b34cc4b62916eeaee734b127ab9a8a88
+  data.tar.gz: fcc6391ac0697659a8b85005766186502731e8473928a5e5165d7c0a97d533f1
 SHA512:
-  metadata.gz: a3b91ec8b00442665b7060840b1e7a43be4193f887b0d9bc6925e1eb528b8b7e6dd173e2ba2c453b11ab8d56a248a4ef875ba760427a06d27de5dea5c58b19e8
-  data.tar.gz: 0abd782f34b8ebc44391a86bc6074e8369773de886738681d025bfafe22f01d357889c54dd8fb8b20a1d321f4789dd590793d32c9d1ddb82d28228c29b8c4d33
+  metadata.gz: be219b93c87935b98780c5d41430dd3d0760b839e20977dc843fa88aa8253614fb0e68dc7f90e37c08de6a23722daec928294f9702114908707011c33c766dc6
+  data.tar.gz: 6f61d4ed9ce65308bf150f24c886e05a1743af8bd38913c80f750db77c64a90b543ae95f60774b9d8ae52953cfa91e5f36e62665e0830b9aab6f6d97925ab289

data/CLAUDE.md

@@ -35,12 +35,6 @@ txtb
 # Run all tests
 bundle exec rake test
 
-# Or simply (default task)
-bundle exec rake
-
-# On Ubuntu/Linux (for CI)
-xvfb-run bundle exec rake test
-
 # Run a single test file
 ruby -Ilib:test test/textbringer/test_buffer.rb
 ```

data/lib/textbringer/buffer.rb

@@ -112,11 +112,13 @@ module Textbringer
     end
 
     def self.current=(buffer)
+      @@current&.input_method&.on_deactivate
       if buffer && buffer.name && @@table.key?(buffer.name)
         @@list.delete(buffer)
         @@list.unshift(buffer)
       end
       @@current = buffer
+      @@current&.input_method&.on_activate
     end
 
     def self.minibuffer

data/lib/textbringer/commands/dired.rb

@@ -0,0 +1,31 @@
+require "fileutils"
+
+module Textbringer
+  module Commands
+    define_command(:dired, doc: "Open a directory browser.") do
+      |dir = read_file_name("Dired: ",
+                            default: (Buffer.current.file_name ?
+                              File.dirname(Buffer.current.file_name) : Dir.pwd) + "/")|
+      dir = File.expand_path(dir)
+      raise EditorError, "#{dir} is not a directory" unless File.directory?(dir)
+      buf_name = "*Dired: #{dir}*"
+      buffer = Buffer.find_or_new(buf_name, undo_limit: 0, read_only: true)
+      buffer[:dired_directory] = dir
+      buffer.apply_mode(DiredMode) unless buffer.mode.is_a?(DiredMode)
+      if buffer.bytesize == 0
+        buffer.read_only_edit do
+          buffer.insert(DiredMode.generate_listing(dir))
+          buffer.beginning_of_buffer
+          buffer.forward_line
+          until buffer.end_of_buffer?
+            buffer.beginning_of_line
+            break unless buffer.looking_at?(/^[D ] \S+\s+\d+\s+[\d-]+\s+[\d:]+\s+\.\.?\/$/)
+            buffer.forward_line
+          end
+        end
+      end
+      switch_to_buffer(buffer)
+      dired_move_to_filename_command
+    end
+  end
+end

data/lib/textbringer/commands/files.rb

@@ -5,6 +5,10 @@ module Textbringer
   module Commands
     define_command(:find_file, doc: "Open or create a file.") do
       |file_name = read_file_name("Find file: ", default: (Buffer.current.file_name ? File.dirname(Buffer.current.file_name) : Dir.pwd) + "/")|
+      if File.directory?(file_name)
+        dired(file_name)
+        next
+      end
       config = EditorConfig.load_file(file_name)
       buffer = Buffer.find_file(file_name)
       if buffer.new_file?

data/lib/textbringer/commands/gamegrid.rb

@@ -0,0 +1,25 @@
+module Textbringer
+  module Commands
+    define_command(:gamegrid_show_scores,
+                   doc: "Display high scores for a game.") do
+      |game_name = read_from_minibuffer("Game name: ")|
+      scores = Gamegrid.load_scores(game_name)
+      buffer = Buffer.find_or_new("*Scores*", undo_limit: 0)
+      buffer.read_only_edit do
+        buffer.clear
+        buffer.insert("High Scores for #{game_name}\n")
+        buffer.insert("=" * 40 + "\n\n")
+        if scores.empty?
+          buffer.insert("No scores recorded.\n")
+        else
+          scores.each_with_index do |entry, i|
+            buffer.insert(
+              "#{i + 1}. #{entry[:score]}  #{entry[:player]}  #{entry[:time]}\n"
+            )
+          end
+        end
+      end
+      switch_to_buffer(buffer)
+    end
+  end
+end

data/lib/textbringer/commands/tetris.rb

@@ -0,0 +1,10 @@
+module Textbringer
+  module Commands
+    define_command(:tetris, doc: "Play Tetris.") do
+      buffer = Buffer.find_or_new("*Tetris*", undo_limit: 0)
+      buffer.apply_mode(TetrisMode) unless buffer.mode.is_a?(TetrisMode)
+      switch_to_buffer(buffer)
+      buffer.mode.tetris_new_game
+    end
+  end
+end

data/lib/textbringer/faces/dired.rb

@@ -0,0 +1,6 @@
+module Textbringer
+  Face.define :dired_directory,  foreground: "magenta"
+  Face.define :dired_symlink,    foreground: "cyan"
+  Face.define :dired_executable, foreground: "green"
+  Face.define :dired_flagged,    foreground: "red"
+end

data/lib/textbringer/faces/gamegrid.rb

@@ -0,0 +1,23 @@
+module Textbringer
+  # Foreground color faces for gamegrid
+  Face.define :gamegrid_red, foreground: "red"
+  Face.define :gamegrid_green, foreground: "green"
+  Face.define :gamegrid_blue, foreground: "blue"
+  Face.define :gamegrid_yellow, foreground: "yellow"
+  Face.define :gamegrid_cyan, foreground: "cyan"
+  Face.define :gamegrid_magenta, foreground: "magenta"
+  Face.define :gamegrid_white, foreground: "white"
+
+  # Block faces (solid background) for Tetris-style solid blocks
+  Face.define :gamegrid_block_red, background: "red", foreground: "red"
+  Face.define :gamegrid_block_green, background: "green", foreground: "green"
+  Face.define :gamegrid_block_blue, background: "blue", foreground: "blue"
+  Face.define :gamegrid_block_yellow, background: "yellow", foreground: "yellow"
+  Face.define :gamegrid_block_cyan, background: "cyan", foreground: "cyan"
+  Face.define :gamegrid_block_magenta, background: "magenta", foreground: "magenta"
+  Face.define :gamegrid_block_white, background: "white", foreground: "white"
+
+  # Utility faces
+  Face.define :gamegrid_border, foreground: "white", bold: true
+  Face.define :gamegrid_score, foreground: "yellow", bold: true
+end

data/lib/textbringer/gamegrid.rb

@@ -0,0 +1,164 @@
+require "fileutils"
+require "time"
+
+module Textbringer
+  class Gamegrid
+    attr_reader :width, :height
+    attr_accessor :score
+
+    def initialize(width, height, margin_left: 0)
+      @width = width
+      @height = height
+      @margin_left = margin_left
+      @grid = Array.new(height) { Array.new(width, 0) }
+      @faces = Array.new(height) { Array.new(width, nil) }
+      @display_options = {}
+      @score = 0
+      @timer_thread = nil
+    end
+
+    # Cell API
+
+    def set_cell(x, y, value)
+      check_bounds(x, y)
+      @grid[y][x] = value
+    end
+
+    def get_cell(x, y)
+      check_bounds(x, y)
+      @grid[y][x]
+    end
+
+    def set_face(x, y, face_name)
+      check_bounds(x, y)
+      @faces[y][x] = face_name
+    end
+
+    def get_face(x, y)
+      check_bounds(x, y)
+      @faces[y][x]
+    end
+
+    def set_display_option(value, char:, face: nil)
+      @display_options[value] = { char: char, face: face }
+    end
+
+    def fill(value)
+      @height.times do |y|
+        @width.times do |x|
+          @grid[y][x] = value
+          @faces[y][x] = nil
+        end
+      end
+    end
+
+    # Rendering
+
+    def render
+      margin = " " * @margin_left
+      @height.times.map { |y|
+        margin + @width.times.map { |x|
+          cell_char(@grid[y][x])
+        }.join
+      }.join("\n")
+    end
+
+    def face_map
+      highlight_on = {}
+      highlight_off = {}
+      offset = 0
+      @height.times do |y|
+        offset += @margin_left
+        @width.times do |x|
+          value = @grid[y][x]
+          # Priority: explicit set_face > display_option face > nil
+          face_name = @faces[y][x]
+          if face_name.nil?
+            opt = @display_options[value]
+            face_name = opt[:face] if opt
+          end
+          if face_name
+            face = Face[face_name]
+            if face
+              highlight_on[offset] = face
+              char_len = cell_char(value).bytesize
+              highlight_off[offset + char_len] = true
+            end
+          end
+          offset += cell_char(value).bytesize
+        end
+        offset += 1  # newline
+      end
+      [highlight_on, highlight_off]
+    end
+
+    # Timer
+
+    def start_timer(interval, &callback)
+      stop_timer
+      @timer_thread = Thread.new do
+        loop do
+          sleep(interval)
+          Controller.current.next_tick(&callback)
+        rescue ThreadError
+          break
+        end
+      end
+    end
+
+    def stop_timer
+      if @timer_thread
+        @timer_thread.kill
+        @timer_thread = nil
+      end
+    end
+
+    def timer_active?
+      !@timer_thread.nil? && @timer_thread.alive?
+    end
+
+    # Score persistence
+
+    def self.score_file_path(game_name)
+      safe_name = File.basename(game_name).gsub(/[^A-Za-z0-9_\-]/, "_")
+      File.expand_path("~/.textbringer/scores/#{safe_name}.scores")
+    end
+
+    def self.add_score(game_name, score, player_name: "anonymous")
+      path = score_file_path(game_name)
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, "a") do |f|
+        f.puts("#{score}\t#{player_name}\t#{Time.now.iso8601}")
+      end
+    end
+
+    def self.load_scores(game_name, limit: 10)
+      path = score_file_path(game_name)
+      return [] unless File.exist?(path)
+      lines = File.readlines(path, chomp: true)
+      lines.map { |line|
+        parts = line.split("\t")
+        { score: parts[0].to_i, player: parts[1], time: parts[2] }
+      }.sort_by { |h| -h[:score] }.first(limit)
+    end
+
+    private
+
+    def check_bounds(x, y)
+      if x < 0 || x >= @width || y < 0 || y >= @height
+        raise ArgumentError, "coordinates (#{x}, #{y}) out of bounds"
+      end
+    end
+
+    def cell_char(value)
+      opt = @display_options[value]
+      if opt
+        opt[:char]
+      elsif value.is_a?(String)
+        value
+      else
+        " "
+      end
+    end
+  end
+end

data/lib/textbringer/input_method.rb

@@ -36,6 +36,12 @@ module Textbringer
       @enabled = false
     end
 
+    def on_activate
+    end
+
+    def on_deactivate
+    end
+
     def enabled?
       @enabled
     end

data/lib/textbringer/input_methods/skk_input_method.rb

@@ -1,8 +1,12 @@
 require "open-uri"
 require "fileutils"
+require "socket"
+require "timeout"
 
 module Textbringer
   CONFIG[:skk_dictionary_path] = File.expand_path("~/.textbringer/skk/SKK-JISYO.L")
+  CONFIG[:skk_server_host] = nil   # nil = disabled (default)
+  CONFIG[:skk_server_port] = 1178
 
   class SkkInputMethod < InputMethod
     HIRAGANA_TABLE = {
@@ -46,7 +50,11 @@ module Textbringer
       "xtu" => "っ", "xtsu" => "っ",
       "xya" => "ゃ", "xyu" => "ゅ", "xyo" => "ょ",
       "xa" => "ぁ", "xi" => "ぃ", "xu" => "ぅ", "xe" => "ぇ", "xo" => "ぉ",
-      "," => "、", "." => "。",
+      "-" => "ー", "," => "、", "." => "。", "[" => "「", "]" => "」",
+      "z-" => "～", "z." => "…", "z/" => "・", "z," => "‥",
+      "z(" => "（", "z)" => "）", "z[" => "『", "z]" => "』",
+      "zh" => "←", "zj" => "↓", "zk" => "↑", "zl" => "→", "zL" => "⇒",
+      "z " => "　",
     }
 
     HIRAGANA_PREFIXES = HIRAGANA_TABLE.keys.flat_map { |s|
@@ -99,6 +107,14 @@ module Textbringer
       (s.size - 1).times.map { |i| s[0, i + 1] }
     }.uniq
 
+    STATUS_NAMES = {
+      hiragana: "かな",
+      katakana: "カナ",
+      hankaku_katakana: "半ｶﾅ",
+      zenkaku_ascii: "全英",
+      ascii: "SKK:"
+    }
+
     DEFAULT_CURSOR_COLORS = {
       hiragana:         "pink",
       katakana:         "green",
@@ -120,6 +136,7 @@ module Textbringer
       @marker_pos = nil
       @okuriiari = nil
       @okurinasi = nil
+      @skk_server_socket = nil
     end
 
     def toggle
@@ -128,22 +145,26 @@ module Textbringer
         update_cursor_color
       else
         reset_cursor_color
+        close_skk_server
       end
     end
 
     def disable
       super
       reset_cursor_color
+      close_skk_server
+    end
+
+    def on_activate
+      update_cursor_color if @enabled
+    end
+
+    def on_deactivate
+      reset_cursor_color if @enabled
     end
 
     def status
-      case @phase
-      when :converting then "▽"
-      when :selecting  then "▼"
-      else
-        { hiragana: "あ", katakana: "ア", hankaku_katakana: "ｱ",
-          zenkaku_ascii: "Ａ", ascii: "A" }[@mode]
-      end
+      STATUS_NAMES[@mode]
     end
 
     def handle_event(event)
@@ -201,7 +222,7 @@ module Textbringer
           process_romaji(event)
         end
       when "l"
-        if [:hiragana, :katakana, :hankaku_katakana].include?(@mode)
+        if @roman_buffer != "z" && [:hiragana, :katakana, :hankaku_katakana].include?(@mode)
           @roman_buffer = +""
           @mode = :ascii
           Window.redisplay
@@ -211,7 +232,7 @@ module Textbringer
           process_romaji(event)
         end
       when "L"
-        if [:hiragana, :katakana, :hankaku_katakana].include?(@mode)
+        if @roman_buffer != "z" && [:hiragana, :katakana, :hankaku_katakana].include?(@mode)
           @roman_buffer = +""
           @mode = :zenkaku_ascii
           Window.redisplay
@@ -389,8 +410,8 @@ module Textbringer
       if kana
         @roman_buffer = +""
         if @okuri_roman
-          # Completing okurigana
-          @okuri_kana = kana
+          # Completing okurigana (accumulate in case a vowel kana was already prepended)
+          @okuri_kana = (@okuri_kana || "") + kana
           with_target_buffer do |buffer|
             buffer.insert(kana)
           end
@@ -429,7 +450,14 @@ module Textbringer
       first_char = @roman_buffer[0]
       last_char = @roman_buffer[-1]
       @roman_buffer = +""
-      append_yomi_kana(first_char)
+      if @okuri_roman && (kana = HIRAGANA_TABLE[first_char])
+        # Vowel starts okurigana: accumulate kana and continue buffering the rest
+        @okuri_kana = (@okuri_kana || "") + kana
+        with_target_buffer { |b| b.insert(kana) }
+        Window.redisplay
+      else
+        append_yomi_kana(first_char)
+      end
       process_converting_romaji(last_char)
     end
 
@@ -457,9 +485,20 @@ module Textbringer
       nil
     end
 
-    def start_okurigana(consonant)
-      @okuri_roman = consonant.dup
-      @roman_buffer = consonant.dup
+    def start_okurigana(c)
+      @okuri_roman = c.dup
+      kana = HIRAGANA_TABLE[c]
+      if kana
+        # Vowel okurigana: insert the kana immediately and record it in @okuri_kana.
+        # (A vowel is never a prefix of a longer romaji sequence, so it's always complete.)
+        @okuri_kana = kana
+        @roman_buffer = +""
+        with_target_buffer { |b| b.insert(kana) }
+        Window.redisplay
+        start_selecting
+      else
+        @roman_buffer = c.dup
+      end
     end
 
     def cancel_converting
@@ -492,16 +531,19 @@ module Textbringer
     end
 
     def start_selecting
-      ensure_dictionary_loaded
-
       lookup_key = if @okuri_roman
         @yomi + @okuri_roman
       else
         @yomi
       end
 
-      dict = @okuri_roman ? @okuriiari : @okurinasi
-      candidates = dict[lookup_key]
+      candidates = if CONFIG[:skk_server_host]
+        skk_server_lookup(lookup_key)
+      else
+        ensure_dictionary_loaded
+        dict = @okuri_roman ? @okuriiari : @okurinasi
+        dict[lookup_key]
+      end
 
       if candidates.nil? || candidates.empty?
         message("No conversion: #{@yomi}")
@@ -750,6 +792,49 @@ module Textbringer
       STDOUT.write("\e]112\a")
       STDOUT.flush
     end
+
+    SKK_SERVER_TIMEOUT = 3  # seconds
+
+    def close_skk_server
+      return unless @skk_server_socket
+      begin
+        @skk_server_socket.write("0\n")
+      rescue IOError, Errno::EPIPE
+      end
+      @skk_server_socket.close rescue nil
+      @skk_server_socket = nil
+    end
+
+    def skk_server_connect
+      return true if @skk_server_socket && !@skk_server_socket.closed?
+      host = CONFIG[:skk_server_host]
+      return false unless host
+      port = CONFIG[:skk_server_port] || 1178
+      Timeout.timeout(SKK_SERVER_TIMEOUT) do
+        @skk_server_socket = TCPSocket.new(host, port)
+      end
+      true
+    end
+
+    def skk_server_lookup(lookup_key)
+      skk_server_connect
+      begin
+        Timeout.timeout(SKK_SERVER_TIMEOUT) do
+          @skk_server_socket.write("1#{lookup_key} \n".encode("EUC-JP"))
+          response = @skk_server_socket.gets("\n")
+          return nil unless response
+          response = response.encode("UTF-8", "EUC-JP", invalid: :replace, undef: :replace).chomp
+          return nil unless response.start_with?("1/")
+          body = response[2..]
+          candidates = body.split("/").map { |c| c.split(";").first&.strip }.compact.reject(&:empty?)
+          candidates.empty? ? nil : candidates
+        end
+      rescue Timeout::Error, IOError, Errno::EPIPE, Errno::ECONNRESET
+        @skk_server_socket.close rescue nil
+        @skk_server_socket = nil
+        nil
+      end
+    end
   end
 
   SKK_DICTIONARY_URL = "https://github.com/skk-dev/dict/raw/090619ac57ef230a0506c191b569fc8c82b1025b/SKK-JISYO.L"

data/lib/textbringer/keymap.rb

@@ -177,6 +177,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-z", :suspend_textbringer)
   GLOBAL_MAP.define_key("\C-x\C-f", :find_file)
   GLOBAL_MAP.define_key("\C-x\C-r", :find_file_read_only)
+  GLOBAL_MAP.define_key("\C-xd", :dired)
   GLOBAL_MAP.define_key("\C-x\C-v", :find_alternate_file)
   GLOBAL_MAP.define_key("\C-xb", :switch_to_buffer)
   GLOBAL_MAP.define_key("\C-x\C-b", :list_buffers)