termpix 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f02b355cf61a8cfd00292a79423a428d071cbc333674c1e2324901f62bd10a38
-  data.tar.gz: d55c9be1b6e0e2de2b0d093ec25cfc4bb462f165197db5cbae20039eee4d7d53
+  metadata.gz: e311d6ce62bc8230d38d93a80b5e93af7422c1d9b9ec06f1bd746d18244c4901
+  data.tar.gz: 35400b9a97498b45855a3c9dda743454a2c0a4d68138dbbfb33d0108fdd6415d
 SHA512:
-  metadata.gz: 8d4d33f281c9fb9346f978dc764c3ce66f9c42b6be11c5a1cc1869f1054798ac8a3230a76450f0be66c063efda2284ad28dcfb0e9c5f34155a07a2bcfb79a19a
-  data.tar.gz: e155d39ed7003b6c5c405a5f703d526d54c6732add1494e0a0f4eae1390660c591f257e0e44114da1aa9c3801d63979b8405a56047a7194bdafca5d9fb86130c
+  metadata.gz: fe0e449f3bc2674e55418bd7fc8194eaef1f5d249824c99eedc006f23e5e8dc15477a21b9b31e33a6ff87f848c1c168822385461091d88d235e3577ffba40cae
+  data.tar.gz: 10bb9db43f2b54f8826f719f9e9a12a5c024564e0f72558949f1ffeb31b1b69cc6812ea5f9ae04a1478da662ebff86e6aab975aa54c47b9c79041b0e38f483a7

data/lib/termpix/protocols.rb

@@ -21,8 +21,9 @@ module Termpix
         pixel_width = max_width * cell_width
         pixel_height = max_height * cell_height
 
-        # Check if we have this image cached
-        cache_key = "#{image_path}:#{pixel_width}x#{pixel_height}"
+        # Check if we have this image cached (include mtime to detect overwrites)
+        mtime = File.mtime(image_path).to_i rescue 0
+        cache_key = "#{image_path}:#{pixel_width}x#{pixel_height}:#{mtime}"
         image_id = @image_cache[cache_key]
 
         unless image_id
@@ -104,7 +105,7 @@ module Termpix
           end
           # Fall back to common defaults (10x20 pixels per cell)
           [10, 20]
-        rescue
+        rescue LoadError, IOError, StandardError
           [10, 20]
         end
       end
@@ -114,7 +115,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
 
@@ -153,35 +154,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'
@@ -191,12 +163,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
 
@@ -229,8 +206,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)
 
@@ -244,9 +221,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
@@ -256,8 +232,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
@@ -270,7 +249,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.1"
+  VERSION = "0.4.0"
 end

data/lib/termpix.rb

@@ -25,8 +25,6 @@ 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
@@ -46,8 +44,6 @@ 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
@@ -95,14 +91,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,19 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: termpix
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-16 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies: []
-description: 'Termpix v0.3.1: WezTerm support added. 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.0: Robustness improvements. Fixed bare rescues, added nil-guards
+  on xwininfo parsing, tput fallbacks, identify output validation. Removed non-functional
+  Ueberzug module. Replaced shell interpolation with IO.popen in W3m protocol.'
 email: g@isene.com
 executables: []
 extensions: []