/*
* ion/ioncore/focus.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2008.
*
- * 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 <libmainloop/hooks.h>
/*EXTL_DOC
* Iterate over focus history until \var{iterfn} returns \code{false}.
- * The function itself returns \code{true} if it reaches the end of list
+ * The function is called in protected mode.
+ * This routine returns \code{true} if it reaches the end of list
* without this happening.
*/
EXTL_EXPORT
}
-static bool region_is_await(WRegion *reg)
+static bool region_is_parent(WRegion *reg, WRegion *aw)
{
- WRegion *aw=(WRegion*)await_watch.obj;
-
while(aw!=NULL){
if(aw==reg)
return TRUE;
}
+static bool region_is_await(WRegion *reg)
+{
+ return region_is_parent(reg, (WRegion*)await_watch.obj);
+}
+
+
+static bool region_is_focusnext(WRegion *reg)
+{
+ return region_is_parent(reg, ioncore_g.focus_next);
+}
+
+
/* Only keep await status if focus event is to an ancestor of the await
* region.
*/
*/
EXTL_SAFE
EXTL_EXPORT_MEMBER
-bool region_is_active(WRegion *reg)
+bool region_is_active(WRegion *reg, bool pseudoact_ok)
{
- return REGION_IS_ACTIVE(reg);
+ return (REGION_IS_ACTIVE(reg) ||
+ (pseudoact_ok && REGION_IS_PSEUDOACTIVE(reg)));
+}
+
+
+bool region_manager_is_focusnext(WRegion *reg)
+{
+ if(reg==NULL || ioncore_g.focus_next==NULL)
+ return FALSE;
+
+ if(reg==ioncore_g.focus_next)
+ return TRUE;
+
+ return region_manager_is_focusnext(REGION_MANAGER(reg));
}
if(REGION_IS_ACTIVE(reg) || REGION_IS_PSEUDOACTIVE(reg))
return TRUE;
-
- if(region_is_await(reg))
+
+ if(region_is_await(reg) || region_is_focusnext(reg))
+ return TRUE;
+
+ if(region_manager_is_focusnext(reg))
return TRUE;
return FALSE;