From 0d6d373af95d0004d33b987d14ad7e04dd5d2003 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 19 Jan 2007 14:52:23 -0800 Subject: [PATCH 1/2] Update Xserver man page to match commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61 Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to -ardelay and -arinterval, respectively. --- doc/Xserver.man.pre | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index 7cf3c26a5..aa931a88a 100644 --- a/doc/Xserver.man.pre +++ b/doc/Xserver.man.pre @@ -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 are different). .TP 8 -.B \-ar1 \fImilliseconds\fP +.B \-ardelay \fImilliseconds\fP sets the autorepeat delay (length of time in milliseconds that a key must be depressed before autorepeat starts). .TP 8 -.B \-ar2 \fImilliseconds\fP +.B \-arinterval \fImilliseconds\fP sets the autorepeat interval (length of time in milliseconds that should elapse between autorepeat-generated keystrokes). .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 loads keyboard description in \fIfilename\fP on server startup. .SH SECURITY EXTENSION OPTIONS From 2dc866252c84ed0e7b3afa25e8a5312f448d405b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 22 Jan 2007 08:41:50 +0800 Subject: [PATCH 2/2] Really fix optimized render cases being hit when they shouldn't. I don't know how this define slipped in there. Fixes 6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3. --- fb/fbpict.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/fb/fbpict.h b/fb/fbpict.h index 5cdde9ef5..434526e32 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -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) { \ FbBits *__bits__; \ FbStride __stride__; \