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

(!1654) Xnest: replace XChangeWindowAttributes() by xcb_aux_change_window_attributes() 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-05 09:57:20 +02:00
parent 0f20702684
commit df324c6150
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xnest/Window.c
View File

@ -269,20 +269,20 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
Bool
xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
{
XSetWindowAttributes attributes;
xcb_params_cw_t attributes;
if (mask & XCB_CW_BACK_PIXMAP)
switch (pWin->backgroundState) {
case XCB_BACK_PIXMAP_NONE:
attributes.background_pixmap = XCB_PIXMAP_NONE;
attributes.back_pixmap = XCB_PIXMAP_NONE;
break;
case XCB_BACK_PIXMAP_PARENT_RELATIVE:
attributes.background_pixmap = ParentRelative;
attributes.back_pixmap = ParentRelative;
break;
case BackgroundPixmap:
attributes.background_pixmap = xnestPixmap(pWin->background.pixmap);
attributes.back_pixmap = xnestPixmap(pWin->background.pixmap);
break;
case BackgroundPixel:
@ -292,7 +292,7 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
if (mask & XCB_CW_BACK_PIXEL) {
if (pWin->backgroundState == BackgroundPixel)
attributes.background_pixel = xnestPixel(pWin->background.pixel);
attributes.back_pixel = xnestPixel(pWin->background.pixel);
else
mask &= ~XCB_CW_BACK_PIXEL;
}
@ -352,10 +352,12 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
if (mask & XCB_CW_CURSOR) /* this is handled in cursor code */
mask &= ~XCB_CW_CURSOR;
if (mask)
XChangeWindowAttributes(xnestDisplay, xnestWindow(pWin),
mask, &attributes);
if (mask) {
xcb_aux_change_window_attributes(xnestUpstreamInfo.conn,
xnestWindow(pWin),
mask,
&attributes);
}
return TRUE;
}