more layout fixes for the decoration elements

[chaz/openbox] / src / blackbox.hh

diff --git a/src/blackbox.hh b/src/blackbox.hh
index acce7b8ba2fb521a2e48a0fe27fac3e4d38af447..42ddeabbd2778d9129d319c498aa0c63bddfc624 100644 (file)
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -25,10 +25,11 @@ extern "C" {
 #include <map>
 #include <string>
 
-#include "basedisplay.hh"
-#include "configuration.hh"
+#include "otk/timer.hh"
+#include "otk/property.hh"
+#include "openbox.hh"
+#include "otk/configuration.hh"
 #include "timer.hh"
-#include "xatom.hh"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -47,6 +48,8 @@ extern "C" {
 #define DecorTiny         (2)
 #define DecorTool         (3)
 
+namespace ob {
+
 struct BlackboxHints {
   unsigned long flags, attrib, workspace, stack, decoration;
 };
@@ -67,7 +70,7 @@ class Blackbox;
 class BlackboxWindow;
 class BWindowGroup;
 
-class Blackbox : public BaseDisplay, public TimeoutHandler {
+class Blackbox : public Openbox {
 private:
   struct BCursor {
     Cursor session, move, ll_angle, lr_angle, ul_angle, ur_angle;
@@ -107,9 +110,9 @@ private:
 
   BScreen *active_screen;
   BlackboxWindow *focused_window, *changing_window;
-  BTimer *timer;
-  Configuration config;
-  XAtom *xatom;
+  otk::OBTimer *timer;
+  otk::Configuration config;
+  otk::OBProperty *xatom;
 
   bool no_focus, reconfigure_wait;
   Time last_time;
@@ -127,7 +130,7 @@ private:
 
 
 public:
-  Blackbox(char **m_argv, char *dpy_name = 0, char *rc = 0);
+  Blackbox(int argc, char **m_argv, char *rc = 0);
   virtual ~Blackbox(void);
 
   BWindowGroup *searchGroup(Window window);
@@ -155,12 +158,12 @@ public:
   void removeWindowSearch(Window window);
   void removeGroupSearch(Window window);
 
-  inline XAtom *getXAtom(void) { return xatom; }
+  inline otk::OBProperty *getXAtom(void) { return xatom; }
 
   inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
   inline BlackboxWindow *getChangingWindow(void) { return changing_window; }
 
-  inline Configuration *getConfig() { return &config; }
+  inline otk::Configuration *getConfig() { return &config; }
   inline const Time &getDoubleClickInterval(void) const
   { return resource.double_click_interval; }
   inline const Time &getLastTime(void) const { return last_time; }
@@ -211,10 +214,11 @@ public:
 
   virtual bool handleSignal(int sig);
 
-  virtual void timeout(void);
+  static void timeout(Blackbox *t);
 
   enum { B_AmericanDate = 1, B_EuropeanDate };
 };
 
+}
 
 #endif // __blackbox_hh