textbringer 22 → 23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75bc23a6bf83f87be572ca81acfb29c2171d99d07d0fc48c5a50fac711b12ecb
-  data.tar.gz: 5811dd657e36666831c26b9212494138c815629fe24997bb939c375c6d4a7944
+  metadata.gz: 0fe4d897c03de987989c81559c4c7d354f9d2afd9ec8cc7ff819c5da0a2c1bb4
+  data.tar.gz: c687cc3726ea8d9ccfd9efcb235590f9d4d447145cb9a0a6eaeb103b133f671f
 SHA512:
-  metadata.gz: a3b91ec8b00442665b7060840b1e7a43be4193f887b0d9bc6925e1eb528b8b7e6dd173e2ba2c453b11ab8d56a248a4ef875ba760427a06d27de5dea5c58b19e8
-  data.tar.gz: 0abd782f34b8ebc44391a86bc6074e8369773de886738681d025bfafe22f01d357889c54dd8fb8b20a1d321f4789dd590793d32c9d1ddb82d28228c29b8c4d33
+  metadata.gz: c1885974de9ae18238d0a49f436e3300d5971c06b7d3b16fb9c21cfc36c42b15e1beb22ee4608a80252100e202cef01d0943fb8d68a3db6ec9884773aff02093
+  data.tar.gz: 75bdc11e89da85249a54568e8d23ecd0979934143604918b292c01f4630a59386fd2965c7a260d9fc9b05c8a5f81695ecf23e9306fcb5df04535f97d65a927b7

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/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/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "22"
+  VERSION = "23"
 end

data/lib/textbringer/window.rb

@@ -175,6 +175,7 @@ module Textbringer
         @@started = true
         yield
       ensure
+        Buffer.current&.input_method&.on_deactivate
         @@list.each do |win|
           win.close
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '22'
+  version: '23'
 platform: ruby
 authors:
 - Shugo Maeda