textbringer 16 → 18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b838b91740f3985ebcdc6987e72ea7fe9daa28ad0b273a6f6e0f309818778a6
-  data.tar.gz: 51a55425c1cdaefb69b74451c3c9091f85138549a27a60e8ebb23161b4530847
+  metadata.gz: 6880825c5cf726a2e49e28052cb09c0e8f0a15eadbf98b38e8806e6b486b9475
+  data.tar.gz: 79cef469e62da96630672057fda32b69ccdd349f76df36821f45a71be7e552d5
 SHA512:
-  metadata.gz: 128afb2fe777b9847ace11badce3121391576a98b7caba7f5bdb93faf4383e00b15db4ae23e263e8f1a26fc79ef1b3fa5b12d02e6ae8b590533088c680ef3532
-  data.tar.gz: 4e082735768a0d2647abf67ca9c7a5268ba6607fe59462de26dff2e59caca272c68224e061791cad58d6f81648bb17c9031b880361a56ce93912b3e27c487457
+  metadata.gz: 868b9d1cce93bf0dc1dabdb4e59c0dd775210c700b794b7093bfedb82d95d7d9e82191fc1d05daa9342e282d151567aa4d0d85a93f489ced5165e7d537d1e102
+  data.tar.gz: afad73fc5062774e6aa9b4d7cfa175be24f2dc25c9345218359ddce61f0049dcd7059709fe72c52c71d15d5625393a46987d0df04a36dbdc19d3855df02a8dab

data/lib/textbringer/buffer.rb

@@ -10,7 +10,7 @@ module Textbringer
 
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
-    attr_reader :current_line, :current_column, :visible_mark, :mark_active
+    attr_reader :current_line, :current_column, :visible_mark, :isearch_mark, :mark_active
     attr_reader :last_match
     attr_reader :input_method
 
@@ -254,6 +254,7 @@ module Textbringer
       @save_point_level = 0
       @match_offsets = []
       @visible_mark = nil
+      @isearch_mark = nil
       @mark_active = false
       @read_only = read_only
       @callbacks = {}
@@ -948,6 +949,18 @@ module Textbringer
       end
     end
 
+    def set_isearch_mark(pos = @point)
+      @isearch_mark ||= new_mark
+      @isearch_mark.location = pos
+    end
+
+    def delete_isearch_mark
+      if @isearch_mark
+        @isearch_mark.delete
+        @isearch_mark = nil
+      end
+    end
+
     def activate_mark
       @mark_active = true
       set_visible_mark(@mark.location) if @mark

data/lib/textbringer/commands/buffers.rb

@@ -96,7 +96,8 @@ module Textbringer
       buffer = Buffer.current
       buffer.exchange_point_and_mark
       # Activate mark if transient mark mode is enabled
-      if TransientMarkMode.enabled?
+      if TransientMarkMode.enabled? &&
+          Controller.current.this_command == :exchange_point_and_mark
         buffer.activate_mark
       end
     end
@@ -153,7 +154,8 @@ module Textbringer
       else
         buffer.push_mark
         # Activate mark if transient mark mode is enabled
-        if TransientMarkMode.enabled?
+        if TransientMarkMode.enabled? &&
+            Controller.current.this_command == :set_mark_command
           buffer.activate_mark
         end
         message("Mark set")

data/lib/textbringer/commands/isearch.rb

@@ -77,10 +77,7 @@ module Textbringer
     end
 
     def isearch_done
-      # Don't delete visible_mark if mark is active (transient mark mode)
-      unless Buffer.current.mark_active?
-        Buffer.current.delete_visible_mark
-      end
+      Buffer.current.delete_isearch_mark
       Controller.current.overriding_map = nil
       remove_hook(:pre_command_hook, :isearch_pre_command_hook)
       ISEARCH_STATUS[:last_string] = ISEARCH_STATUS[:string]
@@ -94,7 +91,7 @@ module Textbringer
     end
 
     define_command(:isearch_abort, doc: "Abort incremental search.") do
-      goto_char(Buffer.current[:isearch_start])
+      goto_char(ISEARCH_STATUS[:start])
       isearch_done
       raise Quit
     end
@@ -157,11 +154,8 @@ module Textbringer
         if Buffer.current != Buffer.minibuffer
           message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
         end
-        # Don't update visible_mark if mark is already active (transient mark mode)
-        unless Buffer.current.mark_active?
-          Buffer.current.set_visible_mark(forward ? match_beginning(0) :
-                                          match_end(0))
-        end
+        Buffer.current.set_isearch_mark(forward ? match_beginning(0) :
+                                        match_end(0))
         goto_char(forward ? match_end(0) : match_beginning(0))
       else
         if Buffer.current != Buffer.minibuffer

data/lib/textbringer/faces/basic.rb

@@ -2,4 +2,6 @@ module Textbringer
   Face.define :mode_line, reverse: true
   Face.define :link, foreground: "blue", bold: true
   Face.define :control
+  Face.define :region, background: "blue", foreground: "white"
+  Face.define :isearch, background: "yellow", foreground: "black"
 end

data/lib/textbringer/modes/transient_mark_mode.rb

@@ -28,6 +28,10 @@ module Textbringer
       :isearch_repeat_forward,
       :isearch_repeat_backward,
       :isearch_printing_char,
+      :isearch_delete_char,
+      :isearch_yank_word_or_char,
+      :isearch_quoted_insert,
+      :isearch_exit,
       # Undo/redo
       :undo,
       :redo_command,

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "16"
+  VERSION = "18"
 end

data/lib/textbringer/window.rb

@@ -236,6 +236,9 @@ module Textbringer
       @raw_key_buffer = []
       @key_buffer = []
       @cursor = Cursor.new(0, 0)
+      @in_region = false
+      @in_isearch = false
+      @current_highlight_attrs = 0
     end
 
     def echo_area?
@@ -405,23 +408,54 @@ module Textbringer
         @window.erase
         @window.setpos(0, 0)
         @window.attrset(0)
+        @in_region = false
+        @in_isearch = false
+        @current_highlight_attrs = 0
         if current? && @buffer.visible_mark &&
            @buffer.point_after_mark?(@buffer.visible_mark)
-          @window.attron(Curses::A_REVERSE)
+          @window.attron(region_attr)
+          @in_region = true
+        end
+        if current? && @buffer.isearch_mark &&
+           @buffer.point_after_mark?(@buffer.isearch_mark)
+          # If already in region, switch to isearch (priority)
+          if @in_region
+            @window.attroff(region_attr)
+          end
+          @window.attron(isearch_attr)
+          @in_isearch = true
         end
         while !@buffer.end_of_buffer?
           cury = @window.cury
           curx = @window.curx
           update_cursor_and_attr(point, cury, curx)
           if attrs = @highlight_off[@buffer.point]
-            @window.attroff(attrs)
+            if @in_region || @in_isearch
+              # In region: only turn off non-color attributes (bold, underline, etc.)
+              @window.attroff(attrs & ~Curses::A_COLOR)
+            else
+              @window.attroff(attrs)
+            end
+            @current_highlight_attrs = 0
           end
           if attrs = @highlight_on[@buffer.point]
-            @window.attron(attrs)
+            if @in_region || @in_isearch
+              # In region: only turn on non-color attributes (preserve region background)
+              @window.attron(attrs & ~Curses::A_COLOR)
+            else
+              @window.attron(attrs)
+            end
+            @current_highlight_attrs = attrs
           end
           c = @buffer.char_after
           if c == "\n"
-            @window.clrtoeol
+            # Fill to end of line with region background if in region
+            if @in_region
+              remaining = columns - curx
+              @window.addstr(" " * remaining) if remaining > 0
+            else
+              @window.clrtoeol
+            end
             break if cury == lines - 2   # lines include mode line
             @window.setpos(cury + 1, 0)
             @buffer.forward_char
@@ -441,7 +475,13 @@ module Textbringer
               if cury == lines - 2
                 break
               else
-                @window.clrtoeol
+                # Fill to end of line with region background if in region
+                if @in_region
+                  remaining = columns - curx
+                  @window.addstr(" " * remaining) if remaining > 0
+                else
+                  @window.clrtoeol
+                end
                 @window.setpos(cury + 1, 0)
               end
             end
@@ -450,8 +490,11 @@ module Textbringer
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
+        if current? && @buffer.isearch_mark
+          @window.attroff(isearch_attr)
+        end
         if current? && @buffer.visible_mark
-          @window.attroff(Curses::A_REVERSE)
+          @window.attroff(region_attr)
         end
         @buffer.mark_to_point(@bottom_of_window)
         if @buffer.point_at_mark?(point)
@@ -679,20 +722,83 @@ module Textbringer
       if @buffer.point_at_mark?(point)
         @cursor.y = cury
         @cursor.x = curx
+        # Handle visible mark transitions
         if current? && @buffer.visible_mark
           if @buffer.point_after_mark?(@buffer.visible_mark)
-            @window.attroff(Curses::A_REVERSE)
+            unless @in_isearch
+              @window.attroff(region_attr)
+              # Restore syntax highlighting colors after exiting region
+              if @current_highlight_attrs != 0
+                @window.attron(@current_highlight_attrs)
+              end
+            end
+            @in_region = false
           elsif @buffer.point_before_mark?(@buffer.visible_mark)
-            @window.attron(Curses::A_REVERSE)
+            unless @in_isearch
+              @window.attron(region_attr)
+            end
+            @in_region = true
+          end
+        end
+        # Handle isearch mark transitions
+        if current? && @buffer.isearch_mark
+          if @buffer.point_after_mark?(@buffer.isearch_mark)
+            @window.attroff(isearch_attr)
+            @in_isearch = false
+            # If we were covering a region, restore it
+            if @in_region
+              @window.attron(region_attr)
+            elsif @current_highlight_attrs != 0
+              @window.attron(@current_highlight_attrs)
+            end
+          elsif @buffer.point_before_mark?(@buffer.isearch_mark)
+            # Entering isearch - turn off region if active
+            if @in_region
+              @window.attroff(region_attr)
+            end
+            @window.attron(isearch_attr)
+            @in_isearch = true
           end
         end
       end
+      # Handle transitions when point crosses isearch mark
+      if current? && @buffer.isearch_mark &&
+         @buffer.point_at_mark?(@buffer.isearch_mark)
+        if @buffer.point_after_mark?(point)
+          @window.attroff(isearch_attr)
+          @in_isearch = false
+          # If we have a region underneath, restore it
+          if @in_region
+            @window.attron(region_attr)
+          elsif @current_highlight_attrs != 0
+            @window.attron(@current_highlight_attrs)
+          end
+        elsif @buffer.point_before_mark?(point)
+          # Entering isearch - turn off region if active
+          if @in_region
+            @window.attroff(region_attr)
+          end
+          @window.attron(isearch_attr)
+          @in_isearch = true
+        end
+      end
+      # Handle transitions when point crosses visible mark
       if current? && @buffer.visible_mark &&
-         @buffer.point_at_mark?(@buffer.visible_mark)
+          @buffer.point_at_mark?(@buffer.visible_mark)
         if @buffer.point_after_mark?(point)
-          @window.attroff(Curses::A_REVERSE)
+          unless @in_isearch
+            @window.attroff(region_attr)
+            # Restore syntax highlighting colors after exiting region
+            if @current_highlight_attrs != 0
+              @window.attron(@current_highlight_attrs)
+            end
+          end
+          @in_region = false
         elsif @buffer.point_before_mark?(point)
-          @window.attron(Curses::A_REVERSE)
+          unless @in_isearch
+            @window.attron(region_attr)
+          end
+          @in_region = true
         end
       end
     end
@@ -870,6 +976,14 @@ module Textbringer
         @key_buffer.shift
       end
     end
+
+    def region_attr
+      @@has_colors ? Face[:region].attributes : Curses::A_REVERSE
+    end
+
+    def isearch_attr
+      @@has_colors ? Face[:isearch].attributes : Curses::A_UNDERLINE
+    end
   end
 
   class EchoArea < Window
@@ -916,6 +1030,10 @@ module Textbringer
           @window.addstr(@buffer.input_method_status)
         end
         @window.setpos(0, 0)
+        @window.attrset(0)
+        @in_region = false
+        @in_isearch = false
+        @current_highlight_attrs = 0
         if @message
           @window.addstr(escape(@message))
         else

metadata

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