X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ioncore%2Ffocus.c;h=1ea72a71175ac48029767264a96236df2d9bfce0;hb=c6005c0b33000cd4c96228c523d915c012db54dd;hp=bbba50d1a66748e1cfb0d6aa30556c2f6d9b2260;hpb=df57861c962a50bfbf57f276d288395fe0c6a4b6;p=ion3.git diff --git a/ioncore/focus.c b/ioncore/focus.c index bbba50d..1ea72a7 100644 --- a/ioncore/focus.c +++ b/ioncore/focus.c @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -308,7 +308,7 @@ bool region_is_active(WRegion *reg, bool pseudoact_ok) } -static bool region_manager_is_focusnext(WRegion *reg) +bool region_manager_is_focusnext(WRegion *reg) { if(reg==NULL || ioncore_g.focus_next==NULL) return FALSE; @@ -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); }