summaryrefslogtreecommitdiff
path: root/src/openbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/openbox.cc')
-rw-r--r--src/openbox.cc12
1 files changed, 4 insertions, 8 deletions
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();
}
}