rabbit 2.1.6 → 2.1.7

data/lib/rabbit/frame.rb

@@ -117,8 +117,8 @@ module Rabbit
 
     private
     def init_window(width, height, window_type=nil)
-      window_type ||= Gtk::Window::TOPLEVEL
-      @window = Gtk::Window.new(window_type)
+      window_type ||= :toplevel
+      @window = Gtk::ApplicationWindow.new(::Rabbit.application)
       @window.set_default_size(width, height)
       @window.parse_geometry(@geometry) if @geometry
       @window.set_app_paintable(true)
@@ -167,18 +167,14 @@ module Rabbit
     def set_window_signal_destroy
       @window.signal_connect("destroy") do
         @canvas.detach
-        if main_window? and Gtk.main_level > 0
-          Gtk.main_quit
-        end
       end
     end
 
     def setup_dnd
-      Gtk::Drag.dest_set(@window,
-                         Gtk::Drag::DEST_DEFAULT_ALL,
-                         [["text/uri-list", 0, 0],
-                          ["_NETSCAPE_URL", 0, 0]],
-                         Gdk::DragContext::ACTION_COPY)
+      @window.drag_dest_set(:all,
+                            [["text/uri-list", 0, 0],
+                             ["_NETSCAPE_URL", 0, 0]],
+                            :copy)
       @window.signal_connect("drag-data-received") do |*args|
         widget, context, x, y, selection_data, info, time = args
         uri = selection_data.data.chomp

data/lib/rabbit/graffiti/config-dialog.rb

@@ -48,11 +48,11 @@ module Rabbit
           @callback.call(nil, spin.value)
         end
         label = Gtk::Label.new(_("Line width:"))
-        hbox = Gtk::HBox.new
-        hbox.pack_end(spin, false, false, 5)
-        hbox.pack_end(label, false, false, 5)
+        hbox = Gtk::Box.new(:horizontal)
+        hbox.pack_end(spin, :expand => false, :fill => false, :padding => 5)
+        hbox.pack_end(label, :expand => false, :fill => false, :padding => 5)
         hbox.show_all
-        @dialog.vbox.pack_end(hbox, false, false, 5)
+        @dialog.vbox.pack_end(hbox, :expand => false, :fill => false, :padding => 5)
       end
     end
   end

data/lib/rabbit/gtk.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2015  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
@@ -14,12 +14,182 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# TODO: Upgrade to gtk3
-require "gtk2"
+require "English"
+
+if ENV["RABBIT_GTK_VERSION"] == "3"
+  require "gtk3"
+  Gtk.init if Gtk.respond_to?(:init)
+else
+  require "cairo"
+  require "gio2"
+  require "gtk2"
+end
+
+module Cairo
+  class Region
+    unless public_method_defined?(:each_rectangle)
+      def each_rectangle
+        num_rectangles.times do |i|
+          yield(self[i])
+        end
+      end
+    end
+  end
+end
 
 module Gdk
   class Event
     STOP = true unless const_defined?(:STOP)
     PROPAGATE = false unless const_defined?(:PROPAGATE)
   end
+
+  class Window
+    unless method_defined?(:width)
+      def width
+        size[0]
+      end
+    end
+
+    unless method_defined?(:height)
+      def height
+        size[1]
+      end
+    end
+  end
+
+  unless const_defined?(:EventType)
+    EventType = Event::Type
+  end
+
+  unless const_defined?(:ModifierType)
+    ModifierType = Window::ModifierType
+  end
+
+  unless const_defined?(:EventMask)
+    EventMask = Event::Mask
+  end
+
+  module Keyval
+    constants.each do |name|
+      if /\AGDK_KEY_/ =~ name.to_s
+        const_set("KEY_#{$POSTMATCH}", const_get(name))
+      end
+    end
+  end
+
+  class Screen
+    unless method_defined?(:get_monitor_geometry)
+      alias_method :get_monitor_geometry, :monitor_geometry
+    end
+  end
+end
+
+module Gtk
+  unless const_defined?(:Actionable)
+    class Action
+      alias_method :initialize_raw, :initialize
+      def initialize(name, options={})
+        initialize_raw(name,
+                       options[:label],
+                       options[:tooltip],
+                       options[:stock_id])
+
+      end
+    end
+  end
+
+  unless const_defined?(:Application)
+    class Application < Gio::Application
+      def initialize(id, flags)
+        super
+        signal_connect_after("activate") do
+          Gtk.main if ApplicationWindow.n_instances > 0
+        end
+      end
+    end
+  end
+
+  unless const_defined?(:ApplicationWindow)
+    class ApplicationWindow
+      @@n_instances = 0
+
+      class << self
+        def new(application)
+          window = Window.new
+          @@n_instances += 1
+          window.signal_connect("destroy") do
+            @@n_instances -= 1
+            Gtk.main_quit if @@n_instances.zero?
+          end
+          window
+        end
+
+        def n_instances
+          @@n_instances
+        end
+      end
+    end
+  end
+
+  class Widget
+    unless public_method_defined?(:drag_dest_set)
+      def drag_dest_set(flags, targets, actions)
+        Gtk::Drag.dest_set(self, flags, targets, actions)
+      end
+    end
+
+    unless public_method_defined?(:shape_combine_region)
+      def shape_combine_region(cairo_region)
+        gdk_region = cairo_region_to_gdk_region(cairo_region)
+        window.shape_combine_region(gdk_region, 0, 0)
+      end
+    end
+
+    private
+    def cairo_region_to_gdk_region(cairo_region)
+      return nil if cairo_region.nil?
+
+      gdk_region = Gdk::Region.new
+      cairo_region.each_rectangle do |rectangle|
+        gdk_region.union(Gdk::Rectangle.new(*rectangle))
+      end
+      gdk_region
+    end
+  end
+
+  if Box.gtype.abstract?
+    class HBox
+      class << self
+        alias_method :new_raw, :new
+        def new(*arguments)
+          new_raw(*arguments)
+        end
+      end
+    end
+
+    class VBox
+      class << self
+        alias_method :new_raw, :new
+        def new(*arguments)
+          new_raw(*arguments)
+        end
+      end
+    end
+
+    class Box
+      class << self
+        def new(type)
+          case type
+          when :horizontal
+            HBox.new
+          when :vertical
+            VBox.new
+          else
+            raise ArgumentError,
+                  "Box type must be :horizontal or :vertical: #{type.inspect}"
+          end
+        end
+      end
+    end
+  end
 end

data/lib/rabbit/image/pdf.rb

@@ -1,6 +1,4 @@
-require "rabbit/utils"
-
-Rabbit::Utils.require_safe "poppler"
+require "poppler"
 
 require "rabbit/gettext"
 require "rabbit/image/base"

data/lib/rabbit/image/svg.rb

@@ -1,6 +1,4 @@
-require "rabbit/utils"
-
-Rabbit::Utils.require_safe "rsvg2"
+require "rsvg2"
 
 require "rabbit/image/base"
 

data/lib/rabbit/info-window.rb

@@ -112,11 +112,11 @@ module Rabbit
       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
+      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
       @window.add_events(event_mask)
       set_button_event(@window)
       set_scroll_event(@window)
@@ -125,26 +125,26 @@ module Rabbit
 
     def init_widgets(width, height)
       init_timer_label(width * (1.0 / 3.0), height * (1.0 / 3.0))
-      @outer_box = Gtk::VBox.new
+      @outer_box = Gtk::Box.new(:vertical)
 
-      current_box = Gtk::HBox.new
+      current_box = Gtk::Box.new(:horizontal)
       @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)
+        container.pack_start(widget, :expand => true, :fill => false)
       end
-      @outer_box.pack_start(current_box, true, false)
+      @outer_box.pack_start(current_box, :expand => true, :fill => false)
 
-      bottom_box = Gtk::HBox.new
+      bottom_box = Gtk::Box.new(:horizontal)
       @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)
+        container.pack_start(widget, :expand => false, :fill => false)
       end
-      bottom_box.pack_start(@timer_label, true, false)
+      bottom_box.pack_start(@timer_label, :expand => true, :fill => 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)
+        container.pack_end(widget, :expand => false, :fill => false)
       end
-      @outer_box.pack_end(bottom_box, false, false)
+      @outer_box.pack_end(bottom_box, :expand => false, :fill => false)
 
       @outer_box.show
     end
@@ -152,33 +152,33 @@ module Rabbit
     def init_widgets_on_note_mode(width, height)
       init_timer_label(width * (1.0 / 5.0), height * (2.0 / 5.0))
       init_note_area
-      @outer_box = Gtk::VBox.new
+      @outer_box = Gtk::Box.new(:vertical)
 
-      current_box = Gtk::HBox.new
-      current_box.pack_start(@timer_label, false, false)
+      current_box = Gtk::Box.new(:horizontal)
+      current_box.pack_start(@timer_label, :expand => false, :fill => false)
       @previous_canvas.attach_to(nil, @window, current_box) do |container, widget|
         widget.set_size_request(width * (1.0 / 5.0), height * (2.0 / 5.0))
-        container.pack_start(widget, true, true, 10)
+        container.pack_start(widget, :expand => true, :fill => true, :padding => 10)
       end
       @current_canvas.attach_to(nil, @window, current_box) do |container, widget|
         widget.set_size_request(width * (2.0 / 5.0), height * (2.0 / 5.0))
-        container.pack_start(widget, true, true)
+        container.pack_start(widget, :expand => true, :fill => true)
       end
       @next_canvas.attach_to(nil, @window, current_box) do |container, widget|
         widget.set_size_request(width * (1.0 / 5.0), height * (2.0 / 5.0))
-        container.pack_end(widget, true, true, 10)
+        container.pack_end(widget, :expand => true, :fill => true, :padding => 10)
       end
-      @outer_box.pack_start(current_box, false, false)
+      @outer_box.pack_start(current_box, :expand => false, :fill => false)
 
-      bottom_box = Gtk::HBox.new
-      bottom_box.pack_start(@note_area, true, true, 20)
-      @outer_box.pack_start(bottom_box, true, true, 20)
+      bottom_box = Gtk::Box.new(:horizontal)
+      bottom_box.pack_start(@note_area, :expand => true, :fill => true, :padding => 20)
+      @outer_box.pack_start(bottom_box, :expand => true, :fill => true, :padding => 20)
 
       @outer_box.show
     end
 
     def init_canvas_widgets
-      @canvas_widgets = Gtk::HBox.new
+      @canvas_widgets = Gtk::Box.new(:horizontal)
       @current_canvas.attach_to(nil, @window, @canvas_widgets)
       @next_canvas.attach_to(nil, @window, @canvas_widgets)
     end
@@ -191,9 +191,17 @@ module Rabbit
 
     def init_note_area
       @note_area = Gtk::DrawingArea.new
-      @note_area.signal_connect("expose-event") do |area, event|
-        draw_text_as_large_as_possible(area, note_text)
-        Gdk::Event::PROPAGATE
+      if @note_area.class.signals.include?("expose-event")
+        @note_area.signal_connect("expose-event") do |area, event|
+          context = area.window.create_cairo_context
+          draw_text_as_large_as_possible(area, context, note_text)
+          Gdk::Event::PROPAGATE
+        end
+      else
+        @note_area.signal_connect("draw") do |area, context|
+          draw_text_as_large_as_possible(area, context, note_text)
+          Gdk::Event::PROPAGATE
+        end
       end
     end
 
@@ -209,12 +217,11 @@ module Rabbit
       note.gsub(/\\n/, "\n")
     end
 
-    def draw_text_as_large_as_possible(area, markupped_text)
+    def draw_text_as_large_as_possible(area, context, markupped_text)
       return if markupped_text.nil?
 
       area_width, area_height = area.window.size
 
-      context = area.window.create_cairo_context
       layout = context.create_pango_layout
       layout.context.resolution = @canvas.font_resolution
       attributes, text = Pango.parse_markup(markupped_text)

data/lib/rabbit/keys.rb

@@ -5,177 +5,177 @@ module Rabbit
   module Keys
 
     QUIT_KEYS = [
-      Gdk::Keyval::GDK_KEY_Escape,
-      Gdk::Keyval::GDK_KEY_q,
+      Gdk::Keyval::KEY_Escape,
+      Gdk::Keyval::KEY_q,
     ]
 
     MOVE_TO_NEXT_KEYS = [
-      Gdk::Keyval::GDK_KEY_n,
-      Gdk::Keyval::GDK_KEY_f,
-      Gdk::Keyval::GDK_KEY_j,
-      Gdk::Keyval::GDK_KEY_l,
-      Gdk::Keyval::GDK_KEY_Page_Down,
-      Gdk::Keyval::GDK_KEY_Tab,
-      Gdk::Keyval::GDK_KEY_Return,
-      Gdk::Keyval::GDK_KEY_rightarrow,
-      Gdk::Keyval::GDK_KEY_downarrow,
-      Gdk::Keyval::GDK_KEY_space,
-      Gdk::Keyval::GDK_KEY_plus,
-      Gdk::Keyval::GDK_KEY_KP_Add,
-      Gdk::Keyval::GDK_KEY_KP_Page_Down,
-      Gdk::Keyval::GDK_KEY_KP_Enter,
-      Gdk::Keyval::GDK_KEY_KP_Tab,
+      Gdk::Keyval::KEY_n,
+      Gdk::Keyval::KEY_f,
+      Gdk::Keyval::KEY_j,
+      Gdk::Keyval::KEY_l,
+      Gdk::Keyval::KEY_Page_Down,
+      Gdk::Keyval::KEY_Tab,
+      Gdk::Keyval::KEY_Return,
+      Gdk::Keyval::KEY_rightarrow,
+      Gdk::Keyval::KEY_downarrow,
+      Gdk::Keyval::KEY_space,
+      Gdk::Keyval::KEY_plus,
+      Gdk::Keyval::KEY_KP_Add,
+      Gdk::Keyval::KEY_KP_Page_Down,
+      Gdk::Keyval::KEY_KP_Enter,
+      Gdk::Keyval::KEY_KP_Tab,
     ]
 
     MOVE_TO_PREVIOUS_KEYS = [
-      Gdk::Keyval::GDK_KEY_p,
-      Gdk::Keyval::GDK_KEY_b,
-      Gdk::Keyval::GDK_KEY_h,
-      Gdk::Keyval::GDK_KEY_k,
-      Gdk::Keyval::GDK_KEY_Page_Up,
-      Gdk::Keyval::GDK_KEY_leftarrow,
-      Gdk::Keyval::GDK_KEY_uparrow,
-      Gdk::Keyval::GDK_KEY_BackSpace,
-      Gdk::Keyval::GDK_KEY_Delete,
-      Gdk::Keyval::GDK_KEY_minus,
-      Gdk::Keyval::GDK_KEY_KP_Subtract,
-      Gdk::Keyval::GDK_KEY_KP_Page_Up,
-      Gdk::Keyval::GDK_KEY_KP_Delete,
+      Gdk::Keyval::KEY_p,
+      Gdk::Keyval::KEY_b,
+      Gdk::Keyval::KEY_h,
+      Gdk::Keyval::KEY_k,
+      Gdk::Keyval::KEY_Page_Up,
+      Gdk::Keyval::KEY_leftarrow,
+      Gdk::Keyval::KEY_uparrow,
+      Gdk::Keyval::KEY_BackSpace,
+      Gdk::Keyval::KEY_Delete,
+      Gdk::Keyval::KEY_minus,
+      Gdk::Keyval::KEY_KP_Subtract,
+      Gdk::Keyval::KEY_KP_Page_Up,
+      Gdk::Keyval::KEY_KP_Delete,
     ]
 
     MOVE_TO_FIRST_KEYS = [
-      Gdk::Keyval::GDK_KEY_a,
-      Gdk::Keyval::GDK_KEY_Home,
-      Gdk::Keyval::GDK_KEY_KP_Home,
-      Gdk::Keyval::GDK_KEY_less,
+      Gdk::Keyval::KEY_a,
+      Gdk::Keyval::KEY_Home,
+      Gdk::Keyval::KEY_KP_Home,
+      Gdk::Keyval::KEY_less,
     ]
 
     MOVE_TO_LAST_KEYS = [
-      Gdk::Keyval::GDK_KEY_e,
-      Gdk::Keyval::GDK_KEY_End,
-      Gdk::Keyval::GDK_KEY_KP_End,
-      Gdk::Keyval::GDK_KEY_greater,
-      Gdk::Keyval::GDK_KEY_dollar,
+      Gdk::Keyval::KEY_e,
+      Gdk::Keyval::KEY_End,
+      Gdk::Keyval::KEY_KP_End,
+      Gdk::Keyval::KEY_greater,
+      Gdk::Keyval::KEY_dollar,
     ]
 
     TOGGLE_FULLSCREEN_KEYS = [
-      Gdk::Keyval::GDK_KEY_F5,
-      Gdk::Keyval::GDK_KEY_F10,
-      Gdk::Keyval::GDK_KEY_F11,
+      Gdk::Keyval::KEY_F5,
+      Gdk::Keyval::KEY_F10,
+      Gdk::Keyval::KEY_F11,
     ]
 
     RELOAD_THEME_KEYS = [
-      Gdk::Keyval::GDK_KEY_t,
-      Gdk::Keyval::GDK_KEY_r,
+      Gdk::Keyval::KEY_t,
+      Gdk::Keyval::KEY_r,
     ]
 
     SAVE_AS_IMAGE_KEYS = [
-      Gdk::Keyval::GDK_KEY_s,
+      Gdk::Keyval::KEY_s,
     ]
 
     ICONIFY_KEYS = [
-      Gdk::Keyval::GDK_KEY_z,
+      Gdk::Keyval::KEY_z,
     ]
 
     TOGGLE_INDEX_MODE_KEYS = [
-      Gdk::Keyval::GDK_KEY_i,
+      Gdk::Keyval::KEY_i,
     ]
 
     CACHE_ALL_SLIDES_KEYS = [
-      Gdk::Keyval::GDK_KEY_c,
+      Gdk::Keyval::KEY_c,
     ]
 
     SEARCH_SLIDE_FORWARD_KEYS = [
-      Gdk::Keyval::GDK_KEY_slash,
+      Gdk::Keyval::KEY_slash,
     ]
 
     SEARCH_SLIDE_BACKWARD_KEYS = [
-      Gdk::Keyval::GDK_KEY_question,
+      Gdk::Keyval::KEY_question,
     ]
 
     SEARCH_SLIDE_FORWARD_NEXT_KEYS = [
-      Gdk::Keyval::GDK_KEY_n,
+      Gdk::Keyval::KEY_n,
     ]
 
     STOP_SLIDE_SEARCH_KEYS = [
-      Gdk::Keyval::GDK_KEY_Escape,
+      Gdk::Keyval::KEY_Escape,
     ]
 
     module Shift
       WHITE_OUT_KEYS = [
-        Gdk::Keyval::GDK_KEY_w,
+        Gdk::Keyval::KEY_w,
       ]
 
       BLACK_OUT_KEYS = [
-        Gdk::Keyval::GDK_KEY_b,
+        Gdk::Keyval::KEY_b,
       ]
 
       EXPAND_HOLE_KEYS = [
-        Gdk::Keyval::GDK_KEY_e,
+        Gdk::Keyval::KEY_e,
       ]
 
       NARROW_HOLE_KEYS = [
-        Gdk::Keyval::GDK_KEY_n,
+        Gdk::Keyval::KEY_n,
       ]
 
       TOGGLE_GRAFFITI_MODE_KEYS = [
-        Gdk::Keyval::GDK_KEY_g,
+        Gdk::Keyval::KEY_g,
       ]
 
       SEARCH_SLIDE_BACKWARD_NEXT_KEYS = [
-        Gdk::Keyval::GDK_KEY_n,
+        Gdk::Keyval::KEY_n,
       ]
 
       TOGGLE_INFO_WINDOW_KEYS = [
-        Gdk::Keyval::GDK_KEY_i,
+        Gdk::Keyval::KEY_i,
       ]
     end
 
     module Control
       CLEAR_SLIDE_KEYS = [
-        Gdk::Keyval::GDK_KEY_l,
+        Gdk::Keyval::KEY_l,
       ]
 
       PRINT_KEYS = [
-        Gdk::Keyval::GDK_KEY_p,
+        Gdk::Keyval::KEY_p,
       ]
 
       UNDO_GRAFFITI_KEYS = [
-        Gdk::Keyval::GDK_KEY_z,
+        Gdk::Keyval::KEY_z,
       ]
 
       CLEAR_GRAFFITI_KEYS = [
-        Gdk::Keyval::GDK_KEY_l,
+        Gdk::Keyval::KEY_l,
       ]
 
       SEARCH_SLIDE_FORWARD_KEYS = [
-        Gdk::Keyval::GDK_KEY_s,
+        Gdk::Keyval::KEY_s,
       ]
 
       SEARCH_SLIDE_BACKWARD_KEYS = [
-        Gdk::Keyval::GDK_KEY_r,
+        Gdk::Keyval::KEY_r,
       ]
 
       SEARCH_SLIDE_FORWARD_NEXT_KEYS = [
-        Gdk::Keyval::GDK_KEY_s,
+        Gdk::Keyval::KEY_s,
       ]
 
       SEARCH_SLIDE_BACKWARD_NEXT_KEYS = [
-        Gdk::Keyval::GDK_KEY_r,
+        Gdk::Keyval::KEY_r,
       ]
 
       STOP_SLIDE_SEARCH_KEYS = [
-        Gdk::Keyval::GDK_KEY_g,
+        Gdk::Keyval::KEY_g,
       ]
     end
 
     module Alt
       RESET_ADJUSTMENT_KEYS = [
-        Gdk::Keyval::GDK_KEY_a,
+        Gdk::Keyval::KEY_a,
       ]
 
       RESET_TIMER_KEYS = [
-        Gdk::Keyval::GDK_KEY_t,
+        Gdk::Keyval::KEY_t,
       ]
     end
   end