rabbit 3.0.3 → 3.0.4

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

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2024  Sutou Kouhei <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/renderer/display/drawing-area-primitive"
 require "rabbit/renderer/display/menu"
 require "rabbit/renderer/display/progress"
@@ -289,7 +305,7 @@ module Rabbit
         end
 
         def paint(color_name)
-          context = @drawable.create_cairo_context
+          context = @surface.create_cairo_context
           context.set_source_rgba(*Color.parse(color_name).to_a)
           context.paint
         end
@@ -313,9 +329,9 @@ module Rabbit
           width, height = pixbuf.width, pixbuf.height
           x = @adjustment_x * width
           y = @adjustment_y * height
-          @drawable.draw_pixbuf(@foreground, pixbuf,
-                                x, y, 0, 0, width, height,
-                                Gdk::RGB::DITHER_NORMAL, 0, 0)
+          @surface.draw_pixbuf(@foreground, pixbuf,
+                               x, y, 0, 0, width, height,
+                               Gdk::RGB::DITHER_NORMAL, 0, 0)
           if @adjustment_x != 0 or @adjustment_y != 0
             draw_next_slide
           end
@@ -353,9 +369,9 @@ module Rabbit
             src_height = -adjustment_height
           end
 
-          @drawable.draw_pixbuf(@foreground, pixbuf, src_x, src_y,
-                                dest_x, dest_y, src_width, src_height,
-                                Gdk::RGB::DITHER_NORMAL, 0, 0)
+          @surface.draw_pixbuf(@foreground, pixbuf, src_x, src_y,
+                               dest_x, dest_y, src_width, src_height,
+                               Gdk::RGB::DITHER_NORMAL, 0, 0)
         end
 
         def configured_after(widget, event)

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

@@ -1,10 +1,25 @@
+# Copyright (C) 2004-2024  Sutou Kouhei <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/utils"
 require "rabbit/renderer/engine"
 require "rabbit/renderer/display/base"
 require 'rabbit/renderer/display/cursor'
-require 'rabbit/renderer/display/gl'
 
 module Rabbit
   module Renderer
@@ -13,7 +28,6 @@ module Rabbit
         include Base
 
         include Cursor
-        include GL
 
         attr_accessor :filename
         def initialize(canvas)
@@ -27,13 +41,9 @@ module Rabbit
           super
 
           set_configure_event
-
-          init_gl(@area)
         end
 
         def detach
-          finalize_gl
-
           if !@window.destroyed? and @configure_signal_id
             @window.signal_handler_disconnect(@configure_signal_id)
             @configure_signal_id = nil
@@ -117,11 +127,6 @@ module Rabbit
         end
 
         private
-        def init_dpi
-          @x_dpi = ScreenInfo.screen_x_resolution
-          @y_dpi = ScreenInfo.screen_y_resolution
-        end
-
         def init_drawing_area
           @area = Gtk::DrawingArea.new
           @area.can_focus = true
@@ -141,15 +146,25 @@ module Rabbit
         end
 
         def mapped(widget)
-          set_drawable(widget.window)
+          set_surface(widget.native.surface)
         end
 
         def set_draw
-          @area.signal_connect("draw") do |widget, context|
-            init_context(context)
-            draw(widget)
-            finish_renderer
-            Gdk::Event::PROPAGATE
+          if @area.respond_to?(:set_draw_func)
+            @area.set_draw_func do |area, context|
+              surface = area.native.surface
+              update_size(surface.width, surface.height)
+              init_context(context)
+              draw(area)
+              finish_renderer
+            end
+          else
+            @area.signal_connect("draw") do |widget, context|
+              init_context(context)
+              draw(widget)
+              finish_renderer
+              Gdk::Event::PROPAGATE
+            end
           end
         end
 
@@ -178,8 +193,8 @@ module Rabbit
         end
 
         def configured(x, y, w, h)
-          @real_width = @drawable.width
-          @real_height = @drawable.height
+          @real_width = @surface.width
+          @real_height = @surface.height
           @size_dirty = true
         end
 
@@ -204,7 +219,7 @@ module Rabbit
 
         def configured_after(widget, event)
           update_size(event.width, event.height)
-          reload_theme if @drawable
+          reload_theme if @surface
         end
 
         def reload_theme(&callback)

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

@@ -1,3 +1,19 @@
+# Copyright (C) 2006-2024  Sutou Kouhei <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/gesture/handler"
 
 module Rabbit
@@ -49,7 +65,7 @@ module Rabbit
               first_move = !@gesture.moved?
               handled = @gesture.button_motion(event.x, event.y, width, height)
               queue_draw if handled or first_move
-              init_renderer(@drawable)
+              init_renderer(@surface)
               @gesture.draw_last_locus(self)
               finish_renderer
               true

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

@@ -1,3 +1,19 @@
+# Copyright (C) 2005-2024  Sutou Kouhei <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 "cairo"
 require "stringio"
 
@@ -12,10 +28,6 @@ module Rabbit
 
         attr_writer :foreground, :background
 
-        def alpha_available?
-          true
-        end
-
         def background_image=(pixbuf)
           surface = ::Cairo::ImageSurface.new(::Cairo::FORMAT_A1, 1, 1)
           context = ::Cairo::Context.new(surface)
@@ -25,8 +37,8 @@ module Rabbit
           pixbuf
         end
 
-        def init_renderer(drawable)
-          init_context(drawable.create_cairo_context)
+        def init_renderer(surface)
+          init_context(surface.create_cairo_context)
         end
 
         def finish_renderer
@@ -105,7 +117,7 @@ module Rabbit
           x2, y2 = from_screen(x2, y2)
           @context.save do
             set_source(color, params)
-            set_line_options(params)
+            set_stroke_options(params)
             @context.new_path
             @context.move_to(x1, y1)
             @context.line_to(x2, y2)
@@ -117,7 +129,7 @@ module Rabbit
           x, y = from_screen(x, y)
           @context.save do
             set_source(color, params)
-            set_line_options(params)
+            set_stroke_options(params)
             @context.rectangle(x, y, w, h)
             apply_cairo_action(filled, params)
           end
@@ -131,7 +143,7 @@ module Rabbit
 
           @context.save do
             set_source(color, params)
-            set_line_options(params)
+            set_stroke_options(params)
             @context.new_path
             @context.rounded_rectangle(x, y, w, h, x_radius, y_radius)
             apply_cairo_action(filled, params)
@@ -149,7 +161,7 @@ module Rabbit
           a1, a2 = convert_angle(a1, a2)
           @context.save do
             set_source(color, params)
-            set_line_options(params)
+            set_stroke_options(params)
             args = [x, y, r, a1, a2]
             action, = cairo_action(filled, params)
             @context.move_to(x, y) unless action == :stroke
@@ -167,7 +179,7 @@ module Rabbit
           return if points.empty?
           @context.save do
             set_source(color, params)
-            set_line_options(params)
+            set_stroke_options(params)
             @context.move_to(*from_screen(*points.first))
             points[1..-1].each do |x, y|
               @context.line_to(*from_screen(x, y))
@@ -181,7 +193,7 @@ module Rabbit
           x, y = from_screen(x, y)
           @context.save do
             set_source(color, params)
-            set_line_options(params)
+            set_stroke_options(params)
             @context.move_to(x, y)
             if params[:stroke]
               @context.pango_layout_path(layout)
@@ -461,12 +473,14 @@ module Rabbit
           end
         end
 
-        def set_line_options(params)
+        def set_stroke_options(params)
           set_line_width(get_line_width(params))
           [:line_cap, :line_join].each do |key|
             value = params[key]
             @context.send("#{key}=", value) if value
           end
+          value = params[:dash]
+          @context.set_dash(*value) if value
         end
       end
     end

data/lib/rabbit/renderer/gl.rb

@@ -22,87 +22,6 @@ module Rabbit
         end
       end
 
-      def draw_cube(filled, x, y, z, size, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_cube(filled, size)
-        end
-      end
-
-      def draw_sphere(filled, x, y, z, radius, slices, stacks,
-                      color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_sphere(filled, radius, slices, stacks)
-        end
-      end
-
-      def draw_cone(filled, x, y, z, base, height, slices, stacks,
-                    color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_cone(filled, base, height, slices, stacks)
-        end
-      end
-
-      def draw_torus(filled, x, y, z, inner_radius, outer_radius,
-                     n_sides, rings, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_torus(filled, inner_radius,
-                             outer_radius, n_sides, rings)
-        end
-      end
-
-      def draw_tetrahedron(filled, x, y, z, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_tetrahedron(filled)
-        end
-      end
-
-      def draw_octahedron(filled, x, y, z, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_octahedron(filled)
-        end
-      end
-
-      def draw_dodecahedron(filled, x, y, z, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_dodecahedron(filled)
-        end
-      end
-
-      def draw_icosahedron(filled, x, y, z, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_icosahedron(filled)
-        end
-      end
-
-      def draw_teapot(filled, x, y, z, scale, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::Gdk::GL.draw_teapot(filled, scale)
-        end
-      end
-
-      def gl_compile(id)
-        return super unless gl_available?
-        ::GL.NewList(id, ::GL::COMPILE)
-        yield
-        ::GL.EndList
-      end
-
-      def gl_call_list(id, x, y, z, color=nil, &block)
-        return super unless gl_available?
-        draw_gl(x, y, z, color, block) do
-          ::GL.CallList(id)
-        end
-      end
-
       def gl_supported?
         (Gtk::GL::BUILD_VERSION <=> [1, 2, 0]) >= 0
       end

data/lib/rabbit/renderer/kernel.rb

@@ -191,51 +191,6 @@ module Rabbit
         [params["pole_width"] + params["flag_width"], pole_height]
       end
 
-      def draw_cube(filled, x, y, z, size, color=nil)
-        not_support_method("draw_cube")
-      end
-
-      def draw_sphere(filled, x, y, z, radius, slices, stacks, color=nil)
-        not_support_method("draw_sphere")
-      end
-
-      def draw_cone(filled, x, y, z, base, height, slices, stacks, color=nil)
-        not_support_method("draw_cone")
-      end
-
-      def draw_torus(filled, x, y, z, inner_radius, outer_radius,
-                     n_sides, rings, color=nil)
-        not_support_method("draw_torus")
-      end
-
-      def draw_tetrahedron(filled, x, y, z, color=nil)
-        not_support_method("draw_tetrahedron")
-      end
-
-      def draw_octahedron(filled, x, y, z, color=nil)
-        not_support_method("draw_octahedron")
-      end
-
-      def draw_dodecahedron(filled, x, y, z, color=nil)
-        not_support_method("draw_dodecahedron")
-      end
-
-      def draw_icosahedron(filled, x, y, z, color=nil)
-        not_support_method("draw_icosahedron")
-      end
-
-      def draw_teapot(filled, x, y, z, scale, color=nil)
-        not_support_method("draw_teapot")
-      end
-
-      def gl_compile(id)
-        not_support_method("gl_compile")
-      end
-
-      def gl_call_list(id, x, y, z, color=nil)
-        not_support_method("gl_call_list")
-      end
-
       def gl_supported?
         false
       end
@@ -248,11 +203,6 @@ module Rabbit
         5.0
       end
 
-      def new_list_id
-        @list_id += 1
-        @list_id
-      end
-
       private
       def get_line_width(params, default=nil)
         params[:line_width] || default

data/lib/rabbit/renderer/offscreen.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2016-2024  Sutou Kouhei <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
@@ -118,11 +118,6 @@ module Rabbit
       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/renderer/printer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2019  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2005-2024  Sutou Kouhei <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
@@ -183,19 +183,13 @@ module Rabbit
         @background = make_color(@background_color)
       end
 
-      def init_dpi
-        super
-        @x_dpi = 300
-        @y_dpi = 300
-      end
-
       def update_layout
         @layout = PrintLayout.create(self, @canvas)
       end
 
       def create_context(output=nil)
         surface = find_surface(filename, output)
-        surface.set_fallback_resolution(@x_dpi, @y_dpi)
+        surface.set_fallback_resolution(300, 300)
         ::Cairo::Context.new(surface)
       end
 

data/lib/rabbit/renderer/screen.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2018-2024  Sutou Kouhei <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
@@ -79,7 +79,11 @@ module Rabbit
 
       def attach_to(window, container=nil)
         super
-        @window.add(@fixed)
+        if container
+          container.add(@fixed)
+        else
+          @window.child = @fixed
+        end
         @fixed.show
         attach_key(@window)
       end
@@ -213,11 +217,6 @@ module Rabbit
       end
 
       private
-      def init_dpi
-        @x_dpi = ScreenInfo.screen_x_resolution
-        @y_dpi = ScreenInfo.screen_y_resolution
-      end
-
       def init_ui
         @fixed = Gtk::Fixed.new
         @fixed.can_focus = true

data/lib/rabbit/source/argf.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2024  Sutou Kouhei <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/source/base"
 
 module Rabbit
@@ -21,7 +37,7 @@ module Rabbit
           @argf.read
         rescue
           @logger.error($!.message)
-          ""
+          +""
         end
       end
     end

data/lib/rabbit/source/base.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2024  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 'fileutils'
 require 'tmpdir'
 
@@ -35,7 +51,7 @@ module Rabbit
           @source = _read
           case @encoding
           when nil
-            enc = guess_encoding(@source)
+            enc = guess_encoding(@source) || Encoding::ASCII_8BIT
           when Encoding
             enc = @encoding
           else
@@ -128,15 +144,24 @@ module Rabbit
         end
       end
 
-      def guess_encoding(str)
-        return Encoding::UTF_8 if utf8_encoding?(str)
-
-        require 'nkf'
-        NKF.guess(str)
-      end
-
-      def utf8_encoding?(string)
-        string.dup.force_encoding(Encoding::UTF_8).valid_encoding?
+      def guess_encoding(string)
+        string = string.dup
+        candidates = [
+          Encoding::UTF_8,
+          Encoding::EUCJP_MS,
+          Encoding::EUCJP,
+          Encoding::WINDOWS_31J,
+          Encoding::Shift_JIS,
+          Encoding::CP51932,
+          Encoding::CP50221,
+          Encoding::ISO2022_JP,
+          Encoding::UTF_16BE,
+          Encoding::UTF_16LE,
+        ]
+        candidates.find do |candidate|
+          next if candidate.dummy?
+          string.force_encoding(candidate).valid_encoding?
+        end
       end
 
       def extract_extension(path)

data/lib/rabbit/source/file.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2024  Sutou Kouhei <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/source/base'
 
 module Rabbit
@@ -25,7 +41,7 @@ module Rabbit
         rescue SourceUnreadableError
           @logger.error($!.message)
           @mtime = Time.now + LimitAccessInterval::MINIMUM_ACCESS_TIME
-          ""
+          +""
         end
       end
 

data/lib/rabbit/source/uri.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2024  Sutou Kouhei <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 "uri"
 require "open-uri"
 
@@ -52,7 +68,7 @@ module Rabbit
         rescue
           @logger.error($!.message)
           @last_modified = Time.now + MINIMUM_ACCESS_TIME
-          ""
+          +""
         end
       end