termpix 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d3e15e1b1d9a862d73b8613665fd576c2f246e5c26949c18e1b926404bae4b
-  data.tar.gz: d58c2201aae6c8642f587f48a74dd77695673481e3d875ae2eacd60eaa56e122
+  metadata.gz: 02dd8d6eb36d91f8db048b0302303bd720fbe246d0934bae5f31a4062a11f00a
+  data.tar.gz: 55745158a3f0657c3457c422ce8fd1bf33b7201132c921274c18ede7c49d9830
 SHA512:
-  metadata.gz: 65a7dd630c64a04cb6982077175380e3d33d4bf81727ca623cf5d576cd4d6db2feec6106445dd47bc50b070cea5e4cff3ce40f0c57d80d9039ee6e801b98e6ff
-  data.tar.gz: ff46fb6a49b7a3ed9429eeb41e491a36235e21216827bf638e81965d1225d772a851e6a06f6ee670786d6576548fa93188bac1faea57922213f9279524e7dca1
+  metadata.gz: 4871c317ab480d3df29ef922958f44fce76fddb54cd6f37d2539ce940ea3229fa754c49479fd2b0865f4b255b559a6663454a244d118b638add4e3e7341144c9
+  data.tar.gz: ce9f36b37d5f3e8c56c1aa5c6027da0a6b3849dc65a457465547b160f0038dc5d22268d5aea2c4cd245b2d2be390ba7d8c55b89a985655f2ee443be52cd6fe12

data/lib/termpix/protocols.rb

@@ -7,7 +7,7 @@ module Termpix
     # Uses Unicode placeholder mode (U=1) for curses/TUI compatibility
     # Images are tied to placeholder characters that curses manages as text
     module Kitty
-      @current_image_id = nil
+      @active_image_ids = []
       @image_cache = {}  # path -> image_id mapping
 
       def self.display(image_path, x:, y:, max_width:, max_height:)
@@ -32,8 +32,6 @@ module Termpix
           image_id = 1 if image_id == 0
         end
 
-        old_image_id = @current_image_id
-
         unless @image_cache[cache_key]
           # Transmit the image with scaling
           escaped = Shellwords.escape(image_path)
@@ -50,11 +48,8 @@ module Termpix
           chunks.each_with_index do |chunk, idx|
             more = idx < chunks.length - 1 ? 1 : 0
             if idx == 0
-              # First chunk: specify format (f=100 for PNG), action (a=t for transmit)
-              # i=image_id, m=more_chunks
               print "\e_Ga=t,f=100,i=#{image_id},m=#{more};#{chunk}\e\\"
             else
-              # Continuation chunks
               print "\e_Gm=#{more};#{chunk}\e\\"
             end
           end
@@ -63,30 +58,21 @@ module Termpix
           @image_cache[cache_key] = image_id
         end
 
-        # Position cursor and display the NEW image FIRST
-        # a=p (place), i=image_id, C=1 (don't move cursor)
-        # Don't specify c/r - let kitty use image's native size (already scaled by ImageMagick)
-        print "\e[#{y};#{x}H"  # Move cursor to position
+        # Position cursor and place the image (keep existing images)
+        print "\e[#{y};#{x}H"
         print "\e_Ga=p,i=#{image_id},C=1\e\\"
         $stdout.flush
 
-        # NOW delete old placement (after new one is visible) - atomic swap
-        if old_image_id && old_image_id != image_id
-          print "\e_Ga=d,d=i,i=#{old_image_id}\e\\"
-          $stdout.flush
-        end
-
-        @current_image_id = image_id
+        @active_image_ids << image_id unless @active_image_ids.include?(image_id)
         true
       end
 
       def self.clear
-        # Actually clear the image
-        if @current_image_id
-          print "\e_Ga=d,d=i,i=#{@current_image_id}\e\\"
-          $stdout.flush
-          @current_image_id = nil
+        @active_image_ids.each do |id|
+          print "\e_Ga=d,d=i,i=#{id}\e\\"
         end
+        $stdout.flush unless @active_image_ids.empty?
+        @active_image_ids.clear
         true
       end
 
@@ -105,7 +91,7 @@ module Termpix
           end
           # Fall back to common defaults (10x20 pixels per cell)
           [10, 20]
-        rescue
+        rescue LoadError, IOError, StandardError
           [10, 20]
         end
       end
@@ -115,7 +101,7 @@ module Termpix
       def self.get_dimensions(image_path)
         escaped = Shellwords.escape(image_path)
         dimensions = `identify -format "%wx%h" #{escaped}[0] 2>/dev/null`.strip
-        return nil if dimensions.empty?
+        return nil if dimensions.empty? || !dimensions.match?(/\A\d+x\d+\z/)
         dimensions.split('x').map(&:to_i)
       end
 
@@ -154,35 +140,6 @@ module Termpix
       end
     end
 
-    # Überzug++ Protocol
-    module Ueberzug
-      def self.display(image_path, x:, y:, max_width:, max_height:)
-        # Get terminal pixel dimensions
-        terminfo = `xwininfo -id $(xdotool getactivewindow 2>/dev/null) 2>/dev/null`
-        return unless terminfo && !terminfo.empty?
-
-        term_w = terminfo.match(/Width: (\d+)/)[1].to_i
-        term_h = terminfo.match(/Height: (\d+)/)[1].to_i
-
-        # Calculate character dimensions
-        char_w = term_w / `tput cols`.to_i
-        char_h = term_h / `tput lines`.to_i
-
-        # Convert character positions to pixels
-        img_x = char_w * x
-        img_y = char_h * y
-        img_w = char_w * max_width
-        img_h = char_h * max_height
-
-        # TODO: Implement actual Überzug++ protocol
-        # For now, placeholder
-      end
-
-      def self.clear
-        system('clear')
-      end
-    end
-
     # w3mimgdisplay Protocol
     module W3m
       @imgdisplay = '/usr/lib/w3m/w3mimgdisplay'
@@ -192,12 +149,17 @@ module Termpix
         terminfo = `xwininfo -id $(xdotool getactivewindow 2>/dev/null) 2>/dev/null`
         return unless terminfo && !terminfo.empty?
 
-        term_w = terminfo.match(/Width: (\d+)/)[1].to_i
-        term_h = terminfo.match(/Height: (\d+)/)[1].to_i
+        w_match = terminfo.match(/Width: (\d+)/)
+        h_match = terminfo.match(/Height: (\d+)/)
+        return unless w_match && h_match
+        term_w = w_match[1].to_i
+        term_h = h_match[1].to_i
 
         # Calculate character dimensions
         cols = `tput cols`.to_i
+        cols = 80 if cols <= 0
         lines = `tput lines`.to_i
+        lines = 24 if lines <= 0
         char_w = term_w / cols
         char_h = term_h / lines
 
@@ -230,8 +192,8 @@ module Termpix
           display_path = image_path
         end
 
-        dimensions = `identify -format "%wx%h" #{Shellwords.escape(display_path)} 2>/dev/null`.strip
-        return if dimensions.empty?
+        dimensions = `identify -format "%wx%h" #{Shellwords.escape(display_path)}[0] 2>/dev/null`.strip
+        return if dimensions.empty? || !dimensions.match?(/\A\d+x\d+\z/)
 
         img_w, img_h = dimensions.split('x').map(&:to_i)
 
@@ -245,9 +207,8 @@ module Termpix
         end
 
         # Display using w3mimgdisplay protocol
-        `echo '0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;#{display_path}
-4;
-3;' | #{@imgdisplay} 2>/dev/null`
+        cmd = "0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;#{display_path}\n4;\n3;\n"
+        IO.popen([@imgdisplay], 'w', err: '/dev/null') { |io| io.write(cmd) }
 
         # Don't delete temp file - keep it cached for performance
       end
@@ -257,8 +218,11 @@ module Termpix
         terminfo = `xwininfo -id $(xdotool getactivewindow 2>/dev/null) 2>/dev/null`
         return true unless terminfo && !terminfo.empty?
 
-        term_w = terminfo.match(/Width: (\d+)/)[1].to_i
-        term_h = terminfo.match(/Height: (\d+)/)[1].to_i
+        w_match = terminfo.match(/Width: (\d+)/)
+        h_match = terminfo.match(/Height: (\d+)/)
+        return true unless w_match && h_match
+        term_w = w_match[1].to_i
+        term_h = h_match[1].to_i
 
         # Calculate character dimensions
         char_w = term_w / term_width
@@ -271,7 +235,8 @@ module Termpix
         img_max_h = char_h * height + 2
 
         # Use w3mimgdisplay command "6" to clear just the image area
-        `echo "6;#{img_x};#{img_y};#{img_max_w};#{img_max_h};\n4;\n3;" | #{@imgdisplay} 2>/dev/null`
+        cmd = "6;#{img_x};#{img_y};#{img_max_w};#{img_max_h};\n4;\n3;\n"
+        IO.popen([@imgdisplay], 'w', err: '/dev/null') { |io| io.write(cmd) }
         true
       end
     end

data/lib/termpix/version.rb

@@ -1,3 +1,3 @@
 module Termpix
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

data/lib/termpix.rb

@@ -25,19 +25,16 @@ module Termpix
         Protocols::Kitty.display(image_path, x: x, y: y, max_width: max_width, max_height: max_height)
       when :sixel
         Protocols::Sixel.display(image_path, x: x, y: y, max_width: max_width, max_height: max_height)
-      when :ueberzug
-        Protocols::Ueberzug.display(image_path, x: x, y: y, max_width: max_width, max_height: max_height)
       when :w3m
         Protocols::W3m.display(image_path, x: x, y: y, max_width: max_width, max_height: max_height)
       else
         return false
       end
 
-      @current_image = image_path
       true
     end
 
-    # Clear the currently displayed image
+    # Clear all displayed images
     def clear(x: 0, y: 0, width: 80, height: 24, term_width: 80, term_height: 24)
       return false unless @protocol
 
@@ -46,13 +43,10 @@ module Termpix
         Protocols::Kitty.clear
       when :sixel
         Protocols::Sixel.clear
-      when :ueberzug
-        Protocols::Ueberzug.clear
       when :w3m
         Protocols::W3m.clear(x: x, y: y, width: width, height: height, term_width: term_width, term_height: term_height)
       end
 
-      @current_image = nil
       true
     end
 
@@ -95,14 +89,6 @@ module Termpix
         return :sixel if check_dependency('convert')
       end
 
-      # Überzug++ - disabled for now (implementation incomplete)
-      # TODO: Implement proper Überzug++ JSON-RPC communication
-      # if command_exists?('ueberzug') || command_exists?('ueberzugpp')
-      #   if check_dependencies('xwininfo', 'xdotool', 'identify')
-      #     return :ueberzug
-      #   end
-      # end
-
       # Fall back to w3m (works on urxvt, xterm, etc.)
       if command_exists?('/usr/lib/w3m/w3mimgdisplay')
         if check_dependencies('xwininfo', 'xdotool', 'identify')

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: termpix
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-30 00:00:00.000000000 Z
+date: 2026-03-27 00:00:00.000000000 Z
 dependencies: []
-description: 'Termpix v0.3.2: Fixed Kitty cache invalidation when files are overwritten.
-  Cache key now includes file mtime. Uses Kitty graphics protocol for kitty, WezTerm,
-  and Ghostty terminals. Provides clean API for displaying images in terminal using
-  best available protocol (Kitty, Sixel, or w3m). Auto-detects terminal capabilities
-  and falls back gracefully.'
+description: 'Termpix v0.4.1: Kitty protocol now supports multiple simultaneous images.
+  Track array of active image IDs instead of single image. clear() removes all active
+  images at once.'
 email: g@isene.com
 executables: []
 extensions: []