got rid of premade funcs

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 1d4a4ec05f46d2f8e47ebbb821d3cd3f1e33aad2..2d177d6937912192151c6f305d144e00bee69a5b 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -127,17 +127,18 @@ void OtkEventDispatcher::dispatchEvents(void)
   } else if (focus != None) {
     // the last focus event was a FocusIn, so unfocus what used to be focus and
     // focus this new target
+//    printf("FOCUSING: %lx\n", focus);
+    _focus_e.xfocus.type = FocusIn;
+    _focus_e.xfocus.window = focus;
+    dispatch(_focus_e);
+
     if (_focus != None) {
 //      printf("UNFOCUSING: %lx\n", _focus);
       _focus_e.xfocus.type = FocusOut;
       _focus_e.xfocus.window = _focus;
       dispatch(_focus_e);
     }
-//    printf("FOCUSING: %lx\n", focus);
-    _focus_e.xfocus.type = FocusIn;
-    _focus_e.xfocus.window = focus;
-    dispatch(_focus_e);
-
+    
     _focus = focus;
   }
   
@@ -159,6 +160,9 @@ void OtkEventDispatcher::dispatch(const XEvent &e) {
   OtkEventHandler *handler;
   OtkEventMap::iterator it;
 
+  if (_master)
+    _master->handle(e);
+
   it = _map.find(e.xany.window);
   
   if (it != _map.end())
@@ -168,9 +172,6 @@ void OtkEventDispatcher::dispatch(const XEvent &e) {
 
   if (handler)
     handler->handle(e);
-
-  if (_master)
-    _master->handle(e);
 }
 
 OtkEventHandler *OtkEventDispatcher::findHandler(Window win)