ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to improve ConfigureNotify event processing.

This commit is contained in:
Ulrich Weigand 1999-06-05 15:12:39 +00:00 committed by Alexandre Julliard
parent 50e96dc2a6
commit 92499dba2f
1 changed files with 36 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
windows/x11drv/event.c
View File

@ -376,9 +376,8 @@ static unsigned __td_lookup( Window w, Window* list, unsigned max )
return i; return i;
} }
static BOOL EVENT_QueryZOrder( HWND hWndCheck) static HWND EVENT_QueryZOrder( HWND hWndCheck)
{ {
BOOL bRet = FALSE;
HWND hwndInsertAfter = HWND_TOP; HWND hwndInsertAfter = HWND_TOP;
WND *pWndCheck = WIN_FindWndPtr(hWndCheck); WND *pWndCheck = WIN_FindWndPtr(hWndCheck);
WND *pDesktop = WIN_GetDesktop(); WND *pDesktop = WIN_GetDesktop();
@ -391,7 +390,7 @@ static BOOL EVENT_QueryZOrder( HWND hWndCheck)
WIN_ReleaseWndPtr(pWndCheck); WIN_ReleaseWndPtr(pWndCheck);
WIN_ReleaseWndPtr(pDesktop->child); WIN_ReleaseWndPtr(pDesktop->child);
WIN_ReleaseDesktop(); WIN_ReleaseDesktop();
return TRUE; return hwndInsertAfter;
} }
WIN_LockWndPtr(pWndZ); WIN_LockWndPtr(pWndZ);
WIN_LockWndPtr(pWnd); WIN_LockWndPtr(pWnd);
@ -433,16 +432,13 @@ static BOOL EVENT_QueryZOrder( HWND hWndCheck)
if( best - check == 1 ) break; if( best - check == 1 ) break;
} }
} }
/* and link pWndCheck right behind it in the local z-order */
} }
WIN_UnlinkWindow( pWndCheck->hwndSelf );
WIN_LinkWindow( pWndCheck->hwndSelf, hwndInsertAfter);
} }
if( children ) TSXFree( children ); if( children ) TSXFree( children );
WIN_ReleaseWndPtr(pWnd); WIN_ReleaseWndPtr(pWnd);
WIN_ReleaseWndPtr(pWndZ); WIN_ReleaseWndPtr(pWndZ);
WIN_ReleaseWndPtr(pWndCheck); WIN_ReleaseWndPtr(pWndCheck);
return bRet; return hwndInsertAfter;
} }
/*********************************************************************** /***********************************************************************
@ -758,101 +754,49 @@ static void EVENT_GetGeometry( Window win, int *px, int *py,
*/ */
static void EVENT_ConfigureNotify( HWND hWnd, XConfigureEvent *event ) static void EVENT_ConfigureNotify( HWND hWnd, XConfigureEvent *event )
{ {
WINDOWPOS winpos; RECT rectWindow;
RECT newWindowRect, newClientRect; int x, y, flags = 0;
RECT oldWindowRect, oldClientRect;
Window above = event->above;
int x, y;
unsigned int width, height; unsigned int width, height;
HWND newInsertAfter, oldInsertAfter;
WND *pWnd = WIN_FindWndPtr(hWnd); /* Get geometry and Z-order according to X */
assert (pWnd->flags & WIN_MANAGED);
/* We don't rely on the event geometry info, because it is relative
* to parent and not to root, and it may be wrong (XFree sets x,y to 0,0
* if the window hasn't moved).
*/
EVENT_GetGeometry( event->window, &x, &y, &width, &height ); EVENT_GetGeometry( event->window, &x, &y, &width, &height );
newInsertAfter = EVENT_QueryZOrder( hWnd );
TRACE_(win)("%04x adjusted to (%i,%i)-(%i,%i)\n", pWnd->hwndSelf, /* Get geometry and Z-order according to Wine */
x, y, x + width, y + height );
/* Fill WINDOWPOS struct */ GetWindowRect( hWnd, &rectWindow );
winpos.flags = SWP_NOACTIVATE | SWP_NOZORDER; oldInsertAfter = GetWindow( hWnd, GW_HWNDPREV );
winpos.hwnd = hWnd; if ( !oldInsertAfter ) oldInsertAfter = HWND_TOP;
winpos.x = x;
winpos.y = y;
winpos.cx = width;
winpos.cy = height;
/* Check for unchanged attributes */ /* Compare what has changed */
if (winpos.x == pWnd->rectWindow.left && winpos.y == pWnd->rectWindow.top)
winpos.flags |= SWP_NOMOVE; if ( rectWindow.left == x && rectWindow.top == y )
if ((winpos.cx == pWnd->rectWindow.right - pWnd->rectWindow.left) && flags |= SWP_NOMOVE;
(winpos.cy == pWnd->rectWindow.bottom - pWnd->rectWindow.top))
winpos.flags |= SWP_NOSIZE;
else else
{ TRACE_(win)( "%04x moving from (%d,%d) to (%d,%d)\n", hWnd,
RECT rect; rectWindow.left, rectWindow.top, x, y );
rect.left = 0; if ( rectWindow.right - rectWindow.left == width
rect.top = 0; && rectWindow.bottom - rectWindow.top == height )
rect.right = pWnd->rectWindow.right - pWnd->rectWindow.left; flags |= SWP_NOSIZE;
rect.bottom = pWnd->rectWindow.bottom - pWnd->rectWindow.top; else
TRACE_(win)( "%04x resizing from (%d,%d) to (%d,%d)\n", hWnd,
rectWindow.right - rectWindow.left,
rectWindow.bottom - rectWindow.top, width, height );
DCE_InvalidateDCE( pWnd, &rect ); if ( newInsertAfter == oldInsertAfter )
} flags |= SWP_NOZORDER;
else
TRACE_(win)( "%04x restacking from after %04x to after %04x\n", hWnd,
oldInsertAfter, newInsertAfter );
/* Send WM_WINDOWPOSCHANGING */ /* If anything changed, call SetWindowPos */
SendMessageA( winpos.hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)&winpos );
if (!IsWindow( winpos.hwnd )) if ( flags != (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER) )
{ SetWindowPos( hWnd, newInsertAfter, x, y, width, height,
WIN_ReleaseWndPtr(pWnd); flags | SWP_NOACTIVATE );
return;
}
/* Calculate new position and size */
newWindowRect.left = x;
newWindowRect.right = x + width;
newWindowRect.top = y;
newWindowRect.bottom = y + height;
WINPOS_SendNCCalcSize( winpos.hwnd, TRUE, &newWindowRect,
&pWnd->rectWindow, &pWnd->rectClient,
&winpos, &newClientRect );
if (!IsWindow( winpos.hwnd ))
{
WIN_ReleaseWndPtr(pWnd);
return;
}
oldWindowRect = pWnd->rectWindow;
oldClientRect = pWnd->rectClient;
/* Set new size and position */
pWnd->rectWindow = newWindowRect;
pWnd->rectClient = newClientRect;
/* FIXME: Copy valid bits */
if( oldClientRect.top - oldWindowRect.top != newClientRect.top - newWindowRect.top ||
oldClientRect.left - oldWindowRect.left != newClientRect.left - newWindowRect.left )
RedrawWindow( winpos.hwnd, NULL, 0, RDW_FRAME | RDW_ALLCHILDREN |
RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW );
WIN_ReleaseWndPtr(pWnd);
SendMessageA( winpos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)&winpos );
if (!IsWindow( winpos.hwnd )) return;
if( above == None ) /* absolute bottom */
{
WIN_UnlinkWindow( winpos.hwnd );
WIN_LinkWindow( winpos.hwnd, HWND_BOTTOM);
}
else EVENT_QueryZOrder( hWnd ); /* try to outsmart window manager */
} }