Imported Upstream version 20090110

[ion3.git] / ioncore / eventh.c

diff --git a/ioncore/eventh.c b/ioncore/eventh.c
index bba225ca48a5f2427708fc46cd58a9c43f703b1c..861007f4b06eb3da7564797025408f39a993be1b 100644 (file)
--- a/ioncore/eventh.c
+++ b/ioncore/eventh.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/eventh.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -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;