rabbit 3.0.5 → 4.0.0

data/lib/rabbit/renderer/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
@@ -16,28 +16,28 @@
 
 require "forwardable"
 require "erb"
-require "rabbit/gtk"
 
-require "rabbit/rabbit"
-require "rabbit/trackball"
-require "rabbit/renderer/color"
+require_relative "../gtk"
+
+require_relative "../rabbit"
+require_relative "color"
 
 module Rabbit
   module Renderer
-    module Base
+    class Base
       extend Forwardable
 
       include ERB::Util
       include GetText
       include DirtyCount
 
-      def_delegators(:@canvas, :reload_source)
-
       attr_accessor :base_width
       attr_accessor :base_height
       attr_accessor :paper_width, :paper_height, :slides_per_page
       attr_accessor :margin_left, :margin_right
       attr_accessor :margin_top, :margin_bottom
+      attr_accessor :foreground
+      attr_accessor :background
       attr_accessor :progress_foreground
       attr_accessor :progress_background
       attr_accessor :adjustment_x, :adjustment_y
@@ -68,13 +68,14 @@ module Rabbit
         @blackout = false
         @adjustment_x = 0
         @adjustment_y = 0
+        @foreground = nil
+        @background = nil
         @progress_foreground = nil
         @progress_background = nil
         @graffiti_color = nil
         @graffiti_line_width = nil
         @draw_scaled_image = true
         clean
-        init_gl_parameters
       end
 
       def page_margin_left
@@ -100,12 +101,24 @@ module Rabbit
         @font_families
       end
 
+      def make_color(color)
+        return color if color.is_a?(Color)
+        if color.nil?
+          @foreground
+        else
+          Color.parse(color)
+        end
+      end
+
+      def set_font_resolution(context)
+      end
+
       def print(&block)
         if printable?
           do_print(&block)
         else
           canvas = make_canvas_with_printable_renderer
-          pre_print(canvas.slide_size)
+          pre_print(canvas.n_slides)
           canceled = false
           canvas.print do |i|
             result = printing(i)
@@ -133,7 +146,7 @@ module Rabbit
       def each_slide_pixbuf
         canvas = offscreen_canvas
         previous_index = canvas.current_index
-        pre_to_pixbuf(canvas.slide_size)
+        pre_to_pixbuf(canvas.n_slides)
         canceled = false
         canvas.slides.each_with_index do |slide, i|
           if !to_pixbufing(i) or !yield(slide, canvas.to_pixbuf(i), i)
@@ -214,9 +227,24 @@ module Rabbit
       def toggle_info_window
       end
 
+      def info_window_showing?
+        false
+      end
+
       def toggle_spotlight
       end
 
+      def spotlighting?
+        false
+      end
+
+      def toggle_magnifier
+      end
+
+      def magnifying?
+        false
+      end
+
       def gl_available?
         @canvas.use_gl? and gl_supported?
       end
@@ -252,12 +280,6 @@ module Rabbit
         false
       end
 
-      def connect_key(keyval, modifier, flags, &block)
-      end
-
-      def disconnect_key(keyval, modifier)
-      end
-
       def change_graffiti_color
       end
 
@@ -276,7 +298,7 @@ module Rabbit
       end
 
       def do_print(&block)
-        pre_print(@canvas.slide_size)
+        pre_print(@canvas.n_slides)
         canceled = false
         @canvas.slides.each_with_index do |slide, i|
           @canvas.move_to_if_can(i)
@@ -292,7 +314,7 @@ module Rabbit
       end
 
       def make_canvas_with_renderer(renderer)
-        canvas = Canvas.new(@canvas.logger, renderer)
+        canvas = Canvas.new(renderer)
         yield canvas
         canvas.apply_theme(@canvas.theme_name)
         @canvas.source_force_modified(true) do |source|
@@ -353,23 +375,7 @@ module Rabbit
       def not_support_method(name)
         format = _("%s does not support: %s")
         msg = format % [self.class.name, name]
-        @canvas.logger.warn(msg)
-      end
-
-      def init_gl_parameters
-        angle = 0.0 * (Math::PI / 180.0)
-        axis_x = 1.0
-        axis_y = 0.0
-        axis_z = 0.0
-        sine = Math.sin(0.5 * angle)
-        quaternion = [
-                      axis_x * sine,
-                      axis_y * sine,
-                      axis_z * sine,
-                      Math.cos(0.5 * angle)
-                     ]
-        @gl_quaternion = TrackBall::Vector.new(quaternion)
-        @gl_scale = 1.0
+        Rabbit.logger.warn(msg)
       end
 
       def clear_keys
@@ -391,6 +397,8 @@ module Rabbit
 
       def init_color
         @background_color = "white"
+        @foreground = make_color("black")
+        @background = make_color(@background_color)
       end
 
       def clear_gesture_actions

data/lib/rabbit/renderer/color.rb

@@ -1,6 +1,22 @@
-require "rabbit/gtk"
+# 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 "rabbit/rabbit"
+require_relative "../gtk"
+
+require_relative "../rabbit"
 
 module Rabbit
   module Renderer

data/lib/rabbit/renderer/display/base.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,14 +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/renderer/base"
-require "rabbit/renderer/display/hook-handler"
+require_relative "hook-handler"
 
 module Rabbit
   module Renderer
     module Display
       module Base
-        include Renderer::Base
         include HookHandler
 
         def initialize(*args, &block)
@@ -54,6 +52,14 @@ module Rabbit
           @size
         end
 
+        def update_size(w, h)
+          return if @real_width == w and @real_height == h
+
+          @real_width = w
+          @real_height = h
+          @size_dirty = true
+        end
+
         def redraw
           widget.queue_draw
         end
@@ -174,14 +180,6 @@ module Rabbit
                            ratio)
         end
 
-        def update_size(w, h)
-          return if @real_width == w and @real_height == h
-
-          @real_width = w
-          @real_height = h
-          @size_dirty = true
-        end
-
         def set_size_ratio(ratio)
           ratio ||= @base_width.to_f / @base_height.to_f
           return if @size.ratio == ratio

data/lib/rabbit/renderer/display/button-handler.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,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/gtk"
+require_relative "../../gtk"
 
 module Rabbit
   module Renderer
@@ -37,75 +37,162 @@ module Rabbit
           @button_handler = []
         end
 
-        def set_button_event(widget)
-          last_button_press_event = nil
-          widget.signal_connect("button_press_event") do |_widget, event|
-            last_button_press_event = event
-            call_hook_procs(@button_press_hook_procs, event)
+        if Gtk.const_defined?(:GestureClick)
+          ButtonPressEvent = Struct.new(:button,
+                                        :n_presses,
+                                        :x,
+                                        :y,
+                                        :state) do
+            def event_type
+              Gdk::EventType::BUTTON_PRESS
+            end
+          end
+          ButtonReleaseEvent = Struct.new(:button,
+                                          :n_presses,
+                                          :x,
+                                          :y,
+                                          :state) do
+            def event_type
+              Gdk::EventType::BUTTON_RELEASE
+            end
           end
 
-          widget.signal_connect("button_release_event") do |_widget, event|
-            if last_button_press_event
-              handled = call_hook_procs(@button_release_hook_procs,
-                                        event, last_button_press_event)
-              if handled
-                clear_button_handler
+          def set_button_event(widget)
+            ["primary", "middle", "secondary"].each do |button_type|
+              click = Gtk::GestureClick.new
+              click.name = "rabbit-click-#{button_type}"
+              click.button = Gdk.const_get("BUTTON_#{button_type.upcase}")
+
+              last_button_press_event = nil
+              click.signal_connect(:pressed) do |_, n_presses, x, y|
+                last_button_press_event =
+                  ButtonPressEvent.new(click.current_button,
+                                       n_presses,
+                                       x,
+                                       y,
+                                       click.current_event_state)
+                call_hook_procs(@button_press_hook_procs,
+                                last_button_press_event)
+              end
+
+              click.signal_connect(:released) do |_, n_presses, x, y|
+                event = ButtonReleaseEvent.new(click.current_button,
+                                               n_presses,
+                                               x,
+                                               y,
+                                               click.current_event_state)
+                if last_button_press_event
+                  handled = call_hook_procs(@button_release_hook_procs,
+                                            event,
+                                            last_button_press_event)
+                  unless handled
+                    click_type = nil
+                    case n_presses
+                    when 1
+                      click_type = "single_click"
+                    when 2
+                      click_type = "double_click" if button_type == "primary"
+                    end
+                    if click_type
+                      handler = "handle_button_#{button_type}_#{click_type}"
+                      __send__(handler, last_button_press_event, event)
+                      start_button_handler
+                    end
+                  end
+                else
+                  clear_button_handler
+                end
+              end
+
+              widget.add_controller(click)
+            end
+          end
+        else
+          def set_button_event(widget)
+            widget.add_events(Gdk::EventMask::BUTTON_PRESS_MASK |
+                              Gdk::EventMask::BUTTON_RELEASE_MASK)
+            last_button_press_event = nil
+            widget.signal_connect("button_press_event") do |_widget, event|
+              last_button_press_event = event
+              call_hook_procs(@button_press_hook_procs, event)
+            end
+
+            widget.signal_connect("button_release_event") do |_widget, event|
+              if last_button_press_event
+                handled = call_hook_procs(@button_release_hook_procs,
+                                          event, last_button_press_event)
+                if handled
+                  clear_button_handler
+                else
+                  handled = handle_button_release(event, last_button_press_event)
+                end
+                handled
               else
-                handled = handle_button_release(event, last_button_press_event)
+                clear_button_handler
+                false
               end
-              handled
-            else
-              clear_button_handler
-              false
             end
           end
-        end
 
-        def handle_button_release(event, last_button_press_event)
-          press_event_type = last_button_press_event.event_type
-          handlers = {
-            Gdk::EventType::BUTTON_PRESS => :handle_button_press,
-            Gdk::EventType::BUTTON2_PRESS => :handle_button2_press,
-            Gdk::EventType::BUTTON3_PRESS => :handle_button3_press,
-          }
-          handler = handlers[press_event_type]
-          if handler
-            __send__(handler, last_button_press_event, event)
-            start_button_handler
+          def handle_button_release(event, last_button_press_event)
+            button_types = {
+              1 => "primary",
+              2 => "middle",
+              3 => "secondary",
+              5 => "primary",
+              4 => "middle",
+            }
+            click_types = {
+              Gdk::EventType::BUTTON_PRESS => "single_click",
+              Gdk::EventType::BUTTON2_PRESS => "double_click",
+            }
+            button_type = button_types[event.button]
+            click_type = click_types[last_button_press_event.event_type]
+            if button_type and click_type
+              handler = "handle_button_#{button_type}_#{click_type}"
+              if respond_to?(handler, true)
+                __send__(handler, last_button_press_event, event)
+                start_button_handler
+                return true
+              end
+            end
+            false
           end
-          true
         end
 
-        def handle_button_press(event, release_event)
-          case event.button
-          when 1, 5
-            if release_event.state.control_mask?
-              add_button_handler do
-                popup_menu
-                true
-              end
-            elsif !release_event.state.mod1_mask?
-              add_button_handler do
-                @canvas.activate("NextSlide")
-                true
-              end
+        def handle_button_primary_single_click(event, release_event)
+          if release_event.state.control_mask?
+            add_button_handler do
+              toggle_menu(release_event.x, release_event.y)
+              true
             end
-          when 2, 4
-            unless release_event.state.mod1_mask?
-              add_button_handler do
-                @canvas.activate("PreviousSlide")
-                true
-              end
+          elsif !release_event.state.alt_mask?
+            add_button_handler do
+              popdown_menu
+              @canvas.activate("NextSlide")
+              true
             end
-          when 3
+          end
+        end
+
+        def handle_button_middle_single_click(event, release_event)
+          unless release_event.state.alt_mask?
             add_button_handler do
-              popup_menu
+              popdown_menu
+              @canvas.activate("PreviousSlide")
               true
             end
           end
         end
 
-        def handle_button2_press(event, release_event)
+        def handle_button_secondary_single_click(event, release_event)
+          add_button_handler do
+            toggle_menu(release_event.x, release_event.y)
+            true
+          end
+        end
+
+        def handle_button_primary_double_click(event, release_event)
           add_button_handler do
             if @canvas.index_mode?
               index = @canvas.current_slide.slide_number(@canvas,
@@ -113,7 +200,7 @@ module Rabbit
                                                          event.y)
               if index
                 @canvas.activate("ToggleIndexMode")
-                @canvas.activate("JumpTo") {index}
+                @canvas.activate("JumpToSlide", GLib::Variant.new(index, "i"))
               end
               true
             else
@@ -122,12 +209,6 @@ module Rabbit
           end
         end
 
-        def handle_button3_press(event, release_event)
-          add_button_handler do
-            false
-          end
-        end
-
         def add_button_handler(handler=nil, &block)
           handler ||= Proc.new(&block)
           @button_handler.push(handler)

data/lib/rabbit/renderer/display/cursor.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,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/cursor-manager"
+require_relative "../../cursor-manager"
 
 module Rabbit
   module Renderer
@@ -35,16 +35,15 @@ module Rabbit
         end
 
         def restore_cursor(name)
-          @cursor_manager.restore(@surface, name)
+          @cursor_manager.restore(@surface || @window, name)
         end
 
         def update_cursor(cursor_type, update_current_cursor=false)
           @cursor_manager.current = cursor_type if update_current_cursor
           cursor_type = :pencil if @graffiti_mode
-          @cursor_manager.update(@surface, cursor_type)
+          @cursor_manager.update(@surface || @window, cursor_type)
         end
       end
     end
   end
 end
-