X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=80622c1c426aee4bc80796c818994dea3b081ff7;hb=a77f0fb344978bb4dafd2ad4639f3de3e090bf7b;hp=93570c8cf9e37f59ff80c9ced4aca55ed1318538;hpb=24dd636f7318b0d21637aa7ffe253fe0ebf71f24;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 93570c8c..80622c1c 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -74,6 +74,8 @@ void Openbox::signalHandler(int signal)
 
 
 Openbox::Openbox(int argc, char **argv)
+  : otk::OtkEventDispatcher(),
+    otk::OtkEventHandler()
 {
   struct sigaction action;
 
@@ -244,14 +246,8 @@ void Openbox::showHelp()
 void Openbox::eventLoop()
 {
   while (!_doshutdown) {
-    if (XPending(otk::OBDisplay::display)) {
-      XEvent e;
-      XNextEvent(otk::OBDisplay::display, &e);
-      //process_event(&e);
-      _xeventhandler.handle(e);
-    } else {
-      _timermanager.fire();
-    }
+    dispatchEvents(); // from OtkEventDispatcher
+    _timermanager.fire();
   }
 }
 
@@ -284,5 +280,6 @@ OBClient *Openbox::findClient(Window window)
     return (OBClient*) 0;
 }
 
+
 }