win32-window 0.1.0.pre → 0.2.0.pre

data/lib/win32/window/version.rb

@@ -1 +1 @@
-$version = '0.1.0.pre'
+$version = '0.2.0.pre'

data/lib/win32/window/window.rb

@@ -11,31 +11,109 @@ module Win32
   class Size < Struct.new(:width, :height)
   end
 
+  module Geometry
+    def location
+      g = geometry()
+      Point.new(g.left, g.top)
+    end
+
+    def x
+      location.x
+    end
+
+    def y
+      location.y
+    end
+
+    def left
+      geometry.left
+    end
+
+    def right
+      geometry.right
+    end
+
+    def top
+      geometry.top
+    end
+    
+    def bottom
+      geometry.bottom
+    end
+
+    def size
+      g = geometry()
+      Size.new(g.right - g.left + 1, g.bottom - g.top + 1)
+    end
+
+    def width
+      size.width
+    end
+
+    def height
+      size.height
+    end
+  end
+
   class Window
     def initialize(handle)
+      # TODO: Validate handle parameter?
+
       @handle = handle
+      @client = Client.new(@handle)
     end
 
     def self.find(opts = {})
-      matches = []
+      Thread.current[:matches] = []
+      Thread.current[:opts] = opts
+
+      @@callback ||= API::Callback.new('LP', 'I') { |handle|
+        opts = Thread.current[:opts]
 
-      callback = API::Callback.new('LP', 'I') { |handle|
         match = true
         match &&= opts[:title].nil? || (get_title(handle) =~ opts[:title])
         match &&= opts[:pid].nil? || (get_pid(handle) == opts[:pid])
 
         if match
-          matches << Window.new(handle)
+          Thread.current[:matches] << Window.new(handle)
         end
 
         1
       }
 
-      EnumWindows.call(callback, nil)
+      EnumWindows.call(@@callback, nil)
+
+      return Thread.current[:matches]
+    end
+
+    def self.from_point(*args)
+      if (args.length == 1) && (args[0].is_a? Point)
+        x = args[0].x
+        y = args[0].y
+      elsif args.length == 2
+        x, y = args
+      else
+        raise ArgumentError
+      end
+
+      handle = WindowFromPoint.call(x,y)
+      if handle == 0
+        nil
+      else
+        Window.new(handle)
+      end
+    end
 
-      return matches
+    def self.from_handle(handle)
+      if IsWindow.call(handle) != 0
+        Window.new(handle)
+      else
+        nil
+      end
     end
 
+    # See also GetShellWindow
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633512(v=vs.85).aspx
     def self.desktop
       Window.new(GetDesktopWindow.call())
     end
@@ -48,22 +126,90 @@ module Win32
       Window.get_title(@handle)
     end
 
+    def handle
+      @handle
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    def ==(other)
+      handle == other.handle
+    end
+
+    def topmost?
+    end
+
     def topmost=(topmost)
       SetWindowPos.call(@handle, topmost ? HWND_TOPMOST : HWND_NOTTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE)
     end
 
+    # Use also SetForegroundWindow?
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633539(v=vs.85).aspx
+    # def bring_to_top
+    #   BringWindowToTop.call(@handle)
+    # end
+
+    def focus
+      # ...?
+    end
+
+    def focused?
+    end
+
+    # window.children.from_point(...)
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms632677(v=vs.85).aspx
+    # ChildWindowFromPointEx
+
+    # window.children.each/window.each_child
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633494(v=vs.85).aspx
+    # EnumChildWindows
+
+    # window.children.topmost
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633514(v=vs.85).aspx
+    # GetTopWindow
+
+    # window.child_of?
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633524(v=vs.85).aspx
+    # IsChild
+
     def minimize
-      CloseWindow.call(@handle)
+      ShowWindow.call(@handle, SW_MINIMIZE)
     end
 
     def minimized?
       IsIconic.call(@handle) != 0
     end
 
+    def maximize
+      ShowWindow.call(@handle, SW_MAXIMIZE)
+    end
+
+    # TODO: max -> min -> restore does not show the window restored,
+    # you have to do max -> min -> restore -> restore.
+    def restore
+      ShowWindow.call(@handle, SW_RESTORE)
+    end
+
+    def maximized?
+      IsZoomed.call(@handle) != 0
+    end
+
     def visible?
       IsWindowVisible.call(@handle) != 0
     end
 
+    # TODO: hide -> maximize/minimize/restore forces the window
+    # to be shown again, use SetWindowPlacement?
+    def hide
+      ShowWindow.call(@handle, SW_HIDE)
+    end
+
+    def show
+      ShowWindow.call(@handle, SW_SHOW)
+    end
+
     def parent
       parent = GetParent.call(@handle)
       if parent == 0
@@ -73,6 +219,17 @@ module Win32
       end
     end
 
+    # See GetAncestor
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633502(v=vs.85).aspx
+    def root
+    end
+
+    # See GetAncestor
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633502(v=vs.85).aspx
+    def owner
+      # ...
+    end
+
     def pid
       Window.get_pid(@handle)
     end
@@ -85,16 +242,10 @@ module Win32
       SetWindowPos.call(@handle, 0, 0, 0, width, height, SWP_NOMOVE | SWP_NOZORDER)
     end
 
-    def location
-      g = geometry()
-      Point.new(g.left, g.top)
-    end
-
-    def size
-      g = geometry()
-      Size.new(g.right - g.left, g.bottom - g.top)
-    end
+    include Geometry
 
+    # TODO: geometry should return special values when
+    # the window is minimized.
     def geometry
       rect = Window.buffer(4 * 4)
       GetWindowRect.call(@handle, rect)
@@ -102,22 +253,50 @@ module Win32
       return Rect.new(left, top, right, bottom)
     end
 
-    def client_geometry
-      rect = Window.buffer(4 * 4)
-      GetClientRect.call(@handle, rect)
-      left, top, right, bottom = rect.unpack('LLLL')
+    def client
+      @client
+    end
+
+    # See GetWindowModuleFileName
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633517(v=vs.85).aspx
+    def module_name
+    end
 
-      width = right - left
-      height = bottom - top
+  private
+    class Client
+      def initialize(handle)
+        @handle = handle
+      end
+
+      include Geometry
+
+      def geometry
+        rect = Window.buffer(4 * 4)
+        GetClientRect.call(@handle, rect)
+        left, top, right, bottom = rect.unpack('LLLL')
+
+        # From GetClientRect documentation: "In conformance with conventions for
+        # the RECT structure, the bottom-right coordinates of the returned rectangle
+        # are exclusive. In other words, the pixel at (right, bottom) lies immediately
+        # outside the rectangle."
+        # Because of this, we decrement to determine the inclusive coordinate.
+        right -= 1
+        bottom -= 1
+
+        width = right - left + 1
+        height = bottom - top + 1
 
-      point = point(left, top)
-      ClientToScreen.call(@handle, point)
-      screen_left, screen_top = point.unpack('LL')
+        top_left = Window.point(left, top)
+        ClientToScreen.call(@handle, top_left)
+        screen_left, screen_top = top_left.unpack('LL')
 
-      return Rect.new(screen_left, screen_top, screen_left + width, screen_top + height)
+        screen_right = screen_left + width - 1
+        screen_bottom = screen_top + height - 1
+
+        return Rect.new(screen_left, screen_top, screen_right, screen_bottom)
+      end
     end
 
-  private
     def self.get_title(handle)
       if GetWindowTextW.call(handle, buffer = "\0" * 1024, buffer.length) == 0
         nil
@@ -133,10 +312,10 @@ module Win32
     end
 
     def self.buffer(bytes)
-      ' ' * bytes
+      "\0" * bytes
     end
 
-    def point(x, y)
+    def self.point(x, y)
       [x, y].pack('LL')
     end
   end
@@ -159,9 +338,6 @@ module Win32
   # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633522(v=vs.85).aspx
   GetWindowThreadProcessId = API.new('GetWindowThreadProcessId', 'IP', 'L', 'user32')
 
-  # http://msdn.microsoft.com/en-us/library/windows/desktop/ms632678(v=vs.85).aspx
-  CloseWindow = API.new('CloseWindow', 'I', 'L', 'user32')
-
   # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633504(v=vs.85).aspx
   GetDesktopWindow = API.new('GetDesktopWindow', '', 'I', 'user32')
 
@@ -174,9 +350,38 @@ module Win32
   # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633527(v=vs.85).aspx
   IsIconic = API.new('IsIconic', 'I', 'I', 'user32')
 
+  # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633531(v=vs.85).aspx
+  IsZoomed = API.new('IsZoomed', 'I', 'I', 'user32')
+
   # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633530(v=vs.85).aspx
   IsWindowVisible = API.new('IsWindowVisible', 'I', 'I', 'user32')
 
+  # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633548(v=vs.85).aspx
+  ShowWindow = API.new('ShowWindow', 'II', 'I', 'user32')
+
+  # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633558(v=vs.85).aspx
+  WindowFromPoint = API.new('WindowFromPoint', 'LL', 'I', 'user32')
+
+  # http://msdn.microsoft.com/en-us/library/windows/desktop/ms632673(v=vs.85).aspx
+  BringWindowToTop = API.new('BringWindowToTop', 'I', 'I', 'user32')
+
+  # http://msdn.microsoft.com/en-us/library/windows/desktop/ms633528(v=vs.85).aspx
+  IsWindow = API.new('IsWindow', 'I', 'I', 'user32')
+
+  SW_FORCEMINIMIZE = 11
+  SW_HIDE = 0
+  SW_MAXIMIZE = 3
+  SW_MINIMIZE = 6
+  SW_RESTORE = 9
+  SW_SHOW = 5
+  SW_SHOWDEFAULT = 10
+  SW_SHOWMAXIMIZED = 3
+  SW_SHOWMINIMIZED = 2
+  SW_SHOWMINNOACTIVE = 7
+  SW_SHOWNA = 8
+  SW_SHOWNOACTIVATE = 4
+  SW_SHOWNORMAL = 1
+
   HWND_BOTTOM = 1
   HWND_NOTTOPMOST = -2
   HWND_TOP = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-window
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.2.0.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: win32-api
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +34,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: qtbindings
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.6'
+- !ruby/object:Gem::Dependency
+  name: win32-semaphore
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0.4'
 description: ! "    A Ruby library to work with Microsoft Windows' Win32 window management
   APIs,\n    including search, enumeration, and window manipulation.\n"
 email: schmch@gmail.com
@@ -58,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the Win32 window management APIs.