rabbit 0.9.1 → 0.9.2

data/lib/rabbit/canvas.rb

@@ -184,9 +184,9 @@ module Rabbit
       Front.new(self, public_level)
     end
 
-    def attach_to(frame, window)
+    def attach_to(frame, window, container=nil, &block)
       @frame = frame if frame
-      @renderer.attach_to(window) if window
+      @renderer.attach_to(window, container, &block) if window
     end
     
     def detach

data/lib/rabbit/dependency-canvas.rb

@@ -4,7 +4,8 @@ module Rabbit
   class DependencyCanvas < Canvas
     extend Forwardable
 
-    def_delegators(:@parent, :theme_name, :allotted_time, :rest_time)
+    def_delegators(:@parent,
+                   :theme_name, :allotted_time, :rest_time, :activate)
 
     def initialize(parent, *rest, &block)
       @parent = parent

data/lib/rabbit/element/slide.rb

@@ -1,5 +1,5 @@
 require 'rabbit/element/slide-element'
-require 'rabbit/element/text-container-element'
+require 'rabbit/element/text-block-element'
 
 module Rabbit
   module Element

data/lib/rabbit/info-window.rb

@@ -2,15 +2,30 @@ require 'erb'
 
 require 'rabbit/dependency-canvas'
 require 'rabbit/renderer/display/drawing-area-view-only'
+require 'rabbit/renderer/display/hook-handler'
+require 'rabbit/renderer/display/key-handler'
+require 'rabbit/renderer/display/button-handler'
+require 'rabbit/renderer/display/scroll-handler'
+require 'rabbit/renderer/display/menu'
 
 module Rabbit
   class InfoWindow
     include ERB::Util
 
+    include Renderer::Display::HookHandler
+    include Renderer::Display::KeyHandler
+    include Renderer::Display::ButtonHandler
+    include Renderer::Display::ScrollHandler
+    include Renderer::Display::Menu
+
     def initialize(canvas)
       @canvas = canvas
       @window = nil
       @timer_started = false
+      init_hook_handler
+      init_key_handler
+      init_button_handler
+      init_scroll_handler
     end
 
     def show(width=nil, height=nil)
@@ -23,15 +38,17 @@ module Rabbit
 
     def hide
       return unless showing?
+      detach_menu(@window)
+      detach_key(@window)
       each do |canvas|
         canvas.detach
       end
       @window.signal_handler_disconnect(@window_destroy_id)
       @window.destroy
       @window = @window_destroy_id = nil
-      @hbox = @vbox = nil
+      @canvas_widgets = @outer_box = nil
       @timer_started = false
-      @previous_canvas = @next_canvas = nil
+      @previous_canvas = @current_canvas = @next_canvas = nil
     end
 
     def showing?
@@ -61,6 +78,7 @@ module Rabbit
     end
 
     def init_canvas
+      @current_canvas = make_canvas
       @previous_canvas = make_canvas
       @next_canvas = make_canvas
     end
@@ -77,29 +95,57 @@ module Rabbit
       end
       @window.title = _("%s: Information window") % @canvas.title
       @window.set_default_size(width, height) if width and height
-      init_vbox
-      @window.add(@vbox)
-    end
+      init_widgets(width, height)
+      init_menu
+      attach_key(@window)
+      attach_menu(@window)
+      event_mask = Gdk::Event::BUTTON_PRESS_MASK
+      event_mask |= Gdk::Event::BUTTON_RELEASE_MASK
+      event_mask |= Gdk::Event::BUTTON1_MOTION_MASK
+      event_mask |= Gdk::Event::BUTTON2_MOTION_MASK
+      event_mask |= Gdk::Event::BUTTON3_MOTION_MASK
+      @window.add_events(event_mask)
+      set_button_event(@window)
+      set_scroll_event(@window)
+      @window.add(@outer_box)
+    end
+
+    def init_widgets(width, height)
+      init_timer_label(width * (1.0 / 3.0), height * (1.0 / 3.0))
+      @outer_box = Gtk::VBox.new
+
+      current_box = Gtk::HBox.new
+      @current_canvas.attach_to(nil, @window, current_box) do |container, widget|
+        widget.set_size_request(width * (2.0 / 3.0), height * (2.0 / 3.0))
+        container.pack_start(widget, true, false)
+      end
+      @outer_box.pack_start(current_box, true, false)
 
-    def init_vbox
-      @vbox = Gtk::VBox.new
-      init_hbox
-      init_timer_label
-      @vbox.pack_start(@hbox, true, true)
-      @vbox.pack_end(@timer_label, true, true)
-      @vbox.show
+      bottom_box = Gtk::HBox.new
+      @previous_canvas.attach_to(nil, @window, bottom_box) do |container, widget|
+        widget.set_size_request(width * (1.0 / 3.0), height * (1.0 / 3.0))
+        container.pack_start(widget, false, false)
+      end
+      bottom_box.pack_start(@timer_label, true, false)
+      @next_canvas.attach_to(nil, @window, bottom_box) do |container, widget|
+        widget.set_size_request(width * (1.0 / 3.0), height * (1.0 / 3.0))
+        container.pack_end(widget, false, false)
+      end
+      @outer_box.pack_end(bottom_box, false, false)
+
+      @outer_box.show
     end
 
-    def init_hbox
-      @hbox = Gtk::HBox.new
-      @previous_canvas.attach_to(nil, @hbox)
-      @next_canvas.attach_to(nil, @hbox)
-      @hbox.show
+    def init_canvas_widgets
+      @canvas_widgets = Gtk::HBox.new
+      @current_canvas.attach_to(nil, @window, @canvas_widgets)
+      @next_canvas.attach_to(nil, @window, @canvas_widgets)
     end
 
-    def init_timer_label
+    def init_timer_label(width, height)
       @timer_label = Gtk::Label.new
-      @timer_label.markup = markupped_timer_label
+      @timer_label.justify = :center
+      @timer_label.markup = markupped_timer_label(width, height)
       @timer_started = false
       check_timer
     end
@@ -113,16 +159,18 @@ module Rabbit
       end
     end
 
-    def markupped_timer_label
+    def markupped_timer_label(width=nil, height=nil)
+      width ||= @window.size[0] * (1.0 / 3.0)
+      height ||= @window.size[1] * (1.0 / 3.0)
       attrs = {}
-      attrs["font_desc"] = ((@window.size[1] * 100) / Pango::SCALE).to_s
+      attrs["font_desc"] = ((height * 200) / Pango::SCALE).to_s
       rest_time = @canvas.rest_time
       attrs["foreground"] = "red" if rest_time and rest_time < 0
       "<span #{@canvas.to_attrs(attrs)}>#{h timer_label}</span>"
     end
 
     def timer_label
-      rest_time = @canvas.rest_time
+      rest_time = @canvas.rest_time || @canvas.allotted_time
       if rest_time
         "%s%02d:%02d" % Utils.split_number_to_minute_and_second(rest_time)
       else
@@ -143,8 +191,9 @@ module Rabbit
 
     def adjust_slide(base_index=nil)
       base_index ||= @canvas.current_index
-      @previous_canvas.move_to_if_can(base_index - 1)
-      @next_canvas.move_to_if_can(base_index + 1)
+      @previous_canvas.move_to_if_can([base_index - 1, 0].max)
+      @current_canvas.move_to_if_can(base_index)
+      @next_canvas.move_to_if_can([base_index + 1, @canvas.slide_size - 1].min)
     end
 
     def toggle_index_mode
@@ -154,7 +203,7 @@ module Rabbit
     end
 
     def each(&block)
-      [@previous_canvas, @next_canvas].each(&block)
+      [@previous_canvas, @current_canvas, @next_canvas].each(&block)
     end
   end
 end

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 
   TMP_DIR_NAME = ".tmp"
 

data/lib/rabbit/renderer/base.rb

@@ -65,7 +65,6 @@ module Rabbit
         @graffiti_line_width = nil
         @draw_scaled_image = true
         clean
-        init_hook_procs
         init_dpi
         init_gl_parameters
       end
@@ -176,46 +175,6 @@ module Rabbit
         end.compact.join(" ")
       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_procs
-      end
-
       def clean
         dirty_count_clean
       end
@@ -454,13 +413,6 @@ module Rabbit
         @canvas.logger.warn(msg)
       end
 
-      def init_hook_procs
-        @motion_notify_hook_procs = []
-        @scroll_hook_procs = []
-        @button_press_hook_procs = []
-        @button_release_hook_procs = []
-      end
-
       def init_dpi
         @x_dpi = 72
         @y_dpi = 72

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

@@ -1,10 +1,12 @@
 require "rabbit/renderer/base"
+require "rabbit/renderer/display/hook-handler"
 
 module Rabbit
   module Renderer
     module Display
       module Base
         include Renderer::Base
+        include HookHandler
 
         def initialize(*args, &block)
           @drawable = nil
@@ -29,14 +31,21 @@ module Rabbit
           widget.queue_draw
         end
 
-        def attach_to(window)
+        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
 
         def toggle_whiteout

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

@@ -188,11 +188,11 @@ module Rabbit
           end
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil)
           super
 
           init_menu
-          add_widget_to_window(@window)
+          add_widgets_to_container(@container)
           widget.show
           attach_menu(@window)
           attach_key(@window)
@@ -203,8 +203,7 @@ module Rabbit
           detach_menu(@window)
           widget.hide
           unless @window.destroyed?
-            remove_widget_from_window(@window)
-            @window.signal_handler_disconnect(@configure_signal_id)
+            remove_widgets_from_container(@container)
           end
 
           super
@@ -297,12 +296,12 @@ module Rabbit
         end
 
         private
-        def add_widget_to_window(window)
-          window.add(@embed)
+        def add_widgets_to_container(container)
+          container.add(@embed)
         end
 
-        def remove_widget_from_window(window)
-          window.remove(@embed)
+        def remove_widgets_from_container(container)
+          container.remove(@embed)
         end
 
         def init_dpi

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

@@ -100,12 +100,12 @@ module Rabbit
         end
 
         private
-        def add_widget_to_window(window)
-          window.add(@area)
+        def add_widgets_to_container(container)
+          container.add(@area)
         end
 
-        def remove_widget_from_window(window)
-          window.remove(@area)
+        def remove_widgets_from_container(container)
+          container.remove(@area)
         end
 
         def attach_menu(window)

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

@@ -73,7 +73,7 @@ module Rabbit
         end
 
         private
-        def add_widget_to_window(window)
+        def add_widgets_to_container(container)
           super
           @vbox.pack_end(@comment_log.widget, false, false, 0)
           init_comment_view_canvas

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

@@ -8,6 +8,7 @@ require "rabbit/renderer/display/graffiti"
 require "rabbit/renderer/display/menu"
 require "rabbit/renderer/display/button-handler"
 require "rabbit/renderer/display/key-handler"
+require "rabbit/renderer/display/scroll-handler"
 require "rabbit/renderer/display/info"
 require "rabbit/renderer/display/spotlight"
 require "rabbit/renderer/display/magnifier"
@@ -26,6 +27,7 @@ module Rabbit
         include Gesture
         include KeyHandler
         include ButtonHandler
+        include ScrollHandler
         include Info
         include Spotlight
         include Magnifier
@@ -195,12 +197,12 @@ module Rabbit
           end
         end
 
-        def attach_to(window)
+        def attach_to(window, container=nil, &block)
           super
 
           init_menu
           init_gesture_actions
-          add_widget_to_window(@window)
+          add_widgets_to_container(@container, &block)
           widget.show
           attach_menu(@window)
           attach_key(@window)
@@ -211,8 +213,7 @@ module Rabbit
           detach_menu(@window)
           widget.hide
           unless @window.destroyed?
-            remove_widget_from_window(@window)
-            @window.signal_handler_disconnect(@configure_signal_id)
+            remove_widgets_from_container(@container)
           end
 
           super
@@ -237,18 +238,22 @@ module Rabbit
         end
 
         private
-        def add_widget_to_window(window)
+        def add_widgets_to_container(container)
           @hbox = Gtk::HBox.new
           @vbox = Gtk::VBox.new
           @vbox.pack_start(@area, true, true, 0)
           @hbox.pack_end(@vbox, true, true, 0)
-          window.add(@hbox)
+          if block_given?
+            yield(container, @hbox)
+          else
+            container.add(@hbox)
+          end
           @hbox.show
           @vbox.show
         end
 
-        def remove_widget_from_window(window)
-          window.remove(@hbox)
+        def remove_widgets_from_container(container)
+          container.remove(@hbox)
           @hbox = @vbox = nil
         end
 
@@ -263,7 +268,7 @@ module Rabbit
           set_key_press_event(@area)
           set_button_event(@area)
           set_motion_notify_event
-          set_scroll_event
+          set_scroll_event(@area)
         end
 
         def mapped(widget)
@@ -365,24 +370,6 @@ module Rabbit
           false
         end
 
-        def set_scroll_event
-          @area.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
-
         def confirm_dialog(message)
           flags = Gtk::Dialog::MODAL | Gtk::Dialog::DESTROY_WITH_PARENT
           dialog_type = Gtk::MessageDialog::INFO