rabbit 2.2.1 → 3.0.0

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

@@ -291,7 +291,7 @@ module Rabbit
 
         def paint(color_name)
           context = @drawable.create_cairo_context
-          context.set_source_rgb(*Color.parse(color_name).to_gdk_rgb)
+          context.set_source_rgba(*Color.parse(color_name).to_a)
           context.paint
         end
 

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

@@ -24,12 +24,21 @@ module Rabbit
         end
 
         def attach_to(window, container=nil)
-          init_gl(@area)
           super
+
+          set_configure_event
+
+          init_gl(@area)
         end
 
         def detach
           finalize_gl
+
+          if !@window.destroyed? and @configure_signal_id
+            @window.signal_handler_disconnect(@configure_signal_id)
+            @configure_signal_id = nil
+          end
+
           super
         end
 
@@ -132,25 +141,14 @@ module Rabbit
 
         def mapped(widget)
           set_drawable(widget.window)
-          prepare_renderer(@drawable)
         end
 
         def set_draw
-          stop_events = false
-          if @area.class.signals.include?("draw")
-            @area.signal_connect("draw") do |widget, context|
-              init_context(context)
-              draw(widget)
-              finish_renderer
-              stop_events
-            end
-          else
-            @area.signal_connect("expose_event") do |widget, event|
-              init_renderer(@drawable)
-              draw(widget)
-              finish_renderer
-              stop_events
-            end
+          @area.signal_connect("draw") do |widget, context|
+            init_context(context)
+            draw(widget)
+            finish_renderer
+            Gdk::Event::PROPAGATE
           end
         end
 
@@ -170,6 +168,20 @@ module Rabbit
           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 = @drawable.width
+          @real_height = @drawable.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|
@@ -190,6 +202,7 @@ module Rabbit
         end
 
         def configured_after(widget, event)
+          update_size(event.width, event.height)
           reload_theme if @drawable
         end
 
@@ -216,19 +229,19 @@ module Rabbit
         end
 
         def grab
-          Gtk.grab_add(@area)
+          @area.grab_add
           Gdk.pointer_grab(@area.window, false,
                            Gdk::EventMask::BUTTON_PRESS_MASK |
                            Gdk::EventMask::BUTTON_RELEASE_MASK |
                            Gdk::EventMask::SCROLL_MASK |
                            Gdk::EventMask::POINTER_MOTION_MASK,
                            nil, nil,
-                           Gdk::Event::CURRENT_TIME)
+                           Gdk::CURRENT_TIME)
         end
 
         def ungrab
-          Gtk.grab_remove(@area)
-          Gdk.pointer_ungrab(Gdk::Event::CURRENT_TIME)
+          @area.grab_remove
+          Gdk.pointer_ungrab(Gdk::CURRENT_TIME)
         end
 
         def pointer

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

@@ -97,9 +97,7 @@ module Rabbit
                 @graffiti.dragging? and
                 pressed_button == target_button
               @graffiti.button_motion(event.x, event.y, width, height)
-              init_renderer(@drawable)
-              @graffiti.draw_last_segment(self)
-              finish_renderer
+              redraw
               true
             else
               false

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

@@ -11,7 +11,8 @@ module Rabbit
           procs.any? {|proc| proc.call(*args)}
         end
 
-        def add_motion_notify_hook(hook=Proc.new)
+        def add_motion_notify_hook(hook=nil, &block)
+          hook ||= Proc.new(&block)
           @motion_notify_hook_procs << hook
         end
 
@@ -19,7 +20,8 @@ module Rabbit
           @motion_notify_hook_procs.clear
         end
 
-        def add_scroll_hook(hook=Proc.new)
+        def add_scroll_hook(hook=nil, &block)
+          hook ||= Proc.new(&block)
           @scroll_hook_procs << hook
         end
 
@@ -27,7 +29,8 @@ module Rabbit
           @scroll_hook_procs.clear
         end
 
-        def add_button_press_hook(hook=Proc.new)
+        def add_button_press_hook(hook=nil, &block)
+          hook ||= Proc.new(&block)
           @button_press_hook_procs << hook
         end
 
@@ -35,7 +38,8 @@ module Rabbit
           @button_press_hook_procs.clear
         end
 
-        def add_button_release_hook(hook=Proc.new)
+        def add_button_release_hook(hook=nil, &block)
+          hook ||= Proc.new(&block)
           @button_release_hook_procs << hook
         end
 

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

@@ -60,6 +60,11 @@ module Rabbit
           end
         end
 
+        def have_slide_number_related_mask?(modifier)
+          modifier.control_mask? or
+            modifier.mod1_mask?
+        end
+
         def calc_slide_number(val, modifier)
           val += 10 if modifier.control_mask?
           val += 20 if modifier.mod1_mask?
@@ -266,14 +271,14 @@ module Rabbit
             modifier = event.state
             case event.keyval
             when *prev_keys
-              if modifier.nonzero?
+              if have_slide_number_related_mask?(modifier)
                 index = calc_slide_number(0, modifier)
                 @canvas.activate("JumpTo") {@canvas.current_index - index}
               else
                 @canvas.activate("PreviousSlide")
               end
             when *next_keys
-              if modifier.nonzero?
+              if have_slide_number_related_mask?(modifier)
                 index = calc_slide_number(0, modifier)
                 @canvas.activate("JumpTo") {@canvas.current_index + index}
               else

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

@@ -75,9 +75,9 @@ module Rabbit
           add_scroll_hook do |event|
             if magnifying?
               case event.direction
-              when Gdk::EventScroll::Direction::UP
+              when Gdk::ScrollDirection::UP
                 @magnifier_ratio = [0.5, @magnifier_ratio - 0.1].max
-              when Gdk::EventScroll::Direction::DOWN
+              when Gdk::ScrollDirection::DOWN
                 @magnifier_ratio = [3, @magnifier_ratio + 0.1].min
               end
               queue_draw

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

@@ -23,27 +23,35 @@ module Rabbit
         private
         def init_progress
           @progress = Rabbit::Progress.new
+          @progress_end_id = nil
         end
 
         def start_progress(max)
           return if max.zero?
 
+          if @progress_end_id
+            GLib::Source.remove(@progress_end_id)
+            @progress_end_id = nil
+            @progress.hide
+          end
           update_menu
           @progress.start_progress(max, @canvas.window)
           adjust_progress_window
         end
 
         def update_progress(i)
+          return if @progress_end_id
           @progress.update_progress(i)
           Utils.process_pending_events
         end
 
         def end_progress
           @progress.end_progress
-          GLib::Timeout.add(100) do
+          @progress_end_id = GLib::Timeout.add(100) do
             @progress.hide
             update_menu
-            false
+            @progress_end_id = nil
+            GLib::Source::REMOVE
           end
         end
 

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

@@ -63,10 +63,10 @@ module Rabbit
           add_scroll_hook do |event|
             if spotlighting?
               case event.direction
-              when Gdk::EventScroll::Direction::UP
+              when Gdk::ScrollDirection::UP
                 @spotlight_radius_ratio =
                   [0.1, @spotlight_radius_ratio - 0.1].max
-              when Gdk::EventScroll::Direction::DOWN
+              when Gdk::ScrollDirection::DOWN
                 @spotlight_radius_ratio =
                   [1, @spotlight_radius_ratio + 0.1].min
               end

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

@@ -25,9 +25,6 @@ module Rabbit
           pixbuf
         end
 
-        def prepare_renderer(drawable)
-        end
-
         def init_renderer(drawable)
           init_context(drawable.create_cairo_context)
         end

data/lib/rabbit/renderer/kernel.rb

@@ -1,3 +1,21 @@
+# Copyright (C) 2006-2018  Kouhei Sutou <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/pango-markup"
+
 require "rabbit/renderer/color"
 
 module Rabbit
@@ -242,6 +260,42 @@ module Rabbit
 
       def set_font_resolution(context)
       end
+
+      def setup_flag_params(pole_height, default_flag_width_ratio, params)
+        params = params.dup
+
+        text = params["text"]
+        text_attrs = params["text_attributes"] || {}
+        if text
+          markupped_text = PangoMarkup.new("span", text_attrs, text)
+          layout = make_layout(markupped_text.to_s)
+          text_width, text_height = layout.pixel_size
+          params["layout"] = layout
+          params["text_width"] = text_width
+          params["text_height"] = text_height
+          flag_width_default = [
+            text_width * default_flag_width_ratio,
+            pole_height / 2
+          ].max
+          flag_height_default = [text_height, flag_width_default].max
+        else
+          params["layout"] = nil
+          flag_width_default = flag_height_default = nil
+        end
+
+        params["pole_width"] = params["pole_width"] || 2
+        params["pole_color"] ||= "black"
+        flag_height = params["flag_height"] ||
+          flag_height_default || pole_height / 2
+        flag_height = [flag_height, pole_height].min
+        params["flag_height"] = flag_height
+        params["flag_width"] ||= flag_width_default || flag_height
+        params["flag_color"] ||= "red"
+        params["flag_frame_width"] ||= params["pole_width"]
+        params["flag_frame_color"] ||= params["pole_color"]
+
+        params
+      end
     end
   end
 end

data/lib/rabbit/renderer/offscreen.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2016-2019  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
@@ -25,15 +25,23 @@ module Rabbit
       include Renderer::Base
       include Engine::Cairo
 
-      attr_accessor :width, :height, :pango_context
+      attr_accessor :filename
+      attr_accessor :pango_context
 
-      def initialize(canvas, width=nil, height=nil)
+      def initialize(canvas)
         super(canvas)
-        @width = width
-        @height = height
+        @filename = nil
         @pango_context = nil
       end
 
+      def width
+        @base_width
+      end
+
+      def height
+        @base_height
+      end
+
       def post_apply_theme
       end
 
@@ -71,7 +79,7 @@ module Rabbit
 
       def to_pixbuf(slide)
         pixbuf = nil
-        ::Cairo::ImageSurface.new(@width, @height) do |surface|
+        ::Cairo::ImageSurface.new(@base_width, @base_height) do |surface|
           context = ::Cairo::Context.new(surface)
           init_context(context)
           slide.draw(@canvas)

data/lib/rabbit/renderer/print-layout.rb

@@ -0,0 +1,150 @@
+# Copyright (C) 2005-2018  Kouhei Sutou <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"
+
+module Rabbit
+  module Renderer
+    class PrintLayout
+      class << self
+        def create(renderer, canvas)
+          map = MAPPING.find do |key, value|
+            key === renderer.slides_per_page
+          end
+          if map.nil?
+            raise InvalidPages.new(renderer.slides_per_page)
+          else
+            map[1].new(renderer, canvas)
+          end
+        end
+      end
+
+      def initialize(renderer, canvas)
+        @renderer = renderer
+        @canvas = canvas
+        @margin_left = renderer.margin_left
+        @margin_right = renderer.margin_right
+        @margin_top = renderer.margin_top
+        @margin_bottom = renderer.margin_bottom
+      end
+    end
+
+    class PrintLayout1 < PrintLayout
+      def slide_width
+        @renderer.page_width
+      end
+
+      def slide_height
+        @renderer.page_height
+      end
+
+      def normalize_x(x)
+        x
+      end
+
+      def normalize_y(y)
+        y
+      end
+    end
+
+    class PrintLayout2 < PrintLayout
+      def initialize(renderer, canvas)
+        super
+        @margin_left ||= 50
+        @margin_right ||= 50
+        @margin_top ||= 30
+        @margin_bottom ||= 30
+      end
+
+      def slide_width
+        @renderer.page_width - @margin_left - @margin_right
+      end
+
+      def slide_height
+        (@renderer.page_height / 2) - @margin_top - @margin_bottom
+      end
+
+      def normalize_x(x)
+        x + @margin_left
+      end
+
+      def normalize_y(y)
+        base = @margin_bottom
+        if below?
+          base += @margin_top + @margin_bottom + slide_height
+        end
+        y + base
+      end
+
+      private
+      def below?
+        (@canvas.current_index % 2) == 1
+      end
+    end
+
+    class PrintLayoutMore < PrintLayout
+      def initialize(renderer, canvas)
+        super
+        @margin_left ||= 10
+        @margin_right ||= 10
+        @margin_top ||= 10
+        @margin_bottom ||= 10
+      end
+
+      def slide_width
+        (@renderer.page_width / 2) - @margin_left - @margin_right
+      end
+
+      def slide_height
+        base = @renderer.page_height / (@renderer.slides_per_page / 2.0).ceil
+        base - @margin_top - @margin_bottom
+      end
+
+      def normalize_x(x)
+        base = @margin_left
+        unless left?
+          base += @margin_left + @margin_right + slide_width
+        end
+        x + base
+      end
+
+      def normalize_y(y)
+        nth_col = (normalized_current_index / 2.0).truncate
+        base = @margin_top * (nth_col + 1)
+        base += @margin_bottom * nth_col
+        base += slide_height * nth_col
+        y + base
+      end
+
+      private
+      def left?
+        (normalized_current_index % 2).zero?
+      end
+
+      def normalized_current_index
+        @canvas.current_index % @renderer.slides_per_page
+      end
+    end
+
+    class PrintLayout
+      MAPPING = [
+        [1, PrintLayout1],
+        [2, PrintLayout2],
+        [3..(1.0/0), PrintLayoutMore],
+      ]
+    end
+  end
+end