cleanups for screen_send_by action, no functional changes

SVN revision: 74038
This commit is contained in:
Mike Blumenkrantz 2012-07-18 06:52:43 +00:00
parent b528baa483
commit 17a2461427
1 changed files with 27 additions and 33 deletions

View File

@ -1676,43 +1676,37 @@ ACT_FN_GO(screen_send_to, )
ACT_FN_GO(screen_send_by, ) ACT_FN_GO(screen_send_by, )
{ {
E_Zone *zone; E_Zone *zone, *zone2;
int scr = 0;
zone = _e_actions_zone_get(obj); zone = _e_actions_zone_get(obj);
if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
if (zone) if (!zone) return;
if (!params) return;
errno = 0;
scr = strtol(params, NULL, 10);
if (errno) return;
if (eina_list_count(e_manager_list()) > 1)
{ {
if (params) scr += zone->container->num;
{ scr = scr % eina_list_count(e_manager_list());
int scr = 0; if (scr < 0) scr += eina_list_count(e_manager_list());
zone2 = e_util_container_zone_number_get(scr, 0);
if (sscanf(params, "%i", &scr) == 1) }
{ else
E_Zone *zone2 = NULL; {
scr += zone->num;
if (eina_list_count(e_manager_list()) > 1) scr = scr % eina_list_count(zone->container->zones);
{ if (scr < 0) scr += eina_list_count(zone->container->zones);
scr += zone->container->num; zone2 = e_util_container_zone_number_get(0, scr);
scr = scr % eina_list_count(e_manager_list()); }
if (scr < 0) scr += eina_list_count(e_manager_list()); if ((zone2) && (zone != zone2))
zone2 = e_util_container_zone_number_get(scr, 0); {
} ecore_x_pointer_warp(zone2->container->win,
else zone2->x + (zone2->w / 2),
{ zone2->y + (zone2->h / 2));
scr += zone->num; e_desk_last_focused_focus(e_desk_current_get(zone2));
scr = scr % eina_list_count(zone->container->zones);
if (scr < 0) scr += eina_list_count(zone->container->zones);
zone2 = e_util_container_zone_number_get(0, scr);
}
if ((zone2) && (zone != zone2))
{
ecore_x_pointer_warp(zone2->container->win,
zone2->x + (zone2->w / 2),
zone2->y + (zone2->h / 2));
e_desk_last_focused_focus(e_desk_current_get(zone2));
}
}
}
} }
} }