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

window_manager.h

 // Copyright (c) 2010 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_WINDOW_MANAGER_H_
 #define WINDOW_MANAGER_WINDOW_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 79 matching lines @@
   }
 
   EventLoop* event_loop() { return event_loop_; }
   XConnection* xconn() { return xconn_; }
   Compositor* compositor() { return compositor_; }
   DBusInterface* dbus() { return dbus_; }
   StackingManager* stacking_manager() { return stacking_manager_.get(); }
   FocusManager* focus_manager() { return focus_manager_.get(); }
 
   XWindow root() const { return root_; }
+  const Rect& root_bounds() const { return root_bounds_; }
+  Size root_size() const { return root_bounds_.size(); }
+  int root_depth() const { return root_depth_; }
+  int width() const { return root_bounds_.width; }
+  int height() const { return root_bounds_.height; }
+
   const Stacker<XWindow>& stacked_xids() const {
     return *(stacked_xids_.get());
   }
 
   Compositor::StageActor* stage() { return stage_; }
 
-  int width() const { return width_; }
-  int height() const { return height_; }
-  int root_depth() const { return root_depth_; }
-  Rect bounds() const { return Rect(0, 0, width_, height_); }
-
   XWindow wm_xid() const { return wm_xid_; }
   XWindow active_window_xid() const { return active_window_xid_; }
 
   KeyBindings* key_bindings() { return key_bindings_.get(); }
   WmIpc* wm_ipc() { return wm_ipc_.get(); }
   int wm_ipc_version() const { return wm_ipc_version_; }
 
   bool logged_in() const { return logged_in_; }
   bool damage_debugging_enabled() const { return damage_debugging_enabled_; }
 
@@ skipping 228 matching lines @@
       XAtom atom, XWindow manager_win, XTime timestamp);
 
   // Tell the previous window and compositing managers to exit and register
   // ourselves as the new managers.
   bool RegisterExistence();
 
   // Set various one-time/unchanging properties on the root window as
   // specified in the Extended Window Manager Hints.
   bool SetEwmhGeneralProperties();
 
-  // Set EWMH properties on the root window relating to the current screen
-  // size (as stored in |width_| and |height_|): _NET_DESKTOP_GEOMETRY,
-  // _NET_DESKTOP_VIEWPORT, and _NET_WORKAREA (by way of calling
-  // SetEwmhWorkareaProperty()).
+  // Set EWMH properties on the root window relating to the current screen size:
+  // _NET_DESKTOP_GEOMETRY, _NET_DESKTOP_VIEWPORT, and _NET_WORKAREA (by way of
+  // calling SetEwmhWorkareaProperty()).
   bool SetEwmhSizeProperties();
 
   // Set the _NET_WORKAREA property on the root window to the screen area
   // minus space used by panel docks.
   bool SetEwmhWorkareaProperty();
 
   // Register all of our key bindings.  Called by Init().
   void RegisterKeyBindings();
 
   // Query the X server for all toplevel windows and start tracking (and
   // possibly managing) them.
   bool ManageExistingWindows();
 
   // Start tracking this window (more specifically, create a Window object
   // for it and register it in |client_windows_|).  Returns NULL for
   // windows that we specifically shouldn't track (e.g. the compositor's
   // stage or the compositing overlay window).
   Window* TrackWindow(XWindow xid, bool override_redirect,
                       XConnection::WindowGeometry& geometry);
 
   // Handle a window getting mapped.  This is primarily used by
   // HandleMapNotify(), but is abstracted out into a separate method so
   // that ManageExistingWindows() can also use it to handle windows that
   // were already mapped when the WM started.
   void HandleMappedWindow(Window* win);
 
   // Handle the screen being resized.
-  void HandleScreenResize(int new_width, int new_height);
+  void HandleScreenResize(const Size& new_size);
 
   // Set the WM_STATE property on a window.  Per ICCCM 4.1.3.1, |state| can
   // be 0 (WithdrawnState), 1 (NormalState), or 3 (IconicState).  Per
   // 4.1.4, IconicState means that the toplevel window isn't viewable, so
   // we should use NormalState even when drawing a scaled-down version of
   // the window.
   bool SetWmStateProperty(XWindow xid, int state);
 
   // Update the _NET_CLIENT_LIST and _NET_CLIENT_LIST_STACKING properties
   // on the root window (as described in EWMH).
@@ skipping 57 matching lines @@
   // chrome_watchdog_->SendPingToChrome().
   void PingChrome();
 
   EventLoop* event_loop_;   // not owned
   XConnection* xconn_;      // not owned
   Compositor* compositor_;  // not owned
   DBusInterface* dbus_;     // not owned
 
   XWindow root_;
 
-  // Root window dimensions and depth.
-  int width_;
-  int height_;
+  // Root window bounds and depth.
+  Rect root_bounds_;
   int root_depth_;
 
   // Offscreen window that we just use for registering as the WM.
   XWindow wm_xid_;
   scoped_ptr<XConnection::WindowDestroyer> wm_xid_destroyer_;
 
   Compositor::StageActor* stage_;  // not owned
 
   // Window containing the compositor's stage.
   XWindow stage_xid_;
@@ skipping 132 matching lines @@
 
   // Number of outstanding requests to force compositing.
   int num_compositing_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace window_manager
 
 #endif  // WINDOW_MANAGER_WINDOW_MANAGER_H_