rdp-win32screenshot 0.0.7.2 → 0.0.7.3

data/VERSION

@@ -1,2 +1,2 @@
-0.0.7.2
+0.0.7.3
 

data/lib/win32/screenshot/bitmap_maker.rb

@@ -13,7 +13,9 @@ module Win32
 
         # user32.dll
         attach_function :enum_windows, :EnumWindows,
-                        [:enum_callback, :pointer], :long
+                        [:enum_callback, :pointer], :int
+        attach_function :enum_child_windows, :EnumChildWindows,
+                        [:long, :enum_callback, :pointer], :int
         attach_function :window_text, :GetWindowTextA,
                         [:long, :pointer, :int], :int
         attach_function :window_text_length, :GetWindowTextLengthA,
@@ -65,26 +67,40 @@ module Win32
         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(searched_window[:search_class] != 0)
+            title = Util.window_class(hwnd)
+          else
+            title = Util.window_title(hwnd)
+          end
           if title =~ Regexp.new(searched_window[:title].read_string) && window_visible(hwnd)
             searched_window[:hwnd] = hwnd
             false
           else
-            true
+            if(searched_window[:search_class] != 0)
+              # if they're searching for a classname, enumerate children, too
+              enum_child_windows(hwnd, EnumWindowCallback, param)
+              if searched_window[:hwnd] != 0
+                # return early if already discovered
+                false 
+              else
+               true
+              end
+            else
+              true
+            end
           end
         end
 
         class WindowStruct < FFI::Struct
           layout :title, :pointer,
-                 :hwnd, :long
+                 :hwnd, :long,
+                 :search_class, :char # boolean
         end
 
-        def hwnd(window_title)
+        def hwnd(window_title, search_class = nil)
           window = WindowStruct.new
           unless window_title.is_a?(Regexp)
             window_title = Regexp.escape(window_title.to_s)
@@ -93,10 +109,11 @@ module Win32
           end
           window_title = FFI::MemoryPointer.from_string(window_title)
           window[:title] = window_title
+          window[:search_class] = search_class ? 1 : 0
           enum_windows(EnumWindowCallback, window.to_ptr)
           window[:hwnd] == 0 ? nil : window[:hwnd]
         end
-
+        
         def prepare_window(hwnd, pause)
           restore(hwnd) if minimized(hwnd)
           set_foreground(hwnd)

data/lib/win32/util.rb

@@ -23,7 +23,7 @@ module Win32
         
         def window_class hwnd
           title = FFI::MemoryPointer.new :char, 100
-          BitmapMaker.class_name(hwnd, title, 100)
+          BitmapMaker.class_name(hwnd, title, 99)
           title.read_string
         end
 

data/spec/win32_screenshot_spec.rb

@@ -72,6 +72,17 @@ describe Win32::Screenshot do
       [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
+  
+  it "can also search by window class name" do
+    good_pid = Win32::Screenshot::BitmapMaker.hwnd(/calculator/i)
+    good_pid.should_not be_nil
+    good_pid.should == Win32::Screenshot::BitmapMaker.hwnd(/calcframe/i, true)
+  end
+  
+  it "can find sub windows as well" do
+    # search for an IE sub-window by class (doesn't have text)
+    Win32::Screenshot::BitmapMaker.hwnd(/CommandBarClass/i, true).should_not be_nil
+  end
 
   it "captures small windows" do
     title = /Notepad/
@@ -140,7 +151,7 @@ describe Win32::Screenshot do
       [width, height].should == Win32::Screenshot::Util.dimensions_for(hwnd)
     end
   end
-
+  
   it "captures area of the window with handle" do
     hwnd = Win32::Screenshot::BitmapMaker.hwnd(/calculator/i)
     Win32::Screenshot.hwnd_area(hwnd, 30, 30, 100, 150) do |width, height, bmp|

data/win32screenshot.gemspec

@@ -1,69 +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.7"
-
-  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-18}
-  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.7}
-  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::VERSION) >= 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
-
+# 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.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jarmo Pertman", "Aslak Helles\u00F8y"]
+  s.date = %q{2010-08-19}
+  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.7}
+  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::VERSION) >= 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

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 7
-  - 2
-  version: 0.0.7.2
+  - 3
+  version: 0.0.7.3
 platform: ruby
 authors: 
 - Jarmo Pertman