rtfm-filemanager 7.2.1 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d39aec21bd04a0722600f1ffceaa2e971fbf91f06a13d0fb33a2641c2ecbbd3
-  data.tar.gz: 596d8c83baf63beceba5d85bb07e273143f40500e8728523962d94c0b3a40799
+  metadata.gz: 70adf5224517b9f2cf7a0ec8150c350c3a9b3c6455a6db26781a2ef33dfa385d
+  data.tar.gz: f07222ba0ed09b855fab399be1209a539efde052a416d48050e82db4c4b42f43
 SHA512:
-  metadata.gz: f54a9dadea1c77298cc7853414be1276639dee8218f4f2866d239904ba146d83cead831d422da76ad0d5ed0f678b756e920b7953cf6d354bc009e03325c897ad
-  data.tar.gz: 212e3a017c78fd2abac1cf7e17fe5a2b1b39343604665d7962e9ebd74f0ced805e5b3d54d2b09eed343b1c8fb33a31add718ad878198f41c5304424d0d8eb530
+  metadata.gz: ef7ce1ea7725333321bddb1b1cbf68300e3c1c697540c7c0b6a0d4f0f4021b7f1a6c408716e4aa2348938b8de555444304a292f886d770ec38df43cca8b145cc
+  data.tar.gz: 5a4f701cd40e6375387198e2febe6bd56a59976e261b0dd226c0efa53cf21c107a3639cb602993791bc9e7ef0c8396b0d045957810b0dbc6496b1cbcadc63151

data/bin/rtfm

@@ -18,7 +18,7 @@
 #             get a great understanding of the code itself by simply sending
 #             or pasting this whole file into you favorite AI for coding with
 #             a prompt like this: "Help me understand every part of this code".
-@version    = '7.2.1' # Performance: Direct print for window title (no spawn)
+@version    = '7.3.0' # Modern image display using termpix gem
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g`.chomp
@@ -43,22 +43,24 @@ def check_image_redraw # {{{2
   now = Time.now
   return if now - @last_focus_check < @focus_check_interval
   @last_focus_check = now
-  
+
   # Only check if we have an image currently displayed
   return unless @image && @current_image_path
-  
+
   begin
-    # Check if terminal has focus and if image needs redrawing
-    active_window = `xdotool getactivewindow 2>/dev/null`.chomp
-    return if active_window.empty?
-    
-    # Simple heuristic: if we can't find any w3mimgdisplay processes,
-    # the image overlay was probably cleared and needs redrawing
-    img_processes = `pgrep w3mimgdisplay 2>/dev/null`.chomp
-    if img_processes.empty? && File.exist?(@current_image_path)
-      # Redraw the image
-      showimage(@current_image_path)
+    # For w3m/ueberzug protocols, check if image overlay was cleared
+    if [:w3m, :ueberzug].include?(@termpix.protocol)
+      active_window = `xdotool getactivewindow 2>/dev/null`.chomp
+      return if active_window.empty?
+
+      # Check if image display process still exists
+      process_name = @termpix.protocol == :w3m ? 'w3mimgdisplay' : 'ueberzug'
+      img_processes = `pgrep #{process_name} 2>/dev/null`.chomp
+      if img_processes.empty? && File.exist?(@current_image_path)
+        showimage(@current_image_path)
+      end
     end
+    # Kitty and Sixel protocols don't need redraw checks - images persist
   rescue
     # Silently fail - we don't want focus checking to break anything
   end
@@ -77,6 +79,7 @@ rescue StandardError => e
 end
 require 'tmpdir'
 require 'set'  # For symlink loop detection
+require 'termpix'  # Terminal image display
 # Lazy-load to speed up startup
 autoload :Shellwords, 'shellwords'
 autoload :Timeout,    'timeout'
@@ -481,13 +484,9 @@ def cmd?(cmd) # Helper function
   system("which #{cmd} > /dev/null 2>&1")
 end
 
-if cmd?('/usr/lib/w3m/w3mimgdisplay')
-  @imgdisplay = '/usr/lib/w3m/w3mimgdisplay'
-  @showimage = true
-else
-  @showimage = false
-end
-@showimage = false unless cmd?('xwininfo') && cmd?('xdotool')
+# Initialize termpix for image display
+@termpix = Termpix::Display.new
+@showimage = @termpix.supported?
 
 # Image auto-redraw variables
 @current_image_path = nil  # Path of currently displayed image
@@ -1120,7 +1119,10 @@ def help_info # {{{3
 end
 
 def show_version # {{{3
-  @pB.say(" RTFM version = #{@version} (latest RubyGems version is #{Gem.latest_version_for('rtfm-filemanager').version} - https://github.com/isene/RTFM)".b)
+  protocol_info = @termpix ? " [Image protocol: #{@termpix.protocol || 'none'}]" : ""
+  version_text = " RTFM version = #{@version}#{protocol_info} (latest RubyGems version is #{Gem.latest_version_for('rtfm-filemanager').version} - https://github.com/isene/RTFM)"
+  @pB.say(version_text.b)
+  @pB.update = false  # Prevent terminal clearing on next render
 end
 
 def refresh_all # {{{3
@@ -5636,50 +5638,27 @@ def showimage(image) # SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW {{{2
   return unless @showimage
 
   begin
-    terminfo    = `xwininfo -id $(xdotool getactivewindow 2>/dev/null) 2>/dev/null`
-    term_w      = terminfo.match(/Width: (\d+)/)[1].to_i
-    term_h      = terminfo.match(/Height: (\d+)/)[1].to_i
-    char_w      = term_w / @w
-    char_h      = term_h / @h
-    img_x       = char_w * @pR.x
-    img_y       = char_h * 2
-    img_max_w   = char_w * (@pR.w - 2)
-    img_max_h   = char_h * (@pR.h - 1)
     if image == 'clear'
-      `clear`
-      img_x     -= char_w
-      img_max_w += char_w + 2
-      img_max_h += 2
-      `echo "6;#{img_x};#{img_y};#{img_max_w};#{img_max_h};\n4;\n3;" | #{@imgdisplay} 2>/dev/null`
-      @current_image_path = nil  # Clear tracking when image is cleared
+      @termpix.clear(
+        x: @pR.x,
+        y: @pR.y,
+        width: @pR.w,
+        height: @pR.h,
+        term_width: @w,
+        term_height: @h)
+      @current_image_path = nil
     else
-      # Ensure we have the absolute path
+      # Display image using termpix
       img_path = File.absolute_path(image)
-      
-      # Properly escape image path for shell commands
-      escaped_image = Shellwords.escape(img_path)
-      # For animated GIFs, get dimensions of first frame only using [0]
-      dimensions = `identify -format "%wx%h" #{escaped_image}[0] 2>/dev/null`
-      img_w, img_h = dimensions.split('x').map(&:to_i)
-
-      # Fix: Use simultaneous scaling to prevent overflow
-      if img_w > img_max_w || img_h > img_max_h
-        scale_w = img_max_w.to_f / img_w
-        scale_h = img_max_h.to_f / img_h
-        scale = [scale_w, scale_h].min
-
-        img_w = (img_w * scale).to_i
-        img_h = (img_h * scale).to_i
-      end
-
-      # Use the absolute path without extra quotes in the w3mimgdisplay protocol
-      `echo '0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;#{img_path}
-4;
-3;' | #{@imgdisplay} 2>/dev/null`
-      @current_image_path = img_path  # Track currently displayed image
+      @termpix.show(img_path,
+        x: @pR.x,
+        y: @pR.y,
+        max_width: @pR.w - 2,
+        max_height: @pR.h - 1)
+      @current_image_path = img_path
     end
-  rescue
-    @pR.text = 'Error showing image'
+  rescue => e
+    @pR.text = "Error showing image: #{e.message}"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.3.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-25 00:00:00.000000000 Z
+date: 2025-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: termpix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bootsnap
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.4'
 description: |-
-  RTFM v7.2.0: BREAKING CHANGE - Batch operations now work ONLY on tagged items when items are tagged (not tagged + selected). If no items are tagged, operations work on the selected item only.
+  RTFM v7.3.0: Modern image display with termpix gem - supports Sixel (mlterm) and w3m protocols.
    A full featured terminal browser with syntax highlighted files, images shown in the terminal, videos thumbnailed, etc. Features include remote SSH/SFTP browsing, interactive SSH shell, comprehensive undo system, bookmarks, and much more. You can bookmark and jump around easily, delete, rename, copy, symlink and move files. RTFM is one of the most feature-packed terminal file managers.
 email: g@isene.com
 executables: