redcar 0.3.1dev → 0.3.2dev

data/plugins/edit_view/features/step_definitions/window_steps.rb

@@ -74,7 +74,7 @@ Then /the window "(.*)" should have (\d+) tabs?/ do |win_title, tab_num|
   shells  = display.get_shells.to_a
   shell   = shells.detect {|s| s.text == win_title}
   sash_form = shell.children.to_a.first
-  tab_folders = sash_form.children.to_a[1].children.select{|c| c.is_a? Swt::Custom::CTabFolder}
+  tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
   items = tab_folders.map{|f| f.getItems.to_a}.flatten
   items.map {|i| model_tab_for_item(i)}.length.should == tab_num
 end

data/plugins/edit_view/features/support/env.rb

@@ -5,7 +5,7 @@ module SwtTabHelpers
     display = Redcar::ApplicationSWT.display
     shell   = display.get_shells.to_a.first
     sash_form = shell.children.to_a.first
-    tab_folders = sash_form.children.to_a[1].children.to_a
+    tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a
     tab_folders.length.should == 1
     tab_folders.first
   end
@@ -23,7 +23,7 @@ module SwtTabHelpers
     display = Redcar::ApplicationSWT.display
     shell   = display.get_shells.to_a.first
     sash_form = shell.children.to_a.first
-    tab_folders = sash_form.children.to_a[1].children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
+    tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
     items = tab_folders.map{|f| f.getItems.to_a}.flatten
     items.map {|i| model_tab_for_item(i)}
   end

data/plugins/edit_view/lib/edit_view.rb

@@ -16,20 +16,31 @@ module Redcar
       attr_reader :undo_sensitivity, :redo_sensitivity
     end
     
-    def self.start
-      Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|
-        tab and tab.is_a?(EditTab)
-      end
-      @undo_sensitivity = 
-        Sensitivity.new(:undoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
-          tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
-          tab and tab.is_a?(EditTab) and tab.edit_view.undoable?
-        end
-      @redo_sensitivity = 
-        Sensitivity.new(:redoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
-          tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
-          tab and tab.is_a?(EditTab) and tab.edit_view.redoable?
+    def self.sensitivities
+      [
+        Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|
+          tab and tab.is_a?(EditTab)
+        end,
+        Sensitivity.new(:selected_text, Redcar.app, false, [:focussed_tab_selection_changed, :tab_focussed]) do
+          if win = Redcar.app.focussed_window
+            tab = win.focussed_notebook.focussed_tab
+            tab and tab.is_a?(EditTab) and tab.edit_view.document.selection?
+          end
+        end,
+        @undo_sensitivity = 
+          Sensitivity.new(:undoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
+            tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+            tab and tab.is_a?(EditTab) and tab.edit_view.undoable?
+          end,
+        @redo_sensitivity = 
+          Sensitivity.new(:redoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
+            tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+            tab and tab.is_a?(EditTab) and tab.edit_view.redoable?
+          end,
+        Sensitivity.new(:clipboard_not_empty, Redcar.app, false, [:clipboard_added, :focussed_window]) do
+          Redcar.app.clipboard.length > 0
         end
+      ]
     end
 
     attr_reader :document

data/plugins/edit_view/lib/edit_view/document.rb

@@ -1,31 +1,26 @@
 
 module Redcar
-  # Each Redcar::Document is associated with an EditView, and has methods for
-  # reading and modifying the contents of the EditView. Every document has a
-  # Mirror of some resource.
-  #
-  # Events: new_mirror
+  # This class controls access to the document text in an edit tab. 
+  # There are methods to read, modify and register listeners
+  # for the document.
   class Document
     include Redcar::Model
     include Redcar::Observable
     extend Forwardable
     
-    def_delegators :controller, 
-                      :length, :line_count, :to_s, :text=,
-                      :line_at_offset, :get_line, :offset_at_line,
-                      :cursor_offset, :cursor_offset=,
-                      :selection_range, :replace, :set_selection_range
-    
     def self.register_controller_type(controller_type)
       unless controller_type.ancestors.include?(Document::Controller)
         raise "expected #{Document::Controller}"
       end
-      (@document_controller_types ||= []) << controller_type
+      document_controller_types << controller_type
+    end
+    
+    def self.document_controller_types
+      @document_controller_types ||= []
     end
     
     class << self
       attr_accessor :default_mirror
-      attr_reader :document_controller_types
     end
     
     attr_reader :mirror
@@ -49,6 +44,10 @@ module Redcar
       end
     end
     
+    def controllers(klass)
+      @controllers.values.flatten.uniq.select {|c| c.is_a?(klass) }
+    end
+    
     def save!
       @mirror.commit(to_s)
       set_modified(false)
@@ -97,22 +96,197 @@ module Redcar
       notify_listeners(:changed)
     end
     
+    def selection_range_changed(start_offset, end_offset)
+      notify_listeners(:selection_range_changed, start_offset..end_offset)
+    end
+    
+    # The line index the cursor is on (zero-based)
+    #
+    # @return [Integer]
     def cursor_line
       line_at_offset(cursor_offset)
     end
     
+    
+    def cursor_line_start_offset
+      offset_at_line(cursor_line)
+    end
+    
+    def cursor_line_end_offset
+      offset_at_line_end(cursor_line)
+    end
+    
+    def offset_at_line_end(line_ix)
+      if line_ix == line_count - 1
+        end_offset = length
+      else
+        end_offset = offset_at_line(line_ix + 1)
+      end
+    end
+    
+    # Is there any text selected? (Or equivalently, is the length
+    # of the selection equal to 0)
+    #
+    # @return [Boolean]
     def selection?
       selection_range.count > 0
     end
-      
+    
+    # Insert text
+    #
+    # @param [Integer] offset  character offset from the start of the document
+    # @param [String] text  text to insert
     def insert(offset, text)
       replace(offset, 0, text)
     end
-      
+    
+    # Delete text
+    #
+    # @param [Integer] offset  character offset from the start of the document
+    # @param [Integer] length  length of text to delete
     def delete(offset, length)
       replace(offset, length, "")
     end
+
+    # Replace text
+    #
+    # @param [Integer] offset  character offset from the start of the document
+    # @param [Integer] length  length of text to replace
+    # @param [String] text  replacement text
+    def replace(offset, length, text)
+      controller.replace(offset, length, text)
+    end
+    
+    # Length of the document in characters
+    #
+    # @return [Integer]
+    def length
+      controller.length
+    end
+    
+    # Number of lines.
+    #
+    # @return [Integer]
+    def line_count
+      controller.line_count
+    end
+    
+    # The entire contents of the document
+    #
+    # @return [String]
+    def to_s
+      controller.to_s
+    end
+    
+    # Set the contents of the document
+    #
+    # @param [String] text  new text
+    def text=(text)
+      controller.text = text
+    end
+    
+    # Get the line index of the given offset
+    #
+    # @param [Integer] offset zero-based character offset
+    # @return [Integer] zero-based index
+    def line_at_offset(offset)
+      controller.line_at_offset(offset)
+    end
+    
+    # Get the character offset at the start of the given line
+    #
+    # @param [Integer] line   zero-based line index
+    # @return [Integer] zero-based character offset
+    def offset_at_line(line)
+      controller.offset_at_line(line)
+    end
     
+    # Get the position of the cursor.
+    #
+    # @return [Integer] zero-based character offset
+    def cursor_offset
+      controller.cursor_offset
+    end
+    
+    def cursor_line_offset
+      cursor_offset - offset_at_line(cursor_line)
+    end
+    
+    # Set the position of the cursor.
+    #
+    # @param [Integer] offset   zero-based character offset
+    def cursor_offset=(offset)
+      controller.cursor_offset = offset
+    end
+    
+    # The range of text selected by the user.
+    #
+    # @return [Range<Integer>] a range between two character offsets
+    def selection_range
+      controller.selection_range
+    end
+
+    # The ranges of text selected by the user.
+    #
+    # @return [Range<Integer>] a range between two character offsets
+    def selection_ranges
+      controller.selection_ranges
+    end
+    
+    # Set the range of text selected by the user.
+    #
+    # @param [Range<Integer>] range   a range between two character offsets
+    def set_selection_range(range)
+      controller.set_selection_range(range.begin, range.end)
+    end
+    
+    # Get the text selected by the user. If no text is selected
+    # returns "".
+    #
+    # @return [String]
+    def selected_text
+      get_range(selection_range.begin, selection_range.count)
+    end
+    
+    def block_selection_mode?
+      controller.block_selection_mode?
+    end
+    
+    def block_selection_mode=(boolean)
+      controller.block_selection_mode = !!boolean
+    end
+    
+    # Get a range of text from the document.
+    #
+    # @param [String] start  the character offset of the start of the range
+    # @param [String] length  the length of the string to get
+    # @return [String] the text
+    def get_range(start, length)
+      controller.get_range(start, length)
+    end
+
+    # Get the text of a line by index. (Includes a trailing "\n", 
+    # unless it is the last line in the document.)
+    #
+    # @param [Integer] line_ix  the zero-based line number
+    # @return [String] the text of the line
+    def get_line(line_ix)
+      controller.get_range(
+        offset_at_line(line_ix),
+        offset_at_line_end(line_ix) - offset_at_line(line_ix)
+      )
+    end
+    
+    # Replace a line in the document. This has two modes. In the first, 
+    # you supply the replacement text as an argument:
+    #
+    #     replace_line(10, "new line text")
+    #
+    # In the second, you supply a block. The block argument is the current
+    # text of the line, and the return value of the block is the 
+    # replacement text:
+    #
+    #     replace_line(10) {|current_text| current_text.upcase }
     def replace_line(line_ix, text=nil)
       text ||= yield(get_line(line_ix))
       start_offset = offset_at_line(line_ix)
@@ -120,6 +294,9 @@ module Redcar
       replace(start_offset, end_offset - start_offset, text)
     end
     
+    # Get the offset at the end of a given line, *before* the newline character.
+    #
+    # @param [Integer] line_ix  a zero-based line index
     def offset_at_inner_end_of_line(line_ix)
       if line_ix == line_count - 1
         length
@@ -128,6 +305,47 @@ module Redcar
       end
     end
     
+    # Does the minimum amount of scrolling that brings the given line 
+    # into the viewport. Which may be none at all.
+    #
+    # @param [Integer] line_ix  a zero-based line index
+    def scroll_to_line(line_ix)
+      if line_ix > biggest_visible_line
+        top_line_ix = smallest_visible_line + (line_ix - biggest_visible_line) + 2
+        top_line_ix = [top_line_ix, line_count - 1].min
+        scroll_to_line_at_top(top_line_ix)
+      elsif line_ix < smallest_visible_line
+        bottom_line_ix = line_ix - 2
+        bottom_line_ix = [bottom_line_ix, 0].max
+        scroll_to_line_at_top(bottom_line_ix)
+      end
+    end
+    
+    # Tries to scroll so the given line is at the top of the viewport.
+    #
+    # @param [Integer] line_ix  a zero-based line index
+    def scroll_to_line_at_top(line_ix)
+      @edit_view.controller.scroll_to_line(line_ix)
+    end
+
+    # The line_ix of the line at the top of the viewport.
+    #
+    # @return [Integer] a zero-based line index    
+    def smallest_visible_line
+      @edit_view.controller.smallest_visible_line
+    end
+    
+    # The line_ix of the line at the bottom of the viewport.
+    #
+    # @return [Integer] a zero-based line index    
+    def biggest_visible_line
+      @edit_view.controller.biggest_visible_line
+    end
+
+    def num_lines_visible
+      biggest_visible_line - smallest_visible_line
+    end
+
     private
     
     def update_from_mirror

data/plugins/edit_view/lib/edit_view/edit_tab.rb

@@ -1,6 +1,5 @@
 module Redcar
   class EditTab < Tab
-    include Redcar::Observable
     
     attr_reader :edit_view
     
@@ -13,12 +12,13 @@ module Redcar
       @edit_view = Redcar::EditView.new(self)
       @edit_view.add_listener(:focussed, &method(:edit_view_focussed))
       @edit_view.document.add_listener(:changed) { notify_listeners(:changed, self) }
+      @edit_view.document.add_listener(:selection_range_changed) { notify_listeners(:selection_changed) }
     end
     
     def edit_view_focussed
       notify_listeners(:focus)
     end
-    
+
     def serialize
       { :title     => title }
     end

data/plugins/edit_view/plugin.rb

@@ -0,0 +1,9 @@
+
+Plugin.define do
+  name    "edit_view"
+  version "1.0"
+  file    "lib", "edit_view"
+  object  "Redcar::EditView"
+  dependencies "core", ">0",
+               "application", ">0"
+end

data/plugins/edit_view/spec/spec_helper.rb

@@ -2,4 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.boot
-Redcar.require_files
+Redcar.load

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -1,6 +1,7 @@
 
 require 'edit_view_swt/document'
 require 'edit_view_swt/edit_tab'
+require 'edit_view_swt/word_movement'
 
 require 'joni'
 require 'jcodings'
@@ -12,15 +13,15 @@ module Redcar
   class EditViewSWT
     include Redcar::Observable
     
-    def self.load
+    def self.start
       gui = ApplicationSWT.gui
       gui.register_controllers(Redcar::EditTab => EditViewSWT::Tab)
       load_textmate_assets
     end
     
     def self.load_textmate_assets
-      JavaMateView::Bundle.load_bundles(Redcar::ROOT + "/textmate/")
-      JavaMateView::ThemeManager.load_themes(Redcar::ROOT + "/textmate/")
+      JavaMateView::Bundle.load_bundles(Redcar.root + "/textmate/")
+      JavaMateView::ThemeManager.load_themes(Redcar.root + "/textmate/")
     end
     
     attr_reader :mate_text, :widget
@@ -40,22 +41,27 @@ module Redcar
       @mate_text.set_theme_by_name(ARGV.option("theme") || "Twilight")
       create_undo_manager
       @document.attach_modification_listeners # comes after undo manager
+      remove_control_keybindings
     end
     
     def create_mate_text
       parent = @edit_tab.notebook.tab_folder
       @widget = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
       layout = Swt::Layout::GridLayout.new
+      layout.verticalSpacing = 0
+      layout.marginHeight = 0
+      layout.horizontalSpacing = 0
+      layout.marginWidth = 0
       layout.numColumns = 2
       @widget.layout = layout
       @mate_text = JavaMateView::MateText.new(@widget)
-      if Core.platform == :osx
+      if Redcar.platform == :osx
         default_font = "Monaco"
         default_font_size = 15
-      elsif Core.platform == :linux
+      elsif Redcar.platform == :linux
         default_font = "Monospace"
         default_font_size = 11
-      elsif Core.platform == :windows
+      elsif Redcar.platform == :windows
         default_font = "FixedSys"
         default_font_size = 15
       end
@@ -145,10 +151,12 @@ module Redcar
       focus_control = ApplicationSWT.display.get_focus_control
       focus_control.parent.parent == @mate_text
     end
-    
+  
+  
     def attach_listeners
       # h = @document.add_listener(:set_text, &method(:reparse))
       # @handlers << [@document, h]
+      @mate_text.get_text_widget.add_word_movement_listener(WordMoveListener.new(self))
     end
     
     def reparse
@@ -164,13 +172,21 @@ module Redcar
     end
     
     def scroll_to_line(line_index)
-      @mate_text.get_text_widget.set_top_index(line_index)
+      @mate_text.viewer.set_top_index(line_index)
     end
     
     def model_grammar_changed(name)
       @mate_text.set_grammar_by_name(name)
     end
     
+    def smallest_visible_line
+      @mate_text.viewer.get_top_index
+    end
+    
+    def biggest_visible_line
+      @mate_text.viewer.get_bottom_index
+    end
+    
     def update_grammar(new_mirror)
       title = new_mirror.title
       return if @mate_text.set_grammar_by_filename(title)
@@ -179,6 +195,19 @@ module Redcar
       @mate_text.set_grammar_by_first_line(first_line) if first_line
     end
     
+    STRIP_KEYS = { 
+      :cut   => 120|Swt::SWT::MOD1,
+      :copy  => 99|Swt::SWT::MOD1,
+      :paste => 118|Swt::SWT::MOD1
+    }
+    
+    def remove_control_keybindings
+      styled_text = @mate_text.get_text_widget
+      STRIP_KEYS.each do |_, key|
+        styled_text.set_key_binding(key, Swt::SWT::NULL)
+      end
+    end
+    
     def dispose
       @combo.dispose
       @widget.dispose