rabbit 2.2.1 → 3.0.0

data/lib/rabbit/renderer/color.rb

@@ -4,75 +4,41 @@ require "rabbit/rabbit"
 
 module Rabbit
   module Renderer
-    Color = Struct.new(:red, :green, :blue, :alpha, :have_alpha)
-    class Color
-      GDK_COLOR_NORMALIZE = 65535.0
-
+    class Color < Struct.new(:red, :green, :blue, :alpha)
       class << self
-        def new_from_gdk_color(color, have_alpha=false)
-          red = color.red / GDK_COLOR_NORMALIZE
-          green = color.green / GDK_COLOR_NORMALIZE
-          blue = color.blue / GDK_COLOR_NORMALIZE
-          alpha = 1.0
-          new(red, green, blue, alpha, have_alpha)
-        end
-
-        HEX = "(?i:[a-z0-9])"
-        def parse(spec)
-          case spec
-          when Array
-            new(*spec)
-          when /\A\#(#{HEX})(#{HEX})(#{HEX})(#{HEX})?\z/
-            new(*normalize($1, $2, $3, $4, 16 ** 1 - 1))
-          when /\A\#(#{HEX}{2})(#{HEX}{2})(#{HEX}{2})(#{HEX}{2})?\z/
-            new(*normalize($1, $2, $3, $4, 16 ** 2 - 1))
-          when /\A\#(#{HEX}{4})(#{HEX}{4})(#{HEX}{4})(#{HEX}{4})?\z/
-            new(*normalize($1, $2, $3, $4, 16 ** 4 - 1))
-          else
-            new_from_gdk_color(Gdk::Color.parse(spec))
-          end
+        def parse(*args)
+          new(*args)
         end
+      end
 
-        def normalize(r, g, b, a, max)
-          red = r.hex / max.to_f
-          green = g.hex / max.to_f
-          blue = b.hex / max.to_f
-          have_alpha = !a.nil?
-          alpha = have_alpha ? a.hex / max.to_f : 1.0
-          [red, green, blue, alpha, have_alpha]
+      def initialize(*args)
+        case args.collect(&:class)
+        when [Gdk::RGBA]
+          rgba = args[0]
+          super(*rgba.to_a)
+        when [String]
+          rgba = parse(args[0])
+          super(*rgba)
+        else
+          super(*args)
         end
       end
 
-      alias have_alpha? have_alpha
-
       def to_s
-        "#%04X%04X%04X%04X" % to_gdk_rgba
+        values = to_a.collect {|x| (x * 65535).ceil}
+        "#%04X%04X%04X%04X" % values
       end
 
       def to_a
-        if have_alpha?
-          [red, green, blue, alpha]
-        else
-          [red, green, blue]
-        end
-      end
-
-      def to_gdk_rgb
-        to_gdk_rgba[0..-2]
+        [red, green, blue, alpha]
       end
 
       def to_gdk_rgba
-        [red, green, blue, alpha || 1.0].collect do |color|
-          (color * GDK_COLOR_NORMALIZE).truncate
-        end
+        Gdk::RGBA.new(*to_a)
       end
 
       def to_gdk_format
-        to_s.gsub(/[a-z0-9]{4}\z/i, '')
-      end
-
-      def to_gdk_color
-        Gdk::Color.new(*to_gdk_rgb)
+        to_s
       end
 
       def to_css_rgba
@@ -82,6 +48,33 @@ module Rabbit
         a = alpha || 1.0
         "rgba(#{red_percent}%, #{green_percent}%, #{blue_percent}%, #{a})"
       end
+
+      private
+      HEX = "(?i:[a-z0-9])"
+      def parse(text)
+        case text
+        when /\A\#(#{HEX})(#{HEX})(#{HEX})(#{HEX})?\z/
+          normalize_rgba($1, $2, $3, $4, 16 ** 1 - 1)
+        when /\A\#(#{HEX}{2})(#{HEX}{2})(#{HEX}{2})(#{HEX}{2})?\z/
+          normalize_rgba($1, $2, $3, $4, 16 ** 2 - 1)
+        when /\A\#(#{HEX}{4})(#{HEX}{4})(#{HEX}{4})(#{HEX}{4})?\z/
+          normalize_rgba($1, $2, $3, $4, 16 ** 4 - 1)
+        else
+          Gdk::RGBA.parse(text).to_a
+        end
+      end
+
+      def normalize_rgba(r, g, b, a, max)
+        red = r.hex / max.to_f
+        green = g.hex / max.to_f
+        blue = b.hex / max.to_f
+        if a
+          alpha = a.hex / max.to_f
+        else
+          alpha = 1.0
+        end
+        [red, green, blue, alpha]
+      end
     end
   end
 end

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

@@ -1,3 +1,19 @@
+# Copyright (C) 2006-2019  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/renderer/base"
 require "rabbit/renderer/display/hook-handler"
 
@@ -12,8 +28,6 @@ module Rabbit
           @drawable = nil
           @size = nil
           @size_dirty = true
-          @default_size_ratio = nil
-          @size_ratio = nil
           super
         end
 
@@ -47,16 +61,9 @@ module Rabbit
         def attach_to(window, container=nil)
           @window = window
           @container = container || @window
-
-          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
-
           @window = nil
           @container = nil
         end
@@ -95,12 +102,13 @@ module Rabbit
         end
 
         def draw_slide(slide, simulation)
-          set_size_ratio(slide.size_ratio || @default_size_ratio)
+          set_size_ratio(slide.size_ratio)
 
           if simulation
             super
           else
             save_context do
+              scale_context(*@size.logical_scale)
               translate_context(@size.logical_margin_left,
                                 @size.logical_margin_top)
               super
@@ -111,33 +119,36 @@ module Rabbit
             end
 
             margin_background = make_color("black")
-            if @size.have_logical_margin_x?
-              draw_rectangle(true,
-                             0,
-                             0,
-                             @size.logical_margin_left,
-                             @size.real_height,
-                             margin_background)
-              draw_rectangle(true,
-                             @size.real_width - @size.logical_margin_right,
-                             0,
-                             @size.logical_margin_right,
-                             @size.real_height,
-                             margin_background)
-            end
-            if @size.have_logical_margin_y?
-              draw_rectangle(true,
-                             0,
-                             0,
-                             @size.real_width,
-                             @size.logical_margin_top,
-                             margin_background)
-              draw_rectangle(true,
-                             0,
-                             @size.real_height - @size.logical_margin_bottom,
-                             @size.real_width,
-                             @size.logical_margin_bottom,
-                             margin_background)
+            save_context do
+              scale_context(*@size.logical_scale)
+              if @size.have_logical_margin_x?
+                draw_rectangle(true,
+                               0,
+                               0,
+                               @size.logical_margin_left,
+                               @size.logical_height,
+                               margin_background)
+                draw_rectangle(true,
+                               @size.logical_margin_left + @size.logical_width,
+                               0,
+                               @size.logical_margin_right,
+                               @size.logical_height,
+                               margin_background)
+              end
+              if @size.have_logical_margin_y?
+                draw_rectangle(true,
+                               0,
+                               0,
+                               @size.logical_width,
+                               @size.logical_margin_top,
+                               margin_background)
+                draw_rectangle(true,
+                               0,
+                               @size.logical_margin_top + @size.logical_height,
+                               @size.logical_width,
+                               @size.logical_margin_bottom,
+                               margin_background)
+              end
             end
           end
         end
@@ -145,47 +156,45 @@ module Rabbit
         private
         def set_drawable(drawable)
           @drawable = drawable
-          w = @drawable.width
-          h = @drawable.height
-          @default_size_ratio = w.to_f / h.to_f
-          @size_ratio = @default_size_ratio
-          set_size(w, h)
+          set_default_size(@drawable.width, @drawable.height)
+        end
+
+        def set_default_size(w, h)
+          @real_width = w
+          @real_height = h
+          ratio = @base_width.to_f / @base_height.to_f
+          set_size(w, h, ratio)
+        end
+
+        def set_size(w, h, ratio)
+          @size = Size.new(@base_width,
+                           @base_height,
+                           w,
+                           h,
+                           ratio)
         end
 
-        def set_size(w, h)
-          @size = Size.new(w, h, @size_ratio)
+        def update_size(w, 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
 
           w = @size.real_width
           h = @size.real_height
-          @size_ratio = ratio
-          @size = Size.new(w, h, @size_ratio)
+          set_size(w, h, ratio)
         end
 
         def refresh_size
           return unless @size_dirty
-
-          @size = Size.new(@drawable.width,
-                           @drawable.height,
-                           @size.ratio)
+          set_size(@real_width, @real_height, @size.ratio)
           @size_dirty = false
         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)
-          @size_dirty = true
-        end
-
         def queue_draw
           widget.queue_draw
         end

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

@@ -113,7 +113,8 @@ module Rabbit
           end
         end
 
-        def add_button_handler(handler=Proc.new)
+        def add_button_handler(handler=nil, &block)
+          handler ||= Proc.new(&block)
           @button_handler.push(handler)
         end
 

data/lib/rabbit/renderer/display/clutter-embed.rb

@@ -1,5 +1,20 @@
-require 'clutter_gtk'
-require 'clutter_cairo'
+# Copyright (C) 2008-2019  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 "clutter-gtk"
 
 require "rabbit/utils"
 require "rabbit/renderer/engine"
@@ -18,10 +33,6 @@ require "rabbit/renderer/display/spotlight"
 require "rabbit/renderer/display/magnifier"
 
 module Rabbit
-  add_gui_init_proc do
-    Clutter::Gtk.init
-  end
-
   module Renderer
     module Display
       class ClutterEmbed
@@ -31,6 +42,8 @@ module Rabbit
           end
         end
 
+        include Renderer::Engine::Cairo
+
         include Base
 
         include Cursor
@@ -46,8 +59,6 @@ module Rabbit
         include Spotlight
         include Magnifier
 
-        include Renderer::Engine::Cairo
-
         attr_accessor :filename
         def initialize(canvas)
           @recreate_id = nil
@@ -61,6 +72,13 @@ module Rabbit
           @embed
         end
 
+        def redraw
+          actor = current_actor
+          # TODO: We need more work for periodical redraw
+          actor.content.invalidate if actor
+          widget.queue_draw
+        end
+
         def clear_slide
           super
           redraw
@@ -90,6 +108,7 @@ module Rabbit
           old_actor.hide if old_actor
           actor = retrieve_actor(index)
           if actor and !hiding?
+            actor.content.set_size(actor.width, actor.height)
             actor.show
             actor.raise_top
             if old_actor
@@ -107,6 +126,7 @@ module Rabbit
           actor.hide if actor
           actor = retrieve_actor(nil, index)
           if actor and !hiding?
+            actor.content.set_size(actor.width, actor.height)
             actor.show
             actor.raise_top
           end
@@ -246,12 +266,12 @@ module Rabbit
         end
 
         def init_clutter_embed
-          @embed = Clutter::GtkEmbed.new
+          @embed = ClutterGtk::Embed.new
           @embed.can_focus = true
           @stage = @embed.stage
           reset_stage_color
           set_map
-          set_expose_event
+          set_draw
           set_configure_event_after
 
           event_mask = Gdk::EventMask::BUTTON_PRESS_MASK
@@ -296,8 +316,8 @@ module Rabbit
           end
         end
 
-        def set_expose_event
-          @embed.signal_connect("expose-event") do |widget, event|
+        def set_draw
+          @embed.signal_connect("draw") do |widget, context|
             reload_source
             false
           end
@@ -315,6 +335,9 @@ module Rabbit
         end
 
         def configured_after(widget, event)
+          @real_width = event.width
+          @real_height = event.height
+          @size_dirty = true
           reload_theme if @drawable
           false
         end
@@ -415,9 +438,9 @@ module Rabbit
             unless handled
               handled = true
               case event.direction
-              when Gdk::EventScroll::Direction::UP
+              when Gdk::ScrollDirection::UP
                 @canvas.activate("PreviousSlide")
-              when Gdk::EventScroll::Direction::DOWN
+              when Gdk::ScrollDirection::DOWN
                 @canvas.activate("NextSlide")
               else
                 handled = false
@@ -431,8 +454,13 @@ module Rabbit
           index ||= index || @canvas.current_index
           slide_actors = @actors[index]
           return nil if slide_actors.nil?
-          slide = @canvas.slides[index]
-          slide_actors[index_in_slide || slide.drawing_index]
+
+          if index_in_slide.nil?
+            slide = @canvas.slides[index]
+            return nil if slide.nil?
+            index_in_slide = slide.drawing_index
+          end
+          slide_actors[index_in_slide]
         end
 
         def current_actor
@@ -455,16 +483,22 @@ module Rabbit
             actor = slide_actors[index_in_slide]
             slide = @canvas.slides[i]
             if actor.nil?
-              actor = Clutter::Cairo.new(width, height)
-              context = actor.create
-              init_context(context)
-              draw_nth_slide(i, index_in_slide)
-              finish_context
+              canvas = Clutter::Canvas.new
+              canvas.signal_connect(:draw, i, index_in_slide) do |_, context, _width, _height, _i, _index_in_slide|
+                init_context(context)
+                draw_nth_slide(_i, _index_in_slide)
+                finish_context
+              end
+              actor = Clutter::Actor.new
+              actor.instance_variable_set(:@c, canvas)
+              actor.content = canvas
+              actor.set_size(@real_width, @real_height)
               @actors[i] ||= []
               @actors[i][index_in_slide] = actor
-              @stage.add(actor)
+              @stage.add_child(actor)
               current_index_in_slide = index_in_slide == slide.drawing_index
               if index.nil? and current_index_in_slide and !hiding?
+                canvas.set_size(@real_width, @real_height)
                 actor.show
                 actor.raise_top
                 Utils.process_pending_events_proc.call
@@ -492,19 +526,19 @@ module Rabbit
         end
 
         def grab
-          Gtk.grab_add(@embed)
+          @embed.grab_add
           Gdk.pointer_grab(@embed.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(@embed)
-          Gdk.pointer_ungrab(Gdk::Event::CURRENT_TIME)
+          @embed.grab_remove
+          Gdk.pointer_ungrab(Gdk::CURRENT_TIME)
         end
 
         def pointer