rdp-win32screenshot 0.0.6 → 0.0.6.1

data/History.rdoc

@@ -1,5 +1,6 @@
 = 0.0.6 2010-XX-XX
 * Trying to bring window to the foreground more aggressively (Roger Pack)
+* Minor bug fixes with using gdi32.dll BitBlt (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/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.6.1

data/lib/win32/screenshot/bitmap_maker.rb

@@ -76,7 +76,7 @@ module Win32
           true
         end
       end
-
+      
       module_function
 
       class WindowStruct < FFI::Struct
@@ -91,6 +91,20 @@ module Win32
         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
+        end
+        
+        enum_windows(out_proc, nil)
+        out
+      end
 
       def prepare_window(hwnd, pause)
         restore(hwnd) if minimized(hwnd)

data/lib/win32/screenshot.rb

@@ -82,16 +82,16 @@ module Win32
       def validate_coordinates(hwnd, *coords)
         specified_coordinates = coords.join(', ')
         if coords.any? {|c| c < 0}
-          raise "specified coordinates (#{specified_coordinates}) are invalid! cannot have any less than zero"
+          raise "specified coordinates (#{specified_coordinates}) are invalid - cannot be negative!"
         end
         x1, y1, x2, y2 = *coords
         if x1 >= x2 || y1 >= y2
-          raise "specified coordinates (#{specified_coordinates}) are invalid! cannot have x1 > x2 or y1 > y2"
+          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! max is #{max_x2},#{max_y2}"
+          raise "specified coordinates (#{specified_coordinates}) are invalid - maximum are x2=#{max_x2} and y2=#{max_y2}!"
         end
       end
     end

data/spec/win32_screenshot_spec.rb

@@ -4,12 +4,12 @@ describe "win32-screenshot" do
   include SpecHelper    
   
   before :all do
-    cleanup
     PROGRAM_FILES = "c:/program files/"
     @notepad = IO.popen("notepad").pid
     @iexplore = IO.popen(File.join(PROGRAM_FILES, "Internet Explorer", "iexplore about:blank")).pid
     @calc = IO.popen("calc").pid
     wait_for_programs_to_open
+    cleanup
   end
 
   it "captures foreground" do
@@ -32,7 +32,7 @@ describe "win32-screenshot" do
 
   it "doesn't allow to capture area of the foreground with invalid coordinates" do
     lambda {Win32::Screenshot.foreground_area(0, 0, -1, 100) {|width, height, bmp| check_image('foreground2')}}.
-            should raise_exception("specified coordinates (0, 0, -1, 100) are invalid! cannot have any less than zero")
+            should raise_exception("specified coordinates (0, 0, -1, 100) are invalid - cannot be negative!")
   end
 
   it "captures desktop" do
@@ -55,7 +55,7 @@ describe "win32-screenshot" do
 
   it "doesn't allow to capture area of the desktop with invalid coordinates" do
     lambda {Win32::Screenshot.desktop_area(0, 0, -1, 100) {|width, height, bmp| check_image('desktop2')}}.
-            should raise_exception("specified coordinates (0, 0, -1, 100) are invalid! cannot have any less than zero")
+            should raise_exception("specified coordinates (0, 0, -1, 100) are invalid - cannot be negative!")
   end
 
   it "captures maximized window by window title" do
@@ -120,25 +120,27 @@ describe "win32-screenshot" do
   it "doesn't allow to capture area of the window with negative coordinates" do
     title = /calculator/i
     lambda {Win32::Screenshot.window_area(title, 0, 0, -1, 100) {|width, height, bmp| check_image('calc2')}}.
-            should raise_exception("specified coordinates (0, 0, -1, 100) are invalid! cannot have any less than zero")
+            should raise_exception("specified coordinates (0, 0, -1, 100) are invalid - cannot be negative!")
   end
 
   it "doesn't allow to capture area of the window if coordinates are the same" do
     title = /calculator/i
     lambda {Win32::Screenshot.window_area(title, 10, 0, 10, 20) {|width, height, bmp| check_image('calc4')}}.
-            should raise_exception("specified coordinates (10, 0, 10, 20) are invalid! cannot have x1 > x2 or y1 > y2")
+            should raise_exception("specified coordinates (10, 0, 10, 20) are invalid - cannot have x1 > x2 or y1 > y2!")
   end
 
   it "doesn't allow to capture area of the window if second coordinate is smaller than first one" do
     title = /calculator/i
     lambda {Win32::Screenshot.window_area(title, 0, 10, 10, 9) {|width, height, bmp| check_image('calc5')}}.
-            should raise_exception("specified coordinates (0, 10, 10, 9) are invalid! cannot have x1 > x2 or y1 > y2")
+            should raise_exception("specified coordinates (0, 10, 10, 9) are invalid - cannot have x1 > x2 or y1 > y2!")
   end
 
   it "doesn't allow to capture area of the window with too big coordinates" do
     title = /calculator/i
-    lambda {Win32::Screenshot.window_area(title, 0, 0, 10, 10000) {|width, height, bmp| check_image('calc3')}}.
-            should raise_exception("specified coordinates (0, 0, 10, 10000) are invalid! max is 212,264")
+    hwnd = Win32::Screenshot::BitmapMaker.hwnd(title)
+    dimensions = Win32::Screenshot::BitmapMaker.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]}!")
   end
 
   it "captures by window with handle" do
@@ -164,17 +166,23 @@ describe "win32-screenshot" do
   it "doesn't allow to capture area of the window with handle with invalid coordinates" do
     hwnd = Win32::Screenshot::BitmapMaker.hwnd(/calculator/i)
     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 have any less than zero")
+            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
-    Win32::Screenshot.hwnd_area(hwnd, 100, 100, 170, 220) do |width, height, bmp|; bmp1 = bmp; end
-    Win32::Screenshot.hwnd_area(hwnd, 0, 0, 70, 120) do |width, height, bmp|; bmp2 = bmp; end
+    Win32::Screenshot.hwnd_area(hwnd, 100, 100, 170, 180) do |width, height, bmp|; bmp1 = bmp; end
+    Win32::Screenshot.hwnd_area(hwnd, 0, 0, 70, 80) do |width, height, bmp|; bmp2 = bmp; end
     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    
 
   after :all do
     Process.kill 9, @notepad

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rdp-win32screenshot
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 0
   - 6
-  version: 0.0.6
+  - 1
+  version: 0.0.6.1
 platform: ruby
 authors: 
 - Jarmo Pertman