xeventhandler can handle everything except client messages now.

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index a845431aee4e297c52492d0a3dc73f27a2b78730..a6a0b9f88d33aa557dff4527d572be245b06eb72 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -107,7 +107,7 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc)
                                            S_IRGRP | S_IWGRP | S_IXGRP |
                                            S_IROTH | S_IWOTH | S_IXOTH);
   
-  if (! rc) rc = "~/.openbox/rc";
+  if (! rc) rc = "~/.openbox/rc3";
   rc_file = expandTilde(rc);
   config.setFile(rc_file);  
 
@@ -158,7 +158,9 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc)
 
   reconfigure_wait = False;
 
-  timer = new BTimer(this, this);
+  timer = new otk::OBTimer(Openbox::instance->timerManager(),
+                           (otk::OBTimeoutHandler)timeout,
+                           this);
   timer->setTimeout(0l);
 }
 
@@ -1130,7 +1132,7 @@ void Blackbox::reconfigure(void) {
 
   reconfigure_wait = True;
 
-  if (! timer->isTiming()) timer->start();
+  if (! timer->timing()) timer->start();
 }
 
 
@@ -1151,11 +1153,11 @@ void Blackbox::saveStyleFilename(const string& filename) {
 }
 
 
-void Blackbox::timeout(void) {
-  if (reconfigure_wait)
-    real_reconfigure();
+void Blackbox::timeout(Blackbox *t) {
+  if (t->reconfigure_wait)
+    t->real_reconfigure();
 
-  reconfigure_wait = False;
+  t->reconfigure_wait = False;
 }
 
 
@@ -1215,14 +1217,4 @@ void Blackbox::setFocusedWindow(BlackboxWindow *win) {
 }
 
 
-void Blackbox::addTimer(BTimer *timer) {
-  (void)timer;
-}
-
-
-void Blackbox::removeTimer(BTimer *timer) {
-  (void)timer;
-}
-
- 
 }