Merge branch 'master' into input-hotplug
This commit is contained in:
commit
0704bb298c
|
@ -143,6 +143,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
|
||||||
Bool loadableFonts = FALSE;
|
Bool loadableFonts = FALSE;
|
||||||
CursorPtr rootCursor;
|
CursorPtr rootCursor;
|
||||||
Bool blackRoot=FALSE;
|
Bool blackRoot=FALSE;
|
||||||
|
Bool whiteRoot=FALSE;
|
||||||
ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */
|
ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */
|
||||||
|
|
||||||
_X_EXPORT TimeStamp currentTime;
|
_X_EXPORT TimeStamp currentTime;
|
||||||
|
|
21
dix/window.c
21
dix/window.c
|
@ -343,9 +343,6 @@ MakeRootTile(WindowPtr pWin)
|
||||||
for (j = len; j > 0; j--)
|
for (j = len; j > 0; j--)
|
||||||
*to++ = *from;
|
*to++ = *from;
|
||||||
|
|
||||||
if (blackRoot)
|
|
||||||
bzero(back, sizeof(back));
|
|
||||||
|
|
||||||
(*pGC->ops->PutImage)((DrawablePtr)pWin->background.pixmap, pGC, 1,
|
(*pGC->ops->PutImage)((DrawablePtr)pWin->background.pixmap, pGC, 1,
|
||||||
0, 0, len, 4, 0, XYBitmap, (char *)back);
|
0, 0, len, 4, 0, XYBitmap, (char *)back);
|
||||||
|
|
||||||
|
@ -506,6 +503,7 @@ void
|
||||||
InitRootWindow(WindowPtr pWin)
|
InitRootWindow(WindowPtr pWin)
|
||||||
{
|
{
|
||||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||||
|
int backFlag = CWBorderPixel | CWCursor | CWBackingStore;
|
||||||
|
|
||||||
if (!(*pScreen->CreateWindow)(pWin))
|
if (!(*pScreen->CreateWindow)(pWin))
|
||||||
return; /* XXX */
|
return; /* XXX */
|
||||||
|
@ -514,12 +512,23 @@ InitRootWindow(WindowPtr pWin)
|
||||||
pWin->cursorIsNone = FALSE;
|
pWin->cursorIsNone = FALSE;
|
||||||
pWin->optional->cursor = rootCursor;
|
pWin->optional->cursor = rootCursor;
|
||||||
rootCursor->refcnt++;
|
rootCursor->refcnt++;
|
||||||
MakeRootTile(pWin);
|
|
||||||
|
if (!blackRoot && !whiteRoot) {
|
||||||
|
MakeRootTile(pWin);
|
||||||
|
backFlag |= CWBackPixmap;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (blackRoot)
|
||||||
|
pWin->background.pixel = pScreen->blackPixel;
|
||||||
|
else
|
||||||
|
pWin->background.pixel = pScreen->whitePixel;
|
||||||
|
backFlag |= CWBackPixel;
|
||||||
|
}
|
||||||
|
|
||||||
pWin->backingStore = defaultBackingStore;
|
pWin->backingStore = defaultBackingStore;
|
||||||
pWin->forcedBS = (defaultBackingStore != NotUseful);
|
pWin->forcedBS = (defaultBackingStore != NotUseful);
|
||||||
/* We SHOULD check for an error value here XXX */
|
/* We SHOULD check for an error value here XXX */
|
||||||
(*pScreen->ChangeWindowAttributes)(pWin,
|
(*pScreen->ChangeWindowAttributes)(pWin, backFlag);
|
||||||
CWBackPixmap|CWBorderPixel|CWCursor|CWBackingStore);
|
|
||||||
|
|
||||||
MapWindow(pWin, serverClient);
|
MapWindow(pWin, serverClient);
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,6 +73,7 @@ extern int limitNoFile;
|
||||||
extern Bool defeatAccessControl;
|
extern Bool defeatAccessControl;
|
||||||
extern long maxBigRequestSize;
|
extern long maxBigRequestSize;
|
||||||
extern Bool blackRoot;
|
extern Bool blackRoot;
|
||||||
|
extern Bool whiteRoot;
|
||||||
|
|
||||||
extern Bool CoreDump;
|
extern Bool CoreDump;
|
||||||
|
|
||||||
|
|
|
@ -642,6 +642,7 @@ void UseMsg(void)
|
||||||
ErrorF("v video blanking for screen-saver\n");
|
ErrorF("v video blanking for screen-saver\n");
|
||||||
ErrorF("-v screen-saver without video blanking\n");
|
ErrorF("-v screen-saver without video blanking\n");
|
||||||
ErrorF("-wm WhenMapped default backing-store\n");
|
ErrorF("-wm WhenMapped default backing-store\n");
|
||||||
|
ErrorF("-wr create root window with white background\n");
|
||||||
ErrorF("-x string loads named extension at init time \n");
|
ErrorF("-x string loads named extension at init time \n");
|
||||||
ErrorF("-maxbigreqsize set maximal bigrequest size \n");
|
ErrorF("-maxbigreqsize set maximal bigrequest size \n");
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
|
@ -983,6 +984,8 @@ ProcessCommandLine(int argc, char *argv[])
|
||||||
defaultScreenSaverBlanking = DontPreferBlanking;
|
defaultScreenSaverBlanking = DontPreferBlanking;
|
||||||
else if ( strcmp( argv[i], "-wm") == 0)
|
else if ( strcmp( argv[i], "-wm") == 0)
|
||||||
defaultBackingStore = WhenMapped;
|
defaultBackingStore = WhenMapped;
|
||||||
|
else if ( strcmp( argv[i], "-wr") == 0)
|
||||||
|
whiteRoot = TRUE;
|
||||||
else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
|
else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
|
||||||
if(++i < argc) {
|
if(++i < argc) {
|
||||||
long reqSizeArg = atol(argv[i]);
|
long reqSizeArg = atol(argv[i]);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user