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:
parent
013374b8c1
commit
8e41541568
|
@ -121,8 +121,7 @@ xnestOpenDisplay(int argc, char *argv[])
|
|||
return;
|
||||
for (i = 0; i < xnestNumDefaultColormaps; i++)
|
||||
xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay,
|
||||
DefaultRootWindow
|
||||
(xnestDisplay),
|
||||
xnestUpstreamInfo.screenInfo->root,
|
||||
xnestVisuals[i].visual,
|
||||
AllocNone);
|
||||
|
||||
|
@ -145,7 +144,7 @@ xnestOpenDisplay(int argc, char *argv[])
|
|||
if (xnestPixmapFormats[i].depth == 1 ||
|
||||
xnestPixmapFormats[i].depth == xnestDepths[j]) {
|
||||
xnestDefaultDrawables[xnestPixmapFormats[i].depth] =
|
||||
XCreatePixmap(xnestDisplay, DefaultRootWindow(xnestDisplay),
|
||||
XCreatePixmap(xnestDisplay, xnestUpstreamInfo.screenInfo->root,
|
||||
1, 1, xnestPixmapFormats[i].depth);
|
||||
}
|
||||
|
||||
|
@ -170,12 +169,12 @@ xnestOpenDisplay(int argc, char *argv[])
|
|||
|
||||
xnestIconBitmap =
|
||||
XCreateBitmapFromData(xnestDisplay,
|
||||
DefaultRootWindow(xnestDisplay),
|
||||
xnestUpstreamInfo.screenInfo->root,
|
||||
(char *) icon_bits, icon_width, icon_height);
|
||||
|
||||
xnestScreenSaverPixmap =
|
||||
XCreatePixmapFromBitmapData(xnestDisplay,
|
||||
DefaultRootWindow(xnestDisplay),
|
||||
xnestUpstreamInfo.screenInfo->root,
|
||||
(char *) screensaver_bits,
|
||||
screensaver_width,
|
||||
screensaver_height,
|
||||
|
|
|
@ -355,7 +355,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
|
|||
else
|
||||
xnestDefaultWindows[pScreen->myNum] =
|
||||
XCreateWindow(xnestDisplay,
|
||||
DefaultRootWindow(xnestDisplay),
|
||||
xnestUpstreamInfo.screenInfo->root,
|
||||
xnestX + POSITION_OFFSET,
|
||||
xnestY + POSITION_OFFSET,
|
||||
xnestWidth, xnestHeight,
|
||||
|
|
Loading…
Reference in New Issue