X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=0c534a0f18df6f92018ecbca527bd46040a86a90;hb=fb3848450e649a05c0bed84a02bc9ab4e563b5d9;hp=93570c8cf9e37f59ff80c9ced4aca55ed1318538;hpb=fac1a6581b65b91eba3024d813a393e04007e197;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 93570c8c..0c534a0f 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();
   }
 }