Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c main.c
Log Message:
Fix some initial desktop setup.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- desktops.c 25 Jul 2004 09:57:30 -0000 1.95
+++ desktops.c 3 Aug 2004 19:35:37 -0000 1.96
@@ -707,7 +707,8 @@
void
GotoDesktop(int desk)
{
- int x, y, pdesk;
+ static int pdesk = -1;
+ int x, y;
EDBUG(2, "GotoDesktop");
@@ -718,11 +719,9 @@
else if (desk < 0)
desk = Conf.desks.num - 1;
}
- if (desk < 0 || desk >= Conf.desks.num || desk == desks.current)
+ if (desk < 0 || desk >= Conf.desks.num || desk == pdesk)
EDBUG_RETURN_;
- pdesk = desks.current;
-
SlideoutsHide();
{
@@ -811,11 +810,14 @@
if (Mode.mode == MODE_DESKSWITCH)
Mode.mode = MODE_NONE;
- RedrawPagersForDesktop(pdesk, 0);
+ if (pdesk >= 0)
+ RedrawPagersForDesktop(pdesk, 0);
RedrawPagersForDesktop(desk, 3);
ForceUpdatePagersForDesktop(desk);
HandleDrawQueue();
+ pdesk = desks.current;
+
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- main.c 15 Jul 2004 16:46:06 -0000 1.99
+++ main.c 3 Aug 2004 19:35:37 -0000 1.100
@@ -234,7 +234,6 @@
ZoomInit();
SetupDirs();
InitDesktopBgs();
- GotoDesktop(0);
CommsSetup();
CommsFindCommsWindow();
LoadGroups();
@@ -314,6 +313,7 @@
/* let's make sure we set this up and go to our desk anyways */
GotoDesktop(desks.current);
+#if 0 /* Why? */
if (desks.current < (Conf.desks.num - 1))
{
char ps = 0;
@@ -342,6 +342,7 @@
if (!Conf.mapslide)
Conf.desks.slidein = ps;
}
+#endif
XSync(disp, False);
/* if we didn't have an external window piped to us, we'll do some stuff */
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
