rabbit 3.0.5 → 4.0.1

data/lib/rabbit/renderer/display/menu.rb

@@ -1,4 +1,20 @@
-require "rabbit/menu"
+# 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 "../../menu"
 
 module Rabbit
   module Renderer
@@ -13,8 +29,16 @@ module Rabbit
           @menu.update_menu(@canvas)
         end
 
-        def popup_menu
-          @menu.popup(0, Gtk.current_event_time)
+        def toggle_menu(x=nil, y=nil)
+          @menu.toggle(x, y)
+        end
+
+        def popup_menu(x=nil, y=nil)
+          @menu.popup(x, y)
+        end
+
+        def popdown_menu
+          @menu.popdown
         end
 
         def attach_menu(window)

data/lib/rabbit/renderer/display/motion-handler.rb

@@ -0,0 +1,45 @@
+# 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 "../../gtk"
+
+module Rabbit
+  module Renderer
+    module Display
+      module MotionHandler
+        private
+        if Gtk::Widget.method_defined?(:add_controller)
+          def set_motion_event(widget)
+            motion = Gtk::EventControllerMotion.new
+            motion.signal_connect(:motion) do |_, x, y|
+              call_hook_procs(@motion_notify_hook_procs, x, y)
+            end
+            widget.add_controller(motion)
+          end
+        else
+          def set_motion_event(widget)
+            widget.add_events(Gdk::EventMask::BUTTON1_MOTION_MASK |
+                              Gdk::EventMask::BUTTON2_MOTION_MASK |
+                              Gdk::EventMask::BUTTON3_MOTION_MASK)
+            widget.signal_connect("motion_notify_event") do |widget, event|
+              call_hook_procs(@motion_notify_hook_procs, event.x, event.y)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/renderer/display/progress.rb

@@ -1,7 +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 "forwardable"
 
-require "rabbit/action"
-require "rabbit/progress"
+require_relative "../../progress"
 
 module Rabbit
   module Renderer

data/lib/rabbit/renderer/display/scroll-handler.rb

@@ -1,4 +1,20 @@
-require 'rabbit/gtk'
+# Copyright (C) 2010-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"
 
 module Rabbit
   module Renderer
@@ -13,21 +29,52 @@ module Rabbit
         def init_scroll_handler
         end
 
-        def set_scroll_event(widget)
-          widget.signal_connect("scroll_event") do |widget, event|
-            handled = call_hook_procs(@scroll_hook_procs, event)
-            unless handled
-              handled = true
-              case event.direction
-              when Gdk::ScrollDirection::UP
-                @canvas.activate("PreviousSlide")
-              when Gdk::ScrollDirection::DOWN
-                @canvas.activate("NextSlide")
+        if Gtk::Widget.method_defined?(:add_controller)
+          ScrollEvent = Struct.new(:direction)
+
+          def set_scroll_event(widget)
+            scroll = Gtk::EventControllerScroll.new([:both_axes])
+            scroll.signal_connect(:scroll) do |_, dx, dy|
+              if dy.zero?
+                false
               else
-                handled = false
+                if dy.positive?
+                  direction = Gdk::ScrollDirection::UP
+                else
+                  direction = Gdk::ScrollDirection::DOWN
+                end
+                event = ScrollEvent.new(direction)
+                handled = call_hook_procs(@scroll_hook_procs, event)
+                unless handled
+                  if direction == Gdk::ScrollDirection::UP
+                    @canvas.activate("NextSlide")
+                  else
+                    @canvas.activate("PreviousSlide")
+                  end
+                end
+                true
+              end
+            end
+            widget.add_controller(scroll)
+          end
+        else
+          def set_scroll_event(widget)
+            widget.add_events(Gdk::EventMask::SCROLL_MASK)
+            widget.signal_connect("scroll_event") do |widget, event|
+              handled = call_hook_procs(@scroll_hook_procs, event)
+              unless handled
+                handled = true
+                case event.direction
+                when Gdk::ScrollDirection::UP
+                  @canvas.activate("PreviousSlide")
+                when Gdk::ScrollDirection::DOWN
+                  @canvas.activate("NextSlide")
+                else
+                  handled = false
+                end
               end
+              handled
             end
-            handled
           end
         end
       end

data/lib/rabbit/renderer/display/search.rb

@@ -1,4 +1,20 @@
-require "rabbit/search-window"
+# 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 "../../search-window"
 
 module Rabbit
   module Renderer
@@ -103,7 +119,8 @@ module Rabbit
           if target_index and target_index >= 0 and
               target_index < indexes.size and
               indexes[target_index] != current_index
-            @canvas.activate("JumpTo") {indexes[target_index]}
+            @canvas.activate("JumpToSlide",
+                             GLib::Variant.new(indexes[target_index], "i"))
           end
         end
       end

data/lib/rabbit/renderer/display/spotlight.rb

@@ -1,3 +1,19 @@
+# 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.
+
 module Rabbit
   module Renderer
     module Display
@@ -7,17 +23,12 @@ module Rabbit
           init_spotlight
         end
 
-        def attach_to(window, container=nil)
-          super
-          spotlight_action.active = false
-        end
-
         def toggle_spotlight
+          @spotlighting = !@spotlighting
           if spotlighting?
             grab
-            x, y, mask = pointer
-            @spotlight_center_x ||= x
-            @spotlight_center_y ||= y
+            @spotlight_center_x ||= 0
+            @spotlight_center_y ||= 0
           else
             ungrab
             @spotlight_center_x = nil
@@ -26,22 +37,33 @@ module Rabbit
           queue_draw
         end
 
+        def spotlighting?
+          @spotlighting
+        end
+
         private
         def init_spotlight
+          @spotlighting = false
+
           @spotlight_radius_ratio = 0.1
           @spotlight_center_x = nil
           @spotlight_center_y = nil
 
-          target_button = 3
-          target_event_type = Gdk::EventType::BUTTON2_PRESS
-          target_info = [target_button, target_event_type]
-
           add_button_press_hook do |event|
-            if [event.button, event.event_type] == target_info
+            is_target = lambda do
+              return false unless event.button == 3
+              if Gdk::EventType.const_defined?(:BUTTON2_PRESS)
+                event.event_type == Gdk::EventType::BUTTON2_PRESS
+              else
+                event.event_type == Gdk::EventType::BUTTON_PRESS and
+                  event.n_presses == 2
+              end
+            end
+            if is_target.call
               add_button_handler do
                 @spotlight_center_x = event.x
                 @spotlight_center_y = event.y
-                spotlight_action.active = !spotlight_action.active?
+                @canvas.activate("ToggleSpotlight")
                 clear_button_handler
                 true
               end
@@ -49,10 +71,10 @@ module Rabbit
             false
           end
 
-          add_motion_notify_hook do |event|
+          add_motion_notify_hook do |x, y|
             if spotlighting?
-              @spotlight_center_x = event.x
-              @spotlight_center_y = event.y
+              @spotlight_center_x = x
+              @spotlight_center_y = y
               queue_draw
               true
             else
@@ -103,14 +125,6 @@ module Rabbit
           }
           draw_rectangle(true, 0, 0, size.real_width, size.real_height, nil, params)
         end
-
-        def spotlighting?
-          spotlight_action.active?
-        end
-
-        def spotlight_action
-          @canvas.action("ToggleSpotlight")
-        end
       end
     end
   end

data/lib/rabbit/renderer/display.rb

@@ -1,37 +1,17 @@
-require "rabbit/utils"
+# 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.
 
-module Rabbit
-  module Renderer
-    module Display
-      extend Utils
-
-      class << self
-        @initialized = false
-        @preferred_class_name = nil
-        def init(options={})
-          if options.has_key?(:preferred_class_name)
-            @preferred_class_name = options[:preferred_class_name]
-          end
-          unless @initialized
-            @initialized = true
-            dir = ::File.join("rabbit", "renderer", "display")
-            require_files_under_directory_in_load_path(dir)
-          end
-        end
-
-        def new(*args, &block)
-          init
-          target_class = nil
-          if @preferred_class_name
-            if const_defined?(@preferred_class_name)
-              target_class = const_get(@preferred_class_name)
-              target_class = nil unless target_class.is_a?(Class)
-            end
-          end
-          target_class ||= corresponding_class_under_module(self)
-          target_class.new(*args, &block)
-        end
-      end
-    end
-  end
-end
+require_relative "display/drawing-area"

data/lib/rabbit/renderer/engine/cairo.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2024  Sutou Kouhei <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
@@ -17,8 +17,8 @@
 require "cairo"
 require "stringio"
 
-require "rabbit/image-data-loader"
-require "rabbit/renderer/kernel"
+require_relative "../../image-data-loader"
+require_relative "../kernel"
 
 module Rabbit
   module Renderer
@@ -26,8 +26,6 @@ module Rabbit
       module Cairo
         include Kernel
 
-        attr_writer :foreground, :background
-
         def background_image=(pixbuf)
           surface = ::Cairo::ImageSurface.new(::Cairo::FORMAT_A1, 1, 1)
           context = ::Cairo::Context.new(surface)
@@ -316,11 +314,6 @@ module Rabbit
         end
 
         private
-        def init_engine_color
-          @foreground = make_color("black")
-          @background = make_color(@background_color)
-        end
-
         def set_source(color, params={})
           pattern = params[:pattern]
           set = false
@@ -474,7 +467,7 @@ module Rabbit
         end
 
         def set_stroke_options(params)
-          set_line_width(get_line_width(params))
+          set_line_width(params[:line_width] || 1)
           [:line_cap, :line_join].each do |key|
             value = params[key]
             @context.send("#{key}=", value) if value

data/lib/rabbit/renderer/engine.rb

@@ -1 +1,17 @@
-require "rabbit/renderer/engine/cairo"
+# 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 "engine/cairo"

data/lib/rabbit/renderer/kernel.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018  Kouhei Sutou <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,22 +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/pango-markup"
-
-require "rabbit/renderer/color"
+require_relative "../pango-markup"
 
 module Rabbit
   module Renderer
     module Kernel
-      def make_color(color)
-        return color if color.is_a?(Color)
-        if color.nil?
-          @foreground
-        else
-          Color.parse(color)
-        end
-      end
-
       def translate_context(x, y, params={})
       end
 
@@ -204,13 +193,6 @@ module Rabbit
       end
 
       private
-      def get_line_width(params, default=nil)
-        params[:line_width] || default
-      end
-
-      def set_font_resolution(context)
-      end
-
       def setup_flag_params(pole_height, default_flag_width_ratio, params)
         params = params.dup
 

data/lib/rabbit/renderer/offscreen.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2024  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
@@ -14,15 +14,14 @@
 # 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-data-loader"
-require "rabbit/renderer/base"
-require "rabbit/renderer/engine/cairo"
-require "rabbit/utils"
+require_relative "../image-data-loader"
+require_relative "base"
+require_relative "engine/cairo"
+require_relative "../utils"
 
 module Rabbit
   module Renderer
-    class Offscreen
-      include Renderer::Base
+    class Offscreen < Base
       include Engine::Cairo
 
       attr_accessor :filename
@@ -93,12 +92,12 @@ module Rabbit
       end
 
       def create_pango_context
-        context = Gtk::Invisible.new.create_pango_context
+        context = Gtk::Label.new.create_pango_context
         set_font_resolution(context)
         context
       end
 
-      def pre_to_pixbuf(slide_size)
+      def pre_to_pixbuf(n_slides)
       end
 
       def to_pixbufing(i)
@@ -110,11 +109,6 @@ module Rabbit
       end
 
       private
-      def init_color
-        super
-        init_engine_color
-      end
-
       def offscreen_renderer?
         true
       end

data/lib/rabbit/renderer/print-layout.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
@@ -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/rabbit"
+require_relative "../rabbit"
 
 module Rabbit
   module Renderer

data/lib/rabbit/renderer/printer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2024  Sutou Kouhei <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
@@ -14,21 +14,20 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/rabbit"
+require_relative "../rabbit"
 
-require "rabbit/filename"
+require_relative "../filename"
 
-require "rabbit/renderer/base"
-require "rabbit/renderer/engine/cairo"
-require "rabbit/renderer/print-layout"
+require_relative "base"
+require_relative "engine/cairo"
+require_relative "print-layout"
 
 module Rabbit
   module Renderer
-    class Printer
+    class Printer < Base
       A4_WIDTH = 596
       A4_HEIGHT = 842
 
-      include Renderer::Base
       include Engine::Cairo
 
       attr_writer :filename
@@ -81,7 +80,7 @@ module Rabbit
         @filename || default_filename
       end
 
-      def pre_print(slide_size)
+      def pre_print(n_slides)
         init_context(create_context)
       end
 
@@ -177,12 +176,6 @@ module Rabbit
         end
       end
 
-      def init_color
-        super
-        @foreground = make_color("black")
-        @background = make_color(@background_color)
-      end
-
       def update_layout
         @layout = PrintLayout.create(self, @canvas)
       end
@@ -214,7 +207,7 @@ module Rabbit
           args[0] = ::Cairo::ScriptDevice.new(args[0])
           ::Cairo::ScriptSurface.new(*args)
         else
-          @canvas.logger.warn(_("can't find printer for %s") % filename)
+          Rabbit.logger.warn(_("can't find printer for %s") % filename)
           args[0] = "default.ps"
           ::Cairo::PSSurface.new(*args)
         end