fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-26 18:20:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Composite extension check.

Browse source
This commit is contained in:
David Reveman 2009-01-22 11:40:31 -05:00
parent 73a8a1aa6c
commit 1dfa85d97a
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
hw/dmx/dmxextension.c
View file

@ -1504,7 +1504,7 @@ dmxAttachScreen (int idx,
if (!beShape)
{
dmxLogErrorSet (dmxWarning, errorSet, error, errorName,
"SHAPE extension missing");
"SHAPE extension missing on back-end server");
dmxCloseDisplay (dmxScreen);
/* Restore the old screen */
@ -1512,6 +1512,31 @@ dmxAttachScreen (int idx,
return 1;
}
#ifdef COMPOSITE
if (!noCompositeExtension)
{
Bool beComposite = FALSE;
int eventBase;
XLIB_PROLOGUE (dmxScreen);
beComposite = XCompositeQueryExtension (dmxScreen->beDisplay,
&eventBase,
&errorBase);
XLIB_EPILOGUE (dmxScreen);
if (!beComposite)
{
dmxLogErrorSet (dmxWarning, errorSet, error, errorName,
"Composite extension missing on back-end server");
dmxCloseDisplay (dmxScreen);
/* Restore the old screen */
*dmxScreen = oldDMXScreen;
return 1;
}
}
#endif
if (!dmxScreen->scrnWin)
dmxScreen->scrnWin = DefaultRootWindow (dmxScreen->beDisplay);