highlight the popup

[chaz/openbox] / src / screen.hh

diff --git a/src/screen.hh b/src/screen.hh
index 37e56cf1085625c9bc77484202667fd2d869891d..db8c26d199c7b4d48049d390c4685c95d60f4597 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,9 +10,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include <X11/Xlib.h>
 }
 

-#include "client.hh"

 #include "widgetbase.hh"
 #include "widgetbase.hh"

-#include "otk/renderstyle.hh"

 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"


@@ -26,7 +24,6 @@ extern "C" {
 namespace ob {
 
 class Client;
 namespace ob {
 
 class Client;

-class RootWindow;

 
 //! Manages a single screen
 /*!
 
 //! Manages a single screen
 /*!


@@ -45,8 +42,10 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 

+  //! Holds a list of Clients
+  typedef std::list<Client*> ClientList;

   //! All managed clients on the screen (in order of being mapped)
   //! All managed clients on the screen (in order of being mapped)

-  Client::List clients;
+  ClientList clients;

   
 private:
   //! Was %Openbox able to manage the screen?
   
 private:
   //! Was %Openbox able to manage the screen?


@@ -58,9 +57,6 @@ private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
   
   //! Information about this screen
   const otk::ScreenInfo *_info;
   

-  //! The style with which to render on the screen
-  otk::RenderStyle _style;
-

   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 


@@ -78,7 +74,7 @@ private:
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order

-  Client::List _stacking;
+  ClientList _stacking;

 
   //! The desktop currently being displayed
   long _desktop;
 
   //! The desktop currently being displayed
   long _desktop;


@@ -146,8 +142,6 @@ public:
   inline bool managed() const { return _managed; }
   //! Returns the area of the screen not reserved by applications' Struts
   inline const otk::Rect &area() const { return _area; }
   inline bool managed() const { return _managed; }
   //! 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::RenderStyle *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
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
   //! Returns the desktop being displayed


@@ -197,6 +191,8 @@ public:
   */
   void setDesktopName(long i, const otk::ustring &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);
   virtual void mapRequestHandler(const XMapRequestEvent &e);
   virtual void propertyHandler(const XPropertyEvent &e);
   virtual void clientMessageHandler(const XClientMessageEvent &e);
   virtual void mapRequestHandler(const XMapRequestEvent &e);