fidgit 0.1.3 → 0.1.4

data/fidgit.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 require "fidgit/version"
 
 Gem::Specification.new do |s|
@@ -20,9 +20,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency('gosu', '~> 0.7.32')
   s.add_dependency('chingu', '~> 0.9rc5')
+  s.add_dependency('clipboard', '~> 0.9.8')
+  s.add_dependency('ffi', '~> 1.0.9') # if RUBY_PLATFORM =~ /mswin32|mingw32/ # Required by clipboard on Windows.
   s.add_development_dependency('rspec', '~> 2.1.0')
   s.add_development_dependency('texplay', '~> 0.3.5')
 end

data/lib/fidgit.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
 require 'chingu'
+require 'clipboard'
 
 require_all File.join(File.dirname(__FILE__), 'fidgit')

data/lib/fidgit/elements/text_area.rb

@@ -46,6 +46,27 @@ module Fidgit
       text[selection_range]
     end
 
+    # Sets the text within the selection. The caret will be placed at the end of the inserted text.
+    #
+    # @param [String] str Text to insert.
+    # @return [String] The new selection text.
+    def selection_text=(str)
+      from = [@text_input.selection_start, @text_input.caret_pos].min
+      new_length = str.length
+
+      full_text = text
+      full_text[selection_range] = str.encode('UTF-8', undef: :replace)
+      @text_input.text = full_text
+
+      @text_input.selection_start = @text_input.caret_pos = from + new_length
+
+      recalc # This may roll back the text if it is too long!
+
+      publish :changed, self.text
+
+      str
+    end
+
     # Position of the caret.
     #
     # @return [Integer] Number in range 0..text.length
@@ -342,6 +363,31 @@ module Fidgit
       nil
     end
 
+    public
+    # Cut the selection and copy it to the clipboard.
+    def cut
+      str = selection_text
+      unless selection_text.empty?
+        Clipboard.copy str
+        self.selection_text = ''
+      end
+    end
+
+    public
+    # Copy the selection to the clipboard.
+    def copy
+      str = selection_text
+      unless selection_text.empty?
+        Clipboard.copy str
+      end
+    end
+
+    public
+    # Paste the contents of the clipboard into the TextArea.
+    def paste
+      self.selection_text = Clipboard.paste
+    end
+
     protected
     # Use block as an event handler.
     def post_init_block(&block)

data/lib/fidgit/states/gui_state.rb

@@ -81,7 +81,11 @@ module Fidgit
         released_right_mouse_button: ->{ redirect_released_mouse_button(:right) },
   
         mouse_wheel_up: :redirect_mouse_wheel_up,
-        mouse_wheel_down: :redirect_mouse_wheel_down
+        mouse_wheel_down: :redirect_mouse_wheel_down,
+
+        x: -> { if @focus and (holding_any?(:left_control, :right_control)) then @focus.cut end },
+        c: -> { if @focus and (holding_any?(:left_control, :right_control)) then @focus.copy end },
+        v: -> { if @focus and (holding_any?(:left_control, :right_control)) then @focus.paste end }
       )
     end
 

data/lib/fidgit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Fidgit
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-13 00:00:00.000000000 +01:00
+date: 2011-06-14 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &26108232 !ruby/object:Gem::Requirement
+  requirement: &25820988 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.32
   type: :runtime
   prerelease: false
-  version_requirements: *26108232
+  version_requirements: *25820988
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &26107920 !ruby/object:Gem::Requirement
+  requirement: &25820712 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,32 @@ dependencies:
         version: 0.9rc5
   type: :runtime
   prerelease: false
-  version_requirements: *26107920
+  version_requirements: *25820712
+- !ruby/object:Gem::Dependency
+  name: clipboard
+  requirement: &25820436 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: *25820436
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &25820160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *25820160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26107452 !ruby/object:Gem::Requirement
+  requirement: &25819884 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +66,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *26107452
+  version_requirements: *25819884
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &26107044 !ruby/object:Gem::Requirement
+  requirement: &25819608 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +77,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *26107044
+  version_requirements: *25819608
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com
@@ -93,7 +115,6 @@ files:
 - fidgit.gemspec
 - lib/fidgit.rb
 - lib/fidgit/chingu_ext/window.rb
-- lib/fidgit/clipboard.rb
 - lib/fidgit/cursor.rb
 - lib/fidgit/elements/button.rb
 - lib/fidgit/elements/color_picker.rb

data/lib/fidgit/clipboard.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-module Fidgit
-  class Clipboard
-    # Items held in the clipboard.
-    attr_reader :items
-
-    def empty?; @items.empty?; end
-
-    def initialize
-      @items = []
-    end
-
-    # Copy items into the clipboard.
-    #
-    # @param [Array] items Items to copy
-    def copy(items)
-      @items = items.to_a.dup
-
-      nil
-    end
-  end
-end