astropanel 3.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0553cb39f667994df7805a9fadb794e93bb39f58dccc33f2403ea55b2ff77dd5
-  data.tar.gz: eb655ebd2e4322298e3b5eef5e9abf1fe464fd5188fadfbe6077537a4e62b481
+  metadata.gz: 6a158fe0fa70e2dfac28d4a6a2173f7004e5a380838110eacd0c6788070470ed
+  data.tar.gz: e151830dfe26f406a7248597ebddccafb632ba6f8395f8157384a17545b32e13
 SHA512:
-  metadata.gz: 62e8e01ecaa8d7676a39d7bd1cb4e9a4446b5b5f18d9222b48a8e163cf8ce3b9d5c0718816107ede2fc0f4310c67f404617281cbb8b41e5cbf62a47065b1bfd9
-  data.tar.gz: 38fff35103e802c3fee09f401c4f07d11350b6a0d010797939cc0d4eb806033a0d3b2747804ee41358d4b8df2869ef4416c34f59e3c54763a27c1ce1a9dc326c
+  metadata.gz: d29cb83902e206efc8debf85825b7d9b44abcf9a757f792d0ea4ab49a5e37e4bf26162e510ad0aae26ac8188a35e4a4e85ec9355b66e7476c1925b6927229641
+  data.tar.gz: 524612c6ca90cded7b63dacce28e0fbb8351cf511ce902b86b5ed2e914002ab849488bf93ed44a0bd59cb7fc4e281a8de4042d7be245c722aa877317c024e993

data/README.md

@@ -1,5 +1,11 @@
 # Astropanel
 
+[![Gem Version](https://badge.fury.io/rb/astropanel.svg)](https://badge.fury.io/rb/astropanel)
+[![Ruby](https://img.shields.io/badge/Ruby-CC342D?style=flat&logo=ruby&logoColor=white)](https://www.ruby-lang.org/)
+[![License](https://img.shields.io/badge/License-Public%20Domain-brightgreen.svg)](https://unlicense.org/)
+[![GitHub stars](https://img.shields.io/github/stars/isene/astropanel.svg)](https://github.com/isene/astropanel/stargazers)
+[![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-blue.svg)](https://isene.org)
+
 <img src="logo.jpg" align="left" width="150" height="150">Terminal program for
 amateur astronomers with weather forecast, ephemeris, astronomical events and
 more. It's what you need to decide wether to take your telescope out for a

data/bin/astropanel

@@ -14,8 +14,8 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-# Version:    3.0.0: Major accuracy improvement with IAU 2006 obliquity standard and
-#             higher-precision ephemeris calculations from https://github.com/isene/ephemeris
+# Version:    4.1.0: Modern image display using termpix gem
+#             for Ruby 3.4+ compatibility
 
 # LOAD MODULES {{{1
 require 'io/console'
@@ -27,6 +27,7 @@ require 'json'
 require 'date'
 require 'time'
 require 'rcurses'
+require 'termpix'
 include Rcurses
 include Rcurses::Input
 include Rcurses::Cursor
@@ -613,34 +614,34 @@ class AstroPanelApp
   end
 
   def setup_image_display # {{{2
-    # allow override from ~/.ap.conf
-    @w3mimgdisplay ||= "/usr/lib/w3m/w3mimgdisplay"
-    @showimage     = File.executable?(@w3mimgdisplay)
+    @termpix = Termpix::Display.new
+    @showimage = @termpix.supported?
     @current_image = nil
   end
 
   def check_image_redraw # {{{2
     # Only check if image display is enabled
     return unless @showimage
-    
+
     # Only check if we have an image currently displayed
     return unless @current_image && File.exist?(@current_image)
-    
+
     begin
-      # Check if we're in the active window - if not, image overlay might be cleared
-      active_window = `xdotool getactivewindow 2>/dev/null`.chomp
-      return if active_window.empty?
-      
-      # Check if this terminal window is the active one
-      current_window = `xdotool getwindowfocus 2>/dev/null`.chomp
-      
-      # Only redraw if we detect a focus change (simple heuristic)
-      if @last_active_window && @last_active_window != active_window && current_window == active_window
-        # Window focus changed and we're now active - redraw image
-        show_image(@current_image)
+      # For w3m protocol, check if image overlay was cleared
+      if @termpix.protocol == :w3m
+        active_window = `xdotool getactivewindow 2>/dev/null`.chomp
+        return if active_window.empty?
+
+        current_window = `xdotool getwindowfocus 2>/dev/null`.chomp
+
+        # Only redraw if we detect a focus change
+        if @last_active_window && @last_active_window != active_window && current_window == active_window
+          show_image(@current_image)
+        end
+
+        @last_active_window = active_window
       end
-      
-      @last_active_window = active_window
+      # Sixel images persist, no redraw needed
     rescue
       # Silently fail - we don't want focus checking to break anything
     end
@@ -650,47 +651,32 @@ class AstroPanelApp
     return unless @showimage
 
     begin
-      # if anything in here takes longer than 2s, we skip it
       Timeout.timeout(2) do
-        # grab window pixel dimensions
-        info = `xwininfo -id $(xdotool getactivewindow) 2>/dev/null`
-        return unless info =~ /Width:\s*(\d+).*Height:\s*(\d+)/m
-        term_w, term_h = $1.to_i, $2.to_i
-
-        # compute character‐cell size
         rows, cols = IO.console.winsize
-        cw = term_w.to_f / cols
-        ch = term_h.to_f / rows
 
-        # top‐left pixel of the image
-        px = ((@main.x - 1) * cw).to_i
-        py = (24 * ch).to_i
+        # Always clear previous image first to prevent overlapping
+        @termpix.clear(
+          x: @main.x - 1,
+          y: 24,
+          width: @main.w,
+          height: rows - 26,
+          term_width: cols,
+          term_height: rows)
 
         if file && File.exist?(file) && File.size(file) > 0
-          # read & scale the image
-          iw, ih = `identify -format "%wx%h" #{file}`.split('x').map(&:to_i)
-          max_w = ((@main.w - 3) * cw).to_i
-          max_h = ((rows - 26) * ch).to_i
-          if iw > max_w
-            ih = ih * max_w / iw; iw = max_w
-          end
-          if ih > max_h
-            iw = iw * max_h / ih; ih = max_h
-          end
-
-          # Clear image area
-          `echo "6;#{px};#{py};#{max_w};#{max_h};\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
-          `echo "0;1;#{px};#{py};#{iw};#{ih};;;;;\"#{file}\"\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
-          
-          # Track the current image
+          # Display new image using termpix (same positioning as original)
+          @termpix.show(file,
+            x: @main.x - 1,
+            y: 24,
+            max_width: @main.w - 3,
+            max_height: rows - 26)
           @current_image = file
         else
-          # Clear image if no file or file doesn't exist
           @current_image = nil
         end
       end
     rescue Timeout::Error
-      # silently skip if w3mimgdisplay/identify/xwininfo hangs
+      # silently skip if image display hangs
     end
   end
 
@@ -1249,12 +1235,15 @@ begin
   # a single quick DNS + TCP check
   TCPSocket.new('api.met.no', 443).close
 rescue SocketError, Socket::ResolutionError => e
-  $stderr.puts "FATAL: can’t resolve api.met.no – network appears down (#{e.message})"
+  $stderr.puts "FATAL: can't resolve api.met.no – network appears down (#{e.message})"
   $stdin.cooked!
   $stdin.echo = true
   exit!
 end
 
+# Initialize rcurses (required for rcurses 6.0.0+)
+Rcurses.init!
+
 AstroPanelApp.new
 
 # VIM MODELINE{{{1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astropanel
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-06 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -16,21 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-description: 'This program shows essential data in order to plan your observations:
-  9 days weather forecast, full ephemeris for the Sun, the Moon and all major planets,
-  complete with graphic representation of rise/set times, detailed info for each day
-  with important astronomical events, star chart displayed in the terminal and more.
-  New in 2.0: Full rewrite using rcurses (https://github.com/isene/rcurses). 3.0.0:
-  Major accuracy improvement with IAU 2006 obliquity standard and higher-precision
-  ephemeris calculations from https://github.com/isene/ephemeris'
+        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'
+description: 'AstroPanel v4.1.0: Modern image display using termpix gem with Sixel
+  and w3m protocol support. This program shows essential data in order to plan your
+  observations: 9 days weather forecast, full ephemeris for the Sun, the Moon and
+  all major planets, complete with graphic representation of rise/set times, detailed
+  info for each day with important astronomical events, star chart displayed in the
+  terminal and more.'
 email: g@isene.com
 executables:
 - astropanel