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

Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework

This commit is contained in:
Ian Romanick 2007-01-22 08:44:36 -08:00
parent c279d5fdc5 2dc866252c
commit 7dfb3cea91
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/Xserver.man.pre
View File

@ -397,20 +397,14 @@ base directory for keyboard layout files. This option is not available
for setuid X servers (i.e., when the X server's real and effective uids for setuid X servers (i.e., when the X server's real and effective uids
are different). are different).
.TP 8 .TP 8
.B \-ar1 \fImilliseconds\fP .B \-ardelay \fImilliseconds\fP
sets the autorepeat delay (length of time in milliseconds that a key must sets the autorepeat delay (length of time in milliseconds that a key must
be depressed before autorepeat starts). be depressed before autorepeat starts).
.TP 8 .TP 8
.B \-ar2 \fImilliseconds\fP .B \-arinterval \fImilliseconds\fP
sets the autorepeat interval (length of time in milliseconds that should sets the autorepeat interval (length of time in milliseconds that should
elapse between autorepeat-generated keystrokes). elapse between autorepeat-generated keystrokes).
.TP 8 .TP 8
.B \-noloadxkb
disables loading of an XKB keymap description on server startup.
.TP 8
.B \-xkbdb \fIfilename\fP
uses \fIfilename\fP for default keyboard keymaps.
.TP 8
.B \-xkbmap \fIfilename\fP .B \-xkbmap \fIfilename\fP
loads keyboard description in \fIfilename\fP on server startup. loads keyboard description in \fIfilename\fP on server startup.
.SH SECURITY EXTENSION OPTIONS .SH SECURITY EXTENSION OPTIONS

3
fb/fbpict.h
View File

@ -105,9 +105,6 @@ fbCanGetSolid(PicturePtr pict)
} }
} }
#define fbCanGetSolid(pict) \
(pict->pDrawable != NULL && pict->pDrawable->width == 1 && pict->pDrawable->height == 1)
#define fbComposeGetSolid(pict, bits, fmt) { \ #define fbComposeGetSolid(pict, bits, fmt) { \
FbBits *__bits__; \ FbBits *__bits__; \
FbStride __stride__; \ FbStride __stride__; \