use the new non-static display

[chaz/openbox] / src / openbox.hh

diff --git a/src/openbox.hh b/src/openbox.hh
index 5167189796014706db503ad4f5e15e88d5287f8a..fe49df15689eae342a8df2684fb93884622c5750 100644 (file)
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -14,6 +14,7 @@ extern "C" {
 #include <vector>
 #include <map>
 
+#include "otk/display.hh"
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
@@ -38,6 +39,14 @@ struct Cursors {
   Cursor ur_angle; //!< For resizing the right corner of a window
 };
 
+class Openbox;
+
+//! The single instance of the Openbox class for the application
+/*!
+  Since this variable is globally available in the application, the Openbox
+  class does not need to be passed around to any of the other classes.
+*/
+extern Openbox *openbox;
 
 //! The main class for the Openbox window manager
 /*!
@@ -52,13 +61,6 @@ struct Cursors {
 class Openbox : public otk::EventDispatcher, public otk::EventHandler
 {
 public:
-  //! The single instance of the Openbox class for the application
-  /*!
-    Since this variable is globally available in the application, the Openbox
-    class does not need to be passed around to any of the other classes.
-  */
-  static Openbox *instance;
-
   //! The posible running states of the window manager
   enum RunState {
     State_Starting, //!< The window manager is starting up (being created)
@@ -73,6 +75,9 @@ public:
   typedef std::vector<Screen *> ScreenList;
   
 private:
+  //! The display on which Openbox is running
+  otk::Display _display;
+  
   // stuff that can be passed on the command line
   //! Path to the config file to use/in use
   /*!