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

diff --git a/src/openbox.hh b/src/openbox.hh
index 163b9132..e718dd25 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)
@@ -229,6 +223,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; }
 };
 
 }