textbringer 15 → 17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad5b7d9a5cc2022075f802db23f24781dcb3be366a4ba3ee27015a66ada834d
-  data.tar.gz: 1933c54c72c4e189b4f0a6ba81d6186d7618c9eaaa3eccbe5b61925d8959c108
+  metadata.gz: afebafd9a22024be2bc3c4c5c2140ac9ad3b7fa7a1efc25e0ae9bf4d38c3da10
+  data.tar.gz: 53841ecd93d7b63e9d33a07d39721f90bf0d39e6803406287518601d67d4a59c
 SHA512:
-  metadata.gz: 44736e20de4174e865ad160107e48461e26d46cd495e74000138c724753dafaae65b5e530902e8f1ad1f38659e301cfe2fbec71208913f85d01af5e23b124bc5
-  data.tar.gz: b07e7c3533f540b88157c268d498f7ec6bd077db6fce0e3adb154acc02fb9d960cee0bfb23cd91342a6dce12f0c8af1083dac1434fc67c9fddc361bd03623ded
+  metadata.gz: 469ef80d72998003e1d5ca9e6c499b70debc5d1c2c09b43b9b79311e94ce15c22adbd766bf31cafaa20a5ac11a19c8b12d9c8392d166cec5a617305c4a50e43f
+  data.tar.gz: 6908288f0debd4001c131327071962fda1392ff0310f26fc72b9f0391b01e281b22824c78e78d2be69cd89b5fc768c7239d116bd35699d1483c4fa944aae76be

data/exe/txtb

@@ -29,6 +29,8 @@ begin
   Window.start do
     $stdout = DefaultOutput.new
     begin
+      transient_mark_mode(true)
+      Window.echo_area.clear_message
       load_user_config("~/.textbringer/init.rb")
       Plugin.load_plugins
       load_user_config("~/.textbringer.rb")

data/lib/textbringer/buffer.rb

@@ -1300,15 +1300,28 @@ module Textbringer
       Utils.run_hooks(mode_class.hook_name)
     end
 
-    def toggle_minor_mode(mode_class)
+    def set_minor_mode(mode_class, arg = nil)
       mode = @minor_modes.find { |mode| mode.instance_of?(mode_class) }
-      if mode
-        mode.disable
-        @minor_modes.delete(mode)
-      else
+      enabled = !!mode
+
+      enable =
+        case arg
+        when true, false
+          return if enabled == arg
+          arg
+        when nil
+          !enabled
+        else
+          raise ArgumentError, "wrong argument #{arg.inspect} (expected true, false, or nil)"
+        end
+
+      if enable
         mode = mode_class.new(self)
         @minor_modes.push(mode)
         mode.enable
+      else
+        mode.disable
+        @minor_modes.delete(mode)
       end
     end
 

data/lib/textbringer/faces/basic.rb

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

data/lib/textbringer/global_minor_mode.rb

@@ -35,13 +35,26 @@ module Textbringer
       child.command_name = command
 
       # Define the toggle command
-      define_command(command) do
-        if child.enabled?
-          child.disable
-          child.enabled = false
-        else
+      define_command(command, doc: "Enable or disable #{command_name}.  " \
+                     "Toggle the mode if arg is nil.  " \
+                     "Enable the mode if arg is true.  " \
+                     "Disable the mode if arg is false") do |arg = nil|
+        enable =
+          case arg
+          when true, false
+            return if child.enabled? == arg
+            arg
+          when nil
+            !child.enabled?
+          else
+            raise ArgumentError, "wrong argument #{arg.inspect} (expected true, false, or nil)"
+          end
+        if enable
           child.enable
           child.enabled = true
+        else
+          child.disable
+          child.enabled = false
         end
       end
     end

data/lib/textbringer/minor_mode.rb

@@ -17,8 +17,11 @@ module Textbringer
         }
       command = command_name.intern
       child.command_name = command
-      define_command(command) do
-        Buffer.current.toggle_minor_mode(child)
+      define_command(command, doc: "Enable or disable #{command_name}.  " \
+                     "Toggle the mode if arg is nil.  " \
+                     "Enable the mode if arg is true.  " \
+                     "Disable the mode if arg is false") do |arg = nil|
+        Buffer.current.set_minor_mode(child, arg)
       end
     end
 

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "15"
+  VERSION = "17"
 end

data/lib/textbringer/window.rb

@@ -236,6 +236,8 @@ module Textbringer
       @raw_key_buffer = []
       @key_buffer = []
       @cursor = Cursor.new(0, 0)
+      @in_region = false
+      @current_highlight_attrs = 0
     end
 
     def echo_area?
@@ -405,23 +407,44 @@ module Textbringer
         @window.erase
         @window.setpos(0, 0)
         @window.attrset(0)
+        @in_region = 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
         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 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 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 +464,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
@@ -451,7 +480,7 @@ module Textbringer
           @buffer.forward_char
         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)
@@ -681,18 +710,30 @@ module Textbringer
         @cursor.x = curx
         if current? && @buffer.visible_mark
           if @buffer.point_after_mark?(@buffer.visible_mark)
-            @window.attroff(Curses::A_REVERSE)
+            @window.attroff(region_attr)
+            @in_region = false
+            # Restore syntax highlighting colors after exiting region
+            if @current_highlight_attrs != 0
+              @window.attron(@current_highlight_attrs)
+            end
           elsif @buffer.point_before_mark?(@buffer.visible_mark)
-            @window.attron(Curses::A_REVERSE)
+            @window.attron(region_attr)
+            @in_region = true
           end
         end
       end
       if current? && @buffer.visible_mark &&
          @buffer.point_at_mark?(@buffer.visible_mark)
         if @buffer.point_after_mark?(point)
-          @window.attroff(Curses::A_REVERSE)
+          @window.attroff(region_attr)
+          @in_region = false
+          # Restore syntax highlighting colors after exiting region
+          if @current_highlight_attrs != 0
+            @window.attron(@current_highlight_attrs)
+          end
         elsif @buffer.point_before_mark?(point)
-          @window.attron(Curses::A_REVERSE)
+          @window.attron(region_attr)
+          @in_region = true
         end
       end
     end
@@ -870,6 +911,10 @@ module Textbringer
         @key_buffer.shift
       end
     end
+
+    def region_attr
+      @@has_colors ? Face[:region].attributes : Curses::A_REVERSE
+    end
   end
 
   class EchoArea < Window
@@ -916,6 +961,9 @@ module Textbringer
           @window.addstr(@buffer.input_method_status)
         end
         @window.setpos(0, 0)
+        @window.attrset(0)
+        @in_region = 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: '15'
+  version: '17'
 platform: ruby
 authors:
 - Shugo Maeda