X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=b5956e46e86e0b3846114a3518f9ea9dd51b6cf9;hb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;hp=976a49774ed2261cc51370d147d6accc3c812a9f;hpb=2ae2b257d39ea62640c2590f794e4275c6db1cd4;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 976a4977..b5956e46 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -30,6 +30,7 @@ namespace ob {
 class OBScreen;
 class OBClient;
 class OBActions;
+class OBBindings;
 
 //! Mouse cursors used throughout Openbox
 struct Cursors {
@@ -121,6 +122,9 @@ private:
   //! The action interface through which all user-available actions occur
   OBActions *_actions;
 
+  //! The interface through which keys/buttons are grabbed and handled
+  OBBindings *_bindings;
+
   //! Run the application in synchronous mode? (for debugging)
   bool _sync;
 
@@ -133,9 +137,6 @@ private:
   //! When set to true, the Openbox::eventLoop function will stop and return
   bool _doshutdown;
 
-  //! The configuration of the application. TEMPORARY
-  otk::Configuration _config;
-
   //! The client with input focus
   /*!
     Updated by the clients themselves.
@@ -184,6 +185,9 @@ public:
   //! Returns the otk::OBProperty instance for the window manager
   inline const otk::OBProperty *property() const { return _property; }
 
+  //! Returns the OBBinding 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());
@@ -237,6 +241,8 @@ public:
     manager can be destroyed.
   */
   inline void shutdown() { _doshutdown = true; }
+
+  bool getConfigString(const char *name, std::string *value);
 };
 
 }