rabbit 2.1.9 → 2.2.0

data/lib/rabbit/password-reader.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2012-2016 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+module Rabbit
+  class PasswordReader
+    def initialize(prompt)
+      @prompt = prompt
+    end
+
+    def read
+      print(@prompt)
+      system("/bin/stty -echo") if $stdin.tty?
+      $stdin.gets.chomp
+    ensure
+      if $stdin.tty?
+        system("/bin/stty echo")
+        puts
+      end
+    end
+  end
+end

data/lib/rabbit/progress.rb

@@ -9,7 +9,6 @@ module Rabbit
       @bar = Gtk::ProgressBar.new
       @bar.show_text = true
       @window.add(@bar)
-      @original_style = @bar.style
       @foreground = nil
       @background = nil
     end
@@ -52,16 +51,29 @@ module Rabbit
 
     private
     def setup_progress_color
-      style = @original_style.copy
-      if @foreground
-        rgb = @foreground.to_gdk_rgb
-        style.set_bg(Gtk::STATE_PRELIGHT, *rgb)
+      if Gtk.const_defined?(:CssProvider)
+        css = "progressbar {\n"
+        if @foreground
+          css << "  color: #{@foreground.to_css_rgba};\n"
+        end
+        if @background
+          css << "  background-color: #{@background.to_css_rgba};\n"
+        end
+        css << "}\n"
+        provider = Gtk::CssProvider.default
+        provider.load(:data => css)
+      else
+        style = @bar.style.copy
+        if @foreground
+          rgb = @foreground.to_gdk_rgb
+          style.set_bg(Gtk::STATE_PRELIGHT, *rgb)
+        end
+        if @background
+          rgb = @background.to_gdk_rgb
+          style.set_bg(Gtk::STATE_NORMAL, *rgb)
+        end
+        @bar.style = style
       end
-      if @background
-        rgb = @background.to_gdk_rgb
-        style.set_bg(Gtk::STATE_NORMAL, *rgb)
-      end
-      @bar.style = style
     end
   end
 end

data/lib/rabbit/renderer.rb

@@ -2,7 +2,7 @@ require "rabbit/utils"
 
 require "rabbit/renderer/color"
 require "rabbit/renderer/display"
-require "rabbit/renderer/pixmap"
+require "rabbit/renderer/offscreen"
 require "rabbit/renderer/print"
 
 module Rabbit

data/lib/rabbit/renderer/base.rb

@@ -114,7 +114,7 @@ module Rabbit
       end
 
       def each_slide_pixbuf
-        canvas = off_screen_canvas
+        canvas = offscreen_canvas
         previous_index = canvas.current_index
         pre_to_pixbuf(canvas.slide_size)
         canceled = false
@@ -129,11 +129,11 @@ module Rabbit
         canvas.activate("Quit") if canvas != @canvas
       end
 
-      def off_screen_canvas
-        if off_screen_renderer?
+      def offscreen_canvas
+        if offscreen_renderer?
           @canvas
         else
-          make_canvas_with_off_screen_renderer
+          make_canvas_with_offscreen_renderer
         end
       end
 
@@ -258,7 +258,7 @@ module Rabbit
       end
 
       private
-      def off_screen_renderer?
+      def offscreen_renderer?
         false
       end
 
@@ -301,8 +301,8 @@ module Rabbit
         end
       end
 
-      def make_canvas_with_off_screen_renderer
-        make_canvas_with_renderer(Pixmap::Cairo) do |canvas|
+      def make_canvas_with_offscreen_renderer
+        make_canvas_with_renderer(Offscreen) do |canvas|
           canvas.width = @canvas.width
           canvas.height = @canvas.height
           setup_3d(canvas)

data/lib/rabbit/renderer/color.rb

@@ -74,6 +74,14 @@ module Rabbit
       def to_gdk_color
         Gdk::Color.new(*to_gdk_rgb)
       end
+
+      def to_css_rgba
+        red_percent = (red * 100).ceil
+        green_percent = (green * 100).ceil
+        blue_percent = (blue * 100).ceil
+        a = alpha || 1.0
+        "rgba(#{red_percent}%, #{green_percent}%, #{blue_percent}%, #{a})"
+      end
     end
   end
 end

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

@@ -268,6 +268,7 @@ module Rabbit
           event_mask |= Gdk::EventMask::BUTTON1_MOTION_MASK
           event_mask |= Gdk::EventMask::BUTTON2_MOTION_MASK
           event_mask |= Gdk::EventMask::BUTTON3_MOTION_MASK
+          event_mask |= Gdk::EventMask::SCROLL_MASK
           @area.add_events(event_mask)
           set_key_press_event(@area)
           set_button_event(@area)

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

@@ -171,14 +171,26 @@ module Rabbit
         end
 
         def set_configure_event_after
+          prev_x = prev_y = prev_width = prev_height = nil
           @area.signal_connect_after("configure_event") do |widget, event|
-            configured_after(widget, event)
+            prev_x ||= event.x
+            prev_y ||= event.y
+            prev_width ||= event.width
+            prev_height ||= event.height
+            if [prev_x, prev_y, prev_width, prev_height] !=
+                [event.x, event.y, event.width, event.height]
+              configured_after(widget, event)
+            end
+            prev_x = event.x
+            prev_y = event.y
+            prev_width = event.width
+            prev_height = event.height
+            false
           end
         end
 
         def configured_after(widget, event)
           reload_theme if @drawable
-          false
         end
 
         def reload_theme(&callback)

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

@@ -93,15 +93,17 @@ module Rabbit
 
           w = width / 1.5
           h = height / 1.5
-          x = @magnifier_center_x - w / 2
-          y = @magnifier_center_y - h / 2
+          center_x = @magnifier_center_x - size.logical_margin_left
+          center_y = @magnifier_center_y - size.logical_margin_top
+          x = center_x - w / 2
+          y = center_y - h / 2
           r = w * 0.1
           save_context do
             clip_block = Proc.new do
               draw_rectangle(true, 0, 0, width, height, @background)
-              translate_context(@magnifier_center_x, @magnifier_center_y)
+              translate_context(center_x, center_y)
               scale_context(@magnifier_ratio, @magnifier_ratio)
-              translate_context(-@magnifier_center_x, -@magnifier_center_y)
+              translate_context(-center_x, -center_y)
               block.call
             end
             draw_rounded_rectangle(false, x, y, w, h, r, nil,

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

@@ -19,9 +19,9 @@ module Rabbit
             unless handled
               handled = true
               case event.direction
-              when Gdk::EventScroll::Direction::UP
+              when Gdk::ScrollDirection::UP
                 @canvas.activate("PreviousSlide")
-              when Gdk::EventScroll::Direction::DOWN
+              when Gdk::ScrollDirection::DOWN
                 @canvas.activate("NextSlide")
               else
                 handled = false

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

@@ -101,7 +101,7 @@ module Rabbit
               :color_stops => color_stops,
             }
           }
-          draw_rectangle(true, 0, 0, width, height, nil, params)
+          draw_rectangle(true, 0, 0, size.real_width, size.real_height, nil, params)
         end
 
         def spotlighting?

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

@@ -186,7 +186,12 @@ module Rabbit
             set_source(color, params)
             set_line_options(params)
             @context.move_to(x, y)
-            @context.show_pango_layout(layout)
+            if params[:stroke]
+              @context.pango_layout_path(layout)
+              apply_cairo_action(false, params)
+            else
+              @context.show_pango_layout(layout)
+            end
           end
         end
 
@@ -266,6 +271,16 @@ module Rabbit
           end
         end
 
+        def draw_link(uri)
+          if @context.respond_to?(:tag)
+            @context.tag(::Cairo::Tag::LINK, "uri='#{uri}'") do
+              yield
+            end
+          else
+            yield
+          end
+        end
+
         def make_layout(text)
           attributes, text = Pango.parse_markup(text)
           layout = @context.create_pango_layout

data/lib/rabbit/renderer/offscreen.rb

@@ -0,0 +1,120 @@
+# Copyright (C) 2016  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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "rabbit/image-data-loader"
+require "rabbit/renderer/base"
+require "rabbit/renderer/engine/cairo"
+require "rabbit/utils"
+
+module Rabbit
+  module Renderer
+    class Offscreen
+      include Renderer::Base
+      include Engine::Cairo
+
+      attr_accessor :width, :height, :pango_context
+
+      def initialize(canvas, width=nil, height=nil)
+        super(canvas)
+        @width = width
+        @height = height
+        @pango_context = nil
+      end
+
+      def post_apply_theme
+      end
+
+      def post_move(old_index, index)
+      end
+
+      def post_move_in_slide(old_index, index)
+      end
+
+      def pre_parse
+      end
+
+      def post_parse
+      end
+
+      def index_mode_on
+      end
+
+      def index_mode_off
+      end
+
+      def pre_toggle_index_mode
+      end
+
+      def post_toggle_index_mode
+      end
+
+      def make_layout(text)
+        attrs, text = Pango.parse_markup(text)
+        layout = Pango::Layout.new(create_pango_context)
+        layout.text = text
+        layout.set_attributes(attrs)
+        layout
+      end
+
+      def to_pixbuf(slide)
+        pixbuf = nil
+        ::Cairo::ImageSurface.new(@width, @height) do |surface|
+          context = ::Cairo::Context.new(surface)
+          init_context(context)
+          slide.draw(@canvas)
+          png = StringIO.new
+          surface.write_to_png(png)
+          loader = ImageDataLoader.new(png.string)
+          pixbuf = loader.load
+          finish_context
+        end
+        pixbuf
+      end
+
+      def create_pango_context
+        context = Gtk::Invisible.new.create_pango_context
+        set_font_resolution(context)
+        context
+      end
+
+      def pre_to_pixbuf(slide_size)
+      end
+
+      def to_pixbufing(i)
+        Utils.process_pending_events
+        true
+      end
+
+      def post_to_pixbuf(canceled)
+      end
+
+      private
+      def init_color
+        super
+        init_engine_color
+      end
+
+      def offscreen_renderer?
+        true
+      end
+
+      def init_dpi
+        @x_dpi = ScreenInfo.screen_x_resolution
+        @y_dpi = ScreenInfo.screen_y_resolution
+      end
+    end
+  end
+end

data/lib/rabbit/search-window.rb

@@ -50,7 +50,7 @@ module Rabbit
 
     def init_frame
       @frame = Gtk::Frame.new
-      @frame.shadow_type = Gtk::ShadowType::ETCHED_IN
+      @frame.shadow_type = :etched_in
       @frame.show
       @window.add(@frame)
     end
@@ -70,7 +70,7 @@ module Rabbit
 
     def init_direction
       @direction = Gtk::ToggleButton.new
-      @arrow = Gtk::Arrow.new(Gtk::Arrow::LEFT, Gtk::SHADOW_NONE)
+      @arrow = Gtk::Arrow.new(:left, :none)
       @arrow.show
       @direction.add(@arrow)
       @direction.can_focus = false
@@ -78,18 +78,18 @@ module Rabbit
       @box.add(@direction)
       @direction.signal_connect("toggled") do |button|
         if forward?
-          type = Gtk::Arrow::RIGHT
+          type = :right
         else
-          type = Gtk::Arrow::LEFT
+          type = :left
         end
-        @arrow.set(type, Gtk::SHADOW_NONE)
+        @arrow.set(type, :none)
       end
       @direction.active = true
     end
 
     def send_focus_change(focus_in)
       @entry.has_focus = focus_in
-      event = Gdk::EventFocus.new(Gdk::EventFocus::FOCUS_CHANGE)
+      event = Gdk::EventFocus.new(:focus_change)
       event.window = @entry.window
       event.in = focus_in
       @entry.event(event)

data/lib/rabbit/searcher.rb

@@ -1,17 +1,7 @@
 require 'rabbit/utils'
 
-Rabbit::Converter.keep_kcode("EUC-JP") do
-  begin
-    require 'migemo'
-  rescue LoadError
-  end
-end
-
 module Rabbit
   class Searcher
-    @@migemo_static_dict = nil
-    @@migemo_static_dict_cache = nil
-
     def initialize(canvas)
       @canvas = canvas
     end
@@ -26,81 +16,11 @@ module Rabbit
 
     private
     def internal_regexp
-      if migemo_available?
-        migemo_regexp
-      else
-        begin
-          /#{@text}/iu
-        rescue RegexpError
-          /#{Regexp.escape(@text)}/iu
-        end
-      end
-    end
-
-    def migemo_regexp
-      text = Converter.to_eucjp_from_utf8(@text)
-      segments = migemo_split_text(text)
-      if segments.size <= 1
-        regexp_str = migemo_generate_regexp_str(text, false)
-      else
-        regexp_str1 = migemo_generate_regexp_str(text, true)
-        regexp_str2 = segments.collect do |pattern|
-          migemo_generate_regexp_str(pattern, true)
-        end.join
-        regexp_str = [regexp_str1, regexp_str2].join("|")
-      end
-      /#{Converter.to_utf8_from_eucjp(regexp_str)}/iu
-    end
-
-    def migemo_generate_regexp_str(pattern, with_paren)
-      Converter.keep_kcode("EUC-JP") do
-        migemo = Migemo.new(@@migemo_static_dict, pattern)
-        migemo.dict_cache = @@migemo_static_dict_cache
-        migemo.with_paren = with_paren
-        migemo.regex
-      end
-    end
-
-    def migemo_split_text(text)
-      text.scan(/[A-Z]?[^A-Z]+|[A-Z]+/e)
-    end
-
-    def migemo_available?
-      defined?(::Migemo) and have_migemo_static_dict?
-    end
-
-    def have_migemo_static_dict?
-      if @@migemo_static_dict.nil?
-        dict, dict_cache = search_migemo_static_dict
-        @@migemo_static_dict, @@migemo_static_dict_cache = dict, dict_cache
-      end
-      not @@migemo_static_dict.nil?
-    end
-
-    def search_migemo_static_dict
-      @canvas.migemo_dictionary_search_path.each do |target|
-        if File.directory?(target)
-          [
-           File.join(target, @canvas.migemo_dictionary_name),
-           File.join(target, "migemo", @canvas.migemo_dictionary_name),
-          ].each do |guess|
-            return make_migemo_dict(guess) if File.readable?(guess)
-          end
-        elsif File.readable?(target)
-          return make_migemo_dict(target)
-        end
-      end
-      nil
-    end
-
-    def make_migemo_dict(path)
-      dict = MigemoStaticDict.new(path)
-      dict_cache = nil
-      dict_cache_path = "#{path}.cache"
-      if File.readable?(dict_cache_path)
-        dict_cache = MigemoDictCache.new(dict_cache_path)
+      begin
+        /#{@text}/iu
+      rescue RegexpError
+        /#{Regexp.escape(@text)}/iu
       end
-      [dict, dict_cache]
     end
   end
 end