frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into mpx 

Conflicts:

	dix/events.c
This commit is contained in:
Peter Hutterer 2008-01-31 16:36:17 +10:30
parent 6c38682084 1692dcf197
commit e5e531ce96
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -27,6 +27,8 @@ install-sh
libtool libtool
ltmain.sh ltmain.sh
missing missing
TAGS
tags
ylwrap ylwrap
xorg-server.pc xorg-server.pc
stamp-h? stamp-h?

2
hw/xfree86/common/xf86Xinput.c
View File

@ -124,7 +124,7 @@ _X_EXPORT void
xf86ProcessCommonOptions(LocalDevicePtr local, xf86ProcessCommonOptions(LocalDevicePtr local,
pointer list) pointer list)
{ {
if (xf86SetBoolOption(list, "AlwaysCore", 0) || if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||
!xf86SetBoolOption(list, "SendCoreEvents", 1) || !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
!xf86SetBoolOption(list, "CorePointer", 1) || !xf86SetBoolOption(list, "CorePointer", 1) ||
!xf86SetBoolOption(list, "CoreKeyboard", 1)) { !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

16
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -1432,24 +1432,24 @@ This optional entry specifies the position of the monitor within the X
screen. screen.
(RandR 1.2-supporting drivers only) (RandR 1.2-supporting drivers only)
.TP 7 .TP 7
.BI "Option " "\*qLeftOf\*q " \*qmonitor\*q .BI "Option " "\*qLeftOf\*q " \*qoutput\*q
This optional entry specifies that the monitor should be positioned to the This optional entry specifies that the monitor should be positioned to the
left of the monitor of the given name. left of the output (not monitor) of the given name.
(RandR 1.2-supporting drivers only) (RandR 1.2-supporting drivers only)
.TP 7 .TP 7
.BI "Option " "\*qRightOf\*q " \*qmonitor\*q .BI "Option " "\*qRightOf\*q " \*qoutput\*q
This optional entry specifies that the monitor should be positioned to the This optional entry specifies that the monitor should be positioned to the
right of the monitor of the given name. right of the output (not monitor) of the given name.
(RandR 1.2-supporting drivers only) (RandR 1.2-supporting drivers only)
.TP 7 .TP 7
.BI "Option " "\*qAbove\*q " \*qmonitor\*q .BI "Option " "\*qAbove\*q " \*qoutput\*q
This optional entry specifies that the monitor should be positioned above the This optional entry specifies that the monitor should be positioned above the
monitor of the given name. output (not monitor) of the given name.
(RandR 1.2-supporting drivers only) (RandR 1.2-supporting drivers only)
.TP 7 .TP 7
.BI "Option " "\*qBelow\*q " \*qmonitor\*q .BI "Option " "\*qBelow\*q " \*qoutput\*q
This optional entry specifies that the monitor should be positioned below the This optional entry specifies that the monitor should be positioned below the
monitor of the given name. output (not monitor) of the given name.
(RandR 1.2-supporting drivers only) (RandR 1.2-supporting drivers only)
.TP 7 .TP 7
.BI "Option " "\*qEnable\*q " \*qbool\*q .BI "Option " "\*qEnable\*q " \*qbool\*q

2
hw/xfree86/loader/loadmod.c
View File

@ -864,7 +864,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
for (cim = compiled_in_modules; *cim; cim++) for (cim = compiled_in_modules; *cim; cim++)
if (!strcmp (module, *cim)) if (!strcmp (module, *cim))
{ {
xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module); xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", module);
return (ModuleDescPtr) 1; return (ModuleDescPtr) 1;
} }

2
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -602,7 +602,7 @@ cleanMTRR()
#ifdef DEBUG #ifdef DEBUG
ErrorF("Clean for (0x%lx,0x%lx)\n", ErrorF("Clean for (0x%lx,0x%lx)\n",
(unsigned long)mrd[i].mr_base, (unsigned long)mrd[i].mr_base,
(unsigned long)rd[i].mr_len); (unsigned long)mrd[i].mr_len);
#endif #endif
if (mrd[i].mr_flags & MDF_FIXACTIVE) { if (mrd[i].mr_flags & MDF_FIXACTIVE) {
mro.mo_arg[0] = MEMRANGE_SET_UPDATE; mro.mo_arg[0] = MEMRANGE_SET_UPDATE;

2
miext/rootless/rootlessWindow.c
View File

@ -471,7 +471,7 @@ RootlessEnsureFrame(WindowPtr pWin)
if (WINREC(pWin) != NULL) if (WINREC(pWin) != NULL)
return WINREC(pWin); return WINREC(pWin);
if (!IsTopLevel(pWin)) if (!IsTopLevel(pWin) && !IsRoot(pWin))
return NULL; return NULL;
if (pWin->drawable.class != InputOutput) if (pWin->drawable.class != InputOutput)