handle mouse motion too

[chaz/openbox] / src / blackbox.hh

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 818a7842426a5f2383d82655bda197edda53a8c9..42ddeabbd2778d9129d319c498aa0c63bddfc624 100644 (file)
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -25,10 +25,11 @@ extern "C" {
 #include <map>
 #include <string>
 
+#include "otk/timer.hh"
+#include "otk/property.hh"
 #include "openbox.hh"
-#include "configuration.hh"
+#include "otk/configuration.hh"
 #include "timer.hh"
-#include "xatom.hh"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -69,7 +70,7 @@ class Blackbox;
 class BlackboxWindow;
 class BWindowGroup;
 
-class Blackbox : public Openbox, public TimeoutHandler, public TimerQueueManager  {
+class Blackbox : public Openbox {
 private:
   struct BCursor {
     Cursor session, move, ll_angle, lr_angle, ul_angle, ur_angle;
@@ -81,7 +82,7 @@ private:
 
     std::string style_file;
     int colors_per_channel;
-    ::timeval auto_raise_delay;
+    timeval auto_raise_delay;
     unsigned long cache_life, cache_max;
     std::string titlebar_layout;
     unsigned int mod_mask;  // modifier mask used for window-mouse interaction
@@ -109,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;
@@ -157,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; }
@@ -176,7 +177,7 @@ public:
   inline std::string getTitlebarLayout(void) const
     { return resource.titlebar_layout; }
 
-  inline const ::timeval &getAutoRaiseDelay(void) const
+  inline const timeval &getAutoRaiseDelay(void) const
     { return resource.auto_raise_delay; }
 
   inline unsigned long getCacheLife(void) const
@@ -213,12 +214,9 @@ public:
 
   virtual bool handleSignal(int sig);
 
-  virtual void timeout(void);
+  static void timeout(Blackbox *t);
 
   enum { B_AmericanDate = 1, B_EuropeanDate };
-
-  virtual void addTimer(BTimer *timer);
-  virtual void removeTimer(BTimer *timer);
 };
 
 }