--- rxvt-unicode/src/feature.h	2006/01/11 00:59:58	1.30
+++ rxvt-unicode/src/feature.h	2006/03/11 00:12:37	1.50
@@ -34,18 +34,50 @@
 # define XAPPLOADDIRLOCALE	X11LIBDIR "/%s/app-defaults"
 #endif
 
+/*-------------------------------SECURITY-------------------------------*/
+
+/*
+ * 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).
+ */
+#define RESTORE_TTY_MODE 0666
+
+/*
+ * Define if you want to use a separate process for pty/tty handling
+ * when running setuid/setgid. You need this when making it setuid/setgid.
+ */
+#define PTYTTY_HELPER 1
+
 /*-----------------------SCREEN OPTIONS AND COLOURS---------------------*/
 
 /*
  * NOTE:
  *
- * Most of these configuration options have not been tested within the new
+ * Some of these configuration options have not been tested within the new
  * rxvt-unicode framework. Changing them should work, might have no effect,
  * destroy your disks or have any other effects. You may freely try (and
  * report bugs, too!), but don't _expect_ them to work.
  */
 
 /*
+ * 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 */
@@ -74,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)
@@ -92,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:
@@ -110,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
@@ -122,11 +155,6 @@
  */
 /* #define ALLOW_132_MODE */
  
-/*
- * Add support for the Offix DND (Drag 'n' Drop) protocol
- */
-/* #define OFFIX_DND */
-
 /*---------------------------------KEYS---------------------------------*/
 
 /*
@@ -224,12 +252,6 @@
 #define MOUSE_THRESHOLD		50
 
 /*
- * If mouse wheel is defined, then scrolling is by 5 lines (or 1 line
- * if the shift key is down).  Scrolling can be smooth or jump scrolling
- */
-#define JUMP_MOUSE_WHEEL
-
-/*
  * Set delay periods for continuous scrolling with scrollbar buttons
  */
 /* #define SCROLLBAR_INITIAL_DELAY 0.33 */
@@ -251,14 +273,9 @@
 
 /*--------------------------------MISC----------------------------------*/
 /*
- * Disable to reset tty device to pre-incovation state
- */
-#define RESET_TTY_TO_COMMON_DEFAULTS
-
-/*
- * Only log in wtmp file when we're a login shell (-ls option)
+ * Only log in wtmp and lastlog files when we're a login shell (-ls option)
  */
-#define WTMP_ONLY_ON_LOGIN
+#define LOG_ONLY_ON_LOGIN
 
 /*--------------------------------BELL----------------------------------*/
 /*
@@ -290,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
@@ -301,26 +323,6 @@
  */
 /* #define SB_BORDER */
 
-/*------------------------------MENU BAR--------------------------------*/
-/*
- * Choose how many of (experimental) menuBars you want to be able to stack at
- * one time.
- *  A value of 1 disables menuBar stacking.
- *  A value of 0 disables menuBar all together.
- *  Note that the amount of memory overhead is the same for any value >= 2.
- */
-#define MENUBAR_MAX 16
-
-/*
- * Change the default shadow style
- */
-/* #define MENUBAR_SHADOW_IN */
-
-/*
- * Change the default shadow style
- */
-#define MENU_SHADOW_IN
-
 /*---------------------------MULTILINGUAL-------------------------------*/
 /*
  * Allow run-time selection of Meta (Alt) to set the 8th bit on
@@ -377,20 +379,23 @@
 /*
  * 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 without hurting. See command.C for details.
  */
-#define VISUAL_BELL_DURATION 20000
+#if __linux__
+# define LINUX_YIELD_HACK 1
+#endif
 
 #endif