Merge branch 'master' into mpx
Conflicts: dix/events.c
This commit is contained in:
commit
e5e531ce96
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -27,6 +27,8 @@ install-sh
|
|||
libtool
|
||||
ltmain.sh
|
||||
missing
|
||||
TAGS
|
||||
tags
|
||||
ylwrap
|
||||
xorg-server.pc
|
||||
stamp-h?
|
||||
|
|
|
@ -124,7 +124,7 @@ _X_EXPORT void
|
|||
xf86ProcessCommonOptions(LocalDevicePtr local,
|
||||
pointer list)
|
||||
{
|
||||
if (xf86SetBoolOption(list, "AlwaysCore", 0) ||
|
||||
if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||
|
||||
!xf86SetBoolOption(list, "SendCoreEvents", 1) ||
|
||||
!xf86SetBoolOption(list, "CorePointer", 1) ||
|
||||
!xf86SetBoolOption(list, "CoreKeyboard", 1)) {
|
||||
|
|
|
@ -1432,24 +1432,24 @@ This optional entry specifies the position of the monitor within the X
|
|||
screen.
|
||||
(RandR 1.2-supporting drivers only)
|
||||
.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
|
||||
left of the monitor of the given name.
|
||||
left of the output (not monitor) of the given name.
|
||||
(RandR 1.2-supporting drivers only)
|
||||
.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
|
||||
right of the monitor of the given name.
|
||||
right of the output (not monitor) of the given name.
|
||||
(RandR 1.2-supporting drivers only)
|
||||
.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
|
||||
monitor of the given name.
|
||||
output (not monitor) of the given name.
|
||||
(RandR 1.2-supporting drivers only)
|
||||
.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
|
||||
monitor of the given name.
|
||||
output (not monitor) of the given name.
|
||||
(RandR 1.2-supporting drivers only)
|
||||
.TP 7
|
||||
.BI "Option " "\*qEnable\*q " \*qbool\*q
|
||||
|
|
|
@ -864,7 +864,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
|
|||
for (cim = compiled_in_modules; *cim; 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;
|
||||
}
|
||||
|
||||
|
|
|
@ -602,7 +602,7 @@ cleanMTRR()
|
|||
#ifdef DEBUG
|
||||
ErrorF("Clean for (0x%lx,0x%lx)\n",
|
||||
(unsigned long)mrd[i].mr_base,
|
||||
(unsigned long)rd[i].mr_len);
|
||||
(unsigned long)mrd[i].mr_len);
|
||||
#endif
|
||||
if (mrd[i].mr_flags & MDF_FIXACTIVE) {
|
||||
mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
|
||||
|
|
|
@ -471,7 +471,7 @@ RootlessEnsureFrame(WindowPtr pWin)
|
|||
if (WINREC(pWin) != NULL)
|
||||
return WINREC(pWin);
|
||||
|
||||
if (!IsTopLevel(pWin))
|
||||
if (!IsTopLevel(pWin) && !IsRoot(pWin))
|
||||
return NULL;
|
||||
|
||||
if (pWin->drawable.class != InputOutput)
|
||||
|
|
Loading…
Reference in New Issue
Block a user