textbringer 21 → 22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb85ae8a3790d1ae876ecac31730522e121047dde8cf759bfb58e137ac5fb59
-  data.tar.gz: 70c9b7d737cda7b8fcc2bbfab347c2d22a47743ca9ec5d3c6863c4bee8b5005d
+  metadata.gz: 75bc23a6bf83f87be572ca81acfb29c2171d99d07d0fc48c5a50fac711b12ecb
+  data.tar.gz: 5811dd657e36666831c26b9212494138c815629fe24997bb939c375c6d4a7944
 SHA512:
-  metadata.gz: 87cecff29b608feff2999cda9619b429d4158b74e6e2ef3d5560f2b742170553b5101996a6907ff1d9c8852086e76b429166108586f353ac73a1d0354276f4df
-  data.tar.gz: 4208176e8fb0ce43237786129ddbcd5a77b8b052b7003ad414c7b018b35086c5f68dfa944c3ade415969f18484e9e298a980ef5e138668fbd60286cc697456a5
+  metadata.gz: a3b91ec8b00442665b7060840b1e7a43be4193f887b0d9bc6925e1eb528b8b7e6dd173e2ba2c453b11ab8d56a248a4ef875ba760427a06d27de5dea5c58b19e8
+  data.tar.gz: 0abd782f34b8ebc44391a86bc6074e8369773de886738681d025bfafe22f01d357889c54dd8fb8b20a1d321f4789dd590793d32c9d1ddb82d28228c29b8c4d33

data/lib/textbringer/face.rb

@@ -2,7 +2,7 @@ require "curses"
 
 module Textbringer
   class Face
-    attr_reader :name, :attributes
+    attr_reader :name, :attributes, :color_pair, :text_attrs
 
     @@face_table = {}
     @@next_color_pair = 1
@@ -39,11 +39,11 @@ module Textbringer
       @reverse = reverse
       Curses.init_pair(@color_pair,
                        Color[foreground], Color[background])
-      @attributes = 0
-      @attributes |= Curses.color_pair(@color_pair)
-      @attributes |= Curses::A_BOLD if bold
-      @attributes |= Curses::A_UNDERLINE if underline
-      @attributes |= Curses::A_REVERSE if reverse
+      @text_attrs = 0
+      @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
   end

data/lib/textbringer/floating_window.rb

@@ -142,24 +142,13 @@ module Textbringer
       @buffer.save_point do |point|
         @window.erase
 
-        # Get face attributes if face is specified
-        face_attrs = 0
-        if @face && Window.has_colors?
-          face = Face[@face]
-          face_attrs = face.attributes if face
-        end
+        # Get face if face is specified
+        face = @face && Window.has_colors? ? Face[@face] : nil
 
-        # Get current line face attributes if specified
-        current_line_attrs = 0
-        if @current_line_face && Window.has_colors?
-          current_line_face = Face[@current_line_face]
-          current_line_attrs = current_line_face.attributes if current_line_face
-        end
+        # Get current line face if specified
+        current_line_face = @current_line_face && Window.has_colors? ? Face[@current_line_face] : nil
 
-        @window.attrset(face_attrs)
-        @in_region = false
-        @in_isearch = false
-        @current_highlight_attrs = face_attrs
+        apply_face_attrs(@window, face)
 
         # First pass: find which line contains point
         point_line = nil
@@ -195,11 +184,10 @@ module Textbringer
           @window.setpos(line_num, 0)
 
           # Determine which face to use for this line
-          line_attrs = if @current_line_face && line_num == point_line
-                         current_line_attrs
-                       else
-                         face_attrs
-                       end
+          line_face = @current_line_face && line_num == point_line ? current_line_face : face
+
+          # Set attributes for the entire line
+          apply_face_attrs(@window, line_face)
 
           # Render characters on this line
           col = 0
@@ -228,29 +216,17 @@ module Textbringer
               break
             end
 
-            # Apply face attributes to all characters
-            if line_attrs != 0
-              @window.attron(line_attrs)
-            end
             @window.addstr(s)
-            if line_attrs != 0
-              @window.attroff(line_attrs)
-            end
 
             col += char_width
             @buffer.forward_char
           end
 
           # Fill remaining space on the line with the face background
-          if line_attrs != 0 && col < @columns
-            @window.attron(line_attrs)
-            @window.addstr(" " * (@columns - col))
-            @window.attroff(line_attrs)
-          elsif line_attrs == 0 && face_attrs != 0 && col < @columns
-            # Use default face for padding if no line-specific attrs
-            @window.attron(face_attrs)
-            @window.addstr(" " * (@columns - col))
-            @window.attroff(face_attrs)
+          if col < @columns
+            fill_face = line_face || face
+            apply_face_attrs(@window, fill_face)
+            @window.addstr(" " * (@columns - col)) if fill_face
           end
 
           # Track cursor position
@@ -263,12 +239,11 @@ module Textbringer
         end
 
         # Fill remaining lines with the face background
-        if face_attrs != 0
+        if face
           while line_num < @lines
             @window.setpos(line_num, 0)
-            @window.attron(face_attrs)
+            apply_face_attrs(@window, face)
             @window.addstr(" " * @columns)
-            @window.attroff(face_attrs)
             line_num += 1
           end
         end

data/lib/textbringer/modes/transient_mark_mode.rb

@@ -18,8 +18,8 @@ module Textbringer
       :backward_char,
       :forward_word,
       :backward_word,
-      :scroll_up_command,
-      :scroll_down_command,
+      :scroll_up,
+      :scroll_down,
       :beginning_of_buffer,
       :end_of_buffer,
       # Search commands

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "21"
+  VERSION = "22"
 end

data/lib/textbringer/window.rb

@@ -1,6 +1,16 @@
 require "curses"
 require_relative "window/fallback_characters"
 
+unless Curses::Window.method_defined?(:attr_set)
+  using Module.new {
+    refine Curses::Window do
+      def attr_set(attrs, pair)
+        attrset(attrs | Curses.color_pair(pair))
+      end
+    end
+  }
+end
+
 module Textbringer
   class Window
     Cursor = Struct.new(:y, :x)
@@ -146,6 +156,10 @@ module Textbringer
         Curses.start_color
         Curses.use_default_colors
         load_faces
+      else
+        Face.define :mode_line, reverse: true
+        Face.define :region, reverse: true
+        Face.define :isearch, underline: true
       end
       begin
         window =
@@ -261,7 +275,7 @@ module Textbringer
       @cursor = Cursor.new(0, 0)
       @in_region = false
       @in_isearch = false
-      @current_highlight_attrs = 0
+      @current_hl_face = nil
     end
 
     def echo_area?
@@ -410,10 +424,10 @@ module Textbringer
           b = @buffer.point
         end
         name = names.find { |n| $~[n] }
-        attributes = Face[name]&.attributes
-        if attributes
-          @highlight_on[b] = attributes
-          @highlight_off[e] = attributes
+        face = Face[name]
+        if face
+          @highlight_on[b] = face
+          @highlight_off[e] = true
         end
       end
     end
@@ -434,45 +448,30 @@ module Textbringer
         highlight
         @window.erase
         @window.setpos(0, 0)
-        @window.attrset(0)
         @in_region = false
         @in_isearch = false
-        @current_highlight_attrs = 0
+        @current_hl_face = nil
         if current_or_minibuffer_selected? && @buffer.visible_mark &&
            @buffer.point_after_mark?(@buffer.visible_mark)
-          @window.attron(region_attr)
           @in_region = true
         end
         if current_or_minibuffer_selected? && @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_region = false
           @in_isearch = true
         end
+        apply_window_attrs(@window)
         while !@buffer.end_of_buffer?
           cury = @window.cury
           curx = @window.curx
           update_cursor_and_attr(point, cury, curx)
-          if attrs = @highlight_off[@buffer.point]
-            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
+          if @highlight_off[@buffer.point]
+            @current_hl_face = nil
+            apply_window_attrs(@window)
           end
-          if attrs = @highlight_on[@buffer.point]
-            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
+          if face = @highlight_on[@buffer.point]
+            @current_hl_face = face
+            apply_window_attrs(@window)
           end
           c = @buffer.char_after
           if c == "\n"
@@ -517,12 +516,7 @@ module Textbringer
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
-        if current_or_minibuffer_selected? && @buffer.isearch_mark
-          @window.attroff(isearch_attr)
-        end
-        if current_or_minibuffer_selected? && @buffer.visible_mark
-          @window.attroff(region_attr)
-        end
+        apply_window_attrs(@window)
         @buffer.mark_to_point(@bottom_of_window)
         if @buffer.point_at_mark?(point)
           @cursor.y = @window.cury
@@ -712,8 +706,8 @@ module Textbringer
     def redisplay_mode_line
       @mode_line.erase
       @mode_line.setpos(0, 0)
-      attrs = @@has_colors ? Face[:mode_line].attributes : Curses::A_REVERSE
-      @mode_line.attrset(attrs)
+      face = Face[:mode_line]
+      @mode_line.attr_set(face.text_attrs, face.color_pair)
       @mode_line.addstr("#{@buffer.input_method_status} #{@buffer.name} ")
       @mode_line.addstr("[+]") if @buffer.modified?
       @mode_line.addstr("[RO]") if @buffer.read_only?
@@ -731,7 +725,7 @@ module Textbringer
       @mode_line.addstr(" #{line},#{column}")
       @mode_line.addstr(" (#{@buffer.mode_names.join(' ')})")
       @mode_line.addstr(" " * (columns - @mode_line.curx))
-      @mode_line.attrset(0)
+      @mode_line.attr_set(0, 0)
       @mode_line.noutrefresh
     end
 
@@ -746,45 +740,28 @@ module Textbringer
     end
 
     def update_cursor_and_attr(point, cury, curx)
+      changed = false
       if @buffer.point_at_mark?(point)
         @cursor.y = cury
         @cursor.x = curx
         # Handle visible mark transitions
         if current_or_minibuffer_selected? && @buffer.visible_mark
           if @buffer.point_after_mark?(@buffer.visible_mark)
-            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
+            changed = true
           elsif @buffer.point_before_mark?(@buffer.visible_mark)
-            unless @in_isearch
-              @window.attron(region_attr)
-            end
             @in_region = true
+            changed = true
           end
         end
         # Handle isearch mark transitions
         if current_or_minibuffer_selected? && @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
+            changed = true
           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
+            changed = true
           end
         end
       end
@@ -792,42 +769,25 @@ module Textbringer
       if current_or_minibuffer_selected? && @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
+          changed = true
         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
+          changed = true
         end
       end
       # Handle transitions when point crosses visible mark
       if current_or_minibuffer_selected? && @buffer.visible_mark &&
           @buffer.point_at_mark?(@buffer.visible_mark)
         if @buffer.point_after_mark?(point)
-          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
+          changed = true
         elsif @buffer.point_before_mark?(point)
-          unless @in_isearch
-            @window.attron(region_attr)
-          end
           @in_region = true
+          changed = true
         end
       end
+      apply_window_attrs(@window) if changed
     end
 
     def compose_character(point, cury, curx, c)
@@ -1004,12 +964,28 @@ module Textbringer
       end
     end
 
-    def region_attr
-      @@has_colors ? Face[:region].attributes : Curses::A_REVERSE
+    def apply_face_attrs(win, face)
+      win.attr_set(face&.text_attrs || 0, face&.color_pair || 0)
     end
 
-    def isearch_attr
-      @@has_colors ? Face[:isearch].attributes : Curses::A_UNDERLINE
+    def apply_window_attrs(win)
+      if @in_isearch
+        face = Face[:isearch]
+      elsif @in_region
+        face = Face[:region]
+      else
+        face = @current_hl_face
+      end
+
+      if face
+        text_attrs = face.text_attrs
+        if (@in_isearch || @in_region) && @current_hl_face
+          text_attrs |= @current_hl_face.text_attrs
+        end
+        win.attr_set(text_attrs, face.color_pair)
+      else
+        win.attr_set(0, 0)
+      end
     end
   end
 
@@ -1057,10 +1033,10 @@ module Textbringer
           @window.addstr(@buffer.input_method_status)
         end
         @window.setpos(0, 0)
-        @window.attrset(0)
+        @window.attr_set(0, 0)
         @in_region = false
         @in_isearch = false
-        @current_highlight_attrs = 0
+        @current_hl_face = nil
         if @message
           @window.addstr(escape(@message))
         else

metadata

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