Imported upstream version 20090526

[ion3.git] / ioncore / focus.c

diff --git a/ioncore/focus.c b/ioncore/focus.c
index ee3fd86ab796625077e6101b5b8460bdf2d9cc1b..1ea72a71175ac48029767264a96236df2d9bfce0 100644 (file)
--- a/ioncore/focus.c
+++ b/ioncore/focus.c
@@ -347,7 +347,7 @@ bool region_may_control_focus(WRegion *reg)
 /*Time ioncore_focus_time=CurrentTime;*/
 
 
-void region_finalise_focusing(WRegion* reg, Window win, bool warp)
+void region_finalise_focusing(WRegion* reg, Window win, bool warp, Time time)
 {
     if(warp)
         region_do_warp(reg);
@@ -356,10 +356,7 @@ void region_finalise_focusing(WRegion* reg, Window win, bool warp)
         return;
     
     region_set_await_focus(reg);
-    /*xwindow_do_set_focus(win);*/
-    XSetInputFocus(ioncore_g.dpy, win, RevertToParent, 
-                   CurrentTime/*ioncore_focus_time*/);
-    /*ioncore_focus_time=CurrentTime;*/
+    XSetInputFocus(ioncore_g.dpy, win, RevertToParent, time);
 }