rabbit 0.9.1 → 0.9.2

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

@@ -23,7 +23,7 @@ module Rabbit
           init_drawing_area
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil)
           init_gl(@area)
           super
         end

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

@@ -8,13 +8,18 @@ module Rabbit
         include Renderer::Engine.renderer_module
         include DrawingAreaPrimitive
 
-        def attach_to(window)
+        def attach_to(window, container=nil, &block)
           super
-          @window.add(@area)# if @window # need?
+          add_widgets_to_container(@container, &block)
+          widget.show
         end
 
         def detach
-          @window.remove(@area)# if @window # need?
+          widget.hide
+          unless @window.destroyed?
+            remove_widgets_from_container(@container)
+          end
+
           super
         end
 
@@ -23,6 +28,18 @@ module Rabbit
           super
           init_engine_color
         end
+
+        def add_widgets_to_container(container, &block)
+          if block_given?
+            yield(container, @area)
+          else
+            container.add(@area)
+          end
+        end
+
+        def remove_widgets_from_container(container)
+          container.remove(@area)
+        end
       end
     end
   end

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

@@ -20,7 +20,7 @@ module Rabbit
           init_graffiti
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil)
           super
           graffiti_mode_action.active = false
         end

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

@@ -0,0 +1,60 @@
+module Rabbit
+  module Renderer
+    module Display
+      module HookHandler
+        def initialize(*args, &block)
+          super
+          init_hook_handler
+        end
+
+        def call_hook_procs(procs, *args)
+          procs.any? {|proc| proc.call(*args)}
+        end
+
+        def add_motion_notify_hook(hook=Proc.new)
+          @motion_notify_hook_procs << hook
+        end
+
+        def clear_motion_notify_hook
+          @motion_notify_hook_procs.clear
+        end
+
+        def add_scroll_hook(hook=Proc.new)
+          @scroll_hook_procs << hook
+        end
+
+        def clear_scroll_hook
+          @scroll_hook_procs.clear
+        end
+
+        def add_button_press_hook(hook=Proc.new)
+          @button_press_hook_procs << hook
+        end
+
+        def clear_button_press_hook
+          @button_press_hook_procs.clear
+        end
+
+        def add_button_release_hook(hook=Proc.new)
+          @button_release_hook_procs << hook
+        end
+
+        def clear_button_release_hook
+          @button_release_hook_procs.clear
+        end
+
+        def clear_hooks
+          init_hook_handler
+        end
+
+        private
+        def init_hook_handler
+          @motion_notify_hook_procs = []
+          @scroll_hook_procs = []
+          @button_press_hook_procs = []
+          @button_release_hook_procs = []
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Rabbit
           init_magnifier
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil)
           super
           magnifier_action.active = false
         end

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

@@ -0,0 +1,36 @@
+require 'gtk2'
+
+module Rabbit
+  module Renderer
+    module Display
+      module ScrollHandler
+        def initialize(*args, &block)
+          super
+          init_scroll_handler
+        end
+
+        private
+        def init_scroll_handler
+        end
+
+        def set_scroll_event(widget)
+          widget.signal_connect("scroll_event") do |widget, event|
+            handled = call_hook_procs(@scroll_hook_procs, event)
+            unless handled
+              handled = true
+              case event.direction
+              when Gdk::EventScroll::Direction::UP
+                @canvas.activate("PreviousSlide")
+              when Gdk::EventScroll::Direction::DOWN
+                @canvas.activate("NextSlide")
+              else
+                handled = false
+              end
+            end
+            handled
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Rabbit
           init_spotlight
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil)
           super
           spotlight_action.active = false
         end

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

@@ -167,7 +167,7 @@ module Rabbit
           x2, y2 = from_screen(x2, y2)
           @context.save do
             set_source(color, params)
-            set_line_width(get_line_width(params))
+            set_line_options(params)
             @context.new_path
             @context.move_to(x1, y1)
             @context.line_to(x2, y2)
@@ -179,7 +179,7 @@ module Rabbit
           x, y = from_screen(x, y)
           @context.save do
             set_source(color, params)
-            set_line_width(get_line_width(params))
+            set_line_options(params)
             @context.rectangle(x, y, w, h)
             apply_cairo_action(filled, params)
           end
@@ -193,7 +193,7 @@ module Rabbit
 
           @context.save do
             set_source(color, params)
-            set_line_width(get_line_width(params))
+            set_line_options(params)
             @context.new_path
             @context.rounded_rectangle(x, y, w, h, x_radius, y_radius)
             apply_cairo_action(filled, params)
@@ -211,7 +211,7 @@ module Rabbit
           a1, a2 = convert_angle(a1, a2)
           @context.save do
             set_source(color, params)
-            set_line_width(get_line_width(params))
+            set_line_options(params)
             args = [x, y, r, a1, a2]
             action, = cairo_action(filled, params)
             @context.move_to(x, y) unless action == :stroke
@@ -229,7 +229,7 @@ module Rabbit
           return if points.empty?
           @context.save do
             set_source(color, params)
-            set_line_width(get_line_width(params))
+            set_line_options(params)
             @context.move_to(*from_screen(*points.first))
             points[1..-1].each do |x, y|
               @context.line_to(*from_screen(x, y))
@@ -243,7 +243,7 @@ module Rabbit
           x, y = from_screen(x, y)
           @context.save do
             set_source(color, params)
-            set_line_width(get_line_width(params))
+            set_line_options(params)
             @context.move_to(x, y)
             @context.show_pango_layout(layout)
           end
@@ -368,11 +368,30 @@ module Rabbit
             info[:color_stops].each do |offset, r, g, b, a|
               pattern.add_color_stop_rgba(offset, r, g, b, a)
             end
+          when :pixbuf
+            @context.set_source_pixbuf(info[:pixbuf])
+            pattern = @context.source
+          end
+          if pattern
+            set_pattern_common_options(pattern, info)
+            @context.set_source(pattern)
           end
-          @context.set_source(pattern) if pattern
           !pattern.nil?
         end
 
+        def set_pattern_common_options(pattern, info)
+          extend = info[:extend]
+          pattern.extend = extend if extend
+          transformations = info[:transformations]
+          if transformations
+            matrix = ::Cairo::Matrix.identity
+            transformations.each do |operation, *args|
+              matrix.send("#{operation}!", *args)
+            end
+            pattern.matrix = matrix
+          end
+        end
+
         def set_color(color)
           @context.set_source_rgba(make_color(color).to_a)
         end
@@ -437,6 +456,14 @@ module Rabbit
             @context.mask(pattern)
           end
         end
+
+        def set_line_options(params)
+          set_line_width(get_line_width(params))
+          [:line_cap, :line_join].each do |key|
+            value = params[key]
+            @context.send("#{key}=", value) if value
+          end
+        end
       end
     end
   end

data/lib/rabbit/theme/applier.rb

@@ -89,28 +89,36 @@ module Rabbit
         end
       end
 
-      def draw_image_mark(image_name, name=nil)
+      def draw_image_mark(image_name, name=nil, options={})
         return if empty?
 
         loader = ImageLoader.new(image_name)
 
         width_proc = Proc.new {loader.width}
         height_proc = Proc.new {loader.height}
+        custom_indent = options[:indent]
         indent_proc = Proc.new do |item, simulation|
           text_height = item.elements.first.original_height
           if text_height < loader.height
             loader.resize(nil, (text_height * 2.0 / 3.0).ceil)
           end
-          loader.width * 2.5
+          if custom_indent.nil?
+            loader.width * 2.5
+          elsif custom_indent.respond_to?(:call)
+            custom_indent.call(item, loader)
+          else
+            custom_indent
+          end
         end
 
-        draw_mark(indent_proc, width_proc, height_proc, name) do
-          |item, canvas, x, y, w, h|
+        draw_mark(indent_proc,
+                  width_proc, height_proc,
+                  name) do  |item, canvas, x, y, w, h|
           x -= loader.width * 0.5
           loader.draw(canvas, x, y)
         end
       end
-      
+
       def draw_order(indent_width, name=nil, &block)
         layouts = {}
         make_order_layout = Proc.new do |item, simulation|

data/lib/rabbit/theme/debian/debian.rb

@@ -0,0 +1,253 @@
+# #--------------------------------------
+# # font size setup
+# #--------------------------------------
+# @xxxx_large_font_size = screen_size(6.5 * Pango::SCALE)
+# @xxx_large_font_size = screen_size(5 * Pango::SCALE)
+# @xx_large_font_size = screen_size(4.5.* Pango::SCALE)
+# @x_large_font_size = screen_size(4 * Pango::SCALE)
+# @large_font_size = screen_size(3.5 * Pango::SCALE)
+# @normal_font_size = screen_size(3 * Pango::SCALE)
+# @small_font_size = screen_size(2.8  * Pango::SCALE)
+# @x_small_font_size = screen_size(2.5 * Pango::SCALE)
+# @xx_small_font_size = screen_size(2.2 * Pango::SCALE)
+# @xxx_small_font_size = screen_size(2 * Pango::SCALE)
+# @script_font_size = @xxx_small_font_size
+# @large_script_font_size = @xx_small_font_size
+# @x_large_script_font_size = @xsmall_font_size
+# #--------------------------------------
+# @title_slide_font_size = @xx_large_font_size
+# @title_slide_title_font_size = @xxxx_large_font_size 
+# @title_slide_subtitle_font_size = @normal_font_size 
+# @title_slide_author_font_size = @xx_large_font_size 
+# @title_slide_content_source_font_size = @_small_font_size
+# @title_slide_institution_font_size = @small_font_size
+# @title_slide_place_font_size = @xx_small_font_size
+# @title_slide_date_font_size = @xx_small_font_size
+# @title_slide_note_font_size = @xxx_small_font_size
+#--------------------------------------
+# font family setup
+#--------------------------------------
+# using font name in `fc-list -v`
+@default_font = "Sans" 
+@font_family = find_font_family(@default_font)
+@bold_font = "Sans" 
+@bold_font_family = find_font_family(@bold_font)
+@monospace_font = "Monospace"
+@monospace_font_family = find_font_family(@monospace_font)
+
+#--------------------------------------
+# using default
+#--------------------------------------
+add_image_path("debian-images")
+#include_theme("default")
+# not need slide-number...
+include_theme("default-icon")
+include_theme("default-title-text")
+include_theme("default-text")
+include_theme("default-title-slide")
+include_theme("default-slide")
+include_theme("default-item-mark")
+include_theme("default-method-list")
+include_theme("default-preformatted")
+include_theme("default-block-quote")
+include_theme("default-foot-text")
+include_theme("default-description")
+include_theme("image")
+include_theme("table")
+include_theme("newline-in-slides")
+include_theme("per-slide-background-color")
+include_theme("background-image-toolkit")
+include_theme("per-slide-background-image")
+include_theme("body-background-image")
+include_theme("tag")
+
+@preformatted_frame_color = "#242424"
+@preformatted_frame_width = 0.5
+@preformatted_fill_color  = "#fff"
+@preformatted_shadow_color = "#242424"
+@centering_preformatted_block = true
+@description_term_line_color ||= "#ff9900"
+
+
+#--------------------------------------
+# title style changed
+#--------------------------------------
+@title_background_image = "debian-logo-pink.png"
+include_theme("title-background-image")
+match(TitleSlide) do |contents|
+ contents.prop_set("style", "normal")
+end
+match(TitleSlide, ContentSource) do |sources|
+  sources.margin_bottom = 0
+end
+match(TitleSlide, Date) do |dates|
+  dates.margin_top = @space 
+end
+match(TitleSlide, Place) do |places|
+end
+#--------------------------------------
+# title logo position changed
+#--------------------------------------
+@title_logo ||= "debian-whirl.png"
+logo_loader = ImageLoader.new(find_file(@title_logo))
+title_logo = Proc.new do |slide, canvas, x, y, w, h, simulation|
+  unless simulation
+    draw_x = canvas.width - logo_loader.width
+    draw_y = canvas.height - logo_loader.height
+    logo_loader.draw(canvas, draw_x, draw_y)
+  end
+  [x, y, w, h]
+end
+match(TitleSlide) do |slides|
+  name2 = "title-logo"
+  slides.delete_pre_draw_proc_by_name(name2)
+  slides.add_pre_draw_proc(name2, &title_logo)
+end
+
+## header/footer settings
+# image loader
+@slide_header ||= "top.png"
+@slide_footer ||= "bottom.png"
+@slide_banner ||= "debian-logo.png"
+# Headline Settings
+loader_head = ImageLoader.new(find_file(@slide_header))
+match(Slide, HeadLine) do |heads|
+  heads.each do |head|
+    head.add_pre_draw_proc("header_bg") do |canvas, x, y, w, h, simulation|
+      unless simulation
+        loader_head.resize(canvas.width, nil)
+        loader_head.draw(canvas, 
+          x + w - canvas.width + @margin_left + @margin_right, 0)
+      end
+      [x, y, w, h]
+    end
+  end
+  name = "head-line"
+  delete_post_draw_proc_by_name(name)
+  heads.margin_left = (canvas.width + @margin_left + @margin_right)/6.0
+  heads.margin_right = @margin_right
+  heads.margin_top = @margin_top * 1.3
+  heads.prop_set("size", @xx_large_font_size)
+  heads.prop_set("foreground", "#fff")
+  loader_head.resize(canvas.width, nil)
+  static_y = loader_head.height - @margin_top
+  original_h = nil
+  heads.add_pre_draw_proc do |head, canvas, x, y, w, h, simulation|
+    original_h = h
+    [x, y, w, h]
+  end
+  heads.add_post_draw_proc do |head, canvas, x, y, w, h, simulation|
+    [x, static_y, w, original_h - static_y]
+  end
+end
+# Slide number settings
+@slide_number_props = {
+  "size" => @x_small_font_size,
+  "font_family" => @bold_font
+}
+@slide_number_color = "#fff"
+match(Slide) do |slides|
+  break if @slide_number_uninstall
+  unless @not_use_slide_number
+    slides.add_post_draw_proc("slide_number") do |slide, canvas, x, y, w, h, simulation|
+      unless simulation
+        text = Text.new("#{canvas.current_index}/#{canvas.slide_size - 1}")
+        text.font @slide_number_props
+        text.align = Pango::Layout::ALIGN_RIGHT
+        text.compile(canvas, x, y, w, h)
+        layout = text.layout
+        layout.set_width(w * Pango::SCALE)
+        num_y = @margin_top
+        canvas.draw_layout(text.layout, x, num_y, @slide_number_color)
+      end
+    [x, y, w, h]
+    end
+  end
+end
+# Footer settings
+loader_foot = ImageLoader.new(find_file(@slide_footer))
+loader_banner = ImageLoader.new(find_file(@slide_banner))
+match(Slide) do |slides|
+  slides.each do |slide|
+    slide.add_post_draw_proc("footer") do |canvas, x, y, w, h, simulation|
+      unless simulation
+        footer_height = canvas.height/26.0 + screen_y(1) * 0.2
+        loader_foot.resize(canvas.width, footer_height)
+        loader_foot.draw(canvas, 0, canvas.height - footer_height)
+        banner_height = canvas.height/26.0
+        loader_banner.resize(nil, banner_height)
+        banner_pos_x = canvas.width - loader_banner.width 
+        banner_pos_y = canvas.height - loader_banner.height - footer_height
+        loader_banner.draw(canvas, banner_pos_x, banner_pos_y)
+      end
+      [x, y, w, h]
+    end
+  end
+end
+
+# item setup need update!!
+slide_body = [Slide, Body]
+item_list_item = [ItemList, ItemListItem]
+match(*(slide_body + (item_list_item * 1))) do |items|
+  name = "item1"
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+  draw_image_mark(items, "item1.png", name)
+end
+
+match(*(slide_body + (item_list_item * 2))) do |items|
+  name = "item2"
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+  draw_image_mark(items, "item1.png", name)
+end
+
+match(*(slide_body + (item_list_item * 3))) do |items|
+  name = "item3"
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+  draw_image_mark(items, "item1.png", name)
+end
+
+enum_list_item = [EnumList, EnumListItem]
+match(*(slide_body + enum_list_item + item_list_item)) do |items|
+  name = "enum-item1"
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+  draw_image_mark(items, "item1.png", name)
+end
+
+match(*(slide_body + enum_list_item + (item_list_item * 2))) do |items|
+  name = "enum-item2"
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+  draw_image_mark(items, "item1.png", name)
+end
+
+# text changed
+match("**", ReferText) do |texts|
+  texts.prop_set("underline", "none")
+  texts.prop_set("foreground", "blue")
+end
+
+# �ⶶ�᥽�å�
+@lightning_talk_proc_name = "lightning-debian"
+@lightning_talk_as_large_as_possible = true
+include_theme("title-on-image-toolkit")
+include_theme("lightning-talk-toolkit")
+match(Slide) do |slides|
+  slides.each do |slide|
+    slide.title_on_image if slide.title_on_image?
+  end
+end
+match(Slide) do |slides|
+  slides.each do |slide|
+    if slide.lightning_talk?
+      # reset header.margin_left
+      slide.headline.margin_left = @margin_left
+      slide.lightning_talk
+    end
+  end
+end
+
+