rabbit 2.1.3 → 2.1.4

data/lib/rabbit/parser/pdf.rb

@@ -22,11 +22,7 @@ module Rabbit
 
       include Element
       def parse
-        @pdf = Tempfile.new("rabbit-pdf")
-        @pdf.binmode
-        @pdf.print(@source.read)
-        @pdf.close
-        doc = Poppler::Document.new("file://#{@pdf.path}")
+        doc = Poppler::Document.new(@source.read)
 
         title_page, *rest = doc.to_a
 

data/lib/rabbit/parser/rd/rt/rt2rabbit-lib.rb

@@ -50,7 +50,7 @@ module Rabbit
       end
       table << block
     end
-    
+
     def process_header(table)
       process_block(table, @header, Element::TableHead, Element::TableHeader)
     end
@@ -84,6 +84,6 @@ module Rabbit
       end
       target.align = target.default_align
     end
-    
+
   end
 end

data/lib/rabbit/rabbit.rb

@@ -167,7 +167,7 @@ module Rabbit
       super(_("immutable source type: %s") % @source_type)
     end
   end
-  
+
   class ThemeExit < Error
     def initialize(message=nil)
       @have_message = !message.nil?

data/lib/rabbit/renderer/base.rb

@@ -6,14 +6,6 @@ require "rabbit/rabbit"
 require "rabbit/trackball"
 require "rabbit/renderer/color"
 
-module Pango
-  class Context
-    unless method_defined?(:families)
-      alias families list_families
-    end
-  end
-end
-
 module Rabbit
   module Renderer
     module Base
@@ -24,7 +16,7 @@ module Rabbit
       include DirtyCount
 
       def_delegators(:@canvas, :reload_source)
-      
+
       attr_reader :x_dpi, :y_dpi
       attr_accessor :paper_width, :paper_height, :slides_per_page
       attr_accessor :margin_left, :margin_right
@@ -71,19 +63,19 @@ module Rabbit
       def page_margin_left
         @page_margin_left || 0
       end
-      
+
       def page_margin_right
         @page_margin_right || 0
       end
-      
+
       def page_margin_top
         @page_margin_top || 0
       end
-      
+
       def page_margin_bottom
         @page_margin_bottom || 0
       end
-      
+
       def font_families
         if @font_families.nil? or @font_families.empty?
           @font_families = create_pango_context.families
@@ -148,7 +140,7 @@ module Rabbit
       def create_pango_context
         Pango::Context.new
       end
-      
+
       def printable?
         false
       end
@@ -163,7 +155,7 @@ module Rabbit
 
       def setup_event(area)
       end
-      
+
       def to_attrs(hash)
         hash.collect do |key, value|
           if value
@@ -228,11 +220,11 @@ module Rabbit
       def graffiti_mode?
         false
       end
-      
+
       def have_graffiti?
         false
       end
-      
+
       def can_undo_graffiti?
         false
       end
@@ -269,7 +261,7 @@ module Rabbit
       def off_screen_renderer?
         false
       end
-      
+
       def do_print(&block)
         pre_print(@canvas.slide_size)
         canceled = false
@@ -296,7 +288,7 @@ module Rabbit
         canvas.toggle_index_mode if @canvas.index_mode?
         canvas
       end
-      
+
       def make_canvas_with_printable_renderer
         renderer = Renderer.printable_renderer(@canvas.slides_per_page)
         make_canvas_with_renderer(renderer) do |canvas|
@@ -308,7 +300,7 @@ module Rabbit
           canvas.slides_per_page = @canvas.slides_per_page
         end
       end
-      
+
       def make_canvas_with_off_screen_renderer
         make_canvas_with_renderer(Pixmap) do |canvas|
           canvas.width = @canvas.width
@@ -321,7 +313,7 @@ module Rabbit
         canvas.margin_left = @canvas.margin_left
         canvas.margin_right = @canvas.margin_right
         canvas.margin_top = @canvas.margin_top
-        canvas.page_margin_bottom = @canvas.page_margin_bottom
+        canvas.margin_bottom = @canvas.margin_bottom
       end
 
       def setup_page_margin(canvas)
@@ -347,7 +339,7 @@ module Rabbit
 
       def setup_flag_params(pole_height, default_flag_width_ratio, params)
         params = params.dup
-        
+
         text = params["text"]
         text_attrs = params["text_attributes"] || {}
         if text
@@ -366,7 +358,7 @@ module Rabbit
           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"] ||

data/lib/rabbit/renderer/color.rb

@@ -44,7 +44,7 @@ module Rabbit
       end
 
       alias have_alpha? have_alpha
-      
+
       def to_s
         "#%04X%04X%04X%04X" % to_gdk_rgba
       end
@@ -56,7 +56,7 @@ module Rabbit
           [red, green, blue]
         end
       end
-      
+
       def to_gdk_rgb
         to_gdk_rgba[0..-2]
       end
@@ -70,7 +70,7 @@ module Rabbit
       def to_gdk_format
         to_s.gsub(/[a-z0-9]{4}\z/i, '')
       end
-      
+
       def to_gdk_color
         Gdk::Color.new(*to_gdk_rgb)
       end

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

@@ -10,22 +10,27 @@ module Rabbit
 
         def initialize(*args, &block)
           @drawable = nil
+          @size = nil
+          @default_size_ratio = nil
+          @size_ratio = nil
           super
         end
 
         def width
-          if @drawable
-            @drawable.size[0]
+          if @size
+            @size.logical_width
+          else
+            nil
           end
         end
-        alias original_width width
 
         def height
-          if @drawable
-            @drawable.size[1]
+          if @size
+            @size.logical_height
+          else
+            nil
           end
         end
-        alias original_height height
 
         def redraw
           widget.queue_draw
@@ -81,7 +86,76 @@ module Rabbit
           @canvas.update_title(@canvas.slide_title)
         end
 
+        def draw_slide(slide, simulation)
+          set_size_ratio(slide.size_ratio || @default_size_ratio)
+
+          if simulation
+            super
+          else
+            save_context do
+              translate_context(@size.logical_margin_left,
+                                @size.logical_margin_top)
+              super
+            end
+
+            unless @size.have_logical_margin?
+              return
+            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)
+            end
+          end
+        end
+
         private
+        def set_drawable(drawable)
+          @drawable = drawable
+          w, h = @drawable.size
+          @default_size_ratio = w.to_f / h.to_f
+          @size_ratio = @default_size_ratio
+          set_size(w, h)
+        end
+
+        def set_size(w, h)
+          @size = Size.new(w, h, @size_ratio)
+        end
+
+        def set_size_ratio(ratio)
+          return if @size.ratio == ratio
+
+          w = @size.real_width
+          h = @size.real_height
+          @size_ratio = ratio
+          @size = Size.new(w, h, @size_ratio)
+        end
+
         def set_configure_event
           id = @window.signal_connect("configure_event") do |widget, event|
             configured(event.x, event.y, event.width, event.height)
@@ -91,6 +165,7 @@ module Rabbit
         end
 
         def configured(x, y, w, h)
+          set_size(w, h)
         end
 
         def queue_draw

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

@@ -291,7 +291,7 @@ module Rabbit
 
         def set_map
           @embed.signal_connect("map") do |widget, event|
-            @drawable = widget.window
+            set_drawable(widget.window)
             false
           end
         end

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

@@ -290,10 +290,10 @@ module Rabbit
 
           if whiteouting?
             @drawable.draw_rectangle(@white, true, 0, 0,
-                                     original_width, original_height)
+                                     @size.real_width, @size.real_height)
           elsif blackouting?
             @drawable.draw_rectangle(@black, true, 0, 0,
-                                     original_width, original_height)
+                                     @size.real_width, @size.real_height)
           else
             super
             draw_graffiti

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

@@ -131,7 +131,7 @@ module Rabbit
         end
 
         def mapped(widget)
-          @drawable = widget.window
+          set_drawable(widget.window)
           prepare_renderer(@drawable)
         end
 

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

@@ -4,70 +4,15 @@ require "stringio"
 require "rabbit/image-data-loader"
 require "rabbit/renderer/kernel"
 
-module Cairo
-  class Context
-    unless instance_methods.include?("rounded_rectangle")
-      def rounded_rectangle(x, y, width, height, x_radius, y_radius=nil)
-        x1 = x
-        x2 = x1 + width
-        y1 = y
-        y2 = y1 + height
-
-        y_radius ||= x_radius
-
-        x_radius = [x_radius, width / 2].min
-        y_radius = [y_radius, height / 2].min
-
-        xr1 = x_radius
-        xr2 = x_radius / 2.0
-        yr1 = y_radius
-        yr2 = y_radius / 2.0
-
-        move_to(x1 + xr1, y1)
-        line_to(x2 - xr1, y1)
-        curve_to(x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1)
-        line_to(x2, y2 - yr1)
-        curve_to(x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2)
-        line_to(x1 + xr1, y2)
-        curve_to(x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1)
-        line_to(x1, y1 + yr1)
-        curve_to(x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1)
-        close_path
-      end
-    end
-  end
-end
-
 module Rabbit
   module Renderer
     module Engine
       module Cairo
         include Kernel
 
-        @@rsvg_available = nil
-        @@poppler_available = nil
-
         class << self
-          def available_with_gdk?
-            Gdk.respond_to?(:cairo_available?) and Gdk.cairo_available?
-          end
-
-          def available_with_gdk_pixbuf?
-            Gdk::Pixbuf.respond_to?(:cairo_available?) and
-              Gdk::Pixbuf.cairo_available?
-          end
-
-          def available_with_pango?
-            Pango.respond_to?(:cairo_available?) and Pango.cairo_available?
-          end
-
           def priority
-            if available_with_gdk? and available_with_gdk_pixbuf? and
-                available_with_pango?
-              100
-            else
-              -100
-            end
+            100
           end
         end
 
@@ -300,13 +245,6 @@ module Rabbit
           end
         end
 
-        def rsvg_available?
-          if @@rsvg_available.nil?
-            @@rsvg_available = RSVG.cairo_available?
-          end
-          @@rsvg_available
-        end
-
         def draw_rsvg_handle(handle, x, y, params={})
           x, y = from_screen(x, y)
           dim = handle.dimensions
@@ -322,13 +260,6 @@ module Rabbit
                                       params)
         end
 
-        def poppler_available?
-          if @@poppler_available.nil?
-            @@poppler_available = Poppler.cairo_available?
-          end
-          @@poppler_available
-        end
-
         def draw_poppler_page(page, x, y, params={})
           x, y = from_screen(x, y)
           w, h = page.size