Imported Upstream version 20090110

[ion3.git] / ioncore / screen-notify.c

diff --git a/ioncore/screen-notify.c b/ioncore/screen-notify.c
index e65208af3a356ffc279b4ccf2cfd4b3bda234912..769b5a3ec6f949cad08697d7959184847fc69472 100644 (file)
--- a/ioncore/screen-notify.c
+++ b/ioncore/screen-notify.c
@@ -1,12 +1,9 @@
 /*
  * ion/ioncore/screen-notify.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #include <string.h>
@@ -44,7 +41,8 @@ static WInfoWin *do_get_notifywin(WScreen *scr, Watch *watch, uint pos,
         param.flags=(MPLEX_ATTACH_UNNUMBERED|
                      MPLEX_ATTACH_SIZEPOLICY|
                      MPLEX_ATTACH_GEOM|
-                     MPLEX_ATTACH_LEVEL);
+                     MPLEX_ATTACH_LEVEL|
+                     MPLEX_ATTACH_PASSIVE);
         param.level=STACKING_LEVEL_ON_TOP;
         
         param.geom.x=0;
@@ -377,11 +375,13 @@ void screen_managed_notify(WScreen *scr, WRegion *reg, WRegionNotify how)
 void ioncore_screen_activity_notify(WRegion *reg, WRegionNotify how)
 {
     if(how==ioncore_g.notifies.activity){
+        screen_update_notifywin(region_screen_of(reg));
+    }else if(how==ioncore_g.notifies.name){
         WScreen *scr=region_screen_of(reg);
-        
-        screen_update_infowin(scr);
-        screen_update_notifywin(scr);
-
+        if(region_is_activity(reg))
+            screen_update_notifywin(scr);
+        if((WRegion*)scr==REGION_MANAGER(reg))
+            screen_do_update_infowin(scr);
     }
 }