rdp-win32screenshot 0.0.6.2 → 0.0.6.3

data/History.rdoc

@@ -1,6 +1,15 @@
-= 0.0.6 2010-XX-XX
+= 0.0.6 2010-08-07
 * Trying to bring window to the foreground more aggressively (Roger Pack)
-* Minor bug fixes with using gdi32.dll BitBlt (Roger Pack)
+* Added utility class Win32::Screenshot.Util with some helper methods not related directly with taking of the screenshots:
+  - all_windows - enumerates all windows and returns their titles and window handles as an Array (Roger Pack)
+  - window_title(hwnd) - returns title of the window for specified handle (Jarmo Pertman)
+  - window_hwnd(title_query) - returns handle of the window for specified title (Jarmo Pertman)
+  - dimensions_for(hwnd) - returns a width and height for a window with specified handle (Jarmo Pertman)
+* Removed a file 'win32screenshot.rb' which was solely used for displaying deprecation warnings for versions older than 0.0.4. Make sure than from now on all require statements require 'win32/screenshot'!
+
+== Bug Fixes:
+* Fixed usages of gdi32.dll BitBlt (Roger Pack)
+* It was impossible to specify correctly window titles with regular expressions special characters in them (Roger Pack)
 
 = 0.0.5 2010-07-07
 * Added method window_area for capturing specified area of the window instead of full window (Jarmo Pertman)

data/README.rdoc

@@ -71,6 +71,25 @@ other formats like png.
     File.open("picture10.png", "wb") {|file| file.puts png}
   end
 
+  #
+  # Win32::Screenshot has also some utility methods which can be used for various needs
+
+  # enumerate all windows and return their titles and handles
+  Win32::Screenshot::Util.all_windows # => [["title1", 2345], ["title2", 3456]]
+
+  # retrieve window title for the specified window handle
+  Win32::Screenshot::Util.window_title(2345) # => "title1"
+
+  # retrieve window handle for the specified title
+  Win32::Screenshot::Util.window_hwnd("title1") # => 2345
+
+  # title can be also a regular expression with first matching window retrieved
+  Win32::Screenshot::Util.window_hwnd(/tit.*1/) # => 2345
+
+  # retrive dimensions of a window with specified handle in an Array of [width, height]
+  # might be useful for using with different capture_area methods
+  Win32::Screenshot::Util.dimensions_for(2345) # => [100, 200]
+
 == Copyright
 
 Copyright (c) 2010 Jarmo Pertman, Aslak Hellesøy. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.6.2
+0.0.6.3

data/lib/win32/screenshot/bitmap_maker.rb

@@ -3,186 +3,164 @@ require 'ffi'
 module Win32
   class Screenshot
     # internal methods
-    module BitmapMaker #:nodoc:all
-      extend FFI::Library
-
-      ffi_lib 'user32', 'gdi32'
-      ffi_convention :stdcall
-
-      callback :enum_callback, [:long, :pointer], :bool
-
-      # user32.dll
-      attach_function :enum_windows, :EnumWindows,
-                      [:enum_callback, :pointer], :long
-      attach_function :window_text, :GetWindowTextA,
-                      [:long, :pointer, :int], :int
-      attach_function :window_text_length, :GetWindowTextLengthA,
-                      [:long], :int
-      attach_function :window_visible, :IsWindowVisible,
-                      [:long], :bool
-      attach_function :dc, :GetDC,
-                      [:long], :long
-      attach_function :client_rect, :GetClientRect,
-                      [:long, :pointer], :bool
-      attach_function :minimized, :IsIconic,
-                      [:long], :bool
-      attach_function :show_window, :ShowWindow,
-                      [:long, :int], :bool
-      attach_function :foreground_window, :GetForegroundWindow,
-                      [], :long
-      attach_function :desktop_window, :GetDesktopWindow,
-                      [], :long
-      attach_function :window_thread_process_id, :GetWindowThreadProcessId,
-                      [:long, :pointer], :long
-      attach_function :attach_thread_input, :AttachThreadInput,
-                      [:long, :long, :bool], :bool
-      attach_function :set_foreground_window, :SetForegroundWindow,
-                      [:long], :bool
-      attach_function :bring_window_to_top, :BringWindowToTop, 
-                       [:long], :bool                
-      attach_function :set_active_window, :SetActiveWindow, 
-                       [:long], :long
-      
-
-      # gdi32.dll
-      attach_function :create_compatible_dc, :CreateCompatibleDC,
-                      [:long], :long
-      attach_function :create_compatible_bitmap, :CreateCompatibleBitmap,
-                      [:long, :int, :int], :long
-      attach_function :select_object, :SelectObject,
-                      [:long, :long], :long
-      attach_function :bit_blt, :BitBlt,
-                      [:long, :int, :int, :int, :int, :long, :int, :int, :long], :bool
-      attach_function :di_bits, :GetDIBits,
-                      [:long, :long, :int, :int, :pointer, :pointer, :int], :int
-      attach_function :delete_object, :DeleteObject,
-                      [:long], :bool
-      attach_function :delete_dc, :DeleteDC,
-                      [:long], :bool
-      attach_function :release_dc, :ReleaseDC,
-                      [:long, :long], :int
-
-
-      EnumWindowCallback = Proc.new do |hwnd, param|
-        searched_window = WindowStruct.new param
-        title_length = window_text_length(hwnd) + 1
-        title = FFI::MemoryPointer.new :char, title_length
-        window_text(hwnd, title, title_length)
-        title = title.read_string
-        if title =~ Regexp.new(searched_window[:title].read_string) && window_visible(hwnd)
-          searched_window[:hwnd] = hwnd
-          false
-        else
-          true
+    class BitmapMaker #:nodoc:all
+      class << self
+        extend FFI::Library
+
+        ffi_lib 'user32', 'gdi32'
+        ffi_convention :stdcall
+        callback :enum_callback, [:long, :pointer], :bool
+
+        # user32.dll
+        attach_function :enum_windows, :EnumWindows,
+                        [:enum_callback, :pointer], :long
+        attach_function :window_text, :GetWindowTextA,
+                        [:long, :pointer, :int], :int
+        attach_function :window_text_length, :GetWindowTextLengthA,
+                        [:long], :int
+        attach_function :window_visible, :IsWindowVisible,
+                        [:long], :bool
+        attach_function :dc, :GetDC,
+                        [:long], :long
+        attach_function :client_rect, :GetClientRect,
+                        [:long, :pointer], :bool
+        attach_function :minimized, :IsIconic,
+                        [:long], :bool
+        attach_function :show_window, :ShowWindow,
+                        [:long, :int], :bool
+        attach_function :foreground_window, :GetForegroundWindow,
+                        [], :long
+        attach_function :desktop_window, :GetDesktopWindow,
+                        [], :long
+        attach_function :window_thread_process_id, :GetWindowThreadProcessId,
+                        [:long, :pointer], :long
+        attach_function :attach_thread_input, :AttachThreadInput,
+                        [:long, :long, :bool], :bool
+        attach_function :set_foreground_window, :SetForegroundWindow,
+                        [:long], :bool
+        attach_function :bring_window_to_top, :BringWindowToTop,
+                        [:long], :bool
+        attach_function :set_active_window, :SetActiveWindow,
+                        [:long], :long
+
+
+        # gdi32.dll
+        attach_function :create_compatible_dc, :CreateCompatibleDC,
+                        [:long], :long
+        attach_function :create_compatible_bitmap, :CreateCompatibleBitmap,
+                        [:long, :int, :int], :long
+        attach_function :select_object, :SelectObject,
+                        [:long, :long], :long
+        attach_function :bit_blt, :BitBlt,
+                        [:long, :int, :int, :int, :int, :long, :int, :int, :long], :bool
+        attach_function :di_bits, :GetDIBits,
+                        [:long, :long, :int, :int, :pointer, :pointer, :int], :int
+        attach_function :delete_object, :DeleteObject,
+                        [:long], :bool
+        attach_function :delete_dc, :DeleteDC,
+                        [:long], :bool
+        attach_function :release_dc, :ReleaseDC,
+                        [:long, :long], :int
+
+
+        EnumWindowCallback = FFI::Function.new(:bool, [ :long, :pointer ], { :convention => :stdcall }) do |hwnd, param|
+          searched_window = WindowStruct.new param
+          title = Util.window_title(hwnd)
+          if title =~ Regexp.new(searched_window[:title].read_string) && window_visible(hwnd)
+            searched_window[:hwnd] = hwnd
+            false
+          else
+            true
+          end
         end
-      end
-      
-      module_function
-
-      class WindowStruct < FFI::Struct
-        layout :title, :pointer,
-               :hwnd, :long
-      end
 
-      def hwnd(window_title)
-        window = WindowStruct.new
-        unless window_title.is_a? Regexp
-          window_title = Regexp.escape(window_title.to_s)
-        end
-        window_title = FFI::MemoryPointer.from_string(window_title.to_s)
-        window[:title] = window_title
-        enum_windows(EnumWindowCallback, window.to_ptr)
-        window[:hwnd] == 0 ? nil : window[:hwnd] 
-      end
-      
-      def list_window_titles
-        out = []
-        out_proc = Proc.new do |hwnd, param|
-          title_length = window_text_length(hwnd) + 1
-          title = FFI::MemoryPointer.new :char, title_length
-          window_text(hwnd, title, title_length)
-          out << title.read_string
-          true
+        class WindowStruct < FFI::Struct
+          layout :title, :pointer,
+                 :hwnd, :long
         end
-        
-        enum_windows(out_proc, nil)
-        out
-      end
 
-      def prepare_window(hwnd, pause)
-        restore(hwnd) if minimized(hwnd)
-        set_foreground(hwnd)
-        sleep pause
-      end
+        def hwnd(window_title)
+          window = WindowStruct.new
+          unless window_title.is_a?(Regexp)
+            window_title = Regexp.escape(window_title.to_s)
+          else
+            window_title = window_title.to_s
+          end
+          window_title = FFI::MemoryPointer.from_string(window_title)
+          window[:title] = window_title
+          enum_windows(EnumWindowCallback, window.to_ptr)
+          window[:hwnd] == 0 ? nil : window[:hwnd]
+        end
 
-      SW_RESTORE = 9
+        def prepare_window(hwnd, pause)
+          restore(hwnd) if minimized(hwnd)
+          set_foreground(hwnd)
+          sleep pause
+        end
 
-      def restore(hwnd)
-        show_window(hwnd, SW_RESTORE)
-      end
+        SW_RESTORE = 9
 
-      def set_foreground(hwnd)
-        if foreground_window != hwnd
-          set_foreground_window(hwnd)
-          set_active_window(hwnd)
-          bring_window_to_top(hwnd)
-          # and just in case...
-          foreground_thread = window_thread_process_id(foreground_window, nil)
-          other_thread = window_thread_process_id(hwnd, nil)          
-          attach_thread_input(foreground_thread, other_thread, true) unless other_thread == foreground_thread
-          set_foreground_window(hwnd)
-          set_active_window(hwnd)
-          bring_window_to_top(hwnd)
-          attach_thread_input(foreground_thread, other_thread, false) unless other_thread == foreground_thread
+        def restore(hwnd)
+          show_window(hwnd, SW_RESTORE)
         end
-      end
 
-      def dimensions_for(hwnd)
-        rect = [0, 0, 0, 0].pack('L4')
-        client_rect(hwnd, rect)
-        x1, y1, x2, y2 = rect.unpack('L4')
-      end
+        def set_foreground(hwnd)
+          if foreground_window != hwnd
+            set_foreground_window(hwnd)
+            set_active_window(hwnd)
+            bring_window_to_top(hwnd)
+            # and just in case...
+            foreground_thread = window_thread_process_id(foreground_window, nil)
+            other_thread = window_thread_process_id(hwnd, nil)
+            attach_thread_input(foreground_thread, other_thread, true) unless other_thread == foreground_thread
+            set_foreground_window(hwnd)
+            set_active_window(hwnd)
+            bring_window_to_top(hwnd)
+            attach_thread_input(foreground_thread, other_thread, false) unless other_thread == foreground_thread
+          end
+        end
 
-      def capture_all(hwnd, &proc)
-        x1, y1, x2, y2 = dimensions_for(hwnd)
-        capture_area(hwnd, x1, y1, x2, y2, &proc)
-      end
+        def capture_all(hwnd, &proc)
+          width, height = Util.dimensions_for(hwnd)
+          capture_area(hwnd, 0, 0, width, height, &proc)
+        end
 
-      SRCCOPY = 0x00CC0020
-      DIB_RGB_COLORS = 0
-
-      def capture_area(hwnd, x1, y1, x2, y2, &proc)
-        hScreenDC = dc(hwnd)
-        w = x2-x1
-        h = y2-y1
-
-        hmemDC = create_compatible_dc(hScreenDC)
-        hmemBM = create_compatible_bitmap(hScreenDC, w, h)
-        select_object(hmemDC, hmemBM)
-        bit_blt(hmemDC, 0, 0, w, h, hScreenDC, x1, y1, SRCCOPY)
-        bitmap_size = w * h * 3 + w % 4 * h
-        lpvpxldata = FFI::MemoryPointer.new(bitmap_size)
-
-        # Bitmap header
-        # http://www.fortunecity.com/skyscraper/windows/364/bmpffrmt.html
-        bmInfo = [40, w, h, 1, 24, 0, 0, 0, 0, 0, 0, 0].pack('L3S2L6')
-        di_bits(hmemDC, hmemBM, 0, h, lpvpxldata, bmInfo, DIB_RGB_COLORS)
-
-        bmFileHeader = [
-                19778,
-                bitmap_size + 40 + 14,
-                0,
-                0,
-                54
-        ].pack('SLSSL')
-
-        bmp_data = bmFileHeader + bmInfo + lpvpxldata.read_string(bitmap_size)
-        proc.call(w, h, bmp_data)
-      ensure
-        lpvpxldata.free
-        delete_object(hmemBM)
-        delete_dc(hmemDC)
-        release_dc(0, hScreenDC)
+        SRCCOPY = 0x00CC0020
+        DIB_RGB_COLORS = 0
+
+        def capture_area(hwnd, x1, y1, x2, y2) # block
+          hScreenDC = dc(hwnd)
+          w = x2-x1
+          h = y2-y1
+
+          hmemDC = create_compatible_dc(hScreenDC)
+          hmemBM = create_compatible_bitmap(hScreenDC, w, h)
+          select_object(hmemDC, hmemBM)
+          bit_blt(hmemDC, 0, 0, w, h, hScreenDC, x1, y1, SRCCOPY)
+          bitmap_size = w * h * 3 + w % 4 * h
+          lpvpxldata = FFI::MemoryPointer.new(bitmap_size)
+
+          # Bitmap header
+          # http://www.fortunecity.com/skyscraper/windows/364/bmpffrmt.html
+          bmInfo = [40, w, h, 1, 24, 0, 0, 0, 0, 0, 0, 0].pack('L3S2L6')
+          di_bits(hmemDC, hmemBM, 0, h, lpvpxldata, bmInfo, DIB_RGB_COLORS)
+
+          bmFileHeader = [
+                  19778,
+                  bitmap_size + 40 + 14,
+                  0,
+                  0,
+                  54
+          ].pack('SLSSL')
+
+          bmp_data = bmFileHeader + bmInfo + lpvpxldata.read_string(bitmap_size)
+          yield(w, h, bmp_data)
+        ensure
+          lpvpxldata.free
+          delete_object(hmemBM)
+          delete_dc(hmemDC)
+          release_dc(0, hScreenDC)
+        end
       end
     end
   end

data/lib/win32/screenshot.rb

@@ -1,4 +1,5 @@
-require 'win32/screenshot/bitmap_maker'
+require File.dirname(__FILE__) + '/screenshot/bitmap_maker'
+require File.dirname(__FILE__) + '/util'
 
 module Win32
   # Captures screenshots with Ruby on Windows
@@ -44,7 +45,7 @@ module Win32
       # captures window with a *title_query* and waits *pause* (by default is 0.5)
       # seconds after trying to set window to the foreground
       def window(title_query, pause=0.5, &proc)
-        hwnd = window_hwnd(title_query)
+        hwnd = Util.window_hwnd(title_query)
         hwnd(hwnd, pause, &proc)
       end
 
@@ -52,7 +53,7 @@ module Win32
       # where *x1* and *y1* are 0 in the upper left corner and
       # *x2* specifies the width and *y2* the height of the area to be captured
       def window_area(title_query, x1, y1, x2, y2, pause=0.5, &proc)
-        hwnd = window_hwnd(title_query)
+        hwnd = Util.window_hwnd(title_query)
         hwnd_area(hwnd, x1, y1, x2, y2, pause, &proc)
       end
 
@@ -73,12 +74,6 @@ module Win32
 
       private
 
-      def window_hwnd(title_query)
-        hwnd = BitmapMaker.hwnd(title_query)
-        raise "window with title '#{title_query}' was not found!" unless hwnd
-        hwnd
-      end
-
       def validate_coordinates(hwnd, *coords)
         specified_coordinates = coords.join(', ')
         if coords.any? {|c| c < 0}
@@ -89,9 +84,9 @@ module Win32
           raise "specified coordinates (#{specified_coordinates}) are invalid - cannot have x1 > x2 or y1 > y2!"
         end
 
-        x1_always_zero, y1_always_zero, max_x2, max_y2 = BitmapMaker.dimensions_for(hwnd)
-        if x2 > max_x2 || y2 > max_y2
-          raise "specified coordinates (#{specified_coordinates}) are invalid - maximum are x2=#{max_x2} and y2=#{max_y2}!"
+        max_width, max_height = Util.dimensions_for(hwnd)
+        if x2 > max_width || y2 > max_height
+          raise "specified coordinates (#{specified_coordinates}) are invalid - maximum are x2=#{max_width} and y2=#{max_height}!"
         end
       end
     end

data/lib/win32/util.rb

@@ -0,0 +1,40 @@
+module Win32
+  class Screenshot
+    class Util
+      class << self
+
+        def all_windows
+          titles = []
+          window_callback = FFI::Function.new(:bool, [ :long, :pointer ], { :convention => :stdcall }) do |hwnd, param|
+            titles << [window_title(hwnd), hwnd]
+            true
+          end
+
+          BitmapMaker.enum_windows(window_callback, nil)
+          titles
+        end
+
+        def window_title hwnd
+          title_length = BitmapMaker.window_text_length(hwnd) + 1
+          title = FFI::MemoryPointer.new :char, title_length
+          BitmapMaker.window_text(hwnd, title, title_length)
+          title.read_string
+        end
+
+        def window_hwnd(title_query)
+          hwnd = BitmapMaker.hwnd(title_query)
+          raise "window with title '#{title_query}' was not found!" unless hwnd
+          hwnd
+        end
+
+        def dimensions_for(hwnd)
+          rect = [0, 0, 0, 0].pack('L4')
+          BitmapMaker.client_rect(hwnd, rect)
+          _, _, width, height = rect.unpack('L4')
+          return width, height
+        end
+
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -41,12 +41,21 @@ module SpecHelper
 
   def wait_for_programs_to_open
     until Win32::Screenshot::BitmapMaker.hwnd(/Internet Explorer/) &&
-            Win32::Screenshot::BitmapMaker.hwnd(/Notepad/) &&
-            Win32::Screenshot::BitmapMaker.hwnd(/Calculator/)
+            Win32::Screenshot::BitmapMaker.hwnd(/Notepad/)
+      sleep 0.1
+    end
+    wait_for_calculator_to_open
+
+    # just in case of slow PC
+    sleep 8
+  end
+
+  def wait_for_calculator_to_open
+    until Win32::Screenshot::BitmapMaker.hwnd(/Calculator/)
       sleep 0.1
     end
     # just in case of slow PC
-    sleep 10
+    sleep 2
   end
 
   def maximize title

data/spec/win32_screenshot_spec.rb

@@ -1,12 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "win32-screenshot" do
-  include SpecHelper    
-  
+describe Win32::Screenshot do
+  include SpecHelper
+
   before :all do
-    PROGRAM_FILES = "c:/program files/"
     @notepad = IO.popen("notepad").pid
-    @iexplore = IO.popen(File.join(PROGRAM_FILES, "Internet Explorer", "iexplore about:blank")).pid
+    @iexplore = Dir.chdir("c:/program files/Internet Explorer") do; IO.popen(".\\iexplore about:blank").pid; end
     @calc = IO.popen("calc").pid
     wait_for_programs_to_open
     cleanup
@@ -16,9 +15,7 @@ describe "win32-screenshot" do
     Win32::Screenshot.foreground do |width, height, bmp|
       check_image(bmp, 'foreground')
       hwnd = Win32::Screenshot::BitmapMaker.foreground_window
-      dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
 
@@ -39,9 +36,7 @@ describe "win32-screenshot" do
     Win32::Screenshot.desktop do |width, height, bmp|
       check_image(bmp, 'desktop')
       hwnd = Win32::Screenshot::BitmapMaker.desktop_window
-      dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
 
@@ -64,9 +59,7 @@ describe "win32-screenshot" do
     Win32::Screenshot.window(title) do |width, height, bmp|
       check_image(bmp, 'iexplore')
       hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
-      dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
 
@@ -76,9 +69,7 @@ describe "win32-screenshot" do
     Win32::Screenshot.window(title) do |width, height, bmp|
       check_image(bmp, 'calc')
       hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
-      dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
 
@@ -91,9 +82,7 @@ describe "win32-screenshot" do
       # screenshot doesn't include titlebar and the size
       # varies between different themes and Windows versions
       hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
-      dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
 
@@ -109,11 +98,11 @@ describe "win32-screenshot" do
   it "captures whole window if window size is specified as coordinates" do
     title = /calculator/i
     hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
-    dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-    Win32::Screenshot.window_area(title, 0, 0, dimensions[2], dimensions[3]) do |width, height, bmp|
+    expected_width, expected_height = Win32::Screenshot::Util.dimensions_for(hwnd)
+    Win32::Screenshot.window_area(title, 0, 0, expected_width, expected_height) do |width, height, bmp|
       check_image(bmp, 'calc_area_full_window')
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      width.should == expected_width
+      height.should == expected_height
     end
   end
 
@@ -138,9 +127,9 @@ describe "win32-screenshot" do
   it "doesn't allow to capture area of the window with too big coordinates" do
     title = /calculator/i
     hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
-    dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
+    expected_width, expected_height = Win32::Screenshot::Util.dimensions_for(hwnd)
     lambda {Win32::Screenshot.window_area(title, 0, 0, 10, 1000) {|width, height, bmp| check_image('calc3')}}.
-            should raise_exception("specified coordinates (0, 0, 10, 1000) are invalid - maximum are x2=#{dimensions[2]} and y2=#{dimensions[3]}!")
+            should raise_exception("specified coordinates (0, 0, 10, 1000) are invalid - maximum are x2=#{expected_width} and y2=#{expected_height}!")
   end
 
   it "captures by window with handle" do
@@ -148,9 +137,7 @@ describe "win32-screenshot" do
     hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
     Win32::Screenshot.hwnd(hwnd) do |width, height, bmp|
       check_image(bmp, 'calc_hwnd')
-      dimensions = Win32::Screenshot::BitmapMaker.dimensions_for(hwnd)
-      width.should == dimensions[2]
-      height.should == dimensions[3]
+      [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
 
@@ -168,7 +155,7 @@ describe "win32-screenshot" do
     lambda {Win32::Screenshot.hwnd_area(hwnd, 0, 0, -1, 100) {|width, height, bmp| check_image('desktop2')}}.
             should raise_exception("specified coordinates (0, 0, -1, 100) are invalid - cannot be negative!")
   end
-  
+
   it "captures based on coordinates" do
     hwnd = Win32::Screenshot::BitmapMaker.hwnd(/calculator/i)
     bmp1 = bmp2 = nil
@@ -177,15 +164,13 @@ describe "win32-screenshot" do
     bmp1.length.should == bmp2.length
     bmp1.should_not == bmp2
   end
-  
-  it "enumerates the available windows" do
-    got = Win32::Screenshot::BitmapMaker.list_window_titles
-    got.length.should be > 1
-    got[0].should be_a String
-  end    
-  
-  it "allow for parentheses in window names" do
-    Win32::Screenshot::BitmapMaker.hwnd("VLC (Direct")
+
+  it "allows window titles to include regular expressions' special characters" do
+    lambda {Win32::Screenshot::BitmapMaker.hwnd("Window title *^$?([.")}.should_not raise_exception
+  end
+
+  it "raises an 'no block given' Exception if no block was given" do
+    lambda {Win32::Screenshot.foreground}.should raise_exception(LocalJumpError)
   end
 
   after :all do

data/spec/win32_screenshot_util_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Win32::Screenshot::Util do
+  include SpecHelper
+
+  before :all do
+    @calc = IO.popen("calc").pid
+    wait_for_calculator_to_open
+    @calc_hwnd = Win32::Screenshot::Util.window_hwnd("Calculator")
+  end
+
+  it ".all_windows enumerates all available windows" do
+    all_windows = Win32::Screenshot::Util.all_windows
+    all_windows.should_not be_empty
+    all_windows[0].should be_an(Array)
+    all_windows[0][0].should be_a(String)
+    all_windows[0][1].should be_a(Fixnum)
+
+    calculator = all_windows.find {|title, hwnd| title =~ /Calculator/}
+    calculator.should_not be_nil
+    calculator[0].should == "Calculator"
+    calculator[1].should == @calc_hwnd
+  end
+
+  it ".window_title returns title of a specified window's handle" do
+    Win32::Screenshot::Util.window_title(@calc_hwnd).should == "Calculator"
+  end
+
+  it ".dimensions_for window handle returns dimensions of the window in pixels" do
+    width, height = Win32::Screenshot::Util.dimensions_for(@calc_hwnd)
+    width.should be > 100
+    height.should be > 100
+  end
+  
+  after :all do
+    Process.kill 9, @calc
+  end
+end

data/win32screenshot.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{win32screenshot}
+  s.version = "0.0.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jarmo Pertman", "Aslak Helles\303\270y"]
+  s.date = %q{2010-08-07}
+  s.description = %q{Capture Screenshots on Windows with Ruby}
+  s.email = ["jarmo.p@gmail.com", "aslak.hellesoy@gmail.com"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "History.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/win32/screenshot.rb",
+     "lib/win32/screenshot/bitmap_maker.rb",
+     "lib/win32/util.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/win32_screenshot_spec.rb",
+     "spec/win32_screenshot_util_spec.rb",
+     "win32screenshot.gemspec"
+  ]
+  s.homepage = %q{http://github.com/jarmo/win32screenshot}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Capture Screenshots on Windows with Ruby}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/win32_screenshot_spec.rb",
+     "spec/win32_screenshot_util_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<os>, [">= 0"])
+      s.add_development_dependency(%q<rmagick>, [">= 0"])
+    else
+      s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<os>, [">= 0"])
+      s.add_dependency(%q<rmagick>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<os>, [">= 0"])
+    s.add_dependency(%q<rmagick>, [">= 0"])
+  end
+end
+

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdp-win32screenshot
 version: !ruby/object:Gem::Version 
-  hash: 83
   prerelease: false
   segments: 
   - 0
   - 0
   - 6
-  - 2
-  version: 0.0.6.2
+  - 3
+  version: 0.0.6.3
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -06:00
+date: 2010-08-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -99,10 +94,12 @@ files:
 - VERSION
 - lib/win32/screenshot.rb
 - lib/win32/screenshot/bitmap_maker.rb
-- lib/win32screenshot.rb
+- lib/win32/util.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/win32_screenshot_spec.rb
+- spec/win32_screenshot_util_spec.rb
+- win32screenshot.gemspec
 has_rdoc: true
 homepage: http://github.com/jarmo/win32screenshot
 licenses: []
@@ -118,7 +115,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -127,7 +123,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -141,3 +136,4 @@ summary: Capture Screenshots on Windows with Ruby
 test_files: 
 - spec/spec_helper.rb
 - spec/win32_screenshot_spec.rb
+- spec/win32_screenshot_util_spec.rb

data/lib/win32screenshot.rb

@@ -1,3 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-Kernel.warn %q(DEPRECATION: use "require 'win32/screenshot'" instead of "require 'win32screenshot'")
-require "win32/screenshot"