[svn-upgrade] Integrating new upstream version, ion3 (20080207)

[ion3.git] / ioncore / eventh.c

diff --git a/ioncore/eventh.c b/ioncore/eventh.c
index 011093ba3e05ebcca558b7ec3c7f891c6ce37330..572ab91073f7582a0ebe009f308085cddd192e18 100644 (file)
--- a/ioncore/eventh.c
+++ b/ioncore/eventh.c
@@ -307,8 +307,10 @@ void ioncore_handle_enter_window(XEvent *ev)
     XEnterWindowEvent *eev=&(ev->xcrossing);
     WRegion *reg=NULL;
     
-    if(ioncore_g.input_mode!=IONCORE_INPUTMODE_NORMAL)
+    if(ioncore_g.input_mode!=IONCORE_INPUTMODE_NORMAL ||
+       ioncore_g.no_mousefocus){
         return;
+    }
         
     if(eev->mode!=NotifyNormal && !ioncore_g.warp_enabled)
         return;