textbringer 19 → 24

data/lib/textbringer/input_methods/skk_input_method.rb

@@ -1,4 +1,13 @@
+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 = {
       "a" => "あ", "i" => "い", "u" => "う", "e" => "え", "o" => "お",
@@ -41,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|
@@ -94,7 +107,13 @@ module Textbringer
       (s.size - 1).times.map { |i| s[0, i + 1] }
     }.uniq
 
-    DICTIONARY_PATH = File.expand_path("~/.textbringer/skk/SKK-JISYO.L")
+    STATUS_NAMES = {
+      hiragana: "かな",
+      katakana: "カナ",
+      hankaku_katakana: "半ｶﾅ",
+      zenkaku_ascii: "全英",
+      ascii: "SKK:"
+    }
 
     DEFAULT_CURSOR_COLORS = {
       hiragana:         "pink",
@@ -117,6 +136,7 @@ module Textbringer
       @marker_pos = nil
       @okuriiari = nil
       @okurinasi = nil
+      @skk_server_socket = nil
     end
 
     def toggle
@@ -125,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)
@@ -198,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
@@ -208,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
@@ -386,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
@@ -426,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
 
@@ -454,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
@@ -489,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}")
@@ -569,7 +614,7 @@ module Textbringer
     def ensure_dictionary_loaded
       return if @okuriiari
 
-      path = CONFIG[:skk_dictionary] || DICTIONARY_PATH
+      path = CONFIG[:skk_dictionary_path]
       @okuriiari = {}
       @okurinasi = {}
       section = :okuriiari
@@ -747,5 +792,70 @@ 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"
+
+  module Commands
+    define_command(:skk_download_dictionary, doc: "Download SKK dictionary") do
+      path = CONFIG[:skk_dictionary_path]
+      if File.exist?(path) && !yes_or_no?("#{path} already exists.  Overwrite it?")
+        return
+      end
+      background do
+        URI.open(SKK_DICTIONARY_URL) do |f|
+          FileUtils.mkdir_p(File.dirname(path))
+          File.open(path, "wb") do |out|
+            IO.copy_stream(f, out)
+          end
+        end
+        foreground do
+          message("Downloaded to #{path}")
+        end
+      end
+    end
   end
 end

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)

data/lib/textbringer/modes/dired_mode.rb

@@ -0,0 +1,322 @@
+module Textbringer
+  class DiredMode < Mode
+    define_keymap :DIRED_MODE_MAP
+    DIRED_MODE_MAP.define_key("n",    :dired_next_line_command)
+    DIRED_MODE_MAP.define_key(" ",    :dired_next_line_command)
+    DIRED_MODE_MAP.define_key("\C-n", :dired_next_line_command)
+    DIRED_MODE_MAP.define_key("p",    :dired_previous_line_command)
+    DIRED_MODE_MAP.define_key("\C-p", :dired_previous_line_command)
+    DIRED_MODE_MAP.define_key("^",    :dired_up_directory_command)
+    DIRED_MODE_MAP.define_key("\C-m", :dired_find_file_command)
+    DIRED_MODE_MAP.define_key("f",    :dired_find_file_command)
+    DIRED_MODE_MAP.define_key("o",    :dired_find_file_other_window_command)
+    DIRED_MODE_MAP.define_key("d",    :dired_flag_file_deletion_command)
+    DIRED_MODE_MAP.define_key("u",    :dired_unmark_command)
+    DIRED_MODE_MAP.define_key("U",    :dired_unmark_all_command)
+    DIRED_MODE_MAP.define_key("x",    :dired_do_flagged_delete_command)
+    DIRED_MODE_MAP.define_key("R",    :dired_do_rename_command)
+    DIRED_MODE_MAP.define_key("C",    :dired_do_copy_command)
+    DIRED_MODE_MAP.define_key("+",    :dired_create_directory_command)
+    DIRED_MODE_MAP.define_key("g",    :dired_revert_command)
+    DIRED_MODE_MAP.define_key("q",    :bury_buffer)
+
+    # Deletion-flagged lines
+    define_syntax :dired_flagged,    /^D .+$/
+    # Symlinks
+    define_syntax :dired_symlink,    /^[ D] \S+\s+\d+\s+[\d-]+ [\d:]+ .+ -> .+$/
+    # Directories
+    define_syntax :dired_directory,  /^[ D] d\S+\s+\d+\s+[\d-]+ [\d:]+ .+\/$/
+    # Executables
+    define_syntax :dired_executable, /^[ D] -[r-][w-]x.+$/
+
+    PERM_BITS = [
+      ["r", 0400], ["w", 0200], ["x", 0100],
+      ["r", 0040], ["w", 0020], ["x", 0010],
+      ["r", 0004], ["w", 0002], ["x", 0001]
+    ]
+
+    def self.format_permissions(stat)
+      type = if stat.directory?  then "d"
+             elsif stat.symlink? then "l"
+             elsif stat.pipe?    then "p"
+             elsif stat.socket?  then "s"
+             elsif stat.chardev? then "c"
+             elsif stat.blockdev? then "b"
+             else "-"
+             end
+      type + PERM_BITS.map { |ch, mask| stat.mode & mask != 0 ? ch : "-" }.join
+    end
+
+    def self.generate_listing(dir)
+      entries = []
+      Dir.foreach(dir) do |name|
+        path = File.join(dir, name)
+        begin
+          stat = File.lstat(path)
+          perms = format_permissions(stat)
+          size  = stat.size
+          mtime = stat.mtime.strftime("%Y-%m-%d %H:%M")
+          if stat.symlink?
+            begin
+              target = File.readlink(path)
+            rescue SystemCallError
+              target = "?"
+            end
+            display = "#{name} -> #{target}"
+          elsif stat.directory?
+            display = "#{name}/"
+          else
+            display = name
+          end
+          entries << {
+            name: name,
+            display: display,
+            perms: perms,
+            size: size,
+            mtime: mtime,
+            directory: stat.directory?
+          }
+        rescue SystemCallError => e
+          entries << {
+            name: name,
+            display: name,
+            perms: "??????????",
+            size: 0,
+            mtime: "????-??-?? ??:??",
+            directory: false,
+            error: e.message
+          }
+        end
+      end
+
+      entries.sort_by! { |e| [e[:directory] ? 0 : 1, e[:name].downcase] }
+
+      lines = ["  #{dir}:\n"]
+      entries.each do |e|
+        line = "  #{e[:perms]}  #{e[:size].to_s.rjust(8)}  #{e[:mtime]}  #{e[:display]}\n"
+        lines << line
+      end
+      lines.join
+    end
+
+    def initialize(buffer)
+      super(buffer)
+      buffer.keymap = DIRED_MODE_MAP
+    end
+
+    define_local_command(:dired_move_to_filename,
+                         doc: "Move point to the filename on the current line.") do
+      @buffer.beginning_of_line
+      if @buffer.looking_at?(/^[D ] \S+\s+\d+\s+[\d-]+\s+[\d:]+\s+/)
+        @buffer.forward_char(@buffer.match_string(0).length)
+      end
+    end
+
+    define_local_command(:dired_next_line, doc: "Move to next file line.") do
+      @buffer.next_line
+      dired_move_to_filename
+    end
+
+    define_local_command(:dired_previous_line, doc: "Move to previous file line.") do
+      first_file_line = @buffer.save_excursion {
+        @buffer.beginning_of_buffer
+        @buffer.current_line
+      }
+      if @buffer.current_line > first_file_line
+        @buffer.previous_line
+      end
+      dired_move_to_filename
+    end
+
+    define_local_command(:dired_up_directory, doc: "Go up to parent directory.") do
+      dir = @buffer[:dired_directory]
+      parent = File.dirname(dir)
+      dired(parent)
+    end
+
+    define_local_command(:dired_find_file, doc: "Visit file or directory at point.") do
+      name = current_file_name
+      return unless name
+      dir = @buffer[:dired_directory]
+      path = File.join(dir, name)
+      if File.directory?(path)
+        dired(path)
+      else
+        find_file(path)
+      end
+    end
+
+    define_local_command(:dired_find_file_other_window,
+                         doc: "Visit file at point in other window.") do
+      name = current_file_name
+      return unless name
+      dir = @buffer[:dired_directory]
+      path = File.join(dir, name)
+      if Window.list.size == 1
+        split_window
+      end
+      other_window
+      if File.directory?(path)
+        dired(path)
+      else
+        find_file(path)
+      end
+    end
+
+    define_local_command(:dired_flag_file_deletion,
+                         doc: "Flag file at point for deletion.") do
+      set_flag("D")
+      dired_next_line
+    end
+
+    define_local_command(:dired_unmark, doc: "Remove deletion flag from file at point.") do
+      set_flag(" ")
+      dired_next_line
+    end
+
+    define_local_command(:dired_unmark_all, doc: "Remove all deletion flags.") do
+      @buffer.save_excursion do
+        @buffer.beginning_of_buffer
+        while !@buffer.end_of_buffer?
+          set_flag(" ")
+          @buffer.next_line
+        end
+      end
+    end
+
+    define_local_command(:dired_do_flagged_delete,
+                         doc: "Delete files flagged for deletion.") do
+      files = collect_flagged_files
+      return if files.empty?
+      list = files.map { |f| "  #{f}" }.join("\n")
+      if yes_or_no?("Delete these files?")
+        files.each do |name|
+          next if name == "." || name == ".."
+          path = File.join(@buffer[:dired_directory], name)
+          begin
+            if File.directory?(path) && !File.symlink?(path)
+              FileUtils.rm_rf(path)
+            else
+              File.delete(path)
+            end
+          rescue SystemCallError => e
+            message("Error deleting #{name}: #{e.message}")
+          end
+        end
+        dired_revert
+      end
+    end
+
+    define_local_command(:dired_do_rename, doc: "Rename/move file at point.") do
+      name = current_file_name
+      return unless name
+      dir = @buffer[:dired_directory]
+      src = File.join(dir, name)
+      dest = read_file_name("Rename #{name} to: ", default: dir + "/")
+      dest = File.expand_path(dest, dir)
+      FileUtils.mv(src, dest)
+      dired_revert
+    end
+
+    define_local_command(:dired_do_copy, doc: "Copy file at point.") do
+      name = current_file_name
+      return unless name
+      dir = @buffer[:dired_directory]
+      src = File.join(dir, name)
+      dest = read_file_name("Copy #{name} to: ", default: dir + "/")
+      dest = File.expand_path(dest, dir)
+      FileUtils.cp_r(src, dest)
+      dired_revert
+    end
+
+    define_local_command(:dired_create_directory, doc: "Create a new directory.") do
+      dir = @buffer[:dired_directory]
+      name = read_from_minibuffer("Create directory: ", default: dir + "/")
+      name = File.expand_path(name, dir)
+      FileUtils.mkdir_p(name)
+      dired_revert
+    end
+
+    define_local_command(:dired_revert, doc: "Refresh directory listing.") do
+      dir = @buffer[:dired_directory]
+      saved_name = current_file_name
+      saved_line = @buffer.current_line
+      @buffer.read_only_edit do
+        @buffer.clear
+        @buffer.insert(DiredMode.generate_listing(dir))
+        @buffer.beginning_of_buffer
+        @buffer.forward_line
+      end
+      if saved_name
+        @buffer.beginning_of_buffer
+        found = false
+        while !@buffer.end_of_buffer?
+          if current_file_name == saved_name
+            found = true
+            break
+          end
+          @buffer.next_line
+        end
+        unless found
+          goto_line(saved_line)
+          @buffer.beginning_of_line
+          if @buffer.end_of_buffer? || current_file_name.nil?
+            @buffer.end_of_buffer
+            @buffer.previous_line while current_file_name.nil? && @buffer.current_line > 2
+          end
+        end
+      end
+      dired_move_to_filename
+    end
+
+    private
+
+    def current_file_name
+      @buffer.save_excursion do
+        @buffer.beginning_of_line
+        # Line format: "  perms  size  date time  display_name"
+        # or:          "D perms  size  date time  display_name"
+        if @buffer.looking_at?(/^[D ] (\S+)\s+\d+\s+[\d-]+\s+[\d:]+\s+(.+)$/)
+          perms = @buffer.match_string(1)
+          display = @buffer.match_string(2)
+          # Strip symlink target: "name -> target" -> "name" (only for symlinks)
+          display = display.sub(/ -> .+$/, "") if perms.start_with?("l")
+          # Strip trailing slash for directories: "name/" -> "name"
+          display = display.chomp("/")
+          display
+        end
+      end
+    end
+
+    def set_flag(char)
+      @buffer.read_only_edit do
+        @buffer.save_excursion do
+          @buffer.beginning_of_line
+          if @buffer.looking_at?(/^[D ]/)
+            @buffer.delete_char(1)
+            @buffer.insert(char)
+          end
+        end
+      end
+    end
+
+    def collect_flagged_files
+      files = []
+      @buffer.save_excursion do
+        @buffer.beginning_of_buffer
+        while !@buffer.end_of_buffer?
+          @buffer.beginning_of_line
+          if @buffer.looking_at?(/^D (\S+)\s+\d+\s+[\d-]+\s+[\d:]+\s+(.+)$/)
+            perms = @buffer.match_string(1)
+            display = @buffer.match_string(2)
+            display = display.sub(/ -> .+$/, "") if perms.start_with?("l")
+            display = display.chomp("/")
+            files << display
+          end
+          @buffer.next_line
+        end
+      end
+      files
+    end
+  end
+end

data/lib/textbringer/modes/gamegrid_mode.rb

@@ -0,0 +1,46 @@
+module Textbringer
+  class GamegridMode < Mode
+    @syntax_table = {}
+
+    def self.inherited(child)
+      super
+      child.instance_variable_set(:@syntax_table, {})
+    end
+
+    define_keymap :GAMEGRID_MODE_MAP
+    GAMEGRID_MODE_MAP.define_key("q", :gamegrid_quit_command)
+
+    def initialize(buffer)
+      super(buffer)
+      buffer.keymap = GAMEGRID_MODE_MAP
+    end
+
+
+    define_local_command(:gamegrid_init,
+                         doc: "Initialize a gamegrid in the current buffer.") do |width, height, margin_left: 0|
+      grid = Gamegrid.new(width, height, margin_left: margin_left)
+      @buffer[:gamegrid] = grid
+      @buffer.read_only = true
+      @buffer[:highlight_override] = -> { grid.face_map }
+      grid
+    end
+
+    define_local_command(:gamegrid_refresh,
+                         doc: "Refresh the gamegrid display.") do
+      grid = @buffer[:gamegrid]
+      return unless grid
+      @buffer.read_only_edit do
+        @buffer.clear
+        @buffer.insert(grid.render)
+        @buffer.beginning_of_buffer
+      end
+    end
+
+    define_local_command(:gamegrid_quit,
+                         doc: "Quit the current game.") do
+      grid = @buffer[:gamegrid]
+      grid&.stop_timer
+      bury_buffer
+    end
+  end
+end