Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
This commit is contained in:
commit
172d45b9b7
|
@ -137,19 +137,13 @@ static const char CREATE_NEW_SCREEN_FUNC[] =
|
|||
static void
|
||||
__glXDRIleaveServer(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < screenInfo.numScreens; i++)
|
||||
DRIDoBlockHandler(i, NULL, NULL, NULL);
|
||||
DRIBlockHandler(NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
__glXDRIenterServer(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < screenInfo.numScreens; i++)
|
||||
DRIDoWakeupHandler(i, NULL, 0, NULL);
|
||||
DRIWakeupHandler(NULL, 0, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -71,7 +71,6 @@
|
|||
#define BUILTIN_MONITOR_SECTION \
|
||||
"Section \"Monitor\"\n" \
|
||||
"\tIdentifier\t" BUILTIN_MONITOR_NAME "\n" \
|
||||
"\tOption\t\"TargetRefresh\"\t\"75.0\"\n" \
|
||||
"EndSection\n\n"
|
||||
|
||||
#define BUILTIN_SCREEN_NAME \
|
||||
|
|
|
@ -580,7 +580,6 @@ void UseMsg(void)
|
|||
#endif
|
||||
ErrorF("-audit int set audit trail level\n");
|
||||
ErrorF("-auth file select authorization file\n");
|
||||
ErrorF("bc enable bug compatibility\n");
|
||||
ErrorF("-br create root window with black background\n");
|
||||
ErrorF("+bs enable any backing store support\n");
|
||||
ErrorF("-bs disable any backing store support\n");
|
||||
|
|
Loading…
Reference in New Issue
Block a user