make close() and shade() private.

[chaz/openbox] / src / openbox.hh

diff --git a/src/openbox.hh b/src/openbox.hh
index 976a49774ed2261cc51370d147d6accc3c812a9f..c5dc3527e724cd0a9187ca2ca10d23e04c91865f 100644 (file)
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -6,10 +6,6 @@
   @brief The main class for the Openbox window manager
 */
 
-/*
-  cuz girls look soooo goood.. on the end of my DICK
-*/
-
 extern "C" {
 #include <X11/Xlib.h>
 }
@@ -30,6 +26,7 @@ namespace ob {
 class OBScreen;
 class OBClient;
 class OBActions;
+class OBBindings;
 
 //! Mouse cursors used throughout Openbox
 struct Cursors {
@@ -94,8 +91,12 @@ private:
   std::string _scriptfilepath;
   //! The display requested by the user, or null to use the DISPLAY env var
   char *_displayreq;
-  //! The value of argv[0], i.e. how this application was executed
-  char *_argv0;
+  //! The value of argv, i.e. how this application was executed
+  char **_argv;
+  //! Run the application in synchronous mode? (for debugging)
+  bool _sync;
+  //! Should Openbox run on a single screen or on all available screens?
+  bool _single;
 
   //! A list of all managed clients
   ClientMap _clients;
@@ -121,8 +122,8 @@ private:
   //! The action interface through which all user-available actions occur
   OBActions *_actions;
 
-  //! Run the application in synchronous mode? (for debugging)
-  bool _sync;
+  //! The interface through which keys/buttons are grabbed and handled
+  OBBindings *_bindings;
 
   //! The running state of the window manager
   RunState _state;
@@ -131,10 +132,15 @@ private:
   Cursors _cursors;
 
   //! When set to true, the Openbox::eventLoop function will stop and return
-  bool _doshutdown;
+  bool _shutdown;
 
-  //! The configuration of the application. TEMPORARY
-  otk::Configuration _config;
+  //! When set to true, and Openbox is about to exit, it will spawn a new
+  //! process
+  bool _restart;
+
+  //! If this contains anything, a restart will try to execute the program in
+  //! this variable, and will fallback to reexec'ing itself if that fails
+  std::string _restart_prog;
 
   //! The client with input focus
   /*!
@@ -184,6 +190,12 @@ public:
   //! Returns the otk::OBProperty instance for the window manager
   inline const otk::OBProperty *property() const { return _property; }
 
+  //! Returns the OBActions instance for the window manager
+  inline OBActions *actions() const { return _actions; }
+
+  //! Returns the OBBindings instance for the window manager
+  inline OBBindings *bindings() const { return _bindings; }
+
   //! Returns a managed screen
   inline OBScreen *screen(int num) {
     assert(num >= 0); assert(num < (signed)_screens.size());
@@ -236,7 +248,14 @@ public:
     Causes the Openbox::eventLoop function to stop looping, so that the window
     manager can be destroyed.
   */
-  inline void shutdown() { _doshutdown = true; }
+  inline void shutdown() { _shutdown = true; }
+
+  inline void restart(const std::string &bin = "") {
+    _shutdown = true; _restart = true; _restart_prog = bin;
+  }
+
+  //! Executes a command on a screen
+  void execute(int screen, const std::string &bin);
 };
 
 }