fixed condition that could cause 2 windows to look focused, and bad things to occur

[chaz/openbox] / src / screen.hh

diff --git a/src/screen.hh b/src/screen.hh
index aea9d2936511d410baadba3ac673fc809c8e5a3c..933fc20de12bdcb5774171026bf86186181eebae 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.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.
   /*!
@@ -167,21 +184,6 @@ 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
   /*!
     @param i The index of the desktop to set the name for (starts at 0)