--- rxvt-unicode/src/feature.h	2006/01/19 16:37:54	1.40
+++ rxvt-unicode/src/feature.h	2007/11/19 09:34:46	1.55
@@ -24,19 +24,20 @@
 #define FEATURE_H
 
 #ifndef X11USRLIBDIR
-# define X11USRLIBDIR		"/usr/X11R6/lib"
+# define X11USRLIBDIR		"/usr/lib"
 #endif
 #ifndef X11LIBDIR
 # define X11LIBDIR		X11USRLIBDIR "/X11"
 #endif
 #ifndef XAPPLOADDIR
-# define XAPPLOADDIR		X11LIBDIR "/app-defaults" 
+# define XAPPLOADDIR		X11LIBDIR "/app-defaults"
 # define XAPPLOADDIRLOCALE	X11LIBDIR "/%s/app-defaults"
 #endif
 
 /*-------------------------------SECURITY-------------------------------*/
 
-/* Default mode to restore when releasing the PTS device. It is relaxed to be
+/*
+ * Default mode to restore when releasing the PTS device. It is relaxed to be
  * compatible with most systems, change it to a more secure value if your
  * system supports it (0640 for example).
  */
@@ -60,6 +61,23 @@
  */
 
 /*
+ * Forcefully disable double-buffering for xft. On some card/driver combination
+ * enabling it slightly decreases performance, on most it greatly helps it.
+ * The slowdown is small, so it should normally be enabled.
+ */
+/* #define FORCE_UNBUFFERED_XFT */
+
+/*
+ * The cursor blink interval, in seconds.
+ */
+#define CURSOR_BLINK_INTERVAL 0.5
+
+/*
+ * The text blink interval, in seconds.
+ */
+#define TEXT_BLINK_INTERVAL CURSOR_BLINK_INTERVAL
+
+/*
  * Avoid enabling the colour cursor (-cr, cursorColor, cursorColor2)
  */
 /* #define NO_CURSORCOLOR */
@@ -88,15 +106,16 @@
 /*
  * Define default colours for certain items.  If you have a low colour
  * display, then consider using colours which are already pre-allocated:
+ *
  *   Black		(#000000)
- *   Red3		(#CD0000)	+ these
- *   Green3		(#00CD00)	+ colours
- *   Yellow3		(#CDCD00)	+ are
- *   Blue3		(#0000CD)	+ not
- *   Magenta3		(#CD00CD)	+ pre-allocated
- *   Cyan3		(#00CDCD)	+ if
- *   AntiqueWhite	(#FAEBD7)	+ NO_BRIGHTCOLOR
- *   Grey25		(#404040)	+ defined
+ *   Red3		(#CD0000)
+ *   Green3		(#00CD00)
+ *   Yellow3		(#CDCD00)
+ *   Blue3		(#0000CD)
+ *   Magenta3		(#CD00CD)
+ *   Cyan3		(#00CDCD)
+ *   AntiqueWhite	(#FAEBD7)
+ *   Grey25		(#404040)
  *   Red		(#FF0000)
  *   Green		(#00FF00)
  *   Yellow		(#FFFF00)
@@ -106,10 +125,10 @@
  *   White		(#FFFFFF)
  */
 /* These colours MUST be defined */
-#define COLOR_FOREGROUND	"Black"
-#define COLOR_BACKGROUND	"White"
-#define COLOR_SCROLLBAR		"#B2B2B2"	/* scrollColor match Netscape */
-#define COLOR_SCROLLTROUGH	"#969696"
+#define COLOR_FOREGROUND	"rgb:00/00/00"
+#define COLOR_BACKGROUND	"rgb:ff/ff/ff"
+#define COLOR_SCROLLBAR		"rgb:b2/b2/b2"	/* scrollColor match Netscape */
+#define COLOR_SCROLLTROUGH	"rgb:96/96/96"
 
 /*
  * The cursor colours are special.  Be very careful about setting these:
@@ -124,7 +143,7 @@
  * Define to remove support for XCopyArea () support.  XCopyArea () is useful
  * for scrolling on non-local X displays
  */
-#undef NO_SLOW_LINK_SUPPORT
+#define NO_SLOW_LINK_SUPPORT
 
 /*
  * Printer pipe which will be used for emulation of attached vt100 printer
@@ -135,11 +154,6 @@
  * Allow 80/132 mode switching on startup
  */
 /* #define ALLOW_132_MODE */
- 
-/*
- * Add support for the Offix DND (Drag 'n' Drop) protocol
- */
-/* #define OFFIX_DND */
 
 /*---------------------------------KEYS---------------------------------*/
 
@@ -178,7 +192,7 @@
 /*
  * Allow scrolling with modifier+Up/Down keys, in addition
  * to modifier+Prior/Next? (modifier is controlled with
- * SCROLL_ON_* defines above.). 
+ * SCROLL_ON_* defines above.).
  * Also for modifier+Home/End keys to move to top/bottom
  */
 /* #define SCROLL_ON_UPDOWN_KEYS */
@@ -293,6 +307,11 @@
 #define SB_WIDTH_MAXIMUM 	100
 
 /*
+ * rxvt scrollbar shadow width in pixels, must be 1 or 2
+ */
+#define SHADOW_WIDTH 1
+
+/*
  * When using Rxvt scrollbar, clicking above or below the slider will move
  * 1/4 of the screen height, if possible.  Setting RXVT_SCROLL_FULL will move
  * it one screen height less one line, if possible
@@ -360,20 +379,28 @@
 /*
  * Provide termcap/terminfo bw support (wrap backwards on cub1)
  */
-#define TERMCAP_HAS_BW
+#define TERMCAP_HAS_BW 1
 
 /*
- * Some (older, e.g. fvwm 2.2.2) window managers need some time when
- * updating window positions. If transparency isn't working correctly
- * then you might try out this one.
+ * The duration of the visual bell flash in s. The default of 20ms
+ * corresponds to the delay given in the terminfo flash code.
  */
-/* #define WAIT_FOR_WM */
+#define VISUAL_BELL_DURATION .020
+
+/*--------------------------------OTHER---------------------------------*/
 
 /*
- * The duration of the visual bell flash in µs. The default of 20ms
- * corresponds to the delay given in the terminfo flash code.
+ * Enable the linux yield/usleep hack, which can dramatically improve
+ * performance by working around the linux kernel tty ratelimit bug.
+ * Unfortunately, it seems screen is negatively affected by this on some
+ * machines, so it is disabled by default. Use freebsd or any other kernel
+ * that doesn't suffer form this bug and it will be fast either way.
+ *
+ * See command.C for details.
  */
-#define VISUAL_BELL_DURATION 20000
+#if __linux__
+# define LINUX_YIELD_HACK 0
+#endif
 
 #endif