xserver: Branch 'server-1.6-branch' - 3 commits
Keith Packard
keithp at kemper.freedesktop.org
Wed Feb 25 11:35:25 PST 2009
hw/xfree86/doc/man/xorg.conf.man.pre | 29 ++++++++++++++++++++++++++++-
hw/xfree86/dri/dri.c | 2 +-
hw/xquartz/darwinEvents.c | 3 ++-
3 files changed, 31 insertions(+), 3 deletions(-)
New commits:
commit 10e0603fb989d1e6b2675ef5ca8223777b4921e6
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Tue Feb 24 23:12:57 2009 -0800
XQuartz: Re-enable support for capslock
(cherry picked from commit 4901b8147e593d26d7a31a9b73a201254b948916)
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 89d2233..374c4e0 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -155,6 +155,7 @@ int darwin_modifier_mask_list[] = {
#else
NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
#endif
+ NX_ALPHASHIFTMASK,
0
};
@@ -174,7 +175,7 @@ static void DarwinUpdateModifiers(
}
for(f=darwin_modifier_mask_list; *f; f++)
- if(*f & flags) {
+ if(*f & flags && *f != NX_ALPHASHIFTMASK) {
key = DarwinModifierNXMaskToNXKey(*f);
if(key == -1)
ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);
commit e96921ca954ff0d3de8a69cea085aac2d43b0a2e
Author: Michel Dänzer <daenzer at vmware.com>
Date: Mon Feb 23 16:49:51 2009 +0100
DRI1: Make DRICreateDrawable return TRUE for pixmaps.
GLX_EXT_texture_from_pixmap was broken since commit
a26c77ff432d2e85a2665fc36fca25143460c476 ('glx: fix retval checks when failures
occur for drawable creation.')
Signed-off-by: Michel Dänzer <daenzer at vmware.com>
(cherry picked from commit ef320bdd5ec3419abba77041d3a4d96a3ff87563)
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 1a3e091..bddb651 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1291,7 +1291,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
*hHWDrawable = pDRIDrawablePriv->hwDrawable;
}
}
- else { /* pixmap (or for GLX 1.3, a PBuffer) */
+ else if (pDrawable->type != DRAWABLE_PIXMAP) { /* PBuffer */
/* NOT_DONE */
return FALSE;
}
commit 584f46b81c6ed126014e963cb4ea40f83014f1c7
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Thu Feb 19 13:57:28 2009 -0800
Add Extensions section to xorg.conf man page
Extensions section was added in X11R6.8.0 and documented in the release notes:
http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3
but never made it into the man page.
Also fix a bonus typo.
Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
(cherry picked from commit ab61033700b5383a7a15370dd054eaa80e72e811)
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index d9a4b35..b6288b6 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -115,6 +115,7 @@ The section names are:
.BR "Files " "File pathnames"
.BR "ServerFlags " "Server flags"
.BR "Module " "Dynamic module loading"
+.BR "Extensions " "Extension enabling"
.BR "InputDevice " "Input device description"
.BR "Device " "Graphics device description"
.BR "VideoAdaptor " "Xv video adaptor description"
@@ -313,7 +314,7 @@ where
.I <identifier>
is an alphanumeric identifier,
.I [attribute]
-is an attribute wich will be passed to the underlying FPE and
+is an attribute which will be passed to the underlying FPE and
.I <priority>
is a number used to order the fontfile FPEs. Examples:
.PP
@@ -774,6 +775,32 @@ It is recommended
that at very least the \(lqextmod\(rq extension module be loaded.
If it isn't, some commonly used server extensions (like the SHAPE
extension) will not be available.
+.SH "EXTENSIONS SECTION"
+The
+.B Extensions
+section is used to specify which X11 protocol extensions should be enabled
+or disabled.
+The
+.B Extensions
+section is optional, as are all of the entries that may be specified in
+it.
+.PP
+Entries in this section are listed as Option statements with the name of
+the extension as the first argument, and a boolean value as the second.
+The extension name is case\-sensitive, and matches the form shown in the output
+of \*qXorg -extension ?\*q.
+.PP
+.RS 7
+Example: the MIT-SHM extension can be disabled with the following entry:
+.PP
+.RS 4
+.nf
+.B "Section \*qExtensions\*q"
+.B " Option \*qMIT-SHM\*q \*qDisable\*q"
+.B "EndSection"
+.fi
+.RE
+.RE
.SH "INPUTDEVICE SECTION"
The config file may have multiple
.B InputDevice
More information about the xorg-commit
mailing list