frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xnest: replace XConfigureWindow() calls by xcb_configure_window() 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-30 21:02:24 +02:00
parent e39ebbab54
commit 6252a4991f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xnest/Window.c
View File

@ -186,7 +186,7 @@ void
xnestConfigureWindow(WindowPtr pWin, unsigned int mask) xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
{ {
unsigned int valuemask; unsigned int valuemask;
XWindowChanges values; xcb_params_configure_window_t values;
if (mask & XCB_CONFIG_WINDOW_SIBLING && if (mask & XCB_CONFIG_WINDOW_SIBLING &&
xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) { xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) {
@ -236,8 +236,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
xnestWindowPriv(pWin)->border_width = pWin->borderWidth; xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
} }
if (valuemask) xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pWin), valuemask, &values);
XConfigureWindow(xnestDisplay, xnestWindow(pWin), valuemask, &values);
if (mask & XCB_CONFIG_WINDOW_SIBLING && if (mask & XCB_CONFIG_WINDOW_SIBLING &&
xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) { xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) {
@ -249,7 +248,8 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
/* the top sibling */ /* the top sibling */
valuemask = XCB_CONFIG_WINDOW_STACK_MODE; valuemask = XCB_CONFIG_WINDOW_STACK_MODE;
values.stack_mode = Above; 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; xnestWindowPriv(pSib)->sibling_above = XCB_WINDOW_NONE;
/* the rest of siblings */ /* the rest of siblings */
@ -257,8 +257,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
valuemask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE; valuemask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE;
values.sibling = xnestWindowSiblingAbove(pSib); values.sibling = xnestWindowSiblingAbove(pSib);
values.stack_mode = Below; values.stack_mode = Below;
XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pSib), valuemask, &values);
&values);
xnestWindowPriv(pSib)->sibling_above = xnestWindowPriv(pSib)->sibling_above =
xnestWindowSiblingAbove(pSib); xnestWindowSiblingAbove(pSib);
} }