rabbit 2.1.6 → 2.1.7

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

@@ -1,5 +1,5 @@
 require "rabbit/renderer/display/drawing-area-primitive"
-require 'rabbit/renderer/display/menu'
+require "rabbit/renderer/display/menu"
 require "rabbit/renderer/display/progress"
 require "rabbit/renderer/display/mask"
 require "rabbit/renderer/display/search"
@@ -239,10 +239,10 @@ module Rabbit
 
         private
         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)
+          @hbox = Gtk::Box.new(:horizontal)
+          @vbox = Gtk::Box.new(:vertical)
+          @vbox.pack_start(@area, :expand => true, :fill => true, :padding => 0)
+          @hbox.pack_end(@vbox, :expand => true, :fill => true, :padding => 0)
           if block_given?
             yield(container, @hbox)
           else
@@ -259,11 +259,11 @@ module Rabbit
 
         def init_drawing_area
           super
-          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
+          event_mask = Gdk::EventMask::BUTTON_PRESS_MASK
+          event_mask |= Gdk::EventMask::BUTTON_RELEASE_MASK
+          event_mask |= Gdk::EventMask::BUTTON1_MOTION_MASK
+          event_mask |= Gdk::EventMask::BUTTON2_MOTION_MASK
+          event_mask |= Gdk::EventMask::BUTTON3_MOTION_MASK
           @area.add_events(event_mask)
           set_key_press_event(@area)
           set_button_event(@area)
@@ -271,36 +271,31 @@ module Rabbit
           set_scroll_event(@area)
         end
 
-        def mapped(widget)
-          super
-          @white = Gdk::GC.new(@drawable)
-          @white.set_rgb_fg_color(Color.parse("white").to_gdk_color)
-          @black = Gdk::GC.new(@drawable)
-          @black.set_rgb_fg_color(Color.parse("black").to_gdk_color)
-        end
-
         def set_motion_notify_event
           @area.signal_connect("motion_notify_event") do |widget, event|
             call_hook_procs(@motion_notify_hook_procs, event)
           end
         end
 
-        def exposed(widget, event)
+        def paint(color_name)
+          context = @drawable.create_cairo_context
+          context.set_source_rgb(*Color.parse(color_name).to_gdk_rgb)
+          context.paint
+        end
+
+        def draw(widget, context)
           reload_source unless @caching
 
           if whiteouting?
-            @drawable.draw_rectangle(@white, true, 0, 0,
-                                     @size.real_width, @size.real_height)
+            paint("white")
           elsif blackouting?
-            @drawable.draw_rectangle(@black, true, 0, 0,
-                                     @size.real_width, @size.real_height)
+            paint("black")
           else
             super
             draw_graffiti
             draw_gesture
             draw_spotlight
           end
-          true
         end
 
         def draw_slide(slide, simulation, &block)

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

@@ -116,7 +116,7 @@ module Rabbit
           @area = Gtk::DrawingArea.new
           @area.can_focus = true
           set_map
-          set_expose_event
+          set_draw
           set_configure_event_after
         end
 
@@ -135,18 +135,27 @@ module Rabbit
           prepare_renderer(@drawable)
         end
 
-        def set_expose_event
-          @area.signal_connect("expose_event") do |widget, event|
-            init_renderer(@drawable)
-            result = exposed(widget, event)
-            finish_renderer
-            result
+        def set_draw
+          stop_events = false
+          if @area.class.signals.include?("draw")
+            @area.signal_connect("draw") do |widget, context|
+              init_context(context)
+              draw(widget, context)
+              finish_renderer
+              stop_events
+            end
+          else
+            @area.signal_connect("expose_event") do |widget, event|
+              init_renderer(@drawable)
+              draw(widget, @drawable.create_cairo_context)
+              finish_renderer
+              stop_events
+            end
           end
         end
 
-        def exposed(widget, event)
+        def draw(widget, context)
           draw_current_slide
-          true
         end
 
         def draw_current_slide
@@ -197,10 +206,10 @@ module Rabbit
         def grab
           Gtk.grab_add(@area)
           Gdk.pointer_grab(@area.window, false,
-                           Gdk::Event::BUTTON_PRESS_MASK |
-                           Gdk::Event::BUTTON_RELEASE_MASK |
-                           Gdk::Event::SCROLL_MASK |
-                           Gdk::Event::POINTER_MOTION_MASK,
+                           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)
         end

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

@@ -5,7 +5,7 @@ module Rabbit
   module Renderer
     module Display
       class DrawingAreaViewOnly
-        include Renderer::Engine.renderer_module
+        include Renderer::Engine::Cairo
         include DrawingAreaPrimitive
 
         def attach_to(window, container=nil, &block)

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

@@ -5,7 +5,7 @@ module Rabbit
   module Renderer
     module Display
       class DrawingArea
-        include Renderer::Engine.renderer_module
+        include Renderer::Engine::Cairo
         include DrawingAreaBase
 
         class << self

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

@@ -15,7 +15,7 @@ module Rabbit
 
           pressed_info = nil
           target_button = 3
-          target_event_type = Gdk::Event::Type::BUTTON_PRESS
+          target_event_type = Gdk::EventType::BUTTON_PRESS
           target_info = [target_button, target_event_type]
 
           add_button_press_hook do |event|

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

@@ -67,30 +67,30 @@ module Rabbit
         end
 
         def init_number_keys
-          no_mod = Gdk::Window::ModifierType.new
+          no_mod = Gdk::ModifierType.new
           mods = Utils.combination([
-                                    Gdk::Window::ModifierType::CONTROL_MASK,
-                                    Gdk::Window::ModifierType::MOD1_MASK,
+                                    Gdk::ModifierType::CONTROL_MASK,
+                                    Gdk::ModifierType::MOD1_MASK,
                                    ])
           mods.each do |mod|
             mod = mod.inject(no_mod) do |result, item|
               result | item
             end
-            keys = (0..9).collect{|i| Gdk::Keyval.const_get("GDK_KEY_#{i}")}
+            keys = (0..9).collect{|i| Gdk::Keyval.const_get("KEY_#{i}")}
             set_keys(keys, mod) do |group, obj, val, modifier|
-              index = calc_slide_number(val - Gdk::Keyval::GDK_KEY_0, modifier)
+              index = calc_slide_number(val - Gdk::Keyval::KEY_0, modifier)
               @canvas.activate("JumpTo") {index}
             end
-            keys = (0..9).collect{|i| Gdk::Keyval.const_get("GDK_KEY_KP_#{i}")}
+            keys = (0..9).collect{|i| Gdk::Keyval.const_get("KEY_KP_#{i}")}
             set_keys(keys, mod) do |group, obj, val, modifier|
-              index = calc_slide_number(val - Gdk::Keyval::GDK_KEY_KP_0, modifier)
+              index = calc_slide_number(val - Gdk::Keyval::KEY_KP_0, modifier)
               @canvas.activate("JumpTo") {index}
             end
           end
         end
 
         def init_no_prefix_keys
-          mod = Gdk::Window::ModifierType.new
+          mod = Gdk::ModifierType.new
 
           keys = Keys::QUIT_KEYS
           set_keys(keys, mod) do |group, obj, val, modifier|
@@ -155,7 +155,7 @@ module Rabbit
         end
 
         def init_shift_keys
-          mod = Gdk::Window::SHIFT_MASK
+          mod = Gdk::ModifierType::SHIFT_MASK
 
           keys = Keys::Shift::WHITE_OUT_KEYS
           set_keys(keys, mod) do |group, obj, val, modifier|
@@ -188,7 +188,7 @@ module Rabbit
         end
 
         def init_control_keys
-          mod = Gdk::Window::CONTROL_MASK
+          mod = Gdk::ModifierType::CONTROL_MASK
 
           keys = Keys::Control::CLEAR_GRAFFITI_KEYS
           set_keys(keys, mod) do |group, obj, val, modifier|
@@ -239,7 +239,7 @@ module Rabbit
         end
 
         def init_alt_keys
-          mod = Gdk::Window::MOD1_MASK
+          mod = Gdk::ModifierType::MOD1_MASK
 
           keys = Keys::Alt::RESET_ADJUSTMENT_KEYS
           set_keys(keys, mod) do |group, obj, val, modifier|
@@ -254,16 +254,16 @@ module Rabbit
 
         def set_key_press_event(widget)
           prev_keys = [
-            Gdk::Keyval::GDK_KEY_Up,
-            Gdk::Keyval::GDK_KEY_Left,
-            Gdk::Keyval::GDK_KEY_KP_Up,
-            Gdk::Keyval::GDK_KEY_KP_Left,
+            Gdk::Keyval::KEY_Up,
+            Gdk::Keyval::KEY_Left,
+            Gdk::Keyval::KEY_KP_Up,
+            Gdk::Keyval::KEY_KP_Left,
           ]
           next_keys = [
-            Gdk::Keyval::GDK_KEY_Right,
-            Gdk::Keyval::GDK_KEY_Down,
-            Gdk::Keyval::GDK_KEY_KP_Right,
-            Gdk::Keyval::GDK_KEY_KP_Down,
+            Gdk::Keyval::KEY_Right,
+            Gdk::Keyval::KEY_Down,
+            Gdk::Keyval::KEY_KP_Right,
+            Gdk::Keyval::KEY_KP_Down,
           ]
           widget.signal_connect("key_press_event") do |_widget, event|
             handled = true

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

@@ -33,7 +33,7 @@ module Rabbit
           @magnifier_center_y = nil
 
           target_button = 3
-          target_event_type = Gdk::Event::BUTTON_PRESS
+          target_event_type = Gdk::EventType::BUTTON_PRESS
           target_info = [target_button, target_event_type]
 
           add_button_press_hook do |event|

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

@@ -31,36 +31,31 @@ module Rabbit
 
         def set_hole
           if @mask_size <= 0
-            @window.shape_combine_mask(nil, 0, 0)
+            @window.shape_combine_region(nil)
           else
-            setup_mask if @mask.nil?
-            w, h = width, height
-            @mask.draw_rectangle(@set_gc, true, 0, 0, w, h)
-            mw = w * @mask_size
-            mh = h * @mask_size
-            mx = (w - mw) / 2
-            my = (h - mh) / 2
-            @mask.draw_rectangle(@xor_gc, true, mx, my, mw, mh)
-            @window.shape_combine_mask(@mask, 0, 0)
+            _size = size
+            w, h = _size.real_width, _size.real_height
+            @mask = Cairo::Region.new
+            @mask.union!(0, 0, w, h)
+            if @mask_size < 1.0
+              mw = w * @mask_size
+              mh = h * @mask_size
+              mx = (w - mw) / 2
+              my = (h - mh) / 2
+              @mask.subtract!(mx, my, mw, mh)
+            else
+              @mask.subtract!(0, 0, w - 1, h)
+            end
+            @window.shape_combine_region(@mask)
           end
+          redraw
           update_title # for xfwm
         end
 
         private
         def init_mask
-          @mask = nil
           @mask_size = 0
         end
-
-        def setup_mask
-          @mask = Gdk::Pixmap.new(nil, width, height, 1)
-          @xor_gc = Gdk::GC.new(@mask)
-          @xor_gc.set_function(Gdk::GC::INVERT)
-          @set_gc = Gdk::GC.new(@mask)
-          @set_gc.set_function(Gdk::GC::SET)
-          @clear_gc = Gdk::GC.new(@mask)
-          @clear_gc.set_function(Gdk::GC::CLEAR)
-        end
       end
     end
   end

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

@@ -55,7 +55,7 @@ module Rabbit
           entry = @search_window.entry
           direction = @search_window.direction
           entry.signal_connect("key_press_event") do |widget, key|
-            if key.state == Gdk::Window::ModifierType.new
+            if key.state == Gdk::ModifierType.new
               false
             else
               Gtk::AccelGroup.activate(@window, key.keyval, key.state)

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

@@ -33,7 +33,7 @@ module Rabbit
           @spotlight_center_y = nil
 
           target_button = 3
-          target_event_type = Gdk::Event::BUTTON2_PRESS
+          target_event_type = Gdk::EventType::BUTTON2_PRESS
           target_info = [target_button, target_event_type]
 
           add_button_press_hook do |event|

data/lib/rabbit/renderer/engine.rb

@@ -1,18 +1 @@
-require 'rabbit/utils'
-
-module Rabbit
-  module Renderer
-    module Engine
-      extend Utils
-
-      dir = ::File.join("rabbit", "renderer", "engine")
-      require_files_under_directory_in_load_path(dir)
-
-      class << self
-        def renderer_module
-          corresponding_module_under_module(self)
-        end
-      end
-    end
-  end
-end
+require "rabbit/renderer/engine/cairo"

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

@@ -10,12 +10,6 @@ module Rabbit
       module Cairo
         include Kernel
 
-        class << self
-          def priority
-            100
-          end
-        end
-
         attr_writer :foreground, :background
 
         def alpha_available?

data/lib/rabbit/renderer/pixmap.rb

@@ -1,25 +1 @@
-require "rabbit/utils"
-
-module Rabbit
-  module Renderer
-    module Pixmap
-      extend Utils
-
-      class << self
-        @initialized = false
-        def init
-          unless @initialized
-            @initialized = true
-            dir = ::File.join("rabbit", "renderer", "pixmap")
-            require_files_under_directory_in_load_path(dir)
-          end
-        end
-
-        def new(*args, &block)
-          init
-          corresponding_class_under_module(self).new(*args, &block)
-        end
-      end
-    end
-  end
-end
+require "rabbit/renderer/pixmap/cairo"

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

@@ -1,6 +1,4 @@
-require "rabbit/utils"
-
-Rabbit::Utils.require_safe "rabbit/renderer/engine/cairo"
+require "rabbit/renderer/engine/cairo"
 require "rabbit/renderer/pixmap/base"
 require "rabbit/renderer/pixmap/gl"
 
@@ -11,12 +9,6 @@ module Rabbit
         include Engine::Cairo
         include GL
         include Base
-
-        class << self
-          def priority
-            Engine::Cairo.priority
-          end
-        end
       end
     end
   end

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

@@ -1,13 +1,4 @@
-require "rabbit/utils"
-
-Rabbit::Utils.require_safe "rabbit/renderer/engine/cairo"
-
-if !(Cairo.const_defined?(:PSSurface) or
-     Cairo.const_defined?(:PDFSurface) or
-     Cairo.const_defined?(:SVGSurface))
-  raise LoadError
-end
-
+require "rabbit/renderer/engine/cairo"
 require "rabbit/renderer/print/base"
 
 module Rabbit

data/lib/rabbit/search-window.rb

@@ -40,7 +40,7 @@ module Rabbit
 
     private
     def init_window
-      @window = Gtk::Window.new(Gtk::Window::POPUP)
+      @window = Gtk::Window.new(:popup)
       @window.modal = true
       init_frame
       init_box
@@ -56,7 +56,7 @@ module Rabbit
     end
 
     def init_box
-      @box = Gtk::HBox.new
+      @box = Gtk::Box.new(:horizontal)
       @box.border_width = 3
       @box.show
       @frame.add(@box)