rabbit 2.2.1 → 3.0.0

data/lib/rabbit/filename.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 2018  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 "glib2"
+
+module Rabbit
+  class Filename
+    class << self
+      def sanitize(string)
+        string.gsub(/[\r\n]/, "").gsub(/[\/\\:]/, "-")
+      end
+    end
+
+    def initialize(filename)
+      @utf8_filename = filename.encode("UTF-8")
+    end
+
+    def encode
+      if GLib.const_defined?(:Win32)
+        GLib::Win32.locale_filename_from_utf8(@utf8_filename)
+      else
+        GLib.filename_from_utf8(@utf8_filename)
+      end
+    end
+  end
+end

data/lib/rabbit/formatter.rb

@@ -28,18 +28,6 @@ module Rabbit
     module SpanTextFormatter
       include Formatter
 
-      PANGO2CSS = {
-        "font_family" => Proc.new do |name, value|
-          ["font-family", "'#{value}'"]
-        end,
-        "foreground" => "color",
-        "size" => Proc.new do |name, value|
-          ["font-size", "#{(value / Pango::SCALE) * 2}px"]
-        end,
-        "style" => "font-style",
-        "weight" => "font-weight",
-      }
-
       attr_reader :value
 
       def initialize(value)
@@ -55,26 +43,24 @@ module Rabbit
       end
 
       def format(text)
-        tagged_text(text, "span", normalize_attribute(name, @value))
+        tagged_text(text, "span", {name => pango_value})
       end
 
       def html_format(text)
-        css_name, css_value = pango2css(name, @value)
         tagged_text(text, "span", {'style' => "#{css_name}: #{css_value};"})
       end
 
+      def pango_value
+        @value
+      end
+
       private
-      def normalize_attribute(name, value)
-        {name => value}
+      def css_name
+        name
       end
 
-      def pango2css(name, value)
-        css_name = PANGO2CSS[name]
-        if css_name.respond_to?(:call)
-          css_name.call(name, value)
-        else
-          [css_name || name, value]
-        end
+      def css_value
+        value
       end
     end
 
@@ -93,17 +79,62 @@ module Rabbit
 EOC
     end
 
-    class Size
-      def initialize(value)
-        value = value.ceil if value.is_a?(Numeric)
-        super(value)
+    class FontFamily
+      private
+      def css_name
+        "font-family"
+      end
+
+      def css_value
+        "'#{@value}'"
       end
     end
 
     class Foreground
-      def normalize_attribute(name, value)
-        value = Renderer::Color.parse(value).to_gdk_format
-        super(name, value)
+      def pango_value
+        Renderer::Color.parse(@value).to_gdk_format
+      end
+
+      private
+      def css_name
+        "color"
+      end
+    end
+
+    class Size
+      def pango_value
+        if @value > Pango::SCALE # For backward compatibility
+          @value.ceil
+        else
+          (@value * Pango::SCALE).ceil
+        end
+      end
+
+      private
+      def css_name
+        "font-size"
+      end
+
+      def css_value
+        if value > Pango::SCALE # For backward compatibility
+          "#{(value / Pango::SCALE) * 2}px"
+        else
+          "#{value * 2}px"
+        end
+      end
+    end
+
+    class Style
+      private
+      def css_name
+        "font-style"
+      end
+    end
+
+    class Weigth
+      private
+      def css_name
+        "font-weight"
       end
     end
 

data/lib/rabbit/frame.rb

@@ -25,13 +25,12 @@ module Rabbit
     def_delegators(:@canvas, :rss_base_uri=, :use_gl?, :use_gl=)
 
     attr_reader :window, :logger
-    attr_accessor :geometry, :force_keep_above
+    attr_accessor :geometry
 
     def initialize(logger, canvas)
       @logger = logger
       @canvas = canvas
       @geometry = nil
-      @force_keep_above = nil
     end
 
     def destroyed?
@@ -88,11 +87,6 @@ module Rabbit
       init_window(width, height, window_type)
       @fullscreen = false
       @main_window = main_window
-      if @main_window
-        @window.keep_above = @force_keep_above unless @force_keep_above.nil?
-      else
-        @window.keep_above = true
-      end
       @window.show
       @canvas.post_init_gui
     end
@@ -122,24 +116,13 @@ module Rabbit
       set_window_signal_destroy
     end
 
-    def update_keep_above(keep_above)
-      if @main_window
-        keep_above = @force_keep_above unless @force_keep_above.nil?
-        @window.keep_above = keep_above
-      else
-        @window.keep_above = true
-      end
-    end
-
     def set_window_signal_window_state_event
       @window.signal_connect("window_state_event") do |widget, event|
         if event.changed_mask.fullscreen?
           @fullscreen = event.new_window_state.fullscreen?
           if @fullscreen
-            @window.keep_above = true
             @canvas.fullscreened
           else
-            update_keep_above(false)
             @canvas.unfullscreened
           end
         elsif event.changed_mask.iconified?
@@ -191,7 +174,6 @@ module Rabbit
     def_null_methods(:icon, :icon=, :set_icon)
     def_null_methods(:icon_list, :icon_list=, :set_icon_list)
     def_null_methods(:update_title, :geometry, :geometry=)
-    def_null_methods(:force_keep_above, :force_keep_above=)
 
     def_null_methods(:fullscreen?, :quit)
 

data/lib/rabbit/front.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2005-2019  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 "monitor"
 
 require "rabbit/rabbit"
@@ -29,11 +45,16 @@ module Rabbit
       AVAILABLE_INTERFACES << [name, PublicLevel::MOVE, false]
     end
 
-    %w(width height paper_width paper_height).each do |name|
+    %w(width height base_width base_height paper_width paper_height).each do |name|
       AVAILABLE_INTERFACES << [name, PublicLevel::READ_SIZE, false]
     end
 
-    %w(width= height= paper_width= paper_height=).each do |name|
+    # Deprecated. Use #base_width= and #base_height= instead.
+    %w(width= height=).each do |name|
+      AVAILABLE_INTERFACES << [name, PublicLevel::CHANGE_SIZE, true]
+    end
+
+    %w(base_width= base_height= paper_width= paper_height=).each do |name|
       AVAILABLE_INTERFACES << [name, PublicLevel::CHANGE_SIZE, true]
     end
 

data/lib/rabbit/gesture/handler.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2006-2017  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/gtk'
 
 require 'rabbit/rabbit'
@@ -79,7 +95,8 @@ module Rabbit
       def draw(renderer)
         if @back_color.alpha == 1.0 or
             (@back_color.alpha < 1.0 and renderer.alpha_available?)
-          args = [true, 0, 0, renderer.width, renderer.height]
+          size = renderer.size
+          args = [true, 0, 0, size.real_width, size.real_height]
           args << @back_color
           renderer.draw_rectangle(*args)
         end
@@ -160,7 +177,9 @@ module Rabbit
         icon = nil
         icon = act.create_icon(Gtk::IconSize::DIALOG) if act
         if icon
-          pixbuf = icon.render_icon(icon.stock, icon.icon_size, act.name)
+          stock, = icon.stock
+          icon_size = icon.icon_size
+          pixbuf = icon.render_icon_pixbuf(stock, icon_size)
           x -= pixbuf.width / 2.0
           y -= pixbuf.height / 2.0
           renderer.draw_pixbuf(pixbuf, x, y)

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

@@ -7,16 +7,18 @@ module Rabbit
     class ConfigDialog
       include GetText
 
-      attr_reader :color, :line_width
       def initialize(color, line_width)
-        @original_color = @color = color
-        @original_line_width = @line_width = line_width
+        @original_color = color
+        @original_line_width = line_width
       end
 
       def run(&block)
         @callback = block
         init_dialog
-        if @dialog.run != Gtk::Dialog::RESPONSE_OK
+        if @dialog.run == Gtk::ResponseType::OK
+          @callback.call(Renderer::Color.new(@dialog.rgba),
+                         nil)
+        else
           @callback.call(@original_color, @original_line_width)
         end
         @dialog.destroy
@@ -24,20 +26,12 @@ module Rabbit
 
       private
       def init_dialog
-        @dialog = Gtk::ColorSelectionDialog.new
-        colorsel = @dialog.colorsel
-        colorsel.has_opacity_control = true
-        colorsel.has_palette = true
-        r, g, b, a = @original_color.to_gdk_rgba
-        colorsel.set_current_color(Gdk::Color.new(r, g, b))
-        colorsel.set_current_alpha(a)
+        @dialog = Gtk::ColorChooserDialog.new
+        @dialog.use_alpha = true
+        @dialog.rgba = @original_color.to_gdk_rgba
         add_line_width_control
-        colorsel.signal_connect("color_changed") do
-          color = Renderer::Color.new_from_gdk_color(colorsel.current_color)
-          color.have_alpha = true
-          alpha = colorsel.current_alpha / Renderer::Color::GDK_COLOR_NORMALIZE
-          color.alpha = alpha
-          @callback.call(color, nil)
+        @dialog.signal_connect(:color_activated) do |gdk_color|
+          @callback.call(Renderer::Color.new(gdk_color), nil)
         end
       end
 
@@ -52,7 +46,10 @@ module Rabbit
         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, :expand => false, :fill => false, :padding => 5)
+        @dialog.child.pack_end(hbox,
+                               :expand => false,
+                               :fill => false,
+                               :padding => 5)
       end
     end
   end

data/lib/rabbit/gtk.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2018  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,193 +14,4 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-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 Pango
-  unless const_defined?(:WrapMode)
-    WrapMode = Layout::WrapMode
-  end
-
-  unless const_defined?(:Alignment)
-    Alignment = Layout::Alignment
-  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
-
-  unless const_defined?(:ScrollDirection)
-    ScrollDirection = Gdk::EventScroll::Direction
-  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
-      attr_reader :windows
-      def initialize(id, flags)
-        super
-        signal_connect_after("activate") do
-          Gtk.main unless @windows.empty?
-        end
-        @windows = []
-      end
-    end
-  end
-
-  unless const_defined?(:ApplicationWindow)
-    class ApplicationWindow
-      class << self
-        def new(application)
-          window = Window.new
-          application.windows << window
-          window.signal_connect("destroy") do
-            windows = application.windows
-            windows.delete(window)
-            Gtk.main_quit if windows.empty?
-          end
-          window
-        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
+require "gtk3"