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

[ion3.git] / ioncore / focus.c

diff --git a/ioncore/focus.c b/ioncore/focus.c
index c25ec716ff1750906c2a9ad50927eccca32f0cb9..b2341ab403b5cd99a65220b8c88e73a894473cf1 100644 (file)
--- a/ioncore/focus.c
+++ b/ioncore/focus.c
@@ -328,6 +328,9 @@ void region_finalise_focusing(WRegion* reg, Window win, bool warp)
     if(warp)
         region_do_warp(reg);
     
+    if(REGION_IS_ACTIVE(reg) && ioncore_await_focus()==NULL)
+        return;
+    
     region_set_await_focus(reg);
     /*xwindow_do_set_focus(win);*/
     XSetInputFocus(ioncore_g.dpy, win, RevertToParent, 
@@ -388,6 +391,7 @@ void region_do_warp(WRegion *reg)
 void region_maybewarp(WRegion *reg, bool warp)
 {
     ioncore_g.focus_next=reg;
+    ioncore_g.focus_next_source=IONCORE_FOCUSNEXT_OTHER;
     ioncore_g.warp_next=(warp && ioncore_g.warp_enabled);
 }
 
@@ -396,7 +400,7 @@ void region_maybewarp_now(WRegion *reg, bool warp)
 {
     ioncore_g.focus_next=NULL;
     /* TODO: what if focus isn't set? Should focus_next be reset then? */
-    region_do_set_focus(reg, warp);
+    region_do_set_focus(reg, warp && ioncore_g.warp_enabled);
 }
 
 
@@ -450,34 +454,33 @@ WRegion *ioncore_current()
  */
 void region_pointer_focus_hack(WRegion *reg)
 {
-    WRegion *act=ioncore_await_focus();
-    const WRectangle *g=&REGION_GEOM(reg);
-    int x, y;
+    WRegion *act;
     
     if(ioncore_g.opmode!=IONCORE_OPMODE_NORMAL)
         return;
-    
-    if(!REGION_IS_ACTIVE(reg) && act==NULL)
-        act=ioncore_g.focus_current;
         
-    if(act==NULL || OBJ_IS_BEING_DESTROYED(act))
+    if(ioncore_g.focus_next!=NULL &&
+       ioncore_g.focus_next_source<=IONCORE_FOCUSNEXT_POINTERHACK){
         return;
-        
-    /* Ok, anything under us should not get focus as we're unmapped:
-     * Either we don't have the focus, or focus change somewhere else
-     * is pending.
-     *
-     * It might be possible to do the pointer check more efficiently
-     * by trying to maintain our internal pointer containment state
-     * by tracking Enter/Leave events...
-     */
+    }
     
-    xwindow_pointer_pos(region_xwindow(reg), &x, &y);
+    act=ioncore_await_focus();
     
-    if(x>=0 && y>=0 && x<g->w && y<g->h){
-        D(fprintf(stderr, "Pointer here and shouldn't alter focus!\n"));
-        region_set_focus(act);
+    if((REGION_IS_ACTIVE(reg) && act==NULL) || !region_is_fully_mapped(reg))
+        return;
+    
+    if(act==NULL)
+        act=ioncore_g.focus_current;
+    
+    if(act==NULL || 
+       OBJ_IS_BEING_DESTROYED(act) || 
+       !region_is_fully_mapped(act) ||
+       region_skip_focus(act)){
+        return;
     }
+
+    region_set_focus(act);
+    ioncore_g.focus_next_source=IONCORE_FOCUSNEXT_POINTERHACK;
 }