X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=77b39ce5fb3d57db2e250cc47a8888457d54369d;hb=14813743539bafc42c91f5aedd28788dcd64ea5e;hp=163b9132e0e6794dd548b436390ff88dc04a20cc;hpb=997f94cf8657201ea9d1f2497e4ec4f56342e22f;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 163b9132..77b39ce5 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -16,7 +16,6 @@ extern "C" {
 
 #include "otk/display.hh"
 #include "otk/screeninfo.hh"
-#include "otk/configuration.hh"
 #include "otk/eventdispatcher.hh"
 #include "otk/eventhandler.hh"
 
@@ -73,9 +72,6 @@ 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
   /*!
@@ -92,8 +88,6 @@ private:
     Defaults to $(HOME)/.openbox/user.py
   */
   std::string _scriptfilepath;
-  //! The display requested by the user, or null to use the DISPLAY env var
-  char *_displayreq;
   //! The value of argv, i.e. how this application was executed
   char **_argv;
   //! Run the application in synchronous mode? (for debugging)
@@ -154,7 +148,6 @@ private:
   static void signalHandler(int signal);
 
 public:
-#ifndef SWIG
   //! Openbox constructor.
   /*!
     \param argc Number of command line arguments, as received in main()
@@ -163,7 +156,6 @@ public:
   Openbox(int argc, char **argv);
   //! Openbox destructor.
   virtual ~Openbox();
-#endif
 
   //! Returns the state of the window manager (starting, exiting, etc)
   inline RunState state() const { return _state; }
@@ -188,7 +180,6 @@ public:
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }
 
-#ifndef SWIG
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.
@@ -196,7 +187,6 @@ public:
     The Openbox::shutdown method will cause this function to exit.
   */
   void eventLoop();
-#endif
 
   //! Adds an Client to the client list for lookups
   void addClient(Window window, Client *client);
@@ -229,6 +219,13 @@ public:
   inline void restart(const std::string &bin = "") {
     _shutdown = true; _restart = true; _restart_prog = bin;
   }
+
+  //! True if Openbox should be restarted instead of exiting
+  inline bool doRestart() const { return _restart; }
+
+  //! The command line requested to be executed in place of restarting
+  //! Openbox the way it was run previously.
+  inline const std::string &restartProgram() const { return _restart_prog; }
 };
 
 }