wm: Update a lot of code to use structs from geometry.h.

test_lib.h

 // Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WINDOW_MANAGER_TEST_LIB_H_
 #define WINDOW_MANAGER_TEST_LIB_H_
 
 #include <string>
 
 #include <gtest/gtest.h>
@@ skipping 65 matching lines @@
 
   // Create a new WindowManager object using the existing X connection,
   // compositor, etc. and store it in |wm_|.
   void CreateNewWm();
 
   // Call CreateNewWm() and then call its Init() method and ensure that it
   // succeeds.
   void CreateAndInitNewWm();
 
   // Create a basic window with no special type.
-  XWindow CreateBasicWindow(int x, int y, int width, int height);
+  XWindow CreateBasicWindow(const Rect& bounds);
 
   // Create a toplevel client window with the passed-in position and
   // dimensions.  It has type WINDOW_TYPE_CHROME_TOPLEVEL.
-  XWindow CreateToplevelWindow(int tab_count, int selected_tab,
-                               int x, int y, int width, int height);
+  XWindow CreateToplevelWindow(int tab_count,
+                               int selected_tab,
+                               const Rect& bounds);
 
   // Create a snapshot client window with the passed-in position and
   // dimensions and associated parent toplevel window.
-  XWindow CreateSnapshotWindow(XWindow parent_xid, int index,
-                               int x, int y,
-                               int width, int height);
+  XWindow CreateSnapshotWindow(XWindow parent_xid,
+                               int index,
+                               const Rect& bounds);
 
   // Creates a fav icon window for the associated snapshot.
-  XWindow CreateFavIconWindow(XWindow snapshot_xid,
-                              int width, int height);
+  XWindow CreateFavIconWindow(XWindow snapshot_xid, const Size& size);
 
   // Creates a title window for the associated snapshot.
-  XWindow CreateTitleWindow(XWindow snapshot_xid,
-                            int width, int height);
+  XWindow CreateTitleWindow(XWindow snapshot_xid, const Size& size);
 
   // Creates a decoration window (favicon or title) for the associated
   // snapshot window.
   XWindow CreateDecorationWindow(XWindow snapshot_xid,
                                  chromeos::WmIpcWindowType type,
-                                 int width, int height);
+                                 const Size& size);
 
   // Creates a toplevel client window with an arbitrary size.
   XWindow CreateSimpleWindow();
 
   // Creates a snapshot client window with an arbitrary size.
   // |toplevel_xid| is the id of the associated toplevel window.
   // |index| is the index of the snapshot within the given toplevel
   // window.
   XWindow CreateSimpleSnapshotWindow(XWindow toplevel_xid, int index);
 
   // Create a panel titlebar or content window.  Muck around with the
   // |*new_panel*| members below to change content window parameters.
-  XWindow CreatePanelTitlebarWindow(int width, int height);
-  XWindow CreatePanelContentWindow(int width, int height, XWindow titlebar_xid);
+  XWindow CreatePanelTitlebarWindow(const Size& size);
+  XWindow CreatePanelContentWindow(const Size& size, XWindow titlebar_xid);
 
   // Create titlebar and content windows for a panel, show them, and return
   // a pointer to the Panel object.
   Panel* CreatePanel(int width, int titlebar_height, int content_height);
 
   // Simulates a change in the selected tab and tab count in a chrome
   // toplevel window.
   void ChangeTabInfo(XWindow toplevel_xid,
                      int tab_count,
                      int selected_tab,
@@ skipping 34 matching lines @@
   // Send a key press and release to the given xid.
   void SendKey(XWindow xid,
                KeyBindings::KeyCombo key,
                XTime press_timestamp,
                XTime release_timestamp);
 
   // Send a _NET_ACTIVE_WINDOW message asking the window manager to focus a
   // window.
   void SendActiveWindowMessage(XWindow xid);
 
-  // Invoke Window::HandleConfigureNotify() using the client window's size.
-  // The Window class defers resizing its actor until it sees a
-  // ConfigureNotify event; this can be used to make sure that the actor's
-  // size matches the current client size.
-  void NotifyWindowAboutSize(Window* win);
+  // Initialize a ConfigureNotify event for |xid|'s current bounds and stacking
+  // and pass it to WindowManager::HandleEvent().
+  void SendConfigureNotifyEvent(XWindow xid);
 
   // Set the _CHROME_LOGGED_IN property on the root window to describe
   // whether Chrome is logged in or not, and send a PropertyNotify event to
   // the window manager (if it's non-NULL).
   void SetLoggedInState(bool logged_in);
 
   // Append an atom to an integer property on a window.
   void AppendAtomToProperty(
       XWindow xid, XAtom property_atom, XAtom atom_to_add);
 
@@ skipping 189 matching lines @@
   virtual bool HandleWindowMapRequest(Window* win) {
     num_map_requests_++;
     return should_return_true_for_map_requests_;
   }
   virtual void HandleWindowMap(Window* win) { num_mapped_windows_++; }
   virtual void HandleWindowUnmap(Window* win) { num_unmapped_windows_++; }
   virtual void HandleWindowPixmapFetch(Window* win) {
     num_fetched_pixmaps_++;
   }
   virtual void HandleWindowConfigureRequest(Window* win,
-                                            int req_x, int req_y,
-                                            int req_width, int req_height) {}
+                                            const Rect& requested_bounds) {}
   virtual void HandleButtonPress(XWindow xid,
-                                 int x, int y,
-                                 int x_root, int y_root,
+                                 const Point& relative_pos,
+                                 const Point& absolute_pos,
                                  int button,
                                  XTime timestamp) {
     num_button_presses_++;
   }
   virtual void HandleButtonRelease(XWindow xid,
-                                   int x, int y,
-                                   int x_root, int y_root,
+                                   const Point& relative_pos,
+                                   const Point& absolute_pos,
                                    int button,
                                    XTime timestamp) {}
   virtual void HandlePointerEnter(XWindow xid,
-                                  int x, int y,
-                                  int x_root, int y_root,
+                                  const Point& relative_pos,
+                                  const Point& absolute_pos,
                                   XTime timestamp) {}
   virtual void HandlePointerLeave(XWindow xid,
-                                  int x, int y,
-                                  int x_root, int y_root,
+                                  const Point& relative_pos,
+                                  const Point& absolute_pos,
                                   XTime timestamp) {}
   virtual void HandlePointerMotion(XWindow xid,
-                                   int x, int y,
-                                   int x_root, int y_root,
+                                   const Point& relative_pos,
+                                   const Point& absolute_pos,
                                    XTime timestamp) {}
   virtual void HandleChromeMessage(const WmIpc::Message& msg) {
     chrome_messages_.push_back(msg);
   }
   virtual void HandleClientMessage(XWindow xid,
                                    XAtom message_type,
                                    const long data[5]) {}
   virtual void HandleFocusChange(XWindow xid, bool focus_in) {}
   virtual void HandleWindowPropertyChange(XWindow xid, XAtom xatom) {}
   virtual void OwnDestroyedWindow(DestroyedWindow* destroyed_win, XWindow xid) {
@@ skipping 16 matching lines @@
   // Messages received via HandleChromeMessage().
   std::vector<WmIpc::Message> chrome_messages_;
 
   // DestroyedWindow objects that WindowManager has given to us.
   std::set<std::tr1::shared_ptr<DestroyedWindow> > destroyed_windows_;
 };
 
 }  // namespace window_manager
 
 #endif  // WINDOW_MANAGER_TEST_LIB_H_