X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=db8c26d199c7b4d48049d390c4685c95d60f4597;hb=ee9eaed6cd48db249711912133758679a029b5b1;hp=933fc20de12bdcb5774171026bf86186181eebae;hpb=4c768d5d63154e416e1282396dc48492d0585d42;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 933fc20d..db8c26d1 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -3,35 +3,32 @@
 #define   __screen_hh
 
 /*! @file screen.hh
-  @brief OBScreen manages a single screen
+  @brief Screen manages a single screen
 */
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "client.hh"
-#include "widget.hh"
-#include "otk/image.hh"
+#include "widgetbase.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
-#include "otk/style.hh"
 #include "otk/screeninfo.hh"
 #include "otk/eventhandler.hh"
 #include "otk/property.hh"
+#include "otk/ustring.hh"
 
 #include <string>
 #include <list>
 
 namespace ob {
 
-class OBClient;
-class OBRootWindow;
+class Client;
 
 //! Manages a single screen
 /*!
 */
-class OBScreen : public otk::OtkEventHandler, public OBWidget {
+class Screen : public otk::EventHandler, public WidgetBase {
 public:
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;
@@ -45,8 +42,10 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! Holds a list of Clients
+  typedef std::list<Client*> ClientList;
   //! All managed clients on the screen (in order of being mapped)
-  OBClient::List clients;
+  ClientList clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -58,12 +57,6 @@ private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
   
-  //! The Image Control used for rendering on the screen
-  otk::BImageControl *_image_control;
-
-  //! The style with which to render on the screen
-  otk::Style _style;
-
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
@@ -81,7 +74,7 @@ private:
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
-  OBClient::List _stacking;
+  ClientList _stacking;
 
   //! The desktop currently being displayed
   long _desktop;
@@ -90,16 +83,16 @@ private:
   long _num_desktops;
 
   //! The names of all desktops
-  otk::OBProperty::StringVect _desktop_names;
+  otk::Property::StringVect _desktop_names;
 
-  //! Calculate the OBScreen::_area member
+  //! Calculate the Screen::_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.
+    Also calls Screen::updateStackingList.
   */
   void changeClientList();
   //! Set the client stacking list on the root window
@@ -133,10 +126,10 @@ private:
 
 public:
 #ifndef SWIG
-  //! Constructs a new OBScreen object
-  OBScreen(int screen);
-  //! Destroys the OBScreen object
-  virtual ~OBScreen();
+  //! Constructs a new Screen object
+  Screen(int screen);
+  //! Destroys the Screen object
+  virtual ~Screen();
 #endif
 
   inline int number() const { return _number; }
@@ -147,12 +140,8 @@ public:
     used.
   */
   inline bool managed() const { return _managed; }
-  //! Returns the Image Control used for rendering on the screen
-  inline otk::BImageControl *imageControl() { return _image_control; }
   //! Returns the area of the screen not reserved by applications' Struts
   inline const otk::Rect &area() const { return _area; }
-  //! Returns the style in use on the screen
-  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
@@ -177,20 +166,32 @@ public:
   /*!
     This removes the window's frame, reparents it to root, unselects events on
     it, etc.
+    @param client The client to unmanage
+  */
+  void unmanageWindow(Client *client);
+
+  //! Raises a client window above all others in its stacking layer
+  /*!
+    raiseWindow has a couple of constraints that lowerWindow does not.<br>
+    1) raiseWindow can be called after changing a Client's stack layer, and
+       the list will be reorganized properly.<br>
+    2) raiseWindow guarantees that XRestackWindows() will <i>always</i> be
+       called for the specified client.
   */
-  void unmanageWindow(OBClient *client);
+  void raiseWindow(Client *client);
 
-  //! Raises/Lowers a client window above/below all others in its stacking
-  //! layer
-  void restack(bool raise, OBClient *client);
+  //! Lowers a client window below all others in its stacking layer
+  void lowerWindow(Client *client);
 
-  //! 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
     If the index is too large, it is simply ignored.
   */
-  void setDesktopName(long i, const std::string &name);
+  void setDesktopName(long i, const otk::ustring &name);
+
+  void installColormap(bool install) const;
 
   virtual void propertyHandler(const XPropertyEvent &e);
   virtual void clientMessageHandler(const XClientMessageEvent &e);