clipboard 0.8.4 → 0.9.0

data/README.rdoc

@@ -15,15 +15,19 @@ 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
+
 === 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)
 
-=== Bugs / TODO
-* Fix 1.9 and Encoding issues on Windows
-* Don't depend on +xclip+ ?
+=== Todo
+* Don't depend on +clip+
+* Don't depend on +xclip+
 
-Feel free to report bugs or to implement one of the TODO entries ;)
+Feel free to report bugs or to implement one of the Todo entries ;)
 
 === Copyright
 Copyright (c) 2010 Jan Lelis, http://rbjl.net, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.9.0

data/clipboard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clipboard}
-  s.version = "0.8.4"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Lelis"]
-  s.date = %q{2010-10-03}
+  s.date = %q{2010-10-13}
   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,4 +1,5 @@
 require 'zucker/os'
+require 'zucker/version'
 require 'zucker/alias_for'
 require 'stringio'
 require File.expand_path '../../version', __FILE__
@@ -7,42 +8,66 @@ module Clipboard
   if OS.windows?
     WriteCommands = ['clip']
     CF_TEXT = 1
+    CF_UNICODETEXT = 13
 
-    require 'Win32API'
-    # init api handlers
-    @open   = Win32API.new("user32", "OpenClipboard",['L'],'L')
-    @close  = Win32API.new("user32", "CloseClipboard",[],'L')
-    @empty  = Win32API.new("user32", "EmptyClipboard",[],'L')
-    @get    = Win32API.new("user32", "GetClipboardData", ['L'], 'L')
-    @lock   = Win32API.new("kernel32", "GlobalLock", ['L'], 'P')
-    @unlock = Win32API.new("kernel32", "GlobalUnlock", ['L'], 'L')
-    instance_variables.each{ |handler|
-      instance_variable_get(handler).instance_eval do
-        alias [] call
-      end
-    }
+    # get ffi function handlers
+    require 'ffi'
 
+    module User32
+      extend FFI::Library
+      ffi_lib "user32"
+      ffi_convention :stdcall
+
+      attach_function :open,  :OpenClipboard,    [ :long ], :long
+      attach_function :close, :CloseClipboard,   [       ], :long
+      attach_function :empty, :EmptyClipboard,   [       ], :long
+      attach_function :get,   :GetClipboardData, [ :long ], :long
+    end
+
+    module Kernel32
+      extend FFI::Library
+      ffi_lib 'kernel32'
+      ffi_convention :stdcall
+  
+      attach_function :lock,   :GlobalLock,   [ :long ], :pointer
+      attach_function :unlock, :GlobalUnlock, [ :long ], :long
+    end
+   
     # paste & clear
-    # inspired by segment7.net and http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
-    # does not work on 1.9, has probably something to do with utf8 strings ?
+    # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
     def self.paste(_=nil)
-      data = ""
-      if 0 != @open[ 0 ]
-        hclip = @get[ CF_TEXT ]
-        if 0 != hclip
-          if 0 != data = @lock[ hclip ]
-            @unlock[            hclip ]
+      ret = ""
+        if 0 != User32.open( 0 )
+          hclip = User32.get( CF_UNICODETEXT )
+          if hclip && 0 != hclip
+            pointer_to_data = Kernel32.lock( hclip )
+            data = ""
+            # Windows Unicode is ended by to null bytes, so get the whole string
+            current_byte = 0
+            until data.size >= 2 && data[-1].ord == 0 && data[-2].ord == 0
+              data << pointer_to_data.get_bytes( current_byte, 1 )
+              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
+            else # 1.8: fallback to simple CP850 encoding
+              require 'iconv'
+              utf8 = Iconv.iconv( "UTF-8", "UTF-16LE", data.chop)[0]
+              ret = Iconv.iconv( "CP850", "UTF-8", utf8)[0]
+            end
+          if data && 0 != data
+            Kernel32.unlock( hclip )
           end
         end
-        @close[]
+        User32.close( )
       end
-      data || ""
+      ret || ""
     end
-
+ 
     def self.clear
-      @open[0]
-      @empty[]
-      @close[]
+      User32.open( 0 )
+      User32.empty( )
+      User32.close( )
       paste
     end
   else #non-windows

data/version.rb

@@ -1,3 +1,3 @@
 module Clipboard
-  VERSION = File.read File.expand_path '../VERSION', __FILE__
+  VERSION = File.read( File.expand_path('../VERSION', __FILE__)).chomp
 end

metadata

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