and remove e_client_util_desk_visible.
Change-Id: Idbe4e96928282e57dc909f1c46387d9c7a344607
{
/* If a border was specified which should be excluded from the list
* (because it will be closed shortly for example), skip */
- if (e_client_util_ignored_get(cec) || (!e_client_util_desk_visible(cec, desk))) continue;
+ if (e_client_util_ignored_get(cec) || (!e_desk_has_ec(desk, cec))) continue;
if (!evas_object_visible_get(cec->frame)) continue;
if (e_policy_client_is_cursor(cec)) continue;
if ((exclude) && (cec == exclude)) continue;
{
/* If a border was specified which should be excluded from the list
* (because it will be closed shortly for example), skip */
- if (e_client_util_ignored_get(cec) || (!e_client_util_desk_visible(cec, desk))) continue;
+ if (e_client_util_ignored_get(cec) || (!e_desk_has_ec(desk, cec))) continue;
if (!evas_object_visible_get(cec->frame)) continue;
if (e_policy_client_is_cursor(cec)) continue;
if ((exclude) && (cec == exclude)) continue;
#else
zone = e_comp_zone_find_by_ec(ec);
if ((!ec->input_only) && (!ec->iconic) &&
- ((!zone) || e_client_util_desk_visible(ec, e_desk_current_get(zone))) &&
+ ((!zone) || e_desk_has_ec(e_desk_current_get(zone), ec)) &&
((ec->take_focus) || (ec->want_focus)))
{
ec->take_focus = 0;
return ec->override || ec->input_only || ec->ignored;
}
-static inline Eina_Bool
-e_client_util_desk_visible(const E_Client *ec, const E_Desk *desk)
-{
- if (!ec) return EINA_FALSE;
- return !ec->desk || ec->sticky || (ec->desk == desk);
-}
-
static inline Ecore_Window
e_client_util_pwin_get(const E_Client *ec)
{
}
EINTERN E_Client *
-e_desk_client_top_visible_get(const E_Desk *desk)
+e_desk_client_top_visible_get(E_Desk *desk)
{
E_Client *ec;
E_OBJECT_TYPE_CHECK_RETURN(desk, E_DESK_TYPE, NULL);
E_CLIENT_REVERSE_FOREACH(ec)
- if (e_client_util_desk_visible(ec, desk) && evas_object_visible_get(ec->frame)) return ec;
+ if (e_desk_has_ec(desk, ec) && evas_object_visible_get(ec->frame)) return ec;
return NULL;
}
EINTERN void e_desk_name_update(void);
EINTERN void e_desk_show(E_Desk *desk);
EINTERN void e_desk_deskshow(E_Zone *zone);
-EINTERN E_Client *e_desk_client_top_visible_get(const E_Desk *desk);
+EINTERN E_Client *e_desk_client_top_visible_get(E_Desk *desk);
E_API E_Desk *e_desk_current_get(E_Zone *zone);
EINTERN E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y);
EINTERN E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos);
E_CLIENT_REVERSE_FOREACH(ec)
{
zone = e_comp_zone_find_by_ec(ec);
- if ((!e_client_util_ignored_get(ec)) && e_client_util_desk_visible(ec, e_desk_current_get(zone)))
+ if ((!e_client_util_ignored_get(ec)) && e_desk_has_ec(e_desk_current_get(zone), ec))
{
ec->want_focus = ec->take_focus = 1;
break;
E_CLIENT_REVERSE_FOREACH(ec)
{
if (e_client_util_ignored_get(ec)) continue;
- if (!e_client_util_desk_visible(ec, desk)) continue;
+ if (!e_desk_has_ec(desk, ec)) continue;
if (!evas_object_visible_get(ec->frame)) continue;
if ((launcher) && (launcher->ec == ec))