allow style options in the rc file to override those found in the style

[chaz/openbox] / src / blackbox.hh

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 055f7761972a543b5dc239cb2bbe7c301579e812..3a9986afaab1e6b500688d46c89d05ca869d5670 100644 (file)
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -51,6 +51,7 @@ extern "C" {
 #include "BaseDisplay.hh"
 #include "Configuration.hh"
 #include "Timer.hh"
+#include "XAtom.hh"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -91,8 +92,6 @@ class BWindowGroup;
 class Basemenu;
 class Toolbar;
 class Slit;
-class XAtom;
-class BInput;
 
 extern I18n i18n;
 
@@ -153,7 +152,6 @@ private:
   BTimer *timer;
   Configuration config;
   XAtom *xatom;
-  BInput *input;
 
   bool no_focus, reconfigure_wait, reread_menu_wait;
   Time last_time;
@@ -200,9 +198,7 @@ public:
   void removeSlitSearch(Window window);
 
   inline XAtom *getXAtom(void) { return xatom; }
-  inline BInput *getInput(void) { return input; }
-  
-  inline BScreen *getFocusedScreen(void) { return active_screen; }
+
   inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
   inline BlackboxWindow *getChangingWindow(void) { return changing_window; }