Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c desktops.h focus.c moveresize.c
Log Message:
Fix non-opaque moves across desk switch. Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -3 -r1.198 -r1.199
--- desktops.c 19 Nov 2005 19:32:45 -0000 1.198
+++ desktops.c 19 Nov 2005 20:43:09 -0000 1.199
@@ -1054,7 +1054,7 @@
DeskGoto(dsk);
}
-void
+static void
DeskSwitchStart(void)
{
FocusNewDeskBegin();
@@ -1065,7 +1065,7 @@
DesksEventsConfigure(0);
}
-void
+static void
DeskSwitchDone(void)
{
/* we flipped - re-enable enter and leave events */
@@ -1139,8 +1139,8 @@
DeskEnter(dsk);
}
- ActionsResume();
DeskSwitchDone();
+ ActionsResume();
ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
}
@@ -1587,10 +1587,9 @@
/* set hints up for it */
HintsSetDesktopViewport();
- ActionsResume();
-
/* re-focus on a new ewin on that new desktop area */
DeskSwitchDone();
+ ActionsResume();
ModulesSignal(ESIGNAL_AREA_SWITCH_DONE, DesksGetCurrent());
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- desktops.h 19 Nov 2005 19:32:45 -0000 1.11
+++ desktops.h 19 Nov 2005 20:43:09 -0000 1.12
@@ -71,9 +71,6 @@
void DeskGotoByEwin(EWin * ewin);
-void DeskSwitchStart(void);
-void DeskSwitchDone(void);
-
unsigned int DesksGetNumber(void);
Desk *DesksGetCurrent(void);
Desk *DesktopAt(int x, int y);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- focus.c 15 Nov 2005 23:24:20 -0000 1.134
+++ focus.c 19 Nov 2005 20:43:09 -0000 1.135
@@ -501,7 +501,7 @@
/* Set the mouse-over window */
Mode.mouse_over_ewin = GetEwinByCurrentPointer();
- FocusToEWin(NULL, FOCUS_DESK_ENTER);
+ doFocusToEwin(NULL, FOCUS_DESK_ENTER);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- moveresize.c 19 Nov 2005 19:32:45 -0000 1.57
+++ moveresize.c 19 Nov 2005 20:43:09 -0000 1.58
@@ -197,8 +197,6 @@
/* If non opaque undraw our boxes */
if (Mode_mr.mode > 0)
{
- EUngrabServer();
-
lst =
ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, Mode.nogroup,
&num);
@@ -210,6 +208,8 @@
}
if (lst)
Efree(lst);
+
+ EUngrabServer();
}
return 0;
@@ -220,7 +220,7 @@
{
EWin *ewin, **lst;
int i, num;
- int x, y, ax, ay, fl;
+ int x, y, fl;
ewin = Mode_mr.ewin;
if (!ewin)
@@ -236,8 +236,6 @@
if (Mode_mr.mode > 0)
EGrabServer();
- DeskCurrentGetArea(&ax, &ay);
-
/* Redraw any windows that were in "move mode" */
lst =
ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, Mode.nogroup, &num);
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
