mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
(!1654) Xnest: replace XConfigureWindow() calls by xcb_configure_window()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
@@ -186,7 +186,7 @@ void
|
||||
xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
|
||||
{
|
||||
unsigned int valuemask;
|
||||
XWindowChanges values;
|
||||
xcb_params_configure_window_t values;
|
||||
|
||||
if (mask & XCB_CONFIG_WINDOW_SIBLING &&
|
||||
xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) {
|
||||
@@ -236,8 +236,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
|
||||
xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
|
||||
}
|
||||
|
||||
if (valuemask)
|
||||
XConfigureWindow(xnestDisplay, xnestWindow(pWin), valuemask, &values);
|
||||
xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pWin), valuemask, &values);
|
||||
|
||||
if (mask & XCB_CONFIG_WINDOW_SIBLING &&
|
||||
xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) {
|
||||
@@ -249,7 +248,8 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
|
||||
/* the top sibling */
|
||||
valuemask = XCB_CONFIG_WINDOW_STACK_MODE;
|
||||
values.stack_mode = Above;
|
||||
XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values);
|
||||
|
||||
xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pSib), valuemask, &values);
|
||||
xnestWindowPriv(pSib)->sibling_above = XCB_WINDOW_NONE;
|
||||
|
||||
/* the rest of siblings */
|
||||
@@ -257,8 +257,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
|
||||
valuemask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE;
|
||||
values.sibling = xnestWindowSiblingAbove(pSib);
|
||||
values.stack_mode = Below;
|
||||
XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask,
|
||||
&values);
|
||||
xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pSib), valuemask, &values);
|
||||
xnestWindowPriv(pSib)->sibling_above =
|
||||
xnestWindowSiblingAbove(pSib);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user