clipboard 0.9.0 → 0.9.1

data/README.rdoc

@@ -16,15 +16,15 @@ On Linux, you can choose, from which clipboard you want to +paste+, default is P
 +copy+ copies to all clipboards in Clipboard::CLIPBOARDS.
 
 ==== Windows Encoding note
-In you use 1.9, the Clipboard encoding will be translated into UTF-8 and then to your Encoding.default_external
-If you use 1.8, it will fallback to CP850 encoding
+If you paste with 1.9, the Clipboard encoding will be translated to your <tt>Encoding.default_external</tt>.
+
+If you paste with 1.8, it will fallback to CP850 encoding.
+Copying with 1.8 will fallback to the +clip+ utility, which is installed by default since Vista
 
 === Non-gem requirements
-* *Linux*: +xclip+ (you can install it on debian/ubuntu with <tt>sudo apt-get install xclip</tt>)
-* *Windows*: +clip+ (installed by default since Vista)
+* *Linux*: +xclip+, you can install it on debian/ubuntu with <tt>sudo apt-get install xclip</tt>
 
 === Todo
-* Don't depend on +clip+
 * Don't depend on +xclip+
 
 Feel free to report bugs or to implement one of the Todo entries ;)

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/clipboard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clipboard}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Lelis"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-10-14}
   s.description = %q{Access the clipboard on all systems (Clipboard.copy & Clipboard.paste)}
   s.email = %q{mail@janlelis.de}
   s.extra_rdoc_files = [

data/lib/clipboard.rb

@@ -1,14 +1,13 @@
 require 'zucker/os'
 require 'zucker/version'
-require 'zucker/alias_for'
-require 'stringio'
+
 require File.expand_path '../../version', __FILE__
 
 module Clipboard
   if OS.windows?
-    WriteCommands = ['clip']
     CF_TEXT = 1
     CF_UNICODETEXT = 13
+    GMEM_MOVEABLE = 2
 
     # get ffi function handlers
     require 'ffi'
@@ -22,6 +21,7 @@ module Clipboard
       attach_function :close, :CloseClipboard,   [       ], :long
       attach_function :empty, :EmptyClipboard,   [       ], :long
       attach_function :get,   :GetClipboardData, [ :long ], :long
+      attach_function :set,   :SetClipboardData, [ :long, :long ], :long
     end
 
     module Kernel32
@@ -31,9 +31,9 @@ module Clipboard
   
       attach_function :lock,   :GlobalLock,   [ :long ], :pointer
       attach_function :unlock, :GlobalUnlock, [ :long ], :long
+      attach_function :alloc,  :GlobalAlloc,  [ :long, :long ], :long
     end
    
-    # paste & clear
     # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
     def self.paste(_=nil)
       ret = ""
@@ -49,7 +49,7 @@ module Clipboard
               current_byte += 1
             end
             if RubyVersion >= 1.9
-              ret = data.chop.force_encoding("UTF-16LE").encode('UTF-8').encode(Encoding.default_external) # TODO check if direct translation is possible
+              ret = data.chop.force_encoding("UTF-16LE").encode(Encoding.default_external) # TODO catch bad encodings
             else # 1.8: fallback to simple CP850 encoding
               require 'iconv'
               utf8 = Iconv.iconv( "UTF-8", "UTF-16LE", data.chop)[0]
@@ -65,11 +65,29 @@ module Clipboard
     end
  
     def self.clear
-      User32.open( 0 )
+      if 0 != User32.open( 0 )
+        User32.empty( )
+        User32.close( )
+      end
+      paste
+    end
+  
+  def self.copy(data_to_copy)
+    if RubyVersion >= 1.9 && 0 != User32.open( 0 )
       User32.empty( )
+      data = data_to_copy.encode("UTF-16LE") # TODO catch bad encodings
+      data << 0 << 0
+      handler = Kernel32.alloc( GMEM_MOVEABLE, data.bytesize )
+      pointer_to_data = Kernel32.lock( handler )
+      pointer_to_data.put_bytes( 0, data, 0, data.bytesize )
+      Kernel32.unlock( handler )
+      User32.set( CF_UNICODETEXT, handler )
       User32.close( )
-      paste
+    else # don't touch anything
+      IO.popen( 'clip', 'w' ){ |input| input << data_to_copy } # depends on clip (available by default since Vista)
     end
+    paste
+  end
   else #non-windows
     require 'open3'
 
@@ -108,14 +126,13 @@ module Clipboard
     def self.clear
       copy ''
     end
-  end
 
-  # copy for all platforms
-  def self.copy(data)
-    WriteCommands.each{ |cmd|
-      IO.popen( cmd, 'w' ){ |input| input << data }
-    }
-    paste
+    def self.copy(data)
+      WriteCommands.each{ |cmd|
+        IO.popen( cmd, 'w' ){ |input| input << data }
+      }
+      paste
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clipboard
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency