--- rxvt-unicode/src/feature.h	2006/01/09 22:41:41	1.29
+++ rxvt-unicode/src/feature.h	2006/01/20 10:27:08	1.41
@@ -34,24 +34,40 @@
 # 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.
  */
 
 /*
- * Define the name of the environment variable to be used in
- * addition to the "PATH" environment and the `path' resource.
- * Usually it should point to where you keep your background pixmaps and/or
- * your menu files
+ * The cursor blink interval, in seconds.
+ */
+#define CURSOR_BLINK_INTERVAL 0.5
+
+/*
+ * The text blink interval, in seconds.
  */
-#define PATH_ENV	"RXVTPATH"
+#define TEXT_BLINK_INTERVAL CURSOR_BLINK_INTERVAL
 
 /*
  * Avoid enabling the colour cursor (-cr, cursorColor, cursorColor2)
@@ -130,13 +146,6 @@
  */
 /* #define ALLOW_132_MODE */
  
-/*------------------------------RESOURCES-------------------------------*/
-/*
- * Define to find installed application defaults for rxvt
- * Only if USE_XGETDEFAULT is not defined.
- */
-#define USE_XAPPLOADDIR
-
 /*
  * Add support for the Offix DND (Drag 'n' Drop) protocol
  */
@@ -164,7 +173,7 @@
  * with various KeySyms (0xFF00 - 0xFFFF).
  * Required by perl.
  */
-#if (!NO_RESOURCES && ENABLE_FRILLS) || ENABLE_PERL
+#if ENABLE_FRILLS || ENABLE_PERL
 # define KEYSYM_RESOURCE
 #endif
 
@@ -239,12 +248,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 */
@@ -266,14 +269,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----------------------------------*/
 /*
@@ -316,26 +314,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