rabbit 3.0.0 → 3.0.1

data/lib/rabbit/info-window.rb

@@ -62,7 +62,7 @@ module Rabbit
       @window.signal_handler_disconnect(@window_destroy_id)
       @window.destroy
       @window = @window_destroy_id = nil
-      @canvas_widgets = @outer_box = nil
+      @canvas_widgets = @grid = nil
       GLib::Source.remove(@timer_id) if @timer_id
       @timer_id = nil
       @previous_canvas = @current_canvas = @next_canvas = nil
@@ -72,9 +72,9 @@ module Rabbit
       !@window.nil?
     end
 
-    def moved(index)
+    def moved
       return unless showing?
-      update(index)
+      update
     end
 
     def parsed
@@ -114,13 +114,14 @@ module Rabbit
       @window = Gtk::Window.new
       @window_destroy_id = @window.signal_connect("destroy") do
         @canvas.activate("ToggleInfoWindow")
+        Gdk::Event::PROPAGATE
       end
       @window.title = _("%s: Information window") % @canvas.title
       @window.set_default_size(width, height) if width and height
       if on_note_mode?
-        init_widgets_on_note_mode(width, height)
+        init_widgets_on_note_mode
       else
-        init_widgets(width, height)
+        init_widgets
       end
       init_menu
       attach_key(@window)
@@ -133,61 +134,91 @@ module Rabbit
       @window.add_events(event_mask)
       set_button_event(@window)
       set_scroll_event(@window)
-      @window.add(@outer_box)
+      @window.add(@grid)
     end
 
-    def init_widgets(width, height)
-      init_timer_label(width * (1.0 / 3.0), height * (1.0 / 3.0))
-      @outer_box = Gtk::Box.new(:vertical)
-
-      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, :expand => true, :fill => false)
+    def init_widgets
+      init_timer_area
+      @grid = Gtk::Grid.new
+      @grid.column_homogeneous = true
+      @grid.row_homogeneous = true
+
+      base_width = 1
+      base_height = 1
+      @current_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width,
+                         0,
+                         base_width * 2,
+                         base_height * 2)
       end
-      @outer_box.pack_start(current_box, :expand => true, :fill => false)
 
-      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, :expand => false, :fill => false)
+      @previous_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         0,
+                         base_height * 2,
+                         base_width,
+                         base_height)
       end
-      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, :expand => false, :fill => false)
+      @next_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width * 3,
+                         base_height * 2,
+                         base_width,
+                         base_height)
       end
-      @outer_box.pack_end(bottom_box, :expand => false, :fill => false)
 
-      @outer_box.show
+      @grid.attach(@timer_area,
+                   base_width,
+                   base_height * 2,
+                   base_width * 2,
+                   base_height)
+
+      @grid.show
     end
 
-    def init_widgets_on_note_mode(width, height)
-      init_timer_label(width * (1.0 / 5.0), height * (2.0 / 5.0))
+    def init_widgets_on_note_mode
+      init_timer_area
       init_note_area
-      @outer_box = Gtk::Box.new(:vertical)
-
-      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, :expand => true, :fill => true, :padding => 10)
+      @grid = Gtk::Grid.new
+      @grid.column_homogeneous = true
+      @grid.row_homogeneous = true
+
+      base_width = 1
+      base_height = 4
+      @previous_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         0,
+                         0,
+                         base_width,
+                         base_height)
       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, :expand => true, :fill => true)
+      @current_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width,
+                         0,
+                         base_width * 2,
+                         base_height)
       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, :expand => true, :fill => true, :padding => 10)
+      @next_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width * 3,
+                         0,
+                         base_width,
+                         base_height)
       end
-      @outer_box.pack_start(current_box, :expand => false, :fill => false)
-
-      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
+      @grid.attach(@note_area,
+                   0,
+                   base_height,
+                   base_width * 4,
+                   base_height)
+      @grid.attach(@timer_area,
+                   0,
+                   base_height * 2,
+                   base_width * 4,
+                   1)
+      @grid.show
     end
 
     def init_canvas_widgets
@@ -196,10 +227,16 @@ module Rabbit
       @next_canvas.attach_to(nil, @window, @canvas_widgets)
     end
 
-    def init_timer_label(width, height)
-      @timer_label = Gtk::Label.new
-      @timer_label.justify = :center
-      @timer_label.markup = markupped_timer_label(width, height)
+    def init_timer_area
+      @timer_area = Gtk::DrawingArea.new
+      @timer_area.signal_connect("draw") do |area, context|
+        context.set_source_rgb(1, 0, 0) if rest_time and rest_time < 0
+        draw_text_as_large_as_possible(area,
+                                       context,
+                                       timer_text,
+                                       alignment: :center)
+        Gdk::Event::PROPAGATE
+      end
     end
 
     def init_note_area
@@ -210,10 +247,10 @@ module Rabbit
       end
     end
 
-    def update(index=nil)
+    def update
       start_timer if @timer_id.nil?
       @note_area.queue_draw if @note_area
-      adjust_slide(index)
+      adjust_slide
     end
 
     def note_text
@@ -222,10 +259,14 @@ module Rabbit
       note.gsub(/\\n/, "\n")
     end
 
-    def draw_text_as_large_as_possible(area, context, markupped_text)
+    def draw_text_as_large_as_possible(area,
+                                       context,
+                                       markupped_text,
+                                       options={})
       return if markupped_text.nil?
 
-      area_width, area_height = area.window.size
+      area_width = area.window.width
+      area_height = area.window.height
 
       layout = context.create_pango_layout
       layout.context.resolution = @canvas.font_resolution
@@ -234,6 +275,9 @@ module Rabbit
       layout.attributes = attributes
       layout.width = area_width * Pango::SCALE
       layout.wrap = :word_char
+      layout.alignment = options[:alignment] if options.key?(:alignment)
+
+      layout.justify = options[:justify] if options.key?(:justify)
       set_as_large_as_font_description(layout, area_height)
 
       context.update_pango_layout(layout)
@@ -258,8 +302,8 @@ module Rabbit
 
     def start_timer
       @timer_id = GLib::Timeout.add(1000) do
-        @timer_label.markup = markupped_timer_label if showing?
         if showing? and @canvas.rest_time
+          @timer_area.queue_draw
           GLib::Source::CONTINUE
         else
           @timer_id = nil
@@ -268,19 +312,11 @@ module Rabbit
       end
     end
 
-    def markupped_timer_label(width=nil, height=nil)
-      width ||= @window.size[0] * (1.0 / 3.0)
-      height ||= @window.size[1] * (1.0 / 3.0)
-      attrs = {}
-      font_size = on_note_mode? ? 100 : 200
-      attrs["font_desc"] = ((height * font_size) / Pango::SCALE).to_s
-      rest_time = @canvas.rest_time
-      attrs["foreground"] = "red" if rest_time and rest_time < 0
-      PangoMarkup.new("span", attrs, timer_label).to_s
+    def rest_time
+      @canvas.rest_time || @canvas.allotted_time
     end
 
-    def timer_label
-      rest_time = @canvas.rest_time || @canvas.allotted_time
+    def timer_text
       if rest_time
         "%s%02d:%02d" % Utils.split_number_to_minute_and_second(rest_time)
       else
@@ -288,18 +324,6 @@ module Rabbit
       end
     end
 
-    def markupped_note_text(width=nil, height=nil)
-      height ||= @window.size[1] * (3.0 / 5.0)
-      if @canvas.current_slide["note"]
-        text = @canvas.current_slide["note"].gsub(/\\n/, "\n")
-      else
-        text = ""
-      end
-      attrs = {}
-      attrs["font_desc"] = ((height * 40) / Pango::SCALE).to_s
-      PangoMarkup.new("span", attrs, text).to_s
-    end
-
     def update_source
       each do |canvas|
         source = Source::Memory.new("UTF-8", @canvas.logger)
@@ -319,10 +343,12 @@ module Rabbit
       end
     end
 
-    def adjust_slide(base_index=nil)
-      base_index ||= @canvas.current_index
+    def adjust_slide
+      base_index = @canvas.current_index
       @previous_canvas.move_to_if_can([base_index - 1, 0].max)
       @current_canvas.move_to_if_can(base_index)
+      @current_canvas.current_slide.drawing_index =
+        @canvas.current_slide.drawing_index
       @next_canvas.move_to_if_can([base_index + 1, @canvas.slide_size - 1].min)
     end
 

data/lib/rabbit/keys.rb

@@ -178,5 +178,11 @@ module Rabbit
         Gdk::Keyval::KEY_t,
       ]
     end
+
+    module ShiftControlAlt
+      TOGGLE_TERMINAL_KEYS = [
+        Gdk::Keyval::KEY_t,
+      ]
+    end
   end
 end

data/lib/rabbit/menu.rb

@@ -260,6 +260,8 @@ module Rabbit
         [:item, "ToggleSpotlight"],
         [:item, "ToggleMagnifier"],
         [:separator],
+        [:item, "ToggleTerminal"],
+        [:separator],
         [:menu, "JumpTo"],
         [:separator],
         [:item, "Previous"],

data/lib/rabbit/parser/ext/charty.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2021  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 "csv"
+
+module Rabbit
+  module Parser
+    module Ext
+      module Charty
+        include GetText
+
+        module_function
+        def make_image(path, prop, logger)
+          require "charty"
+          backend = prop["backend"]
+          ::Charty::Backends.use(backend) if backend
+          data = CSV.read(path, headers: true, converters: :all)
+          type = prop["type"]
+          case type
+          when "bar"
+            plotter = ::Charty.bar_plot(data: data,
+                                        x: prop["x"],
+                                        y: prop["y"],
+                                        color: prop["color"])
+          when "line"
+            plotter = ::Charty.line_plot(data: data,
+                                         x: prop["x"],
+                                         y: prop["y"],
+                                         color: prop["color"])
+          when "scatter"
+            plotter = ::Charty.scatter_plot(data: data,
+                                            x: prop["x"],
+                                            y: prop["y"],
+                                            color: prop["color"])
+          else
+            raise ArgumentError, "charty: unsupported type: #{type.inspect}"
+          end
+          image_file = Tempfile.new(["rabbit-image-charty", ".svg"])
+          plotter.save(image_file.path)
+          image_file
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/parser/ext/image.rb

@@ -108,8 +108,9 @@ module Rabbit
           end
 
           def setup_image_file(canvas, uri, filename)
+            return if File.exist?(filename)
             begin
-              open(uri, "rb") do |in_file|
+              URI.open(uri, "rb") do |in_file|
                 File.open(filename, "wb") do |out|
                   out.print(in_file.read)
                 end

data/lib/rabbit/parser/rd/ext/block-verbatim.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2021  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
@@ -26,6 +26,7 @@ require "rabbit/parser/ext/enscript"
 require "rabbit/parser/ext/tex"
 require "rabbit/parser/ext/aafigure"
 require "rabbit/parser/ext/blockdiag"
+require "rabbit/parser/ext/charty"
 require "rabbit/parser/ext/coderay"
 require "rabbit/parser/ext/emacs"
 require "rabbit/parser/ext/rouge"
@@ -86,7 +87,7 @@ module Rabbit
 
           def ext_block_verb_enscript(label, source, content, visitor)
             return nil unless /\Aenscript (\w+)\z/i =~ label
-            lang = $1.downcase.untaint
+            lang = $1.downcase
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -129,7 +130,7 @@ module Rabbit
 
           def ext_block_verb_coderay(label, source, content, visitor)
             return nil unless /\Acoderay (\w+)\z/i =~ label
-            lang = $1.downcase.untaint
+            lang = $1.downcase
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -140,7 +141,7 @@ module Rabbit
 
           def ext_block_verb_emacs(label, source, content, visitor)
             return nil unless /\Aemacs(?:\s+(.+))?\z/i =~ label
-            mode_line = $1.untaint
+            mode_line = $1
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -193,7 +194,7 @@ module Rabbit
 
           def ext_block_verb_rouge(label, source, content, visitor)
             return nil unless /\Arouge (\w+)\z/i =~ label
-            lang = $1.downcase.untaint
+            lang = $1.downcase
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -201,6 +202,13 @@ module Rabbit
             result = Parser::Ext::Rouge.highlight(lang, src, logger)
             result || default_ext_block_verbatim(label, src, src, visitor)
           end
+
+          def ext_block_verb_charty(label, source, content, visitor)
+            return nil unless /\Acharty\z/i =~ label
+            make_image_from_file(source, visitor) do |src_file_path, prop|
+              Parser::Ext::Charty.make_image(src_file_path, prop, visitor)
+            end
+          end
         end
       end
     end

data/lib/rabbit/progress.rb

@@ -92,7 +92,7 @@ trough {
       provider = Gtk::CssProvider.new
       provider.load(:data => css)
       @bar.style_context.add_provider(provider,
-                                        Gtk::StyleProvider::PRIORITY_USER)
+                                      Gtk::StyleProvider::PRIORITY_USER)
     end
   end
 end

data/lib/rabbit/properties.rb

@@ -0,0 +1,141 @@
+# Copyright (C) 2020  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/relative-size"
+
+module Rabbit
+  class Properties
+    include Enumerable
+
+    def initialize(data)
+      @data = normalize(data)
+    end
+
+    def [](key)
+      @data[normalize_key(key)]
+    end
+
+    def []=(key, value)
+      @data[normalize_key(key)] = value
+    end
+
+    def each(&block)
+      @data.each(&block)
+    end
+
+    def get_boolean(key, default=nil)
+      value = self[key]
+      return default if value.nil?
+      true_value?(value)
+    end
+
+    def get_integer(key, default=nil)
+      integer_value(self[key] || default)
+    end
+
+    def get_float(key, default=nil)
+      float_value(self[key] || default)
+    end
+
+    def get_size(key, filename, default=nil)
+      size_value(self[key] || default, filename, key)
+    end
+
+    def get_relative_size(key, filename, default=nil)
+      relative_size_value(self[key] || default,
+                          filename,
+                          key)
+    end
+
+    def respond_to_missing?(name, include_private)
+      @data.key?(normalize_key(name.to_s.gsub(/\?\z/, "")))
+    end
+
+    def method_missing(name, *args, &block)
+      case args.size
+      when 0
+        key = name.to_s
+        if key.end_with?("?")
+          key = key[0..-2]
+          is_predict = true
+        else
+          is_predict = false
+        end
+        key = normalize_key(key)
+        return super unless @data.key?(key)
+        value = @data[key]
+        if is_predict
+          true_value?(value)
+        else
+          value
+        end
+      when 1
+        key = name.to_s
+        return super unless key.end_with?("=")
+        key = key[0..-2]
+        @data[normalize_key(key)] = args[0]
+      else
+        super
+      end
+    end
+
+    private
+    def normalize(data)
+      normalized_data = {}
+      (data || {}).each do |key, value|
+        normalized_data[normalize_key(key)] = value
+      end
+      normalized_data
+    end
+
+    def normalize_key(key)
+      key.to_s.gsub(/-/, "_")
+    end
+
+    def true_value?(value)
+      value == true or value == "true"
+    end
+
+    def integer_value(value)
+      return nil if value.nil?
+      Integer(value, 10)
+    end
+
+    def float_value(value)
+      return nil if value.nil?
+      Float(value)
+    end
+
+    def size_value(value, filename, name)
+      return nil if value.nil?
+      begin
+        Integer(value, 10)
+      rescue ArgumentError
+        raise InvalidSizeError.new(filename, name, value)
+      end
+    end
+
+    def relative_size_value(value, filename, name)
+      return nil if value.nil?
+      begin
+        value = Float(value)
+      rescue ArgumentError
+        raise InvalidSizeError.new(filename, name, value)
+      end
+      RelativeSize.new(value)
+    end
+  end
+end

data/lib/rabbit/rabbit.rb

@@ -32,7 +32,9 @@ module Rabbit
 
   class << self
     def application
-      @@application ||= Gtk::Application.new(nil, :handles_command_line)
+      @@application ||=
+        Gtk::Application.new("org.rabbit-shocker.Rabbit",
+                             [:non_unique, :handles_command_line])
     end
   end
 end

data/lib/rabbit/relative-size.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 2020  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.
+
+module Rabbit
+  class RelativeSize
+    def initialize(size)
+      @size = size
+    end
+
+    def resolve(base_size)
+      return nil if base_size.nil?
+      ((@size / 100.0) * base_size).ceil
+    end
+  end
+end

data/lib/rabbit/renderer/base.rb

@@ -267,6 +267,12 @@ module Rabbit
       def add_gesture_action(sequence, action, &block)
       end
 
+      def pre_terminal
+      end
+
+      def post_terminal
+      end
+
       private
       def offscreen_renderer?
         false

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

@@ -5,7 +5,6 @@ require "rabbit/renderer/display/mask"
 require "rabbit/renderer/display/search"
 require "rabbit/renderer/display/gesture"
 require "rabbit/renderer/display/graffiti"
-require "rabbit/renderer/display/menu"
 require "rabbit/renderer/display/button-handler"
 require "rabbit/renderer/display/key-handler"
 require "rabbit/renderer/display/scroll-handler"

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

@@ -83,6 +83,7 @@ module Rabbit
 
         def post_parse
           clear_compiled_slides
+          update_cursor(:blank, true)
         end
 
         def pre_toggle_index_mode