Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        emodule.h fx.c moveresize.c 


Log Message:
Allow waves etc. during opaque move/resize.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/emodule.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emodule.h   5 Jun 2005 11:27:40 -0000       1.6
+++ emodule.h   19 Jul 2005 22:33:18 -0000      1.7
@@ -59,10 +59,8 @@
    ESIGNAL_DESK_SWITCH_DONE,
    ESIGNAL_DESK_RESIZE,
    ESIGNAL_BACKGROUND_CHANGE,
-   ESIGNAL_MOVE_START,
-   ESIGNAL_MOVE_DONE,
-   ESIGNAL_RESIZE_START,
-   ESIGNAL_RESIZE_DONE,
+   ESIGNAL_ANIMATION_SUSPEND,
+   ESIGNAL_ANIMATION_RESUME,
    ESIGNAL_EWIN_CREATE,
    ESIGNAL_EWIN_DESTROY,
    ESIGNAL_EWIN_UNMAP,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- fx.c        16 Jul 2005 16:57:40 -0000      1.49
+++ fx.c        19 Jul 2005 22:33:19 -0000      1.50
@@ -955,10 +955,8 @@
      case ESIGNAL_DESK_SWITCH_DONE:
        FX_DeskChange();
        break;
-     case ESIGNAL_MOVE_START:
-     case ESIGNAL_MOVE_DONE:
-     case ESIGNAL_RESIZE_START:
-     case ESIGNAL_RESIZE_DONE:
+     case ESIGNAL_ANIMATION_SUSPEND:
+     case ESIGNAL_ANIMATION_RESUME:
        FX_Pause();
        break;
      }
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- moveresize.c        16 Jul 2005 16:57:43 -0000      1.45
+++ moveresize.c        19 Jul 2005 22:33:30 -0000      1.46
@@ -68,7 +68,6 @@
 #endif
 
    SoundPlay("SOUND_MOVE_START");
-   ModulesSignal(ESIGNAL_MOVE_START, NULL);
 
    if (grab)
      {
@@ -118,13 +117,7 @@
 
    ewin = mode_moveresize_ewin;
    if (!ewin)
-     {
-       if (Conf.movres.mode_move > 0)
-          EUngrabServer();
-       if (Mode.mode == MODE_MOVE)
-          Conf.movres.mode_move = move_mode_real;
-       return 0;
-     }
+      goto done;
 
    gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, Mode.nogroup
                                      || Mode.move.swap, &num);
@@ -158,18 +151,23 @@
                         ewin->shape_y - (EoGetY(d2) - EoGetY(d1)));
      }
 
+   Efree(gwins);
+
    ESync();
-   if (Conf.movres.mode_move > 0)
-      EUngrabServer();
 
-   Efree(gwins);
+ done:
+   Mode.mode = MODE_NONE;
    Conf.movres.mode_move = move_mode_real;
    Mode.nogroup = 0;
    Mode.move.swap = 0;
    Mode.have_place_grab = 0;
    Mode.place.doing_manual = 0;
 
-   ModulesSignal(ESIGNAL_MOVE_DONE, NULL);
+   if (Conf.movres.mode_move > 0)
+     {
+       EUngrabServer();
+       ModulesSignal(ESIGNAL_ANIMATION_RESUME, NULL);
+     }
 
    return 0;
 }
@@ -268,10 +266,12 @@
    mode_moveresize_ewin = ewin;
 
    SoundPlay("SOUND_RESIZE_START");
-   ModulesSignal(ESIGNAL_RESIZE_START, NULL);
 
    if (Conf.movres.mode_resize > 0)
-      EGrabServer();
+     {
+       EGrabServer();
+       ModulesSignal(ESIGNAL_ANIMATION_SUSPEND, NULL);
+     }
 
    if (grab)
      {
@@ -366,28 +366,29 @@
    if (ewin && ewin != mode_moveresize_ewin)
       return 0;
 
+   Mode.mode = MODE_NONE;
+
    GrabPointerRelease();
 
    SoundPlay("SOUND_RESIZE_STOP");
 
    ewin = mode_moveresize_ewin;
    if (!ewin)
-     {
-       if (Conf.movres.mode_resize > 0)
-          EUngrabServer();
-       return 0;
-     }
-   Mode.mode = MODE_NONE;
+      goto done;
+
    DrawEwinShape(ewin, Conf.movres.mode_resize, ewin->shape_x, ewin->shape_y,
                 ewin->client.w, ewin->client.h, 2);
    for (i = 0; i < ewin->border->num_winparts; i++)
       ewin->bits[i].no_expose = 1;
 
    ESync();
-   if (Conf.movres.mode_resize > 0)
-      EUngrabServer();
 
-   ModulesSignal(ESIGNAL_RESIZE_DONE, NULL);
+ done:
+   if (Conf.movres.mode_resize > 0)
+     {
+       EUngrabServer();
+       ModulesSignal(ESIGNAL_ANIMATION_RESUME, NULL);
+     }
 
    return 0;
 }
@@ -415,7 +416,10 @@
    if (Mode.mode == MODE_MOVE_PENDING)
      {
        if (Conf.movres.mode_move > 0)
-          EGrabServer();
+         {
+            EGrabServer();
+            ModulesSignal(ESIGNAL_ANIMATION_SUSPEND, NULL);
+         }
 
        for (i = 0; i < num; i++)
          {




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to