rdp-win32screenshot 0.0.7.3 → 0.0.9

data/VERSION

@@ -1,2 +1 @@
-0.0.7.3
-
+0.0.9

data/lib/win32/screenshot/bitmap_maker.rb

@@ -28,6 +28,8 @@ module Win32
                         [:long], :long
         attach_function :client_rect, :GetClientRect,
                         [:long, :pointer], :bool
+        attach_function :window_rect, :GetWindowRect,
+                        [:long, :pointer], :bool
         attach_function :minimized, :IsIconic,
                         [:long], :bool
         attach_function :show_window, :ShowWindow,
@@ -100,7 +102,7 @@ module Win32
                  :search_class, :char # boolean
         end
 
-        def hwnd(window_title, search_class = nil)
+        def hwnd(window_title, search_class = false)
           window = WindowStruct.new
           unless window_title.is_a?(Regexp)
             window_title = Regexp.escape(window_title.to_s)

data/lib/win32/util.rb

@@ -3,7 +3,7 @@ module Win32
     class Util
       class << self
 
-        def all_windows
+        def all_desktop_windows
           titles = []
           window_callback = FFI::Function.new(:bool, [ :long, :pointer ], { :convention => :stdcall }) do |hwnd, param|
             titles << [window_title(hwnd), hwnd]
@@ -13,7 +13,43 @@ module Win32
           BitmapMaker.enum_windows(window_callback, nil)
           titles
         end
-
+        
+        # just returns a long list of hwnd's...
+        # unless with_info is true
+        # then it will return all hwnds with full info about each window
+        def windows_hierarchy with_info = false          
+          all = {}
+          desktop_hwnd = BitmapMaker.desktop_window
+          root = {:hwnd => desktop_hwnd, :children => []}
+          root.merge!(get_info(desktop_hwnd)) if with_info
+          parents = []
+          parents << root
+          window_callback = FFI::Function.new(:bool, [ :long, :pointer ], { :convention => :stdcall }) do |hwnd, param|
+            # this is a child of the most recent parent
+            myself = {:hwnd => hwnd, :children => []}
+            myself.merge!(get_info(hwnd)) if with_info
+            parents[-1][:children] << myself
+            parents << myself
+            if !all[hwnd]
+              all[hwnd] = true
+              BitmapMaker.enum_child_windows(hwnd, window_callback, nil)
+            end
+            
+            parents.pop
+            true
+          end
+          BitmapMaker.enum_child_windows(desktop_hwnd, window_callback, nil)
+          root
+        end
+        
+        def get_info hwnd
+          {:title => window_title(hwnd), 
+          :class => window_class(hwnd), 
+          :dimensions => dimensions_for(hwnd), 
+          :starting_coordinates => location_of(hwnd)
+          }
+        end  
+        
         def window_title hwnd
           title_length = BitmapMaker.window_text_length(hwnd) + 1
           title = FFI::MemoryPointer.new :char, title_length
@@ -32,6 +68,13 @@ module Win32
           raise "window with title '#{title_query}' was not found!" unless hwnd
           hwnd
         end
+        
+        def location_of(hwnd)
+          rect = [0, 0, 0, 0].pack('L4')
+          BitmapMaker.window_rect(hwnd, rect)
+          x, y, width, height = rect.unpack('L4')
+          return x, y
+        end
 
         def dimensions_for(hwnd)
           rect = [0, 0, 0, 0].pack('L4')

data/spec/win32_screenshot_util_spec.rb

@@ -11,8 +11,8 @@ describe Win32::Screenshot::Util do
     @calc_hwnd = Win32::Screenshot::Util.window_hwnd("Calculator")
   end
 
-  it ".all_windows enumerates all available windows" do
-    all_windows = Win32::Screenshot::Util.all_windows
+  it ".all_desktop_windows enumerates all available windows" do
+    all_windows = Win32::Screenshot::Util.all_desktop_windows
     all_windows.should_not be_empty
     all_windows[0].should be_an(Array)
     all_windows[0][0].should be_a(String)
@@ -38,8 +38,36 @@ describe Win32::Screenshot::Util do
     Win32::Screenshot::Util.window_class(@calc_hwnd).should == "CalcFrame"
   end
   
+  it ".get_info returns lots of info about an hwnd" do
+    desktop_hwnd = Win32::Screenshot::BitmapMaker.desktop_window
+    info = Win32::Screenshot::Util.get_info desktop_hwnd
+    info.should be_a Hash
+    info.keys.sort.should == [:title, :class, :dimensions, :starting_coordinates].sort
+  end
+  
+  it ".windows_hierarchy returns hwnds" do
+    a = Win32::Screenshot::Util.windows_hierarchy
+    # should have root as "desktop"
+    # though in reality some windows might not be descendants of the desktop 
+    # (see the WinCheat source which discusses this further)
+    # but we don't worry about that edge case yet
+    a.should be_a Hash
+    a[:children].should be_an Array
+    a[:children].length.should be > 0
+    a[:children][0].should be_a Hash
+    a[:hwnd].should == Win32::Screenshot::BitmapMaker.desktop_window
+  end
+  
+  it ".windows_hierarchy can return info" do
+    a = Win32::Screenshot::Util.windows_hierarchy true
+    # check for right structure
+    for hash_example in [a, a[:children][0]] do
+      hash_example.keys.sort.should == [:title, :hwnd, :class, :dimensions, :starting_coordinates, :children].sort
+    end
+  end
+  
   after :all do
-    # test our hwnd -> pid method
+    # tests our hwnd -> pid method, and conveniently, shuts down the calculator process
     calc_pid = Win32::Screenshot::Util.window_process_id(@calc_hwnd)
     system("taskkill /PID #{calc_pid}")
     proc {Win32::Screenshot::Util.window_hwnd("Calculator") }.should raise_exception("window with title 'Calculator' was not found!")

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\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
-
+# 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
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdp-win32screenshot
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  - 3
-  version: 0.0.7.3
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -06:00
-default_executable: 
+date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -27,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -55,6 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,6 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -86,9 +89,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - History.rdoc
 - LICENSE
+- RDP_BRANCH_HAS_MASTER_WITH_CORRECT_VERSION_NUMBER
+- RDP_VERSION_IS_IN_RDP_BRANCH
 - README.rdoc
 - Rakefile
 - VERSION
@@ -100,7 +104,6 @@ files:
 - spec/win32_screenshot_spec.rb
 - spec/win32_screenshot_util_spec.rb
 - win32screenshot.gemspec
-has_rdoc: true
 homepage: http://github.com/jarmo/win32screenshot
 licenses: []
 
@@ -115,6 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -123,17 +127,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Capture Screenshots on Windows with Ruby
-test_files: 
-- spec/spec_helper.rb
-- spec/win32_screenshot_spec.rb
-- spec/win32_screenshot_util_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-coverage
-rdoc
-pkg
-.idea
-spec/tmp