fix bug where destroying the wrong windows in BlackboxWindow::positionButtons.

[chaz/openbox] / src / blackbox.hh

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 0545bcc870495280110ccd5c2b15d64398457011..a54346248e434430ec51bdaabe0b66307e709d04 100644 (file)
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -26,7 +26,6 @@
 
 extern "C" {
 #include <X11/Xlib.h>
-#include <X11/Xresource.h>
 
 #ifdef    HAVE_STDIO_H
 # include <stdio.h>
@@ -50,6 +49,7 @@ extern "C" {
 
 #include "i18n.hh"
 #include "BaseDisplay.hh"
+#include "Configuration.hh"
 #include "Timer.hh"
 
 #define AttribShaded      (1l << 0)
@@ -113,6 +113,7 @@ private:
     int colors_per_channel;
     timeval auto_raise_delay;
     unsigned long cache_life, cache_max;
+    std::string titlebar_layout;
   } resource;
 
   typedef std::map<Window, BlackboxWindow*> WindowLookup;
@@ -144,6 +145,7 @@ private:
   BScreen *active_screen;
   BlackboxWindow *focused_window;
   BTimer *timer;
+  Configuration config;
 
   bool no_focus, reconfigure_wait, reread_menu_wait;
   Time last_time;
@@ -195,7 +197,6 @@ private:
 
   void load_rc(void);
   void save_rc(void);
-  void reload_rc(void);
   void real_rereadMenu(void);
   void real_reconfigure(void);
 
@@ -228,6 +229,7 @@ public:
 
   inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
 
+  inline Configuration *getConfig() { return &config; }
   inline const Time &getDoubleClickInterval(void) const
   { return resource.double_click_interval; }
   inline const Time &getLastTime(void) const { return last_time; }
@@ -240,6 +242,9 @@ public:
   inline int getColorsPerChannel(void) const
     { return resource.colors_per_channel; }
 
+  inline std::string getTitlebarLayout(void) const
+    { return resource.titlebar_layout; }
+
   inline const timeval &getAutoRaiseDelay(void) const
     { return resource.auto_raise_delay; }
 
@@ -261,7 +266,6 @@ public:
 
   void setFocusedWindow(BlackboxWindow *w);
   void shutdown(void);
-  void load_rc(BScreen *screen);
   void saveStyleFilename(const std::string& filename);
   void addMenuTimestamp(const std::string& filename);
   void restart(const char *prog = 0);