Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c
Log Message:
Simplify, remove unused code.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- desktops.c 8 Apr 2004 12:54:44 -0000 1.80
+++ desktops.c 8 Apr 2004 22:16:31 -0000 1.81
@@ -1109,11 +1109,7 @@
if ((ewin->iconified) && (ewin->parent != desks.desk[ewin->desktop].win))
{
ewin->parent = desks.desk[ewin->desktop].win;
-#if 0
- DesktopAddEwinToTop(ewin);
-#else
EwinListStackingRaise(ewin);
-#endif
EReparentWindow(disp, ewin->win, desks.desk[ewin->desktop].win, ewin->x,
ewin->y);
ICCCM_Configure(ewin);
@@ -1136,11 +1132,7 @@
else if (ewin->parent != desks.desk[ewin->desktop].win)
{
ewin->parent = desks.desk[ewin->desktop].win;
-#if 0
- DesktopAddEwinToTop(ewin);
-#else
EwinListStackingRaise(ewin);
-#endif
EReparentWindow(disp, ewin->win, desks.desk[ewin->desktop].win, ewin->x,
ewin->y);
StackDesktops();
@@ -1698,84 +1690,33 @@
void
MoveEwinToDesktop(EWin * ewin, int desk)
{
- int pdesk;
-
- EDBUG(3, "MoveEwinToDesktop");
-/* ewin->sticky = 0; */
- ewin->floating = 0;
- pdesk = ewin->desktop;
- ewin->desktop = DESKTOPS_WRAP_NUM(desk);
- ConformEwinToDesktop(ewin);
- if (ewin->has_transients)
- {
- EWin **lst;
- int i, nn;
-
- lst = ListTransientsFor(ewin->client.win, &nn);
- if (lst)
- {
- for (i = 0; i < nn; i++)
- {
- MoveEwinToDesktop(lst[i], desk);
- }
- Efree(lst);
- }
- }
- ForceUpdatePagersForDesktop(pdesk);
- ForceUpdatePagersForDesktop(ewin->desktop);
- EDBUG_RETURN_;
+ MoveEwinToDesktopAt(ewin, desk, ewin->x, ewin->y);
}
-#if 0
-void
-DesktopAddEwinToTop(EWin * ewin)
-{
- EDBUG(5, "DesktopAddEwinToTop");
-
- if ((ewin->desktop < 0)
- || (ewin->desktop > ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1))
- EDBUG_RETURN_;
-
- EwinListStackingRaise(ewin);
- ForceUpdatePagersForDesktop(ewin->desktop);
-
- EDBUG_RETURN_;
-}
-
-void
-DesktopAddEwinToBottom(EWin * ewin)
-{
- EDBUG(5, "DesktopAddEwinToBottom");
-
- if ((ewin->desktop < 0)
- || (ewin->desktop > ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1))
- EDBUG_RETURN_;
-
- EwinListStackingLower(ewin);
- ForceUpdatePagersForDesktop(ewin->desktop);
-
- EDBUG_RETURN_;
-}
-#endif
-
void
MoveEwinToDesktopAt(EWin * ewin, int desk, int x, int y)
{
+ int pdesk;
int dx, dy;
EDBUG(3, "MoveEwinToDesktopAt");
-/* ewin->sticky = 0; */
+
ewin->floating = 0;
- if (desk != ewin->desktop && !ewin->sticky)
+
+ pdesk = ewin->desktop;
+ desk = DESKTOPS_WRAP_NUM(desk);
+ if (desk != pdesk && !ewin->sticky)
{
- ForceUpdatePagersForDesktop(ewin->desktop);
+ ForceUpdatePagersForDesktop(pdesk);
ewin->desktop = DESKTOPS_WRAP_NUM(desk);
}
+
dx = x - ewin->x;
dy = y - ewin->y;
ewin->x = x;
ewin->y = y;
ConformEwinToDesktop(ewin);
+
if (ewin->has_transients)
{
EWin **lst;
@@ -1792,7 +1733,9 @@
Efree(lst);
}
}
+
ForceUpdatePagersForDesktop(desk);
+
EDBUG_RETURN_;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
