--- rxvt-unicode/src/feature.h	2004/01/19 17:26:43	1.6
+++ rxvt-unicode/src/feature.h	2005/02/10 12:25:34	1.23
@@ -31,10 +31,20 @@
 #endif
 #ifndef XAPPLOADDIR
 # define XAPPLOADDIR		X11LIBDIR "/app-defaults" 
-# define XAPPLOADDIRLOCALE	X11LIBDIR "/%-.*s/app-defaults"
+# define XAPPLOADDIRLOCALE	X11LIBDIR "/%s/app-defaults"
 #endif
 
 /*-----------------------SCREEN OPTIONS AND COLOURS---------------------*/
+
+/*
+ * NOTE:
+ *
+ * Most of these configuration options have not been tested within the new
+ * rxvt-unicode framework. Changing them might 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.
@@ -66,17 +76,6 @@
 /* #define NO_BOLD_UNDERLINE_REVERSE */
 
 /*
- * Don't bother cleaning up pixel droppings.  If you don't use bold
- * overstrike then you don't usually need this
- */
-#define NO_PIXEL_DROPPING_AVOIDANCE
-
-/*
- * Add support for '-hc colour' for background highlight of selection
- */
-#define OPTION_HC
-
-/*
  * Define maximum possible columns and rows
  */
 #define MAX_COLS	4000
@@ -107,6 +106,7 @@
 #define COLOR_BACKGROUND	"White"
 #define COLOR_SCROLLBAR		"#B2B2B2"	/* scrollColor match Netscape */
 #define COLOR_SCROLLTROUGH	"#969696"
+
 /*
  * The cursor colours are special.  Be very careful about setting these:
  * foreground/background colours may be modified by command line or resources
@@ -117,10 +117,10 @@
 #define COLOR_CURSOR_BACKGROUND	NULL	/* if NULL, use foreground colour */
 
 /*
- * Define to remove support for XCopyArea() support.  XCopyArea() is useful
+ * Define to remove support for XCopyArea () support.  XCopyArea () is useful
  * for scrolling on non-local X displays
  */
-/* #define NO_SLOW_LINK_SUPPORT */
+#define NO_SLOW_LINK_SUPPORT
 
 /*
  * Printer pipe which will be used for emulation of attached vt100 printer
@@ -137,7 +137,7 @@
  * Define to find installed application defaults for rxvt
  * Only if USE_XGETDEFAULT is not defined.
  */
-/* #define USE_XAPPLOADDIR */
+#define USE_XAPPLOADDIR
 
 /*
  * Add support for the Offix DND (Drag 'n' Drop) protocol
@@ -150,16 +150,8 @@
  * Define defaults for backspace and delete keys - unless they have been
  * configured out with --disable-backspace-key / --disable-delete-key
  */
-//#define DEFAULT_BACKSPACE	"DEC"		/* SPECIAL */
-#define DEFAULT_BACKSPACE	"\010"		/* wrong, but match terminfo etc. */
-#define DEFAULT_DELETE	"\033[3~"
-
-/*
- * Choose one of these values to be the `hotkey' for changing font.
- * This has been superceded and is only for you older users
- */
-/* #define HOTKEY_CTRL */
-/* #define HOTKEY_META */
+#define DEFAULT_BACKSPACE	"DEC"		/* SPECIAL */
+#define DEFAULT_DELETE		"\033[3~"
 
 /*
  * To use
@@ -174,12 +166,12 @@
  * with various KeySyms (0xFF00 - 0xFFFF).
  * Only works with the default hand-rolled resources.
  */
-#ifndef NO_RESOURCES
+#if !NO_RESOURCES && ENABLE_FRILLS
 # define KEYSYM_RESOURCE
 #endif
 
 /*
- * Modifier/s to use to allow up/down arrows and Priot/Next keys
+ * Modifier/s to use to allow up/down arrows and Prior/Next keys
  * to scroll single or page-fulls
  */
 #define SCROLL_ON_SHIFT
@@ -214,13 +206,6 @@
 /* #define CTRL_TAB_MAKES_META */
 /* #define MOD4_TAB_MAKES_META */
 
-/*
- * default mode switch when greek keyboard is enabled (i.e. GREEK_SUPPORT)
- */
-#ifndef GREEK_KEYBOARD_MODESWITCH
-# define GREEK_KEYBOARD_MODESWITCH XK_Mode_switch
-#endif
-
 /*--------------------------------MOUSE---------------------------------*/
 /*
  * Disable sending escape sequences (up, down, page up/down)
@@ -232,7 +217,7 @@
  * Default separating chars for multiple-click selection
  * Space and tab are separate separating characters and are not settable
  */
-#define CUTCHARS	"\"&'()*,;<=>?@[\\]^`{|}~"
+#define CUTCHARS	"\"&'()*,;<=>?@[\\]^`{|}"
 
 /*
  * Add run-time support for changing the cutchars for double click selection
@@ -242,7 +227,7 @@
 /*
  * Have mouse reporting include double-click info for button1
  */
-/* #define MOUSE_REPORT_DOUBLECLICK */
+//#define MOUSE_REPORT_DOUBLECLICK
 
 /*
  * Set delay between multiple click events [default: 500 milliseconds]
@@ -259,27 +244,27 @@
  * 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 */
+#define JUMP_MOUSE_WHEEL
 
 /*
  * Set delay periods for continuous scrolling with scrollbar buttons
  */
-/* #define SCROLLBAR_INITIAL_DELAY 40 */
-/* #define SCROLLBAR_CONTINUOUS_DELAY 2 */
+/* #define SCROLLBAR_INITIAL_DELAY 0.33 */
+/* #define SCROLLBAR_CONTINUOUS_DELAY 0.05 */
 
 /*
  * The speed of selection scrolling is proportional to the distance
  * the mouse pointer is out of the text window.  This is the max
  * number of lines to scroll at a time.
  */
-#define SELECTION_SCROLL_MAX_LINES 2
+#define SELECTION_SCROLL_MAX_LINES 8
 
 /*
  * The number of lines (measured in character's heights, not pixels)
  * the pointer must be out of the window for each increase in the
  * number of lines scrolled.
  */
-#define SELECTION_SCROLL_LINE_SPEEDUP 4
+#define SELECTION_SCROLL_LINE_SPEEDUP 3
 
 /*--------------------------------MISC----------------------------------*/
 /*
@@ -292,18 +277,6 @@
  */
 #define WTMP_ONLY_ON_LOGIN
 
-/*
- * When pasting ACS characters, convert to similar normal characters
- */
-/* #define ACS_ASCII */
-
-/*
- * Default ascii characters to which ACS symbols are converted
- */
-#ifdef ACS_ASCII
-# define ACS_CHARS ".#    o+  ----+---__++--|<> =#. "
-#endif
-
 /*--------------------------------BELL----------------------------------*/
 /*
  * Disable all bell indications
@@ -353,7 +326,7 @@
  *  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 8
+#define MENUBAR_MAX 16
 
 /*
  * Change the default shadow style
@@ -383,12 +356,6 @@
 /* #define DISPLAY_IS_IP */
 
 /*
- * Have "\E[7n" transmit the display name.
- * This has been cited as a potential security hole.
- */
-#define ENABLE_DISPLAY_ANSWER
-
-/*
  * Change what ESC Z transmits instead of the default "\E[?1;2c"
  */
 /* #define ESCZ_ANSWER	"\033[?1;2C" */
@@ -397,7 +364,7 @@
  * Check the current value of the window-time/icon-name and avoid
  * re-setting it to the same value -- avoids unnecessary window refreshes
  */
-#define SMART_WINDOW_TITLE
+//#define SMART_WINDOW_TITLE // currently disabled, needs to be reimplemented
 
 /*
  * Allow foreground/background colour to be changed with an
@@ -411,12 +378,6 @@
 /* #define NO_SECONDARY_SCREEN_CURSOR */
 
 /*
- * If no secondary screen is available (NO_SECONDARY_SCREEN in config.h),
- * then scroll the text up on a window change request
- */
-#define SCROLL_ON_NO_SECONDARY
-
-/*
  * Width of the term internal border
  */
 #define INTERNALBORDERWIDTH	2
@@ -437,20 +398,16 @@
 #define SAVELINES	64
 
 /*
- * Provide termcap/terminfo bw support
+ * Provide termcap/terminfo bw support (wrap backwards on cub1)
  */
-/* #define TERMCAP_HAS_BW */
+#define TERMCAP_HAS_BW
 
 /*
- * MAX_NFONTS is the maximum allowed number of fonts in the list
- * FONT0_IDX is the default font in the list (starting at 0)
- * Sizes between multi-char fonts sets (MFONT_LIST) and single-char font
- * sets (NFONT_LIST) have been matched up
+ * 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.
  */
-#define MAX_NFONTS	7
-#define FONT0_IDX	2
-
-#define UNICODE 1 /* TODO */
-#define UTF8 1 /* TODO */
+/* #define WAIT_FOR_WM */
 
 #endif
+