e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix non-opaque moves across desk switch. Cleanups. 

SVN revision: 18541
This commit is contained in:
Kim Woelders 2005-11-19 20:43:09 +00:00
parent ac60a6615a
commit f9cf7b23ef
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/desktops.c
View File

@ -1054,7 +1054,7 @@ DeskGotoNum(unsigned int desk)
DeskGoto(dsk);
}
void
static void
DeskSwitchStart(void)
{
FocusNewDeskBegin();
@ -1065,7 +1065,7 @@ DeskSwitchStart(void)
DesksEventsConfigure(0);
}
void
static void
DeskSwitchDone(void)
{
/* we flipped - re-enable enter and leave events */
@ -1139,8 +1139,8 @@ DeskGoto(Desk * dsk)
DeskEnter(dsk);
}
ActionsResume();
DeskSwitchDone();
ActionsResume();
ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
}
@ -1587,10 +1587,9 @@ DeskCurrentGotoArea(int ax, int ay)
/* 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());

3
src/desktops.h
View File

@ -71,9 +71,6 @@ void DeskCurrentMoveAreaBy(int ax, int ay);
void DeskGotoByEwin(EWin * ewin);
void DeskSwitchStart(void);
void DeskSwitchDone(void);
unsigned int DesksGetNumber(void);
Desk *DesksGetCurrent(void);
Desk *DesktopAt(int x, int y);

2
src/focus.c
View File

@ -501,7 +501,7 @@ FocusNewDesk(void)
/* Set the mouse-over window */
Mode.mouse_over_ewin = GetEwinByCurrentPointer();
FocusToEWin(NULL, FOCUS_DESK_ENTER);
doFocusToEwin(NULL, FOCUS_DESK_ENTER);
}
static void

8
src/moveresize.c
View File

@ -197,8 +197,6 @@ ActionMoveSuspend(void)
/* 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 @@ ActionMoveSuspend(void)
}
if (lst)
Efree(lst);
EUngrabServer();
}
return 0;
@ -220,7 +220,7 @@ ActionMoveResume(void)
{
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 @@ ActionMoveResume(void)
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);