Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-08-10 14:14:54 +03:00 committed by Daniel Stone
commit 172d45b9b7
3 changed files with 2 additions and 10 deletions

View File

@ -137,19 +137,13 @@ static const char CREATE_NEW_SCREEN_FUNC[] =
static void static void
__glXDRIleaveServer(void) __glXDRIleaveServer(void)
{ {
int i; DRIBlockHandler(NULL, NULL, NULL);
for (i = 0; i < screenInfo.numScreens; i++)
DRIDoBlockHandler(i, NULL, NULL, NULL);
} }
static void static void
__glXDRIenterServer(void) __glXDRIenterServer(void)
{ {
int i; DRIWakeupHandler(NULL, 0, NULL);
for (i = 0; i < screenInfo.numScreens; i++)
DRIDoWakeupHandler(i, NULL, 0, NULL);
} }
static void static void

View File

@ -71,7 +71,6 @@
#define BUILTIN_MONITOR_SECTION \ #define BUILTIN_MONITOR_SECTION \
"Section \"Monitor\"\n" \ "Section \"Monitor\"\n" \
"\tIdentifier\t" BUILTIN_MONITOR_NAME "\n" \ "\tIdentifier\t" BUILTIN_MONITOR_NAME "\n" \
"\tOption\t\"TargetRefresh\"\t\"75.0\"\n" \
"EndSection\n\n" "EndSection\n\n"
#define BUILTIN_SCREEN_NAME \ #define BUILTIN_SCREEN_NAME \

View File

@ -580,7 +580,6 @@ void UseMsg(void)
#endif #endif
ErrorF("-audit int set audit trail level\n"); ErrorF("-audit int set audit trail level\n");
ErrorF("-auth file select authorization file\n"); ErrorF("-auth file select authorization file\n");
ErrorF("bc enable bug compatibility\n");
ErrorF("-br create root window with black background\n"); ErrorF("-br create root window with black background\n");
ErrorF("+bs enable any backing store support\n"); ErrorF("+bs enable any backing store support\n");
ErrorF("-bs disable any backing store support\n"); ErrorF("-bs disable any backing store support\n");