fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-02 15:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix window cascading to not affect popups or menus

Browse source
This commit is contained in:
Earle F. Philhower III 2004-03-18 16:17:57 +00:00
parent 78cc1a5768
commit 559610b8a2
3 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
hw/xwin/winmultiwindowclass.c
View file

@ -229,10 +229,46 @@ winMultiWindowGetWMNormalHints (WindowPtr pWin, WinXSizeHints *hints)
else
prop = prop->next;
}
return 0;
}
int
winMultiWindowGetTransientFor (WindowPtr pWin, WindowPtr *ppDaddy)
{
struct _Window *pwin;
struct _Property *prop;
if (!pWin)
{
ErrorF ("winMultiWindowGetTransientFor - pWin was NULL\n");
return 0;
}
pwin = (struct _Window*) pWin;
if (pwin->optional)
prop = (struct _Property *) pwin->optional->userProps;
else
prop = NULL;
if (ppDaddy)
*ppDaddy = NULL;
while (prop)
{
if (prop->propertyName == XA_WM_TRANSIENT_FOR)
{
if (ppDaddy)
memcpy (*ppDaddy, prop->data, sizeof (WindowPtr *));
return 1;
}
else
prop = prop->next;
}
return 0;
}
int
winMultiWindowGetWMName (WindowPtr pWin, char **wmName)

3
hw/xwin/winmultiwindowclass.h
View file

@ -110,4 +110,7 @@ winMultiWindowGetWMNormalHints (WindowPtr pWin, WinXSizeHints *hints);
int
winMultiWindowGetWMName (WindowPtr pWin, char **wmName);
int
winMultiWindowGetTransientFor (WindowPtr pWin, WindowPtr *ppDaddy);
#endif

8
hw/xwin/winmultiwindowwindow.c
View file

@ -60,7 +60,6 @@ winUpdateWindowsWindow (WindowPtr pWin);
static void
winFindWindow (pointer value, XID id, pointer cdata);
/*
* Constant defines
*/
@ -478,12 +477,14 @@ winCreateWindowsWindow (WindowPtr pWin)
/* Default positions if none specified */
if (!winMultiWindowGetWMNormalHints(pWin, &hints))
hints.flags = 0;
if ( !(hints.flags & (USPosition|PPosition)) )
if ( !(hints.flags & (USPosition|PPosition)) &&
!winMultiWindowGetTransientFor (pWin, NULL) &&
!pWin->overrideRedirect )
{
iX = CW_USEDEFAULT;
iY = CW_USEDEFAULT;
}
iWidth = pWin->drawable.width;
iHeight = pWin->drawable.height;
@ -907,3 +908,4 @@ winAdjustXWindow (WindowPtr pWin, HWND hwnd)
#undef WIDTH
#undef HEIGHT
}