Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c desktops.c stacking.c
Log Message:
Fix initial window stacking if not on desk 0 + trivial stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -3 -r1.292 -r1.293
--- E.h 27 Jun 2004 22:30:52 -0000 1.292
+++ E.h 28 Jun 2004 18:21:57 -0000 1.293
@@ -2632,7 +2632,7 @@
extern EWinList EwinListFocus;
extern EWinList EwinListStack;
int EwinListGetIndex(EWinList * ewl, EWin * ewin);
-void EwinListAdd(EWinList * ewl, EWin * ewin);
+void EwinListAdd(EWinList * ewl, EWin * ewin, int ontop);
void EwinListDelete(EWinList * ewl, EWin * ewin);
int EwinListRaise(EWinList * ewl, EWin * ewin, int mode);
int EwinListLower(EWinList * ewl, EWin * ewin, int mode);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- borders.c 27 Jun 2004 20:24:25 -0000 1.199
+++ borders.c 28 Jun 2004 18:21:59 -0000 1.200
@@ -1366,8 +1366,8 @@
CWEventMask | CWDontPropagate, &att);
FocusEwinSetGrabs(ewin);
GrabButtonGrabs(ewin);
- EwinListAdd(&EwinListStack, ewin);
- EwinListAdd(&EwinListFocus, ewin);
+ EwinListAdd(&EwinListStack, ewin, 0);
+ EwinListAdd(&EwinListFocus, ewin, 0);
ewin->client.win = win;
ewin->client.event_mask = EWIN_CLIENT_EVENT_MASK;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- desktops.c 19 Jun 2004 01:31:20 -0000 1.91
+++ desktops.c 28 Jun 2004 18:22:02 -0000 1.92
@@ -76,7 +76,7 @@
int num, i;
blst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 1);
- if ((blst) && (num > 0))
+ if (blst)
{
for (i = 0; i < num; i++)
ButtonShow(blst[i]);
@@ -92,7 +92,7 @@
int num, i;
blst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 2);
- if ((blst) && (num > 0))
+ if (blst)
{
for (i = 0; i < num; i++)
ButtonShow(blst[i]);
@@ -108,7 +108,7 @@
int num, i;
blst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 2);
- if ((blst) && (num > 0))
+ if (blst)
{
for (i = 0; i < num; i++)
ButtonHide(blst[i]);
@@ -626,7 +626,7 @@
EReparentWindow(disp, ewin->win, desks.desk[ewin->desktop].win, ewin->x,
ewin->y);
ICCCM_Configure(ewin);
- StackDesktops();
+ StackDesktop(ewin->desktop);
}
else if (ewin->floating)
{
@@ -648,7 +648,7 @@
EwinListStackingRaise(ewin);
EReparentWindow(disp, ewin->win, desks.desk[ewin->desktop].win, ewin->x,
ewin->y);
- StackDesktops();
+ StackDesktop(ewin->desktop);
MoveEwin(ewin, ewin->x, ewin->y);
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/stacking.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- stacking.c 22 May 2004 20:19:50 -0000 1.11
+++ stacking.c 28 Jun 2004 18:22:04 -0000 1.12
@@ -68,7 +68,7 @@
}
void
-EwinListAdd(EWinList * ewl, EWin * ewin)
+EwinListAdd(EWinList * ewl, EWin * ewin, int ontop)
{
int i;
@@ -83,8 +83,15 @@
ewl->list = (EWin **) Erealloc(ewl->list, ewl->nalloc * sizeof(EWin *));
}
- /* Add to end */
- ewl->list[ewl->nwins] = ewin;
+ if (ontop)
+ {
+ memmove(ewl->list + 1, ewl->list, ewl->nwins * sizeof(EWin *));
+ ewl->list[0] = ewin;
+ }
+ else
+ {
+ ewl->list[ewl->nwins] = ewin;
+ }
ewl->nwins++;
EwinListShow("EwinListAdd", ewl);
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
