rabbit 3.0.5 → 4.0.1

data/lib/rabbit/front.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2005-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
@@ -16,8 +16,8 @@
 
 require "monitor"
 
-require "rabbit/rabbit"
-require "rabbit/utils"
+require_relative "rabbit"
+require_relative "utils"
 
 module Rabbit
 
@@ -109,8 +109,15 @@ module Rabbit
       @canvas.slide_title
     end
 
+    def n_slides
+      @canvas.n_slides
+    end
+
     def total_slide_number
-      @canvas.slide_size
+      warn("#{self.class.name}\##{__method__} is deprecated. " +
+           "Use \#n_slides instead.",
+           category: :deprecated)
+      n_slides
     end
 
     def current_slide_number

data/lib/rabbit/gem-finder.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-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,16 +14,12 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/gettext"
+require_relative "gettext"
 
 module Rabbit
   class GemFinder
     include GetText
 
-    def initialize(logger=nil)
-      @logger = logger || Logger.default
-    end
-
     def find(name, prefix)
       normalized_name = name.downcase
       unless normalized_name.start_with?(prefix)
@@ -43,11 +39,11 @@ module Rabbit
             require "rubygems/dependency_installer"
             options = {}
             if File.writable?(Gem.dir)
-              @logger.info(_("Installing gem: %s") % normalized_name)
+              Rabbit.logger.info(_("Installing gem: %s") % normalized_name)
             else
               options[:user_install] = true
               format = _("Installing gem in user install mode: %s")
-              @logger.info(format % normalized_name)
+              Rabbit.logger.info(format % normalized_name)
             end
             installer = Gem::DependencyInstaller.new(options)
             installer.install(normalized_name, Gem::Requirement.default)

data/lib/rabbit/gem-pusher.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2023  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2016-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
@@ -17,9 +17,9 @@
 require "rake"
 require "open-uri"
 
-require "rabbit/gettext"
-require "rabbit/password-reader"
-require "rabbit/yaml-loader"
+require_relative "gettext"
+require_relative "password-reader"
+require_relative "yaml-loader"
 
 module Rabbit
   class GemPusher

data/lib/rabbit/gesture/handler.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2024  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2006-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,11 +14,11 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'rabbit/gtk'
+require_relative "../gtk"
 
-require 'rabbit/rabbit'
-require 'rabbit/renderer/engine'
-require 'rabbit/gesture/processor'
+require_relative "../rabbit"
+require_relative "../renderer/engine"
+require_relative "processor"
 
 module Rabbit
   module Gesture
@@ -35,6 +35,7 @@ module Rabbit
       attr_accessor :line_width, :next_width
       def initialize(conf={})
         super()
+        @icon_theme = Gtk::IconTheme.default
         conf ||= {}
         @back_color = conf[:back_color] || DEFAULT_BACK_COLOR
         @line_color = conf[:line_color] || DEFAULT_LINE_COLOR
@@ -56,12 +57,12 @@ module Rabbit
         @actions.clear
       end
 
-      def add_action(sequence, action, &block)
+      def add_action(sequence, action)
         invalid_motion = sequence.find do |motion|
           not @processor.available_motion?(motion)
         end
         raise InvalidMotionError.new(invalid_motion) if invalid_motion
-        @actions << [sequence, action, block]
+        @actions << [sequence, action]
       end
 
       def start(button, x, y, base_x, base_y)
@@ -100,7 +101,7 @@ module Rabbit
 
         draw_available_marks(renderer, next_available_motions)
 
-        act, = action
+        act = action
         draw_mark(renderer, act, *@processor.position) if act
 
         draw_locus(renderer)
@@ -117,11 +118,11 @@ module Rabbit
 
       private
       def perform_action
-        act, block = action
+        act = action
         @processor.reset
         @locus.clear
         if act
-          act.activate(&block)
+          act.gaction.activate
           true
         else
           false
@@ -130,16 +131,16 @@ module Rabbit
 
       def action
         motions = @processor.motions
-        @actions.each do |sequence, act, block|
-          return [act, block] if sequence == motions and act.sensitive?
+        @actions.each do |sequence, act|
+          return act if sequence == motions and act.gaction.enabled?
         end
         nil
       end
 
       def available_motions
         motions = @processor.motions
-        @actions.collect do |sequence, act, block|
-          if sequence == motions and act.sensitive?
+        @actions.collect do |sequence, act|
+          if sequence == motions and act.gaction.enabled?
             [sequence.last, act]
           else
             nil
@@ -149,8 +150,8 @@ module Rabbit
 
       def next_available_motions
         motions = @processor.motions
-        @actions.collect do |sequence, act, block|
-          if sequence[0..-2] == motions and act.sensitive?
+        @actions.collect do |sequence, act|
+          if sequence[0..-2] == motions and act.gaction.enabled?
             [sequence.last, act]
           else
             nil
@@ -171,12 +172,16 @@ module Rabbit
       end
 
       def draw_action_image(renderer, act, x, y)
-        icon = nil
-        icon = act.create_icon(Gtk::IconSize::DIALOG) if act
+        icon = act&.icon
         if icon
-          stock, = icon.stock
-          icon_size = icon.icon_size
-          pixbuf = icon.render_icon_pixbuf(stock, icon_size)
+          if icon.respond_to?(:bytes)
+            loader = GdkPixbuf::PixbufLoader.new
+            loader.set_size(48, 48)
+            loader.last_write(icon.bytes.to_s)
+            pixbuf = loader.pixbuf
+          else
+            pixbuf = @icon_theme.load_icon(icon.names[0], 48, 0)
+          end
           x -= pixbuf.width / 2.0
           y -= pixbuf.height / 2.0
           renderer.draw_pixbuf(pixbuf, x, y)

data/lib/rabbit/graffiti/config-dialog.rb

@@ -1,6 +1,22 @@
-require 'rabbit/gtk'
+# Copyright (C) 2006-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/renderer/color'
+require_relative "../gtk"
+
+require_relative "../renderer/color"
 
 module Rabbit
   module Graffiti

data/lib/rabbit/graffiti/processor.rb

@@ -1,7 +1,23 @@
-require 'rabbit/gtk'
-
-require 'rabbit/renderer/engine'
-require 'rabbit/graffiti/config-dialog'
+# Copyright (C) 2006-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_relative "../gtk"
+
+require_relative "../renderer/engine"
+require_relative "config-dialog"
 
 module Rabbit
   module Graffiti

data/lib/rabbit/gtk.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2024  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2014-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
@@ -23,27 +23,49 @@ end
 
 Gtk.init if Gtk.respond_to?(:init)
 
-module Gtk
-  if const_defined?(:Action)
-    class Action
-      alias _activate activate
-      def activate(&block)
-        @block = block
-        _activate
-      ensure
-        @block = nil
+module Gdk
+  class ModifierType
+    ALT_MASK = MOD1_MASK unless const_defined?(:ALT_MASK)
+    alias_method :alt_mask?, :mod1_mask? unless method_defined?(:alt_mask?)
+  end
+
+  if const_defined?(:Paintable)
+    class PixbufAnimationPaintable < GLib::Object
+      type_register
+
+      include Paintable
+
+      def initialize(animation)
+        super()
+        @animation = animation
+        @iter = @animation.get_iter
+      end
+
+      def virtual_do_snapshot(snapshot, width, height)
+        @iter.advance
+        texture = Texture.new(@iter.pixbuf)
+        snapshot.append_texture(texture, [0, 0, width, height])
+        delay_time = @iter.delay_time
+        if delay_time != -1
+          GLib::Timeout.add(@iter.delay_time) do
+            invalidate_contents
+            GLib::Source::REMOVE
+          end
+        end
       end
 
-      def block_given?
-        not @block.nil?
+      def virtual_do_get_intrinsic_width
+        @animation.width
       end
 
-      def call(*args, &block)
-        @block.call(*args, &block)
+      def virtual_do_get_intrinsic_height
+        @animation.height
       end
     end
   end
+end
 
+module Gtk
   unless const_defined?(:Native)
     # For GTK 3
     #
@@ -56,4 +78,16 @@ module Gtk
       alias_method :surface, :window
     end
   end
+
+  unless const_defined?(:StackTransitionType)
+    StackTransitionType = Stack::TransitionType
+  end
+end
+
+unless Gtk.const_defined?(:MediaFile)
+  # For video
+  begin
+    require "gst"
+  rescue LoadError
+  end
 end

data/lib/rabbit/html/generator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2018  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2005-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
@@ -22,11 +22,11 @@ begin
 rescue LoadError
 end
 
-require "rabbit/filename"
-require "rabbit/front"
-require "rabbit/keys"
-require "rabbit/rabbit"
-require "rabbit/utils"
+require_relative "../filename"
+require_relative "../front"
+require_relative "../keys"
+require_relative "../rabbit"
+require_relative "../utils"
 
 module Rabbit
   module HTML
@@ -72,7 +72,7 @@ module Rabbit
           @outputting_index = false
           @canvas.each_slide_pixbuf do |slide, pixbuf, slide_number|
             message = _("Creating a image for the %dth page") % slide_number
-            @canvas.logger.info(message)
+            Rabbit.logger.info(message)
             save_slide(slide, pixbuf, slide_number)
             true
           end
@@ -84,7 +84,7 @@ module Rabbit
             end
           end
           unless save_rss
-            @canvas.logger.warn(_("can't generate RSS"))
+            Rabbit.logger.warn(_("can't generate RSS"))
           end
         end
       end
@@ -160,18 +160,18 @@ module Rabbit
       private
       def save_environment
         @index_mode = @canvas.index_mode?
-        @slide_size = @canvas.slide_size
-        @index_slide_size = 0
+        @n_slides = @canvas.n_slides
+        @index_n_slides = 0
         if output_index_html?
           @canvas.with_index_mode(true) do
-            @index_slide_size = @canvas.slide_size
+            @index_n_slides = @canvas.n_slides
           end
         end
         yield
       ensure
         @index_mode = nil
-        @slide_size = nil
-        @index_slide_size = nil
+        @n_slides = nil
+        @index_n_slides = nil
       end
 
       def save_html(slide, slide_number)
@@ -229,8 +229,8 @@ module Rabbit
       def filename_format
         format = @base_name.dup
         format << "-index" if outputting_index?
-        slide_size = outputting_index? ? @index_slide_size : @slide_size
-        format << "-%0#{number_of_places(slide_size)}d%s.%s"
+        n_slides = outputting_index? ? @index_n_slides : @n_slides
+        format << "-%0#{number_of_places(n_slides)}d%s.%s"
       end
 
       def make_filename(slide_number, suffix, optional=nil)
@@ -290,7 +290,7 @@ module Rabbit
 
       def image_title(slide_number=@slide_number)
         title = h(slide_title(slide_number))
-        title << "(#{slide_number}/#{@canvas.slide_size - 1})"
+        title << "(#{slide_number}/#{@canvas.n_slides - 1})"
         title
       end
 
@@ -315,7 +315,7 @@ module Rabbit
       end
 
       def last_slide?(slide_number=@slide_number)
-        @canvas.slide_size.zero? or slide_number == @canvas.slide_size - 1
+        @canvas.n_slides.zero? or slide_number == @canvas.n_slides - 1
       end
 
       def first_index(slide_number=@slide_number)
@@ -331,7 +331,7 @@ module Rabbit
       end
 
       def last_index(slide_number=@slide_number)
-        @canvas.slide_size - 1
+        @canvas.n_slides - 1
       end
 
       def first_link(slide_number=@slide_number)

data/{test/helper/fixture.rb → lib/rabbit/icon.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 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,11 +14,21 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module Helper
-  module Fixture
-    private
-    def fixture_path(*components)
-      File.join(File.dirname(__FILE__), "..", "fixtures", *components)
+require_relative "gtk"
+
+require_relative "image"
+require_relative "theme/searcher"
+
+module Rabbit
+  module Icon
+    module_function
+    def rabbit
+      image_theme = Theme::Searcher.find_theme("rabbit-images", true)
+      file = Theme::Searcher.find_file("lavie-icon.png", [image_theme])
+      loader = ImageLoader.new(file)
+      loader.resize(32, 32)
+      bytes = GLib::Bytes.new(loader.pixbuf.save("png"))
+      Gio::BytesIcon.new(bytes)
     end
   end
 end

data/lib/rabbit/image/base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2022  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
@@ -19,8 +19,9 @@ require "digest/sha2"
 
 require "gdk_pixbuf2"
 
-require "rabbit/image-data-loader"
-require "rabbit/properties"
+require_relative "../image-data-loader"
+require_relative "../properties"
+require_relative "../utils"
 
 module Rabbit
   module ImageManipulable
@@ -116,9 +117,9 @@ module Rabbit
       end
 
       def resize(w, h)
-        if w.nil? and h.nil?
-          return
-        elsif keep_ratio?
+        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

data/lib/rabbit/image/default.rb

@@ -1,4 +1,20 @@
-require "rabbit/image/base"
+# 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_relative "base"
 
 module Rabbit
   module ImageManipulable

data/lib/rabbit/image/dia.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2022  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
@@ -14,7 +14,7 @@
 # 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/base"
+require_relative "base"
 
 module Rabbit
   module ImageManipulable

data/lib/rabbit/image/eps.rb

@@ -1,6 +1,20 @@
-require "rabbit/utils"
+# 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 "rabbit/image/base"
+require_relative "base"
 
 module Rabbit
   module ImageManipulable

data/lib/rabbit/image/gimp.rb

@@ -1,5 +1,21 @@
-require "rabbit/utils"
-require "rabbit/image/base"
+# Copyright (C) 2006-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_relative "../utils"
+require_relative "base"
 
 module Rabbit
   module ImageManipulable
@@ -23,21 +39,22 @@ module Rabbit
 
       private
       def update_size
-        png_file = Tempfile.new("rabbit-loader-gimp-png")
+        png_file = Tempfile.new(["rabbit-loader-gimp-png", ".png"])
         png_path = png_file.path
         clip_to_image = 1
         merge_type = clip_to_image
-        command = <<-EOC
+        command = <<-COMMAND
 (let ((image (car (gimp-file-load RUN-NONINTERACTIVE
                                   "#{@filename}" "#{@filename}"))))
-  (let ((layer (car (gimp-image-merge-visible-layers image #{merge_type}))))
-    (file-png-save-defaults RUN-NONINTERACTIVE image layer
-                            "#{png_path}" "#{png_path}"))
+  (gimp-file-save RUN-NONINTERACTIVE image "#{png_path}")
   (gimp-image-delete image))
-EOC
-        args = %w(-i)
-        args.concat(["-b", command])
-        args.concat(["-b", "(gimp-quit TRUE)"])
+        COMMAND
+        args = [
+          "--no-interface",
+          "--batch-interpreter", "plug-in-script-fu-eval",
+          "--batch", command,
+          "--batch", "(gimp-quit TRUE)",
+        ]
         if GIMP_COMMANDS.any? {|gimp| run(gimp, *args); File.exist?(png_path)}
           png_file.open
           png_file.binmode

data/lib/rabbit/image/mermaid.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2022-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,8 +14,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/gettext"
-require "rabbit/image/pdf"
+require_relative "../gettext"
+require_relative "pdf"
 
 module Rabbit
   module ImageManipulable

data/lib/rabbit/image/pdf.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2006-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
@@ -16,8 +16,8 @@
 
 require "poppler"
 
-require "rabbit/gettext"
-require "rabbit/image/base"
+require_relative "../gettext"
+require_relative "base"
 
 module Rabbit
   module ImageManipulable