przn 0.3.0 → 0.5.0

data/lib/przn.rb

@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
-require_relative "przn/version"
-require_relative "przn/kitty_text"
-require_relative "przn/image_util"
-require_relative "przn/slide"
-require_relative "przn/parser"
-require_relative "przn/presentation"
-require_relative "przn/terminal"
-require_relative "przn/renderer"
-require_relative "przn/controller"
-require_relative "przn/pdf_exporter"
-require_relative "przn/screenshot_pdf_exporter"
-require_relative "przn/theme"
+require 'tmpdir'
+require 'securerandom'
+
+require_relative 'przn/version'
+require_relative 'przn/kitty_text'
+require_relative 'przn/image_util'
+require_relative 'przn/parser'
+require_relative 'przn/slide'
+require_relative 'przn/presentation'
+require_relative 'przn/terminal'
+require_relative 'przn/renderer'
+require_relative 'przn/presenter_renderer'
+require_relative 'przn/audience_link'
+require_relative 'przn/echoes_client'
+require_relative 'przn/controller'
+require_relative 'przn/screenshot_pdf_exporter'
+require_relative 'przn/theme'
 
 module Przn
   class Error < StandardError; end
@@ -26,29 +31,73 @@ module Przn
     Controller.new(presentation, terminal, renderer)
   end
 
-  # Default PDF export: drives the live renderer, asks the terminal to save
-  # each rendered slide as a one-page vector PDF via OSC 7772 `capture`,
-  # then concatenates the per-slide PDFs into a single multi-page PDF.
-  # Requires Echoes (or any terminal that implements the same capture
-  # command); use `export_pdf_prawn` instead for environments where that's
-  # not possible (CI, headless).
-  def self.export_pdf(file, output, theme: nil)
+  # Audience-side entry: opens the file, listens on `socket`, and renders
+  # whatever slide the presenter sends a `goto` for. Notes are stripped.
+  # Spawned by Echoes when the presenter requests an extended-display window.
+  def self.audience(file, socket:, theme: nil)
     markdown = File.read(file)
     presentation = Parser.parse(markdown)
+    terminal = Terminal.new
     base_dir = File.dirname(File.expand_path(file))
-    ScreenshotPdfExporter.new(presentation, base_dir: base_dir, theme: theme).export(output)
-    puts "Generated: #{output}"
+    renderer = Renderer.new(terminal, base_dir: base_dir, theme: theme, mode: :audience)
+
+    terminal.enter_alt_screen
+    terminal.hide_cursor
+    begin
+      render = ->(idx, started_at) {
+        presentation.go_to(idx)
+        renderer.render(presentation.current_slide,
+                        current: presentation.current,
+                        total: presentation.total,
+                        started_at: started_at)
+      }
+      render.call(0, nil)
+      AudienceLink.serve(socket) do |msg|
+        next unless msg[:type] == "goto" && msg[:index].is_a?(Integer)
+        started_at = msg[:started_at] ? Time.at(msg[:started_at]) : nil
+        render.call(msg[:index], started_at)
+      end
+    ensure
+      terminal.write "\e]7772;bg-clear\a"
+      terminal.write ImageUtil.kitty_clear_all if ImageUtil.kitty_terminal?
+      terminal.show_cursor
+      terminal.leave_alt_screen
+    end
   end
 
-  # Legacy PDF export via Prawn — renders the deck directly into a vector
-  # PDF without touching the terminal. Diverges from what's on screen for
-  # any feature the live renderer adds (OSC 66 sized text, OSC 7772
-  # backgrounds, proportional fonts) but works headlessly.
-  def self.export_pdf_prawn(file, output, theme: nil)
+  # Presenter-side entry: detects a second display via Echoes, spawns the
+  # audience window on it, connects to the spawned process over a Unix
+  # socket, and returns a Controller wired up to drive both sides.
+  # Falls back to today's mirror-mode (`start`) when only one display is
+  # attached or Echoes is not the host terminal.
+  def self.present(file, theme: nil, theme_path: nil)
+    info = EchoesClient.display_info
+    if info.nil? || info.size < 2
+      warn "przn: extended-display unavailable (no secondary display detected), falling back to mirror mode"
+      return start(file, theme: theme)
+    end
+
+    socket_path = File.join(Dir.tmpdir, "przn-#{Process.pid}-#{SecureRandom.hex(4)}.sock")
+    audience_argv = [File.expand_path($PROGRAM_NAME), '--audience', '--socket', socket_path]
+    audience_argv += ['--theme', theme_path] if theme_path
+    audience_argv << File.expand_path(file)
+    EchoesClient.open_window(display: info.last[:index], argv: audience_argv)
+
+    deadline = Time.now + 5
+    sleep 0.1 until File.exist?(socket_path) || Time.now > deadline
+    unless File.exist?(socket_path)
+      warn "przn: audience window did not come up within 5s, falling back to mirror mode"
+      return start(file, theme: theme)
+    end
+
+    link = AudienceLink.connect(socket_path)
+    link.gets # discard the {"type":"ready"} handshake
+
     markdown = File.read(file)
     presentation = Parser.parse(markdown)
+    terminal = Terminal.new
     base_dir = File.dirname(File.expand_path(file))
-    PdfExporter.new(presentation, base_dir: base_dir, theme: theme).export(output)
-    puts "Generated: #{output}"
+    renderer = PresenterRenderer.new(terminal, presentation: presentation, base_dir: base_dir, theme: theme)
+    Controller.new(presentation, terminal, renderer, audience_link: link)
   end
 end

data/sample/sample.md

@@ -40,6 +40,30 @@ This is **bold**, this is *italic*, and this is `inline code`.
 
 normal and {::tag name="red"}red text{:/tag} mixed
 
+# Image (PNG)
+
+![](doge.png){:relative_height="70"}
+
+# Image (JPG)
+
+![](doge.jpg){:relative_height="70"}
+
+# Image (XML form)
+
+<img src="doge.png" relative_height="70"/>
+
+# Image (absolute position)
+
+<img src="doge.png" x="5"   y="3"   relative_height="40"/>
+<img src="doge.png" x="50%" y="50%" relative_height="40"/>
+
+# Absolute-position text
+
+<at x="10" y="10">top-left ish</at>
+<at x="40" y="15"><size=3>BIG</size></at>
+<at x="80" y="25"><color=red>warn</color></at>
+<at x="50%" y="50%">dead center</at>
+
 # Thank You!
 
 That's all! Enjoy!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: przn
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
   - Akira Matsuda
@@ -55,18 +55,23 @@ files:
   - default_theme.yml
   - exe/przn
   - lib/przn.rb
+  - lib/przn/audience_link.rb
   - lib/przn/controller.rb
+  - lib/przn/echoes_client.rb
   - lib/przn/image_util.rb
   - lib/przn/kitty_text.rb
   - lib/przn/parser.rb
-  - lib/przn/pdf_exporter.rb
+  - lib/przn/prawn_pdf_exporter.rb
   - lib/przn/presentation.rb
+  - lib/przn/presenter_renderer.rb
   - lib/przn/renderer.rb
   - lib/przn/screenshot_pdf_exporter.rb
   - lib/przn/slide.rb
   - lib/przn/terminal.rb
   - lib/przn/theme.rb
   - lib/przn/version.rb
+  - sample/doge.jpg
+  - sample/doge.png
   - sample/sample.md
   - sig/przn.rbs
 homepage: "https://github.com/amatsuda/przn"