textbringer 25 → 27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32054ff4c06164a8e49a6d82bde0d32fb2aed2e7fa1c842fa908fbb57abd5a6f
-  data.tar.gz: 7cebf42f75471bce99359f177344d0ce141cf617e9f350ac341a06253d48a4e8
+  metadata.gz: be4c934800d0492229b1476d4541825533ff3e824490ad23ef331926ee8d6492
+  data.tar.gz: 9157e0ba963f1dd77eab7a50f929c91b1ae6a7689c1ad41cda22876c32d6c0fb
 SHA512:
-  metadata.gz: a96f17982fa5b370357fc97bfd5e14617a0af7df230e5ad40071f0b751e82860ea0a01f025f8279aa6f38847d59484f159fa9244ed057f084d537c8f3c5741c7
-  data.tar.gz: 0fd05fb7d8aa16e51550e5276d549547b2023fad1b06aadc278fc41215da145a249fe868f632371811a10ab7680e4e9aa74e4db653665c733f2132a61e58456a
+  metadata.gz: 3f70f40322ad8fed8ef2044839e3df7fee67922b1cfe975283516cf3a10fac6566248d0a5fbcc98ef319155302105c0c37d9f30fa602f6a3b3b2069dbf5a1314
+  data.tar.gz: 6348a9ecddb8423d4fb07b8291dcda1ce7945cf049e997770347deb309ad8c3a507bfb6815a5db2c7f277677680c4023793cf9fd221ea96bd4ed60e5863e68e6

data/README.ja.md

@@ -58,6 +58,14 @@ Textbringerが依存するcurses.gemをインストールする前に、ncursesw
     mod_meta_key = alt
     mod_meta_mode = esc
 
+### True color (24ビットカラー)
+
+端末エミュレータがtrue colorに対応している場合、`TERM`に`xterm-direct`を設定すると24ビットカラーが有効になります。
+
+    $ TERM=xterm-direct txtb
+
+テーマで指定されたhex色が256色パレットに近似されず、そのまま表示されるようになります。
+
 ### 東アジアの曖昧な文字幅
 
 [曖昧な文字](http://unicode.org/reports/tr11/#Ambiguous)を全角扱いするには、以下の設定を~/.textbringer.rbに記述してください。
@@ -91,6 +99,22 @@ xterm、 mlterm、screenにはそれぞれ独自の設定項目があります
 
     cjkwidth on
 
+## テーマ
+
+`Alt+x load_theme RET` で[textbringer/themes](lib/textbringer/themes)または~/.textbringer/themes内のテーマを読み込むことができます。
+
+~/.textbringer.rbでテーマを設定することもできます。
+
+```ruby
+load_theme "catppuccin"
+```
+
+テーマが独自の背景色を設定している場合に、端末のデフォルト背景色を使いたいときは`load_theme`の後に以下を追加してください。
+
+```ruby
+set_background_color "default"
+```
+
 ## プラグイン
 
 * [Mournmail](https://github.com/shugo/mournmail): 電子メールクライアント

data/README.md

@@ -31,6 +31,10 @@ Install ncursesw before installing curses.gem, on which textbringer depends.
     $ sudo apt-get install libncursesw5-dev
     $ gem install curses
 
+You need ffi to use clipboard commands on Windows.
+
+    $ gem install ffi
+
 ## Usage
 
     $ txtb
@@ -60,6 +64,14 @@ Add the following lines to ~/.mlterm/main.
     mod_meta_key = alt
     mod_meta_mode = esc
 
+### True color (24-bit color)
+
+If your terminal emulator supports true color, set `TERM` to `xterm-direct` to enable 24-bit color.
+
+    $ TERM=xterm-direct txtb
+
+This allows themes to display their exact hex colors instead of approximating to the 256-color palette.
+
 ### East asian ambiguous width
 
 Add the following line to ~/.textbringer.rb to treat
@@ -103,6 +115,22 @@ Add the following line to ~/.screenrc.
 * [textbringer-presentation](https://github.com/shugo/textbringer-presentation): a presentation tool
 * [textbringer-ghost_text](https://github.com/shugo/textbringer-ghost_text): a [GhostText](https://github.com/fregante/GhostText) plugin
 
+## Themes
+
+Type `Alt+x load_theme RET` to load a theme from [textbringer/themes](lib/textbringer/themes) or ~/.textbringer/themes.
+
+Themes can also be loaded in ~/.textbringer.rb.
+
+```ruby
+load_theme "catppuccin"
+```
+
+If a theme sets its own background color but you prefer to use the terminal's default background, add the following after `load_theme`:
+
+```ruby
+set_background_color "default"
+```
+
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/textbringer/color.rb

@@ -22,6 +22,30 @@ module Textbringer
       "brightwhite" => 15
     }
 
+    DIRECT_COLOR_THRESHOLD = 256 * 256 * 256
+
+    # Canonical RGB values for basic ANSI colors (xterm defaults),
+    # packed as 0xRRGGBB for use in direct color mode.
+    BASIC_COLORS_RGB = {
+      "default"       => -1,
+      "black"         => 0x000000,
+      "red"           => 0xCD0000,
+      "green"         => 0x00CD00,
+      "yellow"        => 0xCDCD00,
+      "blue"          => 0x0000EE,
+      "magenta"       => 0xCD00CD,
+      "cyan"          => 0x00CDCD,
+      "white"         => 0xE5E5E5,
+      "brightblack"   => 0x7F7F7F,
+      "brightred"     => 0xFF0000,
+      "brightgreen"   => 0x00FF00,
+      "brightyellow"  => 0xFFFF00,
+      "brightblue"    => 0x5C5CFF,
+      "brightmagenta" => 0xFF00FF,
+      "brightcyan"    => 0x00FFFF,
+      "brightwhite"   => 0xFFFFFF
+    }
+
     RGBColor = Struct.new(:r, :g, :b, :number)
 
     ADDITIONAL_COLORS = []
@@ -46,10 +70,17 @@ module Textbringer
       end
     end
 
+    def self.direct_color?
+      Window.colors >= DIRECT_COLOR_THRESHOLD
+    end
+
     def self.find_color_number(name)
       if name.is_a?(Integer)
         return name
       end
+      if direct_color?
+        return find_direct_color(name)
+      end
       case name
       when /\A\#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})\z/
         r = $1.to_i(16)
@@ -65,5 +96,20 @@ module Textbringer
         BASIC_COLORS[name]
       end
     end
+
+    def self.find_direct_color(name)
+      case name
+      when /\A\#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})\z/
+        r = $1.to_i(16)
+        g = $2.to_i(16)
+        b = $3.to_i(16)
+        (r << 16) | (g << 8) | b
+      else
+        unless BASIC_COLORS_RGB.key?(name)
+          raise EditorError, "No such color: #{name}"
+        end
+        BASIC_COLORS_RGB[name]
+      end
+    end
   end
 end

data/lib/textbringer/commands/clipboard.rb

@@ -2,12 +2,15 @@ module Clipboard
   @implementation = nil
 end
 
-require "clipboard"
-
 module Textbringer
   module Commands
-    CLIPBOARD_AVAILABLE =
-      Clipboard.implementation.name != "Clipboard::File"
+    begin
+      require "clipboard"
+      CLIPBOARD_AVAILABLE =
+        Clipboard.implementation.name != "Clipboard::File"
+    rescue LoadError
+      CLIPBOARD_AVAILABLE = false
+    end
 
     if CLIPBOARD_AVAILABLE
       GLOBAL_MAP.define_key("\M-w", :clipboard_copy_region)

data/lib/textbringer/commands/misc.rb

@@ -291,46 +291,48 @@ module Textbringer
         if CONFIG[:shell_file_name]
           cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
         end
-        Open3.popen3(*cmd, opts) do |input, output, error, wait_thread|
-          input.close
-          catch(:finish) do
-            loop do
-              rs, = IO.select([output, error], nil, nil, 0.5)
-              Window.redisplay
-              rs&.each do |r|
-                begin
-                  s = r.read_nonblock(1024).force_encoding("utf-8").
-                    scrub("\u{3013}").gsub(/\r\n/, "\n")
-                  buffer.insert(s)
-                  Window.redisplay
-                rescue EOFError
-                  throw(:finish) if output.eof? && error.eof?
-                rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-                  Window.redisplay
-                  next
+        with_clean_env do |env|
+          Open3.popen3(env, *cmd, opts) do |input, output, error, wait_thread|
+            input.close
+            catch(:finish) do
+              loop do
+                rs, = IO.select([output, error], nil, nil, 0.5)
+                Window.redisplay
+                rs&.each do |r|
+                  begin
+                    s = r.read_nonblock(1024).force_encoding("utf-8").
+                      scrub("\u{3013}").gsub(/\r\n/, "\n")
+                    buffer.insert(s)
+                    Window.redisplay
+                  rescue EOFError
+                    throw(:finish) if output.eof? && error.eof?
+                  rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+                    Window.redisplay
+                    next
+                  end
                 end
-              end
-              if received_keyboard_quit?
-                if signals.empty?
-                  keyboard_quit
-                else
-                  sig = signals.shift
-                  pid = wait_thread.pid
-                  pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
-                  message("Send #{sig} to #{pid}")
-                  Process.kill(sig, pid)
+                if received_keyboard_quit?
+                  if signals.empty?
+                    keyboard_quit
+                  else
+                    sig = signals.shift
+                    pid = wait_thread.pid
+                    pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
+                    message("Send #{sig} to #{pid}")
+                    Process.kill(sig, pid)
+                  end
                 end
               end
             end
-          end
-          status = wait_thread.value
-          pid = status.pid
-          if status.exited?
-            code = status.exitstatus
-            message("Process #{pid} exited with status code #{code}")
-          elsif status.signaled?
-            signame = Signal.signame(status.termsig)
-            message("Process #{pid} was killed by #{signame}")
+            status = wait_thread.value
+            pid = status.pid
+            if status.exited?
+              code = status.exitstatus
+              message("Process #{pid} exited with status code #{code}")
+            elsif status.signaled?
+              signame = Signal.signame(status.termsig)
+              message("Process #{pid} was killed by #{signame}")
+            end
           end
         end
       ensure
@@ -352,6 +354,36 @@ module Textbringer
       RubyVM::MJIT.resume
     end
 
+    define_command(:forward_page,
+                   doc: "Move forward to page boundary.") do
+      |n = number_prefix_arg|
+      buffer = Buffer.current
+      n.times do
+        unless buffer.re_search_forward(/^\f/, raise_error: false)
+          buffer.end_of_buffer
+          break
+        end
+      end
+    end
+
+    define_command(:backward_page,
+                   doc: "Move backward to page boundary.") do
+      |n = number_prefix_arg|
+      buffer = Buffer.current
+      n.times do
+        if buffer.point == 0
+          break
+        end
+        buffer.backward_char
+        if buffer.re_search_backward(/^\f/, raise_error: false)
+          buffer.forward_char
+        else
+          buffer.beginning_of_buffer
+          break
+        end
+      end
+    end
+
     define_command(:what_cursor_position,
                    doc: "Print info on cursor position.") do
       |arg = current_prefix_arg|

data/lib/textbringer/face.rb

@@ -7,6 +7,8 @@ module Textbringer
     @@face_table = {}
     @@next_color_pair = 1
     @@color_pair_cache = {}
+    @@default_foreground = -1
+    @@default_background = -1
 
     def self.[](name)
       @@face_table[name]
@@ -26,6 +28,20 @@ module Textbringer
       @@face_table.delete(name)
     end
 
+    # Set the concrete color numbers substituted for -1 (default color).
+    # PDCurses resolves -1 when init_pair is called and
+    # assume_default_colors only affects color pair 0, so faces must be
+    # re-resolved with concrete colors to get the new default colors.
+    def self.set_default_color_numbers(fg_num, bg_num)
+      return if fg_num == @@default_foreground &&
+        bg_num == @@default_background
+      @@default_foreground = fg_num
+      @@default_background = bg_num
+      @@face_table.each_value do |face|
+        face.send(:resolve_inheritance)
+      end
+    end
+
     def initialize(name, **opts)
       @name = name
       update(**opts)
@@ -68,6 +84,8 @@ module Textbringer
       @reverse = @explicit_reverse.nil? ? (parent&.instance_variable_get(:@reverse) || false) : @explicit_reverse
       fg_num = Color[@foreground]
       bg_num = Color[@background]
+      fg_num = @@default_foreground if fg_num == -1
+      bg_num = @@default_background if bg_num == -1
       key = [fg_num, bg_num]
       unless @@color_pair_cache.key?(key)
         @@color_pair_cache[key] = @@next_color_pair

data/lib/textbringer/input_methods/skk_input_method.rb

@@ -307,7 +307,7 @@ module Textbringer
       when "x"
         prev_candidate
         nil
-      when "\C-m", "\r", "\n"
+      when "\r", "\n"
         confirm_selecting
         nil
       else

data/lib/textbringer/keymap.rb

@@ -167,6 +167,8 @@ module Textbringer
   GLOBAL_MAP.define_key(:npage, :scroll_up)
   GLOBAL_MAP.define_key("\M-v", :scroll_down)
   GLOBAL_MAP.define_key(:ppage, :scroll_down)
+  GLOBAL_MAP.define_key("\C-x]", :forward_page)
+  GLOBAL_MAP.define_key("\C-x[", :backward_page)
   GLOBAL_MAP.define_key("\C-x0", :delete_window)
   GLOBAL_MAP.define_key("\C-x1", :delete_other_windows)
   GLOBAL_MAP.define_key("\C-x2", :split_window)

data/lib/textbringer/modes/dired_mode.rb

@@ -188,7 +188,6 @@ module Textbringer
                          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 == ".."

data/lib/textbringer/modes/ruby_mode.rb

@@ -8,7 +8,7 @@ module Textbringer
   class RubyMode < ProgrammingMode
     self.file_name_pattern =
       /\A(?:.*\.(?:rb|ru|rake|thor|jbuilder|gemspec|podspec)|
-            (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/ix
+            (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file|.irbrc)\z/ix
     self.interpreter_name_pattern = /ruby/i
 
     def comment_start
@@ -22,18 +22,13 @@ module Textbringer
       @prism_version = nil
       @prism_tokens = nil
       @prism_ast = nil
-      @prism_method_call_locs = nil
+      @prism_method_name_locs = nil
       @literal_levels = nil
       @literal_levels_version = nil
     end
 
     def forward_definition(n = number_prefix_arg || 1)
-      ensure_prism_tokens
-      tokens = @prism_tokens.filter_map { |token, _state|
-        type = token.type
-        next if type == :EOF
-        [token.location.start_line, type]
-      }
+      tokens = filter_prism_tokens_line_and_type
       @buffer.forward_line
       n.times do |i|
         tokens = tokens.drop_while { |l, type|
@@ -54,12 +49,7 @@ module Textbringer
     end
 
     def backward_definition(n = number_prefix_arg || 1)
-      ensure_prism_tokens
-      tokens = @prism_tokens.filter_map { |token, _state|
-        type = token.type
-        next if type == :EOF
-        [token.location.start_line, type]
-      }.reverse
+      tokens = filter_prism_tokens_line_and_type.reverse
       @buffer.beginning_of_line
       n.times do |i|
         tokens = tokens.drop_while { |l, type|
@@ -120,12 +110,11 @@ module Textbringer
     def highlight(ctx)
       ensure_prism_tokens
       return unless @prism_tokens
-      ensure_method_call_locs
+      ensure_method_name_locs
       base_pos = ctx.buffer.point_min
       hl_start = ctx.highlight_start
       hl_end = ctx.highlight_end
       in_symbol = false
-      after_def = false
       after_class_or_module = false
       @prism_tokens.each do |token_info|
         token = token_info[0]
@@ -139,26 +128,18 @@ module Textbringer
           face_name = PRISM_TOKEN_FACES[type]
           if in_symbol
             face_name = :string if face_name.nil? || face_name == :constant ||
-              face_name == :operator
-          elsif after_def
-            face_name = :function_name if type == :IDENTIFIER ||
-              type == :CONSTANT || type == :METHOD_NAME ||
-              PRISM_TOKEN_FACES[type] == :operator
+              face_name == :keyword || face_name == :operator
+          elsif @prism_method_name_locs.key?(offset)
+            face_name = :function_name
           elsif face_name == :constant &&
               (after_class_or_module || token.location.slice.match?(/\p{Lower}/))
             face_name = :type
-          elsif @prism_method_call_locs.key?(offset)
-            face_name = :function_name
           end
           if face_name && (face = Face[face_name])
             ctx.highlight(pos, pos_end, face)
           end
         end
         in_symbol = type == :SYMBOL_BEGIN
-        after_def = type == :KEYWORD_DEF ||
-          (after_def && (type == :KEYWORD_SELF || type == :DOT ||
-                         type == :NEWLINE || type == :IGNORED_NEWLINE ||
-                         type == :COMMENT))
         after_class_or_module = (type == :KEYWORD_CLASS || type == :KEYWORD_MODULE) ||
           (after_class_or_module && !(type == :NEWLINE || type == :SEMICOLON))
       end
@@ -199,6 +180,9 @@ module Textbringer
       # Strings and string-like
       STRING_BEGIN: :string, STRING_CONTENT: :string, STRING_END: :string,
       SYMBOL_BEGIN: :string, REGEXP_BEGIN: :string, REGEXP_END: :string,
+      PERCENT_LOWER_I: :string, PERCENT_UPPER_I: :string,
+      PERCENT_LOWER_W: :string, PERCENT_UPPER_W: :string,
+      PERCENT_LOWER_X: :string,
       HEREDOC_START: :string, HEREDOC_END: :string,
       LABEL: :property,
 
@@ -273,6 +257,8 @@ module Textbringer
       EQUAL_GREATER
     ].to_set
 
+    OPERATORS = %i(!= !~ =~ == === <=> > >= < <= & | ^ >> << - + % / * ** -@ +@ ~ ! [] []=)
+
     BLOCK_END = {
       EMBEXPR_BEGIN: :EMBEXPR_END,
       BRACE_LEFT: :BRACE_RIGHT,
@@ -489,6 +475,15 @@ module Textbringer
       @literal_levels[i][1] > 0
     end
 
+    def filter_prism_tokens_line_and_type
+      ensure_prism_tokens
+      @prism_tokens.filter_map { |token, _state|
+        type = token.type
+        next if type == :EOF
+        [token.location.start_line, type]
+      }
+    end
+
     def ensure_prism_tokens
       return if @prism_version == @buffer.version
       source = @buffer.to_s
@@ -499,27 +494,41 @@ module Textbringer
         @prism_ast = nil
         @prism_tokens = []
       end
-      @prism_method_call_locs = nil
+      @prism_method_name_locs = nil
       @prism_version = @buffer.version
       @literal_levels_version = nil
     end
 
-    def ensure_method_call_locs
-      return if @prism_method_call_locs
-      @prism_method_call_locs = {}
+    def ensure_method_name_locs
+      return if @prism_method_name_locs
+      @prism_method_name_locs = {}
       return unless @prism_ast
-      collect_method_call_locs(@prism_ast)
+      collect_method_name_locs(@prism_ast)
     end
 
-    def collect_method_call_locs(node)
-      if node.is_a?(Prism::CallNode) && node.message_loc
-        name_str = node.name.to_s
-        unless name_str.match?(/\A[^a-zA-Z_]/) || name_str.end_with?("@")
-          loc = node.message_loc
-          @prism_method_call_locs[loc.start_offset] = true
-        end
+    def collect_method_name_locs(node)
+      if node.type == :def_node
+        @prism_method_name_locs[node.name_loc.start_offset] = true
+      elsif node.type == :alias_method_node
+        add_alias_method_name_locs(node.new_name)
+        add_alias_method_name_locs(node.old_name)
+      elsif ((node.type == :call_node &&
+              !(node.call_operator_loc.nil? && OPERATORS.include?(node.name)) &&          # exclude operators
+              !((node.call_operator_loc.nil? || node.call_operator_loc.slice == "::") &&  # exclude constants
+                /\A\p{Upper}/.match?(node.name))) ||
+             node.type == :call_operator_write_node ||
+             node.type == :call_and_write_node ||
+             node.type == :call_or_write_node) &&
+          node.message_loc
+        @prism_method_name_locs[node.message_loc.start_offset] = true
+      end
+      node.compact_child_nodes.each { |child| collect_method_name_locs(child) }
+    end
+
+    def add_alias_method_name_locs(node)
+      if node.type == :symbol_node && node.opening_loc.nil?
+        @prism_method_name_locs[node.value_loc.start_offset] = true
       end
-      node.compact_child_nodes.each { |child| collect_method_call_locs(child) }
     end
 
     def ensure_literal_levels