X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.hh;h=c3403de311bd8d79a48e4128211d4e6f6c6ceb54;hb=8f8acc24933830d4f5784616b9b0c5896bde0b93;hp=aea9d2936511d410baadba3ac673fc809c8e5a3c;hpb=00e2c5aaad4a0831fd1e0d1b1c287df4d6eaac93;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index aea9d293..c3403de3 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -11,7 +11,7 @@ extern "C" {
 }
 
 #include "client.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
 #include "otk/image.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
@@ -116,6 +116,21 @@ private:
   //! Get desktop names from the root window property
   void updateDesktopNames();
 
+  //! Changes to the specified desktop, displaying windows on it and hiding
+  //! windows on the others.
+  /*!
+    @param desktop The number of the desktop to switch to (starts from 0).
+    If the desktop is out of valid range, it is ignored.
+  */
+  void changeDesktop(long desktop);
+
+  //! Changes the number of desktops.
+  /*!
+    @param num The number of desktops that should exist. This value must be
+               greater than 0 or it will be ignored.
+  */
+  void changeNumDesktops(long num);
+
 public:
 #ifndef SWIG
   //! Constructs a new OBScreen object
@@ -141,7 +156,9 @@ public:
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
   //! Returns the desktop being displayed
-  inline unsigned long desktop() const { return _desktop; }
+  inline long desktop() const { return _desktop; }
+  //! Returns the number of desktops
+  inline long numDesktops() const { return _num_desktops; }
 
   //! Update's the screen's combined strut of all the clients.
   /*!
@@ -160,6 +177,7 @@ public:
   /*!
     This removes the window's frame, reparents it to root, unselects events on
     it, etc.
+    @param client The client to unmanage
   */
   void unmanageWindow(OBClient *client);
 
@@ -167,22 +185,7 @@ public:
   //! layer
   void restack(bool raise, OBClient *client);
 
-  //! Changes to the specified desktop, displaying windows on it and hiding
-  //! windows on the others.
-  /*!
-    @param desktop The number of the desktop to switch to (starts from 0).
-    If the desktop is out of valid range, it is ignored.
-  */
-  void changeDesktop(long desktop);
-
-  //! Changes the number of desktops.
-  /*!
-    @param num The number of desktops that should exist. This value must be
-               greater than 0 or it will be ignored.
-  */
-  void changeNumDesktops(long num);
-
-  //! Sets the name of a desktop
+  //! Sets the name of a desktop by changing the root window property
   /*!
     @param i The index of the desktop to set the name for (starts at 0)
     @param name The name to set for the desktop