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

diff --git a/src/screen.hh b/src/screen.hh
index aea9d293..8904c2a7 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -3,7 +3,7 @@
 #define   __screen_hh
 
 /*! @file screen.hh
-  @brief OBScreen manages a single screen
+  @brief Screen manages a single screen
 */
 
 extern "C" {
@@ -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"
@@ -25,13 +25,13 @@ extern "C" {
 
 namespace ob {
 
-class OBClient;
-class OBRootWindow;
+class Client;
+class RootWindow;
 
 //! 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;
@@ -46,7 +46,7 @@ public:
                                           ButtonReleaseMask;
 
   //! All managed clients on the screen (in order of being mapped)
-  OBClient::List clients;
+  Client::List clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -59,7 +59,7 @@ private:
   const otk::ScreenInfo *_info;
   
   //! The Image Control used for rendering on the screen
-  otk::BImageControl *_image_control;
+  otk::ImageControl *_image_control;
 
   //! The style with which to render on the screen
   otk::Style _style;
@@ -81,7 +81,7 @@ private:
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
-  OBClient::List _stacking;
+  Client::List _stacking;
 
   //! The desktop currently being displayed
   long _desktop;
@@ -90,16 +90,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
@@ -116,12 +116,27 @@ 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
-  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; }
@@ -133,7 +148,7 @@ public:
   */
   inline bool managed() const { return _managed; }
   //! Returns the Image Control used for rendering on the screen
-  inline otk::BImageControl *imageControl() { return _image_control; }
+  inline otk::ImageControl *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
@@ -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,29 +177,15 @@ 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);
+  void unmanageWindow(Client *client);
 
   //! Raises/Lowers a client window above/below all others in its stacking
   //! 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);
+  void restack(bool raise, 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