Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c
Log Message:
Fix missing return and bug in desk wrap-around.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -3 -r1.196 -r1.197
--- desktops.c 30 Oct 2005 19:40:49 -0000 1.196
+++ desktops.c 10 Nov 2005 00:09:35 -0000 1.197
@@ -1047,7 +1047,7 @@
if (Conf.desks.desks_wraparound)
desk %= Conf.desks.num;
- if (desk >= Conf.desks.num || desk == desks.previous->num)
+ if (desk >= Conf.desks.num || desk == desks.current->num)
return;
dsk = _DeskGet(desk);
@@ -1079,9 +1079,10 @@
DeskGoto(Desk * dsk)
{
if (!dsk || dsk == desks.previous)
+ return;
- if (EventDebug(EDBUG_TYPE_DESKS))
- Eprintf("DeskGoto %d\n", dsk->num);
+ if (EventDebug(EDBUG_TYPE_DESKS))
+ Eprintf("DeskGoto %d\n", dsk->num);
ModulesSignal(ESIGNAL_DESK_SWITCH_START, NULL);
@@ -2223,8 +2224,6 @@
Desk *dsk;
Desk *pd = DesksGetCurrent();
- if (Conf.desks.desks_wraparound)
- desk %= Conf.desks.num;
if (desk >= Conf.desks.num)
return;
@@ -2239,7 +2238,13 @@
static void
DeskOpGotoRel(int drel)
{
- DeskOpGoto(DesksGetCurrentNum() + drel);
+ int desk;
+
+ desk = (int)DesksGetCurrentNum() + drel;
+ if (Conf.desks.desks_wraparound)
+ desk = (desk + Conf.desks.num) % Conf.desks.num;
+
+ DeskOpGoto((unsigned int)desk);
}
static void
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
