Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c
Log Message:
no loops.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_actions.c 16 Jun 2006 09:37:32 -0000 1.69
+++ e_actions.c 17 Jun 2006 03:29:54 -0000 1.70
@@ -923,14 +923,20 @@
if (sscanf(params, "%i", &scr) == 1)
{
- E_Zone *zone2;
+ E_Zone *zone2 = NULL;
- while (scr >= zone->container->num) scr -=
zone->container->num;
- while (scr < 0) scr += zone->container->num;
- if (evas_list_count(e_manager_list()) > 1)
- zone2 = e_util_container_zone_number_get(scr, 0);
+ if (evas_list_count(e_manager_list()) > 1)
+ {
+ scr = scr % evas_list_count(e_manager_list());
+ if (scr < 0) scr += evas_list_count(e_manager_list());
+ zone2 = e_util_container_zone_number_get(scr, 0);
+ }
else
- zone2 = e_util_container_zone_number_get(0, scr);
+ {
+ scr = scr % evas_list_count(zone->container->zones);
+ if (scr < 0) scr +=
evas_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),
@@ -954,20 +960,20 @@
if (sscanf(params, "%i", &scr) == 1)
{
- E_Zone *zone2;
+ E_Zone *zone2 = NULL;
- if (evas_list_count(e_manager_list()) > 1)
+ if (evas_list_count(e_manager_list()) > 1)
{
scr += zone->container->num;
- while (scr >= zone->container->num) scr -=
zone->container->num;
- while (scr < 0) scr += zone->container->num;
+ scr = scr % evas_list_count(e_manager_list());
+ if (scr < 0) scr += evas_list_count(e_manager_list());
zone2 = e_util_container_zone_number_get(scr, 0);
}
else
{
- scr += zone->num;
- while (scr >= zone->num) scr -= zone->num;
- while (scr < 0) scr += zone->num;
+ scr += zone->num;
+ scr = scr % evas_list_count(zone->container->zones);
+ if (scr < 0) scr +=
evas_list_count(zone->container->zones);
zone2 = e_util_container_zone_number_get(0, scr);
}
if ((zone2) && (zone != zone2))
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
