Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ewin-ops.c ewins.c 


Log Message:
Move function.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewin-ops.c  27 Apr 2005 22:03:43 -0000      1.25
+++ ewin-ops.c  28 Apr 2005 22:11:19 -0000      1.26
@@ -1287,53 +1287,6 @@
 }
 
 void
-MoveEwinToDesktop(EWin * ewin, int desk)
-{
-   MoveEwinToDesktopAt(ewin, desk, EoGetX(ewin), EoGetY(ewin));
-}
-
-void
-MoveEwinToDesktopAt(EWin * ewin, int desk, int x, int y)
-{
-   EWin              **lst;
-   int                 i, num;
-   int                 pdesk, dx, dy;
-
-   EoSetFloating(ewin, 0);
-
-#if 0
-   Eprintf("MoveEwinToDesktopAt: %#lx %d->%d\n", ewin->client.win,
-          EoGetDesk(ewin), desk);
-#endif
-
-   pdesk = ewin->ld;
-   desk = desk % Conf.desks.num;
-   EoSetDesk(ewin, desk);
-
-   if (desk != pdesk && !EoIsSticky(ewin))
-     {
-       SnapshotEwinUpdate(ewin, SNAP_USE_DESK);
-       if (pdesk >= 0)
-          ModulesSignal(ESIGNAL_DESK_CHANGE, (void *)pdesk);
-     }
-
-   dx = x - EoGetX(ewin);
-   dy = y - EoGetY(ewin);
-   EoSetX(ewin, x);
-   EoSetY(ewin, y);
-   EwinConformToDesktop(ewin);
-
-   lst = EwinListTransients(ewin, &num, 0);
-   for (i = 0; i < num; i++)
-      MoveEwinToDesktopAt(lst[i], desk, EoGetX(lst[i]) + dx,
-                         EoGetY(lst[i]) + dy);
-   if (lst)
-      Efree(lst);
-
-   ModulesSignal(ESIGNAL_DESK_CHANGE, (void *)desk);
-}
-
-void
 EwinOpClose(EWin * ewin)
 {
    EWin              **gwins;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewins.c     28 Apr 2005 22:01:53 -0000      1.48
+++ ewins.c     28 Apr 2005 22:11:21 -0000      1.49
@@ -878,8 +878,6 @@
        ShowEwin(ewin);
      }
 
-   EwinDetermineArea(ewin);
-
    ecore_x_ungrab();
 }
 
@@ -905,7 +903,6 @@
 #endif
 
    EwinConformToDesktop(ewin);
-   EwinDetermineArea(ewin);
 
    ecore_x_ungrab();
 
@@ -984,6 +981,53 @@
 }
 
 void
+MoveEwinToDesktop(EWin * ewin, int desk)
+{
+   MoveEwinToDesktopAt(ewin, desk, EoGetX(ewin), EoGetY(ewin));
+}
+
+void
+MoveEwinToDesktopAt(EWin * ewin, int desk, int x, int y)
+{
+   EWin              **lst;
+   int                 i, num;
+   int                 pdesk, dx, dy;
+
+   EoSetFloating(ewin, 0);
+
+#if 0
+   Eprintf("MoveEwinToDesktopAt: %#lx %d->%d\n", ewin->client.win,
+          EoGetDesk(ewin), desk);
+#endif
+
+   pdesk = ewin->ld;
+   desk = desk % Conf.desks.num;
+   EoSetDesk(ewin, desk);
+
+   if (desk != pdesk && !EoIsSticky(ewin))
+     {
+       SnapshotEwinUpdate(ewin, SNAP_USE_DESK);
+       if (pdesk >= 0)
+          ModulesSignal(ESIGNAL_DESK_CHANGE, (void *)pdesk);
+     }
+
+   dx = x - EoGetX(ewin);
+   dy = y - EoGetY(ewin);
+   EoSetX(ewin, x);
+   EoSetY(ewin, y);
+   EwinConformToDesktop(ewin);
+
+   lst = EwinListTransients(ewin, &num, 0);
+   for (i = 0; i < num; i++)
+      MoveEwinToDesktopAt(lst[i], desk, EoGetX(lst[i]) + dx,
+                         EoGetY(lst[i]) + dy);
+   if (lst)
+      Efree(lst);
+
+   ModulesSignal(ESIGNAL_DESK_CHANGE, (void *)desk);
+}
+
+void
 EwinReparent(EWin * ewin, Window parent)
 {
    EReparentWindow(ewin->client.win, parent, 0, 0);




-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start!  http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to