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

(!1654) Xnest: fetch default screen's root window from screen info 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-30 20:08:31 +02:00
parent f10f055bf8
commit ab5fdbb9b4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xnest/Display.c
View File

@ -120,8 +120,7 @@ xnestOpenDisplay(int argc, char *argv[])
sizeof(Colormap)); sizeof(Colormap));
for (i = 0; i < xnestNumDefaultColormaps; i++) for (i = 0; i < xnestNumDefaultColormaps; i++)
xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay, xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay,
DefaultRootWindow xnestUpstreamInfo.screenInfo->root,
(xnestDisplay),
xnestVisuals[i].visual, xnestVisuals[i].visual,
AllocNone); AllocNone);
@ -144,7 +143,7 @@ xnestOpenDisplay(int argc, char *argv[])
if (xnestPixmapFormats[i].depth == 1 || if (xnestPixmapFormats[i].depth == 1 ||
xnestPixmapFormats[i].depth == xnestDepths[j]) { xnestPixmapFormats[i].depth == xnestDepths[j]) {
xnestDefaultDrawables[xnestPixmapFormats[i].depth] = xnestDefaultDrawables[xnestPixmapFormats[i].depth] =
XCreatePixmap(xnestDisplay, DefaultRootWindow(xnestDisplay), XCreatePixmap(xnestDisplay, xnestUpstreamInfo.screenInfo->root,
1, 1, xnestPixmapFormats[i].depth); 1, 1, xnestPixmapFormats[i].depth);
} }
@ -169,12 +168,12 @@ xnestOpenDisplay(int argc, char *argv[])
xnestIconBitmap = xnestIconBitmap =
XCreateBitmapFromData(xnestDisplay, XCreateBitmapFromData(xnestDisplay,
DefaultRootWindow(xnestDisplay), xnestUpstreamInfo.screenInfo->root,
(char *) icon_bits, icon_width, icon_height); (char *) icon_bits, icon_width, icon_height);
xnestScreenSaverPixmap = xnestScreenSaverPixmap =
XCreatePixmapFromBitmapData(xnestDisplay, XCreatePixmapFromBitmapData(xnestDisplay,
DefaultRootWindow(xnestDisplay), xnestUpstreamInfo.screenInfo->root,
(char *) screensaver_bits, (char *) screensaver_bits,
screensaver_width, screensaver_width,
screensaver_height, screensaver_height,

2
hw/xnest/Screen.c
View File

@ -356,7 +356,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
else else
xnestDefaultWindows[pScreen->myNum] = xnestDefaultWindows[pScreen->myNum] =
XCreateWindow(xnestDisplay, XCreateWindow(xnestDisplay,
DefaultRootWindow(xnestDisplay), xnestUpstreamInfo.screenInfo->root,
xnestX + POSITION_OFFSET, xnestX + POSITION_OFFSET,
xnestY + POSITION_OFFSET, xnestY + POSITION_OFFSET,
xnestWidth, xnestHeight, xnestWidth, xnestHeight,