rabbit 3.0.5 → 4.0.1

data/lib/rabbit/renderer/display/drawing-area-base.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
@@ -14,19 +14,19 @@
 # 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/display/drawing-area-primitive"
-require "rabbit/renderer/display/menu"
-require "rabbit/renderer/display/progress"
-require "rabbit/renderer/display/mask"
-require "rabbit/renderer/display/search"
-require "rabbit/renderer/display/gesture"
-require "rabbit/renderer/display/graffiti"
-require "rabbit/renderer/display/button-handler"
-require "rabbit/renderer/display/key-handler"
-require "rabbit/renderer/display/scroll-handler"
-require "rabbit/renderer/display/info"
-require "rabbit/renderer/display/spotlight"
-require "rabbit/renderer/display/magnifier"
+require_relative "drawing-area-primitive"
+require_relative "menu"
+require_relative "progress"
+require_relative "mask"
+require_relative "search"
+require_relative "gesture"
+require_relative "graffiti"
+require_relative "button-handler"
+require_relative "motion-handler"
+require_relative "scroll-handler"
+require_relative "info"
+require_relative "spotlight"
+require_relative "magnifier"
 
 module Rabbit
   module Renderer
@@ -40,8 +40,8 @@ module Rabbit
         include Progress
         include Search
         include Gesture
-        include KeyHandler
         include ButtonHandler
+        include MotionHandler
         include ScrollHandler
         include Info
         include Spotlight
@@ -53,6 +53,13 @@ module Rabbit
           super
         end
 
+        def update_size(width, height)
+          super
+          @mask = nil
+          set_hole
+          reload_theme if @surface
+        end
+
         def post_apply_theme
           if @need_reload_theme
             @need_reload_theme = false
@@ -122,8 +129,8 @@ module Rabbit
           super
         end
 
-        def pre_print(slide_size)
-          start_progress(slide_size)
+        def pre_print(n_slides)
+          start_progress(n_slides)
         end
 
         def printing(i)
@@ -136,9 +143,9 @@ module Rabbit
           end_progress
         end
 
-        def pre_to_pixbuf(slide_size)
+        def pre_to_pixbuf(n_slides)
           super
-          start_progress(slide_size)
+          start_progress(n_slides)
           @pixbufing_size = [width, height]
         end
 
@@ -155,7 +162,7 @@ module Rabbit
         end
 
         def cache_all_slides
-          pre_cache_all_slides(@canvas.slide_size)
+          pre_cache_all_slides(@canvas.n_slides)
           canceled = false
           @canvas.slides.each_with_index do |slide, i|
             @canvas.change_current_index(i) do
@@ -169,10 +176,10 @@ module Rabbit
           post_cache_all_slides(canceled)
         end
 
-        def pre_cache_all_slides(slide_size)
+        def pre_cache_all_slides(n_slides)
           @caching = true
           @caching_size = [width, height]
-          start_progress(slide_size)
+          start_progress(n_slides)
         end
 
         def caching_all_slides(i)
@@ -209,9 +216,9 @@ module Rabbit
           if @canvas.need_reload_source?
             callback ||= Utils.process_pending_events_proc
             begin
-              super(callback)
+              @canvas.reload_source(callback)
             rescue
-              @canvas.logger.error($!)
+              Rabbit.logger.error($!)
             end
           end
         end
@@ -224,11 +231,9 @@ module Rabbit
           add_widgets_to_container(@container, &block)
           widget.show
           attach_menu(@window)
-          attach_key(@window)
         end
 
         def detach
-          detach_key(@window)
           detach_menu(@window)
           widget.hide
           unless @window.destroyed?
@@ -285,25 +290,11 @@ module Rabbit
 
         def init_drawing_area
           super
-          event_mask = Gdk::EventMask::BUTTON_PRESS_MASK
-          event_mask |= Gdk::EventMask::BUTTON_RELEASE_MASK
-          event_mask |= Gdk::EventMask::BUTTON1_MOTION_MASK
-          event_mask |= Gdk::EventMask::BUTTON2_MOTION_MASK
-          event_mask |= Gdk::EventMask::BUTTON3_MOTION_MASK
-          event_mask |= Gdk::EventMask::SCROLL_MASK
-          @area.add_events(event_mask)
-          set_key_press_event(@area)
           set_button_event(@area)
-          set_motion_notify_event
+          set_motion_event(@area)
           set_scroll_event(@area)
         end
 
-        def set_motion_notify_event
-          @area.signal_connect("motion_notify_event") do |widget, event|
-            call_hook_procs(@motion_notify_hook_procs, event)
-          end
-        end
-
         def paint(color_name)
           context = @surface.create_cairo_context
           context.set_source_rgba(*Color.parse(color_name).to_a)
@@ -374,13 +365,6 @@ module Rabbit
                                Gdk::RGB::DITHER_NORMAL, 0, 0)
         end
 
-        def configured_after(widget, event)
-          @mask = nil
-          set_hole
-          super unless @caching
-          false
-        end
-
         def confirm_dialog(message)
           flags = Gtk::Dialog::MODAL | Gtk::Dialog::DESTROY_WITH_PARENT
           dialog_type = Gtk::MessageDialog::INFO

data/lib/rabbit/renderer/display/drawing-area-primitive.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
@@ -14,12 +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/gtk'
+require_relative "../../gtk"
 
-require "rabbit/utils"
-require "rabbit/renderer/engine"
-require "rabbit/renderer/display/base"
-require 'rabbit/renderer/display/cursor'
+require_relative "../../utils"
+require_relative "../engine"
+require_relative "base"
+require_relative "cursor"
 
 module Rabbit
   module Renderer
@@ -37,21 +37,6 @@ module Rabbit
           init_drawing_area
         end
 
-        def attach_to(window, container=nil)
-          super
-
-          set_configure_event
-        end
-
-        def detach
-          if !@window.destroyed? and @configure_signal_id
-            @window.signal_handler_disconnect(@configure_signal_id)
-            @configure_signal_id = nil
-          end
-
-          super
-        end
-
         def widget
           @area
         end
@@ -103,7 +88,7 @@ module Rabbit
           queue_draw
         end
 
-        def pre_to_pixbuf(slide_size)
+        def pre_to_pixbuf(n_slides)
         end
 
         def to_pixbufing(i)
@@ -132,7 +117,6 @@ module Rabbit
           @area.can_focus = true
           set_map
           set_draw
-          set_configure_event_after
         end
 
         def depth
@@ -179,49 +163,17 @@ module Rabbit
               compile_slide(slide) unless compiled_slide?(slide)
               slide.draw(@canvas, false)
             rescue
-              @canvas.logger.warn($!)
+              Rabbit.logger.warn($!)
             end
           end
         end
 
-        def set_configure_event
-          id = @window.signal_connect("configure_event") do |widget, event|
-            configured(event.x, event.y, event.width, event.height)
-            false
-          end
-          @configure_signal_id = id
-        end
-
         def configured(x, y, w, h)
           @real_width = @surface.width
           @real_height = @surface.height
           @size_dirty = true
         end
 
-        def set_configure_event_after
-          prev_x = prev_y = prev_width = prev_height = nil
-          @area.signal_connect_after("configure_event") do |widget, event|
-            prev_x ||= event.x
-            prev_y ||= event.y
-            prev_width ||= event.width
-            prev_height ||= event.height
-            if [prev_x, prev_y, prev_width, prev_height] !=
-                [event.x, event.y, event.width, event.height]
-              configured_after(widget, event)
-            end
-            prev_x = event.x
-            prev_y = event.y
-            prev_width = event.width
-            prev_height = event.height
-            false
-          end
-        end
-
-        def configured_after(widget, event)
-          update_size(event.width, event.height)
-          reload_theme if @surface
-        end
-
         def reload_theme(&callback)
           callback ||= Utils.process_pending_events_proc
           @canvas.activate("ReloadTheme", &callback)
@@ -245,6 +197,7 @@ module Rabbit
         end
 
         def grab
+          return unless @area.respond_to?(:grab_add)
           @area.grab_add
           Gdk.pointer_grab(@area.window, false,
                            Gdk::EventMask::BUTTON_PRESS_MASK |
@@ -256,14 +209,10 @@ module Rabbit
         end
 
         def ungrab
+          return unless @area.respond_to?(:grab_remove)
           @area.grab_remove
           Gdk.pointer_ungrab(Gdk::CURRENT_TIME)
         end
-
-        def pointer
-          window, x, y, mask = @area.window.pointer
-          [x, y, mask]
-        end
       end
     end
   end

data/lib/rabbit/renderer/display/drawing-area-view-only.rb

@@ -1,10 +1,26 @@
-require 'rabbit/renderer/engine'
-require 'rabbit/renderer/display/drawing-area-primitive'
+# 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
+# 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"
+require_relative "drawing-area-primitive"
 
 module Rabbit
   module Renderer
     module Display
-      class DrawingAreaViewOnly
+      class DrawingAreaViewOnly < Renderer::Base
         include Renderer::Engine::Cairo
         include DrawingAreaPrimitive
 
@@ -24,11 +40,6 @@ module Rabbit
         end
 
         private
-        def init_color
-          super
-          init_engine_color
-        end
-
         def add_widgets_to_container(container, &block)
           if block_given?
             yield(container, @area)

data/lib/rabbit/renderer/display/drawing-area.rb

@@ -1,24 +1,28 @@
-require 'rabbit/renderer/engine'
-require 'rabbit/renderer/display/drawing-area-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 "../engine"
+require_relative "drawing-area-base"
 
 module Rabbit
   module Renderer
     module Display
-      class DrawingArea
+      class DrawingArea < Renderer::Base
         include Renderer::Engine::Cairo
         include DrawingAreaBase
-
-        class << self
-          def priority
-            100
-          end
-        end
-
-        private
-        def init_color
-          super
-          init_engine_color
-        end
       end
     end
   end

data/lib/rabbit/renderer/display/gesture.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,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/gesture/handler"
+require_relative "../../gesture/handler"
 
 module Rabbit
   module Renderer
@@ -56,14 +56,14 @@ module Rabbit
             end
           end
 
-          add_motion_notify_hook do |event|
+          add_motion_notify_hook do |x, y|
             if @gesture.processing? and pressed_info == target_info
               unless @gesture.moved?
                 keep_cursor(:gesture)
                 update_cursor(:hand)
               end
               first_move = !@gesture.moved?
-              handled = @gesture.button_motion(event.x, event.y, width, height)
+              handled = @gesture.button_motion(x, y, width, height)
               queue_draw if handled or first_move
               init_renderer(@surface)
               @gesture.draw_last_locus(self)
@@ -84,16 +84,16 @@ module Rabbit
           add_gesture_action(%w(L R), "FirstSlide")
           add_gesture_action(%w(U), "Quit")
 
-          add_gesture_action(%w(D), "ToggleIndexMode", &bg_proc)
-          add_gesture_action(%w(D U), "ToggleFullScreen", &bg_proc)
+          add_gesture_action(%w(D), "ToggleIndexMode")
+          add_gesture_action(%w(D U), "ToggleFullscreen")
           add_gesture_action(%w(LR), "ToggleGraffitiMode")
 
           add_gesture_action(%w(UL), "Redraw")
-          add_gesture_action(%w(UL D), "ReloadTheme", &bg_proc)
+          add_gesture_action(%w(UL D), "ReloadTheme")
         end
 
-        def add_gesture_action(sequence, action, &block)
-          @gesture.add_action(sequence, @canvas.action(action), &block)
+        def add_gesture_action(sequence, action)
+          @gesture.add_action(sequence, @canvas.actions.find_action(action))
         end
 
         def gesturing?

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

@@ -1,7 +1,22 @@
+# 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 "forwardable"
 
-require "rabbit/action"
-require "rabbit/graffiti/processor"
+require_relative "../../graffiti/processor"
 
 module Rabbit
   module Renderer
@@ -20,13 +35,8 @@ module Rabbit
           init_graffiti
         end
 
-        def attach_to(window, container=nil)
-          super
-          graffiti_mode_action.active = false
-        end
-
         def graffiti_mode?
-          graffiti_mode_action.active?
+          @graffiti_mode
         end
 
         def have_graffiti?
@@ -38,6 +48,7 @@ module Rabbit
         end
 
         def toggle_graffiti_mode
+          @graffiti_mode = !@graffiti_mode
           if graffiti_mode?
             update_cursor(:pencil)
           else
@@ -48,13 +59,11 @@ module Rabbit
 
         def clear_graffiti
           @graffiti.clear
-          Action.update_graffiti_action_status(@canvas)
           @area.queue_draw
         end
 
         def undo_graffiti
           @graffiti.undo
-          Action.update_graffiti_action_status(@canvas)
           @area.queue_draw
         end
 
@@ -67,6 +76,7 @@ module Rabbit
         private
         def init_graffiti
           @graffiti = Rabbit::Graffiti::Processor.new
+          @graffiti_mode = false
 
           pressed_button = nil
           target_button = 1
@@ -85,18 +95,17 @@ module Rabbit
             pressed_button = nil
             if graffiti_mode? and event.button == target_button
               @graffiti.button_release(event.x, event.y, width, height)
-              Action.update_graffiti_action_status(@canvas)
               true
             else
               false
             end
           end
 
-          add_motion_notify_hook do |event|
+          add_motion_notify_hook do |x, y|
             if graffiti_mode? and
                 @graffiti.dragging? and
                 pressed_button == target_button
-              @graffiti.button_motion(event.x, event.y, width, height)
+              @graffiti.button_motion(x, y, width, height)
               redraw
               true
             else

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

@@ -1,4 +1,20 @@
-require 'rabbit/info-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 "../../info-window"
 
 module Rabbit
   module Renderer
@@ -10,13 +26,17 @@ module Rabbit
         end
 
         def toggle_info_window
-          if @info_window.showing?
+          if info_window_showing?
             hide_info_window
           else
             show_info_window
           end
         end
 
+        def info_window_showing?
+          @info_window.showing?
+        end
+
         def show_info_window
           @info_window.show(width, height)
         end

data/lib/rabbit/renderer/display/magnifier.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_magnifier
         end
 
-        def attach_to(window, container=nil)
-          super
-          magnifier_action.active = false
-        end
-
         def toggle_magnifier
+          @magnifying = !@magnifying
           if magnifying?
             grab
-            x, y, mask = pointer
-            @magnifier_center_x ||= x
-            @magnifier_center_y ||= y
+            @magnifier_center_x = 0
+            @magnifier_center_y = 0
           else
             ungrab
             @magnifier_center_x = nil
@@ -26,8 +37,14 @@ module Rabbit
           queue_draw
         end
 
+        def magnifying?
+          @magnifying
+        end
+
         private
         def init_magnifier
+          @magnifying = false
+
           @magnifier_ratio = 1.5
           @magnifier_center_x = nil
           @magnifier_center_y = nil
@@ -41,7 +58,7 @@ module Rabbit
                 event.state.control_mask?
               @magnifier_center_x = event.x
               @magnifier_center_y = event.y
-              magnifier_action.active = true
+              magnifier_action.enabled = true
               true
             else
               false
@@ -50,17 +67,17 @@ module Rabbit
 
           add_button_release_hook do |event, last_event|
             if magnifying? and event.button == target_button
-              magnifier_action.active = false
+              magnifier_action.enabled = false
               true
             else
               false
             end
           end
 
-          add_motion_notify_hook do |event|
+          add_motion_notify_hook do |x, y|
             if magnifying?
-              @magnifier_center_x = event.x
-              @magnifier_center_y = event.y
+              @magnifier_center_x = x
+              @magnifier_center_y = y
               queue_draw
               add_button_handler do
                 clear_button_handler
@@ -112,10 +129,6 @@ module Rabbit
           draw_rounded_rectangle(false, x, y, w, h, r, "red")
         end
 
-        def magnifying?
-          magnifier_action.active?
-        end
-
         def magnifier_action
           @canvas.action("ToggleMagnifier")
         end

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

@@ -1,4 +1,20 @@
-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_relative "../../gtk"
 
 module Rabbit
   module Renderer