X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=c3403de311bd8d79a48e4128211d4e6f6c6ceb54;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=37f22d88a067eb59c97c83b8823e16358bcc1a25;hpb=2ae2b257d39ea62640c2590f794e4275c6db1cd4;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 37f22d88..c3403de3 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,14 +10,18 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "rootwindow.hh"
+#include "client.hh"
+#include "widgetbase.hh"
 #include "otk/image.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/style.hh"
-#include "otk/configuration.hh" // TEMPORARY
+#include "otk/screeninfo.hh"
+#include "otk/eventhandler.hh"
+#include "otk/property.hh"
 
 #include <string>
+#include <list>
 
 namespace ob {
 
@@ -27,10 +31,8 @@ class OBRootWindow;
 //! Manages a single screen
 /*!
 */
-class OBScreen {
+class OBScreen : public otk::OtkEventHandler, public OBWidget {
 public:
-  //! Holds a list of OBClient objects
-  typedef std::list<OBClient*> ClientList;
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;
 
@@ -43,8 +45,8 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
-  //! All managed clients on the screen
-  ClientList clients;
+  //! All managed clients on the screen (in order of being mapped)
+  OBClient::List clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -62,49 +64,83 @@ private:
   //! The style with which to render on the screen
   otk::Style _style;
 
-  //! The screen's root window
-  OBRootWindow _root;
-  
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
   //! Area usable for placement etc (total - struts)
   otk::Rect _area;
 
-  //! Areas of the screen reserved by applications
-  StrutList _struts;
+  //! Combined strut from all of the clients' struts
+  otk::Strut _strut;
 
   //!  An offscreen window which gets focus when nothing else has it
   Window _focuswindow;
-  
+
+  //! An offscreen window which shows that a NETWM compliant window manager is
+  //! running
+  Window _supportwindow;
+
+  //! A list of all managed clients on the screen, in their stacking order
+  OBClient::List _stacking;
+
+  //! The desktop currently being displayed
+  long _desktop;
+
+  //! The number of desktops
+  long _num_desktops;
+
+  //! The names of all desktops
+  otk::OBProperty::StringVect _desktop_names;
 
   //! Calculate the OBScreen::_area member
   void calcArea();
+  //! Set the list of supported NETWM atoms on the root window
+  void changeSupportedAtoms();
   //! Set the client list on the root window
   /*!
     Sets the _NET_CLIENT_LIST root window property.<br>
     Also calls OBScreen::updateStackingList.
   */
-  void setClientList();
+  void changeClientList();
   //! Set the client stacking list on the root window
   /*!
     Set the _NET_CLIENT_LIST_STACKING root window property.
   */
-  void setStackingList();
+  void changeStackingList();
   //! Set the work area hint on the root window
   /*!
     Set the _NET_WORKAREA root window property.
   */
-  void setWorkArea();
-  
+  void changeWorkArea();
+
+  //! 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
-  OBScreen(int screen, const otk::Configuration &config);
+  OBScreen(int screen);
   //! Destroys the OBScreen object
   virtual ~OBScreen();
 #endif
 
+  inline int number() const { return _number; }
+  
   //! Returns if the screen was successfully managed
   /*!
     If this is false, then the screen should be deleted and should NOT be
@@ -119,14 +155,16 @@ public:
   inline const otk::Style *style() const { return &_style; }
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
+  //! Returns the desktop being displayed
+  inline long desktop() const { return _desktop; }
+  //! Returns the number of desktops
+  inline long numDesktops() const { return _num_desktops; }
 
-  //! Adds a window's strut to the screen's list of reserved spaces
-  void addStrut(otk::Strut *strut);
-  //! Removes a window's strut from the screen's list of reserved spaces
-  void removeStrut(otk::Strut *strut);
-
-  //! Loads a new style on the screen
-  void loadStyle(const otk::Configuration &config);
+  //! Update's the screen's combined strut of all the clients.
+  /*!
+    Clients should call this whenever they change their strut.
+  */
+  void updateStrut();
 
   //! Manage any pre-existing windows on the screen
   void manageExisting();
@@ -139,8 +177,25 @@ 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);
+
+  //! Raises/Lowers a client window above/below all others in its stacking
+  //! layer
+  void restack(bool raise, OBClient *client);
+
+  //! 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
+    If the index is too large, it is simply ignored.
+  */
+  void setDesktopName(long i, const std::string &name);
+
+  virtual void propertyHandler(const XPropertyEvent &e);
+  virtual void clientMessageHandler(const XClientMessageEvent &e);
+  virtual void mapRequestHandler(const XMapRequestEvent &e);
 };
 
 }