fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-24 18:20:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Never update proxy window geometry on backend server.

Browse source
This commit is contained in:
David Reveman 2008-11-18 18:22:34 -05:00
parent 0a4fa666b5
commit f05de44e82
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
hw/dmx/dmxwindow.c
View file

@ -263,6 +263,7 @@ static Window dmxCreateNonRootWindow(WindowPtr pWindow)
XSetWindowAttributes attribs;
dmxWinPrivPtr pParentPriv = DMX_GET_WINDOW_PRIV(pWindow->parent);
Window win = None;
int x, y, w, h, bw;
/* Avoid to create windows on back-end servers with virtual framebuffer */
if (dmxScreen->virtualFb)
@ -309,14 +310,29 @@ static Window dmxCreateNonRootWindow(WindowPtr pWindow)
be created on top of the stack, so we must restack the windows */
pWinPriv->restacked = (pWindow->prevSib != NullWindow);
if (pWindow != dmxScreen->pInputOverlayWin)
{
x = pWindow->origin.x - wBorderWidth(pWindow);
y = pWindow->origin.y - wBorderWidth(pWindow);
w = pWindow->drawable.width;
h = pWindow->drawable.height;
bw = pWindow->borderWidth;
}
else
{
x = y = -1;
w = h = 1;
bw = 0;
}
XLIB_PROLOGUE (dmxScreen);
win = XCreateWindow(dmxScreen->beDisplay,
parent,
pWindow->origin.x - wBorderWidth(pWindow),
pWindow->origin.y - wBorderWidth(pWindow),
pWindow->drawable.width,
pWindow->drawable.height,
pWindow->borderWidth,
x,
y,
w,
h,
bw,
pWindow->drawable.depth,
pWindow->drawable.class,
pWinPriv->visual,
@ -514,7 +530,7 @@ Bool dmxPositionWindow(WindowPtr pWindow, int x, int y)
been created yet, create it and map it */
if (!pWinPriv->window && pWinPriv->mapped && !pWinPriv->offscreen) {
dmxCreateAndRealizeWindow(pWindow, TRUE);
} else if (pWinPriv->window) {
} else if (pWinPriv->window && pWindow != dmxScreen->pInputOverlayWin) {
/* Position window on back-end server */
m = CWX | CWY | CWWidth | CWHeight;
c.x = pWindow->origin.x - wBorderWidth(pWindow);
@ -897,7 +913,7 @@ void dmxResizeWindow(WindowPtr pWindow, int x, int y,
been created yet, create it and map it */
if (!pWinPriv->window && pWinPriv->mapped && !pWinPriv->offscreen) {
dmxCreateAndRealizeWindow(pWindow, TRUE);
} else if (pWinPriv->window) {
} else if (pWinPriv->window && pWindow != dmxScreen->pInputOverlayWin) {
/* Handle resizing on back-end server */
m = CWX | CWY | CWWidth | CWHeight;
c.x = pWindow->origin.x - wBorderWidth(pWindow);
@ -960,7 +976,7 @@ void dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width)
/* NOTE: Do we need to check for on/off screen here? */
if (pWinPriv->window) {
if (pWinPriv->window && pWindow != dmxScreen->pInputOverlayWin) {
/* Handle border width change on back-end server */
m = CWBorderWidth;
c.border_width = width;