textbringer 24 → 25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7426dda13275f37439bdcc360a55971b34cc4b62916eeaee734b127ab9a8a88
-  data.tar.gz: fcc6391ac0697659a8b85005766186502731e8473928a5e5165d7c0a97d533f1
+  metadata.gz: 32054ff4c06164a8e49a6d82bde0d32fb2aed2e7fa1c842fa908fbb57abd5a6f
+  data.tar.gz: 7cebf42f75471bce99359f177344d0ce141cf617e9f350ac341a06253d48a4e8
 SHA512:
-  metadata.gz: be219b93c87935b98780c5d41430dd3d0760b839e20977dc843fa88aa8253614fb0e68dc7f90e37c08de6a23722daec928294f9702114908707011c33c766dc6
-  data.tar.gz: 6f61d4ed9ce65308bf150f24c886e05a1743af8bd38913c80f750db77c64a90b543ae95f60774b9d8ae52953cfa91e5f36e62665e0830b9aab6f6d97925ab289
+  metadata.gz: a96f17982fa5b370357fc97bfd5e14617a0af7df230e5ad40071f0b751e82860ea0a01f025f8279aa6f38847d59484f159fa9244ed057f084d537c8f3c5741c7
+  data.tar.gz: 0fd05fb7d8aa16e51550e5276d549547b2023fad1b06aadc278fc41215da145a249fe868f632371811a10ab7680e4e9aa74e4db653665c733f2132a61e58456a

data/exe/txtb

@@ -33,6 +33,7 @@ begin
       transient_mark_mode(true)
       Window.echo_area.clear_message
       Plugin.load_plugins
+      Theme.load_default if Window.has_colors?
       load_user_config("~/.textbringer.rb")
       ruby_mode
       if ARGV.size > 0

data/lib/textbringer/buffer.rb

@@ -9,7 +9,8 @@ module Textbringer
     extend Enumerable
 
     attr_accessor :mode, :keymap
-    attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
+    attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks,
+      :file_version, :version
     attr_reader :current_line, :current_column, :visible_mark, :isearch_mark, :mark_active
     attr_reader :last_match
     attr_reader :input_method
@@ -31,7 +32,7 @@ module Textbringer
     @@auto_detect_encodings = [
       Encoding::UTF_8,
       Encoding::EUC_JP,
-      Encoding::Windows_31J
+      Encoding::WINDOWS_31J
     ]
 
     DEFAULT_DETECT_ENCODING = ->(s) {
@@ -225,6 +226,7 @@ module Textbringer
                    file_encoding: CONFIG[:default_file_encoding],
                    file_mtime: nil, new_file: true, undo_limit: UNDO_LIMIT,
                    read_only: false)
+      @version = 0
       set_contents(s, file_encoding)
       @name = name
       @file_name = file_name
@@ -247,7 +249,7 @@ module Textbringer
       @undoing = false
       @composite_edit_level = 0
       @composite_edit_actions = []
-      @version = 0
+      @file_version = 0
       @modified = false
       @mode = FundamentalMode.new(self)
       @minor_modes = []
@@ -454,7 +456,7 @@ module Textbringer
       if file_name != @file_name
         self.file_name = file_name
       end
-      @version += 1
+      @file_version += 1
       @modified = false
       @new_file = false
       @read_only = false
@@ -605,6 +607,7 @@ module Textbringer
         end
       end
       @point = @gap_start += size
+      @version += 1
       update_line_and_column(pos, @point)
       unless @undoing
         if merge_undo && @undo_stack.last.is_a?(InsertAction)
@@ -645,6 +648,7 @@ module Textbringer
       s = @point
       pos = get_pos(@point, n)
       if n > 0
+        @version += 1
         str = substring(s, pos)
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
         @contents.bytesplice(@gap_end...user_to_gap(pos), "\0" * (pos - @point))
@@ -660,6 +664,7 @@ module Textbringer
         self.modified = true
         Utils.run_hooks(:after_change_functions, s, s, str) unless @undoing || !current?
       elsif n < 0
+        @version += 1
         str = substring(pos, s)
         update_line_and_column(@point, pos)
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
@@ -1014,6 +1019,7 @@ module Textbringer
       update_line_and_column(old_pos, s)
       save_point do
         str = substring(s, e)
+        @version += 1
         @point = s
         adjust_gap
         len = e - s
@@ -1052,6 +1058,7 @@ module Textbringer
 
     def clear
       check_read_only_flag
+      @version += 1
       @contents = String.new
       @point = @gap_start = @gap_end = 0
       @marks.each do |m|
@@ -1309,7 +1316,7 @@ module Textbringer
           @composite_edit_actions.each do |i|
             action.add_action(i)
           end
-          action.version = @composite_edit_actions.first.version
+          action.file_version = @composite_edit_actions.first.file_version
           push_undo(action)
           @composite_edit_actions.clear
         end
@@ -1516,6 +1523,7 @@ module Textbringer
     private
 
     def set_contents(s, enc)
+      @version += 1
       case s.encoding
       when Encoding::UTF_8, Encoding::ASCII_8BIT
         @contents = +s
@@ -1723,7 +1731,7 @@ module Textbringer
     def push_undo(action)
       return if @undoing || @undo_limit == 0
       if !modified?
-        action.version = @version
+        action.file_version = @file_version
       end
       if @composite_edit_level > 0
         @composite_edit_actions.push(action)
@@ -1746,11 +1754,11 @@ module Textbringer
       begin
         was_modified = @modified
         action.send(op)
-        if action.version == @version
+        if action.file_version == @file_version
           @modified = false
-          action.version = nil
+          action.file_version = nil
         elsif !was_modified
-          action.version = @version
+          action.file_version = @file_version
         end
         to_stack.push(action)
       ensure
@@ -1824,11 +1832,11 @@ module Textbringer
   KILL_RING = Ring.new
 
   class UndoableAction
-    attr_accessor :version
+    attr_accessor :file_version
     attr_reader :location
 
     def initialize(buffer, location)
-      @version = nil
+      @file_version = nil
       @buffer = buffer
       @location = location
     end

data/lib/textbringer/commands/misc.rb

@@ -376,5 +376,24 @@ module Textbringer
         describe_char
       end
     end
+    define_command(:load_theme,
+                   doc: "Load and activate a theme by name.") do
+      |name = read_theme_name("Load theme: ")|
+      Theme.load(name)
+      Window.redisplay
+      message("Loaded theme: #{name}")
+    end
+
+    def read_theme_name(prompt)
+      builtin = Dir.glob(
+        File.expand_path("../../themes/*.rb", __FILE__)
+      ).map { |f| File.basename(f, ".rb") }
+      user = Dir.glob(
+        File.expand_path("~/.textbringer/themes/*.rb")
+      ).map { |f| File.basename(f, ".rb") }
+      names = (builtin + user).uniq.sort
+      f = ->(s) { complete_for_minibuffer(s, names) }
+      read_from_minibuffer(prompt, completion_proc: f)
+    end
   end
 end

data/lib/textbringer/commands/windows.rb

@@ -84,6 +84,20 @@ module Textbringer
       end
     end
 
+    define_command(:set_foreground_color, doc: <<~EOD) do
+        Set the default foreground color.
+      EOD
+      |color = read_from_minibuffer("Foreground color: ")|
+      Window.set_default_colors(color, nil)
+    end
+
+    define_command(:set_background_color, doc: <<~EOD) do
+        Set the default background color.
+      EOD
+      |color = read_from_minibuffer("Background color: ")|
+      Window.set_default_colors(nil, color)
+    end
+
     define_command(:list_buffers, doc: <<~EOD) do |buffers = Buffer.list|
         List the existing buffers.
       EOD

data/lib/textbringer/config.rb

@@ -18,6 +18,7 @@ module Textbringer
     ispell_command: "aspell -a",
     fill_column: 70,
     read_file_name_completion_ignore_case: RUBY_PLATFORM.match?(/darwin/),
-    default_input_method: "t_code"
+    default_input_method: "t_code",
+    background_mode: nil
   }
 end

data/lib/textbringer/face.rb

@@ -6,6 +6,7 @@ module Textbringer
 
     @@face_table = {}
     @@next_color_pair = 1
+    @@color_pair_cache = {}
 
     def self.[](name)
       @@face_table[name]
@@ -17,6 +18,8 @@ module Textbringer
       else
         @@face_table[name] = new(name, **opts)
       end
+      resolve_dependents(name)
+      @@face_table[name]
     end
 
     def self.delete(name)
@@ -25,26 +28,79 @@ module Textbringer
 
     def initialize(name, **opts)
       @name = name
-      @color_pair = @@next_color_pair
-      @@next_color_pair += 1
       update(**opts)
     end
 
-    def update(foreground: -1, background: -1,
-               bold: false, underline: false, reverse: false)
-      @foreground = foreground
-      @background = background
-      @bold = bold
-      @underline = underline
-      @reverse = reverse
-      Curses.init_pair(@color_pair,
-                       Color[foreground], Color[background])
+    UNSET = Object.new.freeze
+    private_constant :UNSET
+
+    def update(foreground: nil, background: nil,
+               bold: nil, underline: nil, reverse: nil,
+               inherit: UNSET)
+      unless inherit.equal?(UNSET)
+        if inherit && !inherit.is_a?(Symbol)
+          raise EditorError,
+                "Face inherit: must be a Symbol, got #{inherit.inspect}"
+        end
+        if inherit && cyclic_inheritance?(@name, inherit)
+          raise EditorError,
+                "Cyclic face inheritance: #{@name} inherits from #{inherit}"
+        end
+        @inherit = inherit
+      end
+      @explicit_foreground = foreground
+      @explicit_background = background
+      @explicit_bold = bold
+      @explicit_underline = underline
+      @explicit_reverse = reverse
+      resolve_inheritance
+      self
+    end
+
+    private
+
+    def resolve_inheritance
+      parent = @inherit ? self.class[@inherit] : nil
+      @foreground = @explicit_foreground || parent&.instance_variable_get(:@foreground) || -1
+      @background = @explicit_background || parent&.instance_variable_get(:@background) || -1
+      @bold = @explicit_bold.nil? ? (parent&.instance_variable_get(:@bold) || false) : @explicit_bold
+      @underline = @explicit_underline.nil? ? (parent&.instance_variable_get(:@underline) || false) : @explicit_underline
+      @reverse = @explicit_reverse.nil? ? (parent&.instance_variable_get(:@reverse) || false) : @explicit_reverse
+      fg_num = Color[@foreground]
+      bg_num = Color[@background]
+      key = [fg_num, bg_num]
+      unless @@color_pair_cache.key?(key)
+        @@color_pair_cache[key] = @@next_color_pair
+        Curses.init_pair(@@next_color_pair, fg_num, bg_num)
+        @@next_color_pair += 1
+      end
+      @color_pair = @@color_pair_cache[key]
       @text_attrs = 0
-      @text_attrs |= Curses::A_BOLD if bold
-      @text_attrs |= Curses::A_UNDERLINE if underline
-      @text_attrs |= Curses::A_REVERSE if reverse
+      @text_attrs |= Curses::A_BOLD if @bold
+      @text_attrs |= Curses::A_UNDERLINE if @underline
+      @text_attrs |= Curses::A_REVERSE if @reverse
       @attributes = Curses.color_pair(@color_pair) | @text_attrs
-      self
     end
+
+    def cyclic_inheritance?(name, inherit)
+      current = inherit
+      while current
+        return true if current == name
+        face = self.class[current]
+        current = face&.instance_variable_get(:@inherit)
+      end
+      false
+    end
+
+    def self.resolve_dependents(name, visited = {})
+      visited[name] = true
+      @@face_table.each_value do |face|
+        if face.instance_variable_get(:@inherit) == name
+          face.send(:resolve_inheritance)
+          resolve_dependents(face.name, visited) unless visited.key?(face.name)
+        end
+      end
+    end
+    private_class_method :resolve_dependents
   end
 end

data/lib/textbringer/gamegrid.rb

@@ -63,9 +63,7 @@ module Textbringer
       }.join("\n")
     end
 
-    def face_map
-      highlight_on = {}
-      highlight_off = {}
+    def apply_highlights(ctx)
       offset = 0
       @height.times do |y|
         offset += @margin_left
@@ -80,16 +78,14 @@ module Textbringer
           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
+              ctx.highlight(offset, offset + char_len, face)
             end
           end
           offset += cell_char(value).bytesize
         end
         offset += 1  # newline
       end
-      [highlight_on, highlight_off]
     end
 
     # Timer

data/lib/textbringer/highlight_context.rb

@@ -0,0 +1,21 @@
+module Textbringer
+  class HighlightContext
+    attr_reader :buffer, :highlight_start, :highlight_end
+
+    def initialize(buffer:, highlight_start:, highlight_end:,
+                   highlight_on:, highlight_off:)
+      @buffer = buffer
+      @highlight_start = highlight_start
+      @highlight_end = highlight_end
+      @highlight_on = highlight_on
+      @highlight_off = highlight_off
+    end
+
+    def highlight(start_offset, end_offset, face)
+      start_offset = @highlight_start if start_offset < @highlight_start &&
+        @highlight_start < end_offset
+      @highlight_on[start_offset] = face
+      @highlight_off[end_offset] = true
+    end
+  end
+end

data/lib/textbringer/mode.rb

@@ -81,5 +81,30 @@ module Textbringer
     def syntax_table
       self.class.syntax_table
     end
+
+    def highlight(ctx)
+      syntax_table = self.class.syntax_table || DEFAULT_SYNTAX_TABLE
+      if ctx.buffer.bytesize < CONFIG[:highlight_buffer_size_limit]
+        base_pos = ctx.buffer.point_min
+        s = ctx.buffer.to_s
+      else
+        base_pos = ctx.highlight_start
+        s = ctx.buffer.substring(ctx.highlight_start,
+              ctx.highlight_end).scrub("")
+      end
+      return if !s.valid_encoding?
+      re_str = syntax_table.map { |name, re|
+        "(?<#{name}>#{re})"
+      }.join("|")
+      re = Regexp.new(re_str)
+      names = syntax_table.keys
+      s.scan(re) do
+        b = base_pos + $`.bytesize
+        e = b + $&.bytesize
+        name = names.find { |n| $~[n] }
+        face = Face[name]
+        ctx.highlight(b, e, face) if face
+      end
+    end
   end
 end

data/lib/textbringer/modes/gamegrid_mode.rb

@@ -21,10 +21,15 @@ module Textbringer
       grid = Gamegrid.new(width, height, margin_left: margin_left)
       @buffer[:gamegrid] = grid
       @buffer.read_only = true
-      @buffer[:highlight_override] = -> { grid.face_map }
       grid
     end
 
+    def highlight(ctx)
+      grid = @buffer[:gamegrid]
+      return unless grid
+      grid.apply_highlights(ctx)
+    end
+
     define_local_command(:gamegrid_refresh,
                          doc: "Refresh the gamegrid display.") do
       grid = @buffer[:gamegrid]