rabbit 3.0.5 → 4.0.1

data/lib/rabbit/element/video.rb

@@ -1,9 +1,25 @@
-require "rabbit/utils"
+# Copyright (C) 2012  Narihiro Nakamura <authornari@gmail.com>
+# Copyright (C) 2013-2025  Sutou Kouhei <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/image"
-require "rabbit/element/block-element"
-require "rabbit/element/text-renderer"
-require "rabbit/parser/base"
+require_relative "../image"
+require_relative "../parser/base"
+require_relative "../properties"
+require_relative "block-element"
+require_relative "text-renderer"
 
 module Rabbit
   module Element
@@ -11,7 +27,6 @@ module Rabbit
       include Base
       include BlockElement
       include BlockHorizontalCentering
-      include TextRenderer
 
       attr_reader :filename
       attr_reader :relative_width, :relative_height
@@ -20,33 +35,24 @@ module Rabbit
       attr_reader :relative_padding_top, :relative_padding_bottom
       attr_reader :relative_padding_left, :relative_padding_right
 
-      def initialize(filename, prop)
+      def initialize(filename, props)
         @filename = filename
-        prop = Utils.stringify_hash_key(prop)
+        @thumbnail = nil
         super()
-        normalized_prop = {}
-        prop.each do |name, value|
-          normalized_prop[name.gsub(/-/, '_')] = value
-        end
-        prop = normalized_prop
-        %w(as_large_as_possible).each do |name|
-          instance_variable_set("@#{name}", true_value?(prop[name]))
-        end
-        %w(width height
-           relative_width relative_height
+        @properties = Properties.new(props)
+        width, height = detect_size
+        @original_width = width
+        @original_height = height
+        %w(relative_width relative_height
            relative_margin_top relative_margin_bottom
            relative_margin_left relative_margin_right
            relative_padding_top relative_padding_bottom
            relative_padding_left relative_padding_right
           ).each do |name|
-          begin
-            instance_variable_set("@#{name}", prop[name] && Integer(prop[name]))
-          rescue ArgumentError
-            raise InvalidSizeError.new(filename, name, prop[name])
-          end
+          instance_variable_set("@#{name}",
+                                @properties.get_relative_size(name, @filename))
         end
-
-        resize(@width, @height)
+        resize(width, height)
       end
 
       alias _compile compile
@@ -59,6 +65,23 @@ module Rabbit
         adjust_size(canvas, @x, @y, @w, @h)
       end
 
+      def setup_scene_element(canvas, scene_widget, x, y, w, h)
+        x, y, w, h = super
+
+        video = Gtk::Video.new(@filename)
+        scene_widget.put(video, x, y, @width || w, @height || h)
+        y += @height
+        h -= @height
+
+        [x, y, w, h]
+      end
+
+      def scene_snapshot_element(widget, snapshot, canvas, x, y, w, h)
+        y += @height
+        h -= @height
+        [x, y, w, h]
+      end
+
       def width
         @width.to_i + @padding_left + @padding_right
       end
@@ -68,23 +91,24 @@ module Rabbit
       end
 
       def as_large_as_possible?
-        @as_large_as_possible
+        @properties.get_boolean("as_large_as_possible", false)
+      end
+
+      def keep_ratio?
+        @properties.get_boolean("keep_ratio", true) and
+          @original_width and
+          @original_height
       end
 
       def draw_element(canvas, x, y, w, h, simulation)
         unless simulation
-          if canvas.display?
-            require "rabbit/video-window"
-            VideoWindow.show(canvas.window, self)
-          else
-            draw_layout(canvas, x, y)
-          end
+          @thumbnail.draw(canvas, x, y) if @thumbnail
         end
         [x, y + height, w, h - height]
       end
 
       def text
-        "video : #{File.basename(@filename)}"
+        "video: #{File.basename(@filename)}"
       end
 
       def to_rd
@@ -92,26 +116,106 @@ module Rabbit
       end
 
       private
+      def detect_size
+        width = @properties.get_size("width", @filename)
+        height = @properties.get_size("height", @filename)
+        if (width.nil? or height.nil?) and Gtk.const_defined?(:MediaFile)
+          w, h = detect_size_media_file
+          width ||= w
+          height ||= h
+        end
+        if (width.nil? or height.nil?) and defined?(::Gst)
+          w, h = detect_size_gstreamer
+          width ||= w
+          height ||= h
+        end
+        [width, height]
+      end
+
+      def detect_size_media_file
+        gio_file = Gio::File.open(path: @filename)
+        media_file = Gtk::MediaFile.new(gio_file)
+        # We want to mute here to avoid playing audio but if we
+        # mute, media_file isn't prepared...
+        # media_file.muted = true
+        media_file.play
+        while GLib::MainContext.default.iteration(true) do
+        end
+        width = media_file.intrinsic_width
+        width = nil if width.zero?
+        height = media_file.intrinsic_height
+        height = nil if height.zero?
+        media_file.pause
+        media_file.unref
+        [width, height]
+      end
+
+      def detect_size_gstreamer
+        pipeline = Gst::Pipeline.new
+        filesrc = Gst::ElementFactory.make("filesrc")
+        filesrc.location = @filename
+        decodebin = Gst::ElementFactory.make("decodebin")
+        return [nil, nil] if decodebin.nil?
+        videoconvert = Gst::ElementFactory.make("videoconvert")
+        return [nil, nil] if videoconvert.nil?
+        jpegenc = Gst::ElementFactory.make("jpegenc")
+        return [nil, nil] if jpegenc.nil?
+        filesink = Gst::ElementFactory.make("filesink")
+        @thumbnail_file = Tempfile.new(["rabbit-video", ".jpeg"])
+        filesink.location = @thumbnail_file.path
+
+        pipeline << filesrc << decodebin << videoconvert << jpegenc << filesink
+        filesrc >> decodebin
+        decodebin.signal_connect(:pad_added) do |_, pad|
+          sink_pad = videoconvert.get_static_pad("sink")
+          pad.link(sink_pad)
+        end
+        videoconvert >> jpegenc >> filesink
+
+        loop = GLib::MainLoop.new
+
+        bus = pipeline.bus
+        bus.add_watch do |bus, message|
+          case message.type
+          when Gst::MessageType::EOS
+            loop.quit
+          when Gst::MessageType::ERROR
+            loop.quit
+          end
+          true
+        end
+
+        pipeline.play
+        begin
+          loop.run
+        ensure
+          pipeline.stop
+        end
+
+        @thumbnail = ImageLoader.new(@thumbnail_file.path)
+        [@thumbnail.width, @thumbnail.height]
+      end
+
       def adjust_margin(w, h)
         @margin_top =
-          make_relative_size(@relative_margin_top, h) || @margin_top
+          @relative_margin_top&.resolve(h) || @margin_top
         @margin_bottom =
-          make_relative_size(@relative_margin_bottom, h) || @margin_bottom
+          @relative_margin_bottom&.resolve(h) || @margin_bottom
         @margin_left =
-          make_relative_size(@relative_margin_left, w) || @margin_left
+          @relative_margin_left&.resolve(w) || @margin_left
         @margin_right =
-          make_relative_size(@relative_margin_right, w) || @margin_right
+          @relative_margin_right&.resolve(w) || @margin_right
       end
 
       def adjust_padding(w, h)
         @padding_top =
-          make_relative_size(@relative_padding_top, h) || @padding_top
+          @relative_padding_top&.resolve(h) || @padding_top
         @padding_bottom =
-          make_relative_size(@relative_padding_bottom, h) || @padding_bottom
+          @relative_padding_bottom&.resolve(h) || @padding_bottom
         @padding_left =
-          make_relative_size(@relative_padding_left, w) || @padding_left
+          @relative_padding_left&.resolve(w) || @padding_left
         @padding_right =
-          make_relative_size(@relative_padding_right, w) || @padding_right
+          @relative_padding_right&.resolve(w) || @padding_right
       end
 
       def adjust_size(canvas, x, y, w, h)
@@ -120,21 +224,25 @@ module Rabbit
         adjust_margin(base_w, base_h)
         adjust_padding(base_w, base_h)
         base_h = base_h - @padding_top - @padding_bottom
-        if @as_large_as_possible
+        if as_large_as_possible?
           iw = base_w
           ih = base_h
         else
-          rw = make_relative_size(@relative_width, base_w)
-          rh = make_relative_size(@relative_height, base_h)
-          iw = rw || base_w
-          ih = rh || base_h
+          iw = @relative_width&.resolve(base_w)
+          ih = @relative_height&.resolve(base_h)
         end
         resize(iw, ih)
       end
 
       def resize(w, h)
-        if w.nil? and h.nil?
-          return
+        return if w.nil? and h.nil?
+
+        if keep_ratio?
+          if w and h.nil?
+            h = (@original_height * w.to_f / @original_width).ceil
+          elsif w.nil? and h
+            w = (@original_width * h.to_f / @original_height).ceil
+          end
         else
           w ||= width
           h ||= height
@@ -144,16 +252,9 @@ module Rabbit
         if w and w > 0 and h and h > 0 and [w, h] != [width, height]
           @width = w
           @height = h
+          @thumbnail&.resize(@width, @height)
         end
       end
-
-      def make_relative_size(size, parent_size)
-        size && parent_size && ((size / 100.0) * parent_size).ceil
-      end
-
-      def true_value?(value)
-        value == true or value == "true"
-      end
     end
   end
 end

data/lib/rabbit/element.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2017-2025  Sutou Kouhei <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,22 +14,22 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/element/block"
-require "rabbit/element/description-list"
-require "rabbit/element/enum-list"
-require "rabbit/element/footnote"
-require "rabbit/element/image-title-slide"
-require "rabbit/element/image"
-require "rabbit/element/index-slide"
-require "rabbit/element/item-list"
-require "rabbit/element/method-list"
-require "rabbit/element/poppler-slide"
-require "rabbit/element/poppler-title-slide"
-require "rabbit/element/preformatted"
-require "rabbit/element/slide"
-require "rabbit/element/syntax-highlighting"
-require "rabbit/element/table"
-require "rabbit/element/tag"
-require "rabbit/element/text"
-require "rabbit/element/title-slide"
-require "rabbit/element/video"
+require_relative "element/block"
+require_relative "element/description-list"
+require_relative "element/enum-list"
+require_relative "element/footnote"
+require_relative "element/image-title-slide"
+require_relative "element/image"
+require_relative "element/index-slide"
+require_relative "element/item-list"
+require_relative "element/method-list"
+require_relative "element/poppler-slide"
+require_relative "element/poppler-title-slide"
+require_relative "element/preformatted"
+require_relative "element/slide"
+require_relative "element/syntax-highlighting"
+require_relative "element/table"
+require_relative "element/tag"
+require_relative "element/text"
+require_relative "element/title-slide"
+require_relative "element/video"

data/lib/rabbit/formatter.rb

@@ -1,5 +1,22 @@
+# Copyright (C) 2004-2025  Sutou Kouhei <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "erb"
-require "rabbit/renderer/color"
+
+require_relative "renderer/color"
 
 module Rabbit
   module Format

data/lib/rabbit/frame.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2024  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2025  Sutou Kouhei <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,9 +15,10 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require "forwardable"
-require "rabbit/gtk"
 require "rexml/text"
 
+require_relative "gtk"
+
 begin
   case ENV["RABBIT_GTK"]
   when "4"
@@ -28,15 +29,14 @@ begin
 rescue LoadError
 end
 
-require "rabbit/rabbit"
-require "rabbit/utils"
+require_relative "rabbit"
+require_relative "utils"
 
 module Rabbit
   class Frame
     extend Forwardable
 
     def_delegators(:@window, :icon, :icon=, :set_icon)
-    def_delegators(:@window, :icon_list, :icon_list=, :set_icon_list)
     def_delegators(:@window, :iconify, :show, :hide, :visible?)
     def_delegators(:@window, :set_size_request, :resize)
 
@@ -47,14 +47,13 @@ module Rabbit
     def_delegators(:@canvas, :output_html=, :output_index_html=)
     def_delegators(:@canvas, :rss_base_uri=, :use_gl?, :use_gl=)
 
-    attr_reader :window, :logger
+    attr_reader :window
     attr_accessor :geometry
 
-    def initialize(logger, canvas)
-      @logger = logger
+    def initialize(canvas)
       @canvas = canvas
       @geometry = nil
-      @notebook = nil
+      @stack = nil
       @terminal = nil
       @running = true
     end
@@ -115,8 +114,7 @@ module Rabbit
       @fullscreen = false
       @main_window = main_window
       @terminal.show if @terminal
-      @notebook.show if @notebook
-      @window.show
+      @stack.show if @stack
       @canvas.post_init_gui
     end
 
@@ -130,17 +128,20 @@ module Rabbit
 
     def toggle_terminal
       return if @terminal.nil?
-      terminal_page = @notebook.page_num(@terminal)
-      if @notebook.current_page == terminal_page
-        @notebook.current_page = 0
+      if @stack.visible_child_name == "terminal"
+        if @stack.respond_to?(:pages)
+          @stack.visible_child = @stack.pages[0].child
+        else
+          @stack.visible_child = @stack.children[0]
+        end
       else
-        @notebook.current_page = terminal_page
+        @stack.visible_child_name = "terminal"
       end
     end
 
     def in_terminal?
       return false if @terminal.nil?
-      @notebook.current_page == @notebook.page_num(@terminal)
+      @stack.visible_child_name == "terminal"
     end
 
     private
@@ -149,54 +150,88 @@ module Rabbit
       @window = Gtk::ApplicationWindow.new(::Rabbit.application)
       @window.set_default_size(width, height)
       @window.parse_geometry(@geometry) if @geometry
-      @window.set_app_paintable(true)
-      if defined?(Vte::Terminal)
-        init_notebook
-      end
-      set_window_signal
-      setup_dnd
-      @canvas.attach_to(self, @window, @notebook)
-      if defined?(Vte::Terminal)
-        init_terminal
-      end
-    end
-
-    def init_notebook
-      @notebook = Gtk::Notebook.new
-      @notebook.show_tabs = false
-      provider = Gtk::CssProvider.new
-      provider.load(data: <<-CSS)
-        notebook {
-          border-width: 0px;
-        }
-      CSS
-      @notebook.style_context.add_provider(provider,
-                                           Gtk::StyleProvider::PRIORITY_USER)
-      @window.add(@notebook)
-    end
-
-    def set_window_signal
-      set_window_signal_window_state_event
+      init_stack
       set_window_signal_destroy
-    end
-
-    def set_window_signal_window_state_event
-      @window.signal_connect("window_state_event") do |widget, event|
-        if event.changed_mask.fullscreen?
-          @fullscreen = event.new_window_state.fullscreen?
-          if @fullscreen
-            @canvas.fullscreened
-          else
-            @canvas.unfullscreened
+      setup_dnd
+      @window.show # @window.surface is only available after @window.show.
+      if Gtk::Version::MAJOR < 4
+        @window.signal_connect(:configure_event) do |_, event|
+          GLib::Idle.add do
+            width = @stack.allocated_width
+            height = @stack.allocated_height
+            @canvas.renderer.update_size(width, height)
+            GLib::Source::REMOVE
           end
-        elsif event.changed_mask.iconified?
-          if event.new_window_state.iconified?
-            @canvas.iconified
+          false
+        end
+        @window.signal_connect(:window_state_event) do |widget, event|
+          if event.changed_mask.fullscreen?
+            @fullscreen = event.new_window_state.fullscreen?
+            if @fullscreen
+              @canvas.fullscreened
+            else
+              @canvas.unfullscreened
+            end
+          elsif event.changed_mask.iconified?
+            if event.new_window_state.iconified?
+              @canvas.iconified
+            end
           end
+
+          false
         end
+      else
+        previous_width = nil
+        previous_height = nil
+        previous_fullscreen = @fullscreen = @window.fullscreen?
+        previous_minimized = false
+        @surface = @window.surface # This is to guard from GC.
+        @surface.signal_connect(:notify) do |surface, param|
+          case param.name
+          when "width", "height"
+            GLib::Idle.add do
+              width = @stack.width
+              height = @stack.height
+              if previous_width != width or previous_height != height
+                @canvas.renderer.update_size(width, height)
+                previous_width = width
+                previous_height = height
+              end
+              GLib::Source::REMOVE
+            end
+          when "state"
+            state = surface.state
+            @canvas.reload_source if state.focused?
+            fullscreen = state.fullscreen?
+            if previous_fullscreen != fullscreen
+              @fullscreen = fullscreen
+              if @fullscreen
+                @canvas.fullscreened
+              else
+                @canvas.unfullscreened
+              end
+              previous_fullscreen = @fullscreen
+            end
+            minimized = state.minimized?
+            if previous_minimized != minimized
+              @canvas.iconified if minimized
+              previous_minimized = minimized
+            end
+          end
+        end
+      end
+      @canvas.attach_to(self, @window, @stack)
+      init_terminal if defined?(Vte::Terminal)
+    end
 
-        false
+    def init_stack
+      @stack = Gtk::Stack.new
+      if Gtk::StackTransitionType.const_defined?(:ROTATE_LEFT_RIGHT)
+        @stack.transition_type = :rotate_left_right
+      else
+        @stack.transition_type = :slide_left_right
       end
+      @window.child = @stack
     end
 
     def set_window_signal_destroy
@@ -206,6 +241,7 @@ module Rabbit
     end
 
     def setup_dnd
+      return if Gtk::Version::MAJOR >= 4 # TODO
       @window.drag_dest_set(:all,
                             [["text/uri-list", 0, 0],
                              ["_NETSCAPE_URL", 0, 0]],
@@ -214,7 +250,7 @@ module Rabbit
         widget, context, x, y, selection_data, info, time = args
         uri = selection_data.data.chomp
         Gtk.idle_add do
-          parse(Source::URI.new(nil, logger, uri))
+          parse(Source::URI.new(nil, uri))
           false
         end
         Gtk::Drag.finish(context, true, false, time)
@@ -242,11 +278,11 @@ module Rabbit
         @terminal.color_background = terminal_color_background
       end
       @terminal.enable_sixel = true if @terminal.respond_to?(:enable_sixel=)
-      @notebook.add(@terminal)
+      @stack.add_named(@terminal, "terminal")
       pid = nil
       in_terminal = false
-      @notebook.signal_connect(:switch_page) do |_, page,|
-        if page == @terminal
+      @stack.signal_connect("notify::visible-child-name") do |_, param|
+        if @stack.visible_child_name == "terminal"
           if @running
             pid = @terminal.spawn if pid.nil?
             @canvas.pre_terminal unless in_terminal
@@ -259,8 +295,7 @@ module Rabbit
       end
       @terminal.signal_connect(:child_exited) do
         pid = nil
-        terminal_page = @notebook.page_num(@terminal)
-        if @notebook.current_page == terminal_page
+        if @stack.visible_child_name == "terminal"
           @canvas.activate("ToggleTerminal")
         end
       end
@@ -277,10 +312,9 @@ module Rabbit
     end
 
     def_null_methods(:icon, :icon=, :set_icon)
-    def_null_methods(:icon_list, :icon_list=, :set_icon_list)
     def_null_methods(:update_title, :geometry, :geometry=)
 
-    def_null_methods(:fullscreen?, :quit)
+    def_null_methods(:quit)
 
     def fullscreen_available?
       false
@@ -296,35 +330,9 @@ module Rabbit
     def in_terminal?
       false
     end
-  end
-
-  class EmbedFrame < Frame
-    def update_title(new_title)
-    end
-
-    def fullscreen_available?
-      false
-    end
-
-    def iconify_available?
-      false
-    end
 
-    def toggle_terminal
-    end
-
-    def in_terminal?
+    def fullscreen?
       false
     end
-
-    def init_gui(width, height, main_window, window_type=nil)
-      @window = Gtk::EventBox.new
-      @window.set_size_request(width, height)
-      @canvas.attach_to(self, @window)
-      @fullscreen = false
-      @main_window = main_window
-      @window.show
-      @canvas.post_init_gui
-    end
   end
 end