--- rxvt-unicode/src/feature.h 2006/03/11 00:12:37 1.50 +++ rxvt-unicode/src/feature.h 2009/05/30 08:51:23 1.61 @@ -24,13 +24,13 @@ #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 @@ -61,13 +61,6 @@ */ /* - * 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 @@ -104,73 +97,17 @@ #define MAX_SAVELINES 10000000 /* - * 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) - * Green3 (#00CD00) - * Yellow3 (#CDCD00) - * Blue3 (#0000CD) - * Magenta3 (#CD00CD) - * Cyan3 (#00CDCD) - * AntiqueWhite (#FAEBD7) - * Grey25 (#404040) - * Red (#FF0000) - * Green (#00FF00) - * Yellow (#FFFF00) - * Blue (#0000FF) - * Magenta (#FF00FF) - * Cyan (#00FFFF) - * White (#FFFFFF) - */ -/* These colours MUST be defined */ -#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: - * foreground/background colours may be modified by command line or resources - * prior to this allocation. Also, they are not valid if NO_CURSORCOLOR is - * defined - */ -#define COLOR_CURSOR_FOREGROUND NULL /* if NULL, use background colour */ -#define COLOR_CURSOR_BACKGROUND NULL /* if NULL, use foreground colour */ - -/* * Define to remove support for XCopyArea () support. XCopyArea () is useful * for scrolling on non-local X displays */ #define NO_SLOW_LINK_SUPPORT /* - * Printer pipe which will be used for emulation of attached vt100 printer - */ -#define PRINTPIPE "lpr" - -/* * Allow 80/132 mode switching on startup */ /* #define ALLOW_132_MODE */ - -/*---------------------------------KEYS---------------------------------*/ - -/* - * 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_DELETE "\033[3~" -/* - * To use - * Home = "\E[1~", End = "\E[4~" - * instead of - * Home = "\E[7~", End = "\E[8~" [default] - */ -/* #define LINUX_KEYS */ +/*---------------------------------KEYS---------------------------------*/ /* * Enable the keysym resource which allows you to define strings associated @@ -192,7 +129,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 */ @@ -208,7 +145,7 @@ * (rather than a proportion (1/5) of savedlines buffer) * when paging the savedlines with SHIFT-{Prior,Next} keys. */ -#define PAGING_CONTEXT_LINES 1 /* */ +#define PAGING_CONTEXT_LINES 1 /* * Have either Ctrl+Tab or Mod4+Tab emit \e\t @@ -225,20 +162,9 @@ /* #define NO_SCROLLBAR_REPORT */ /* - * Default separating chars for multiple-click selection - * Space and tab are separate separating characters and are not settable - */ -#define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|}" - -/* - * Add run-time support for changing the cutchars for double click selection - */ -#define CUTCHAR_RESOURCE - -/* * 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] @@ -312,14 +238,13 @@ #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 + * clicking above or below the scrollbar slider (all styles minus + * xterm) will scroll by (height - 1) rather than (height / 4). */ #define RXVT_SCROLL_FULL 1 /* - * (Hops) draw an internal border line on inside edge of the scrollbar + * (Hops) draw an internal border line on inside edge of the rxvt scrollbar */ /* #define SB_BORDER */ @@ -346,8 +271,8 @@ /* #define ESCZ_ANSWER "\033[?1;2C" */ /* - * Allow foreground/background colour to be changed with an - * xterm escape sequence "\E]39;colour^G" + * Allow foreground/background colour to be changed with xterm + * operating system commands. */ #define XTERM_COLOR_CHANGE @@ -357,45 +282,111 @@ /* #define NO_SECONDARY_SCREEN_CURSOR */ /* - * Width of the term internal border + * Provide termcap/terminfo bw support (wrap backwards on cub1) */ -#define INTERNALBORDERWIDTH 2 +#define TERMCAP_HAS_BW 1 /* - * Width of the term external border + * The duration of the visual bell flash in s. The default of 20ms + * corresponds to the delay given in the terminfo flash code. */ -#define EXTERNALBORDERWIDTH 0 +#define VISUAL_BELL_DURATION .020 + +/*--------------------------------OTHER---------------------------------*/ /* - * Default number of extra dots between lines + * 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 LINESPACE 0 +#if __linux__ +# define LINUX_YIELD_HACK 0 +#endif + +/* DEFAULT RESOURCES VALUES */ /* - * Default number of lines in the scrollback buffer + * 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) + * Green3 (#00CD00) + * Yellow3 (#CDCD00) + * Blue3 (#0000CD) + * Magenta3 (#CD00CD) + * Cyan3 (#00CDCD) + * AntiqueWhite (#FAEBD7) + * Grey25 (#404040) + * Red (#FF0000) + * Green (#00FF00) + * Yellow (#FFFF00) + * Blue (#0000FF) + * Magenta (#FF00FF) + * Cyan (#00FFFF) + * White (#FFFFFF) */ -#define SAVELINES 1000 +/* These colours MUST be defined */ +#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" /* - * Provide termcap/terminfo bw support (wrap backwards on cub1) + * The cursor colours are special. Be very careful about setting these: + * foreground/background colours may be modified by command line or resources + * prior to this allocation. Also, they are not valid if NO_CURSORCOLOR is + * defined */ -#define TERMCAP_HAS_BW 1 +#define COLOR_CURSOR_FOREGROUND NULL /* if NULL, use background colour */ +#define COLOR_CURSOR_BACKGROUND NULL /* if NULL, use foreground colour */ /* - * The duration of the visual bell flash in s. The default of 20ms - * corresponds to the delay given in the terminfo flash code. + * Printer pipe which will be used for emulation of attached vt100 printer */ -#define VISUAL_BELL_DURATION .020 +#define PRINTPIPE "lpr" -/*--------------------------------OTHER---------------------------------*/ +/* + * 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_DELETE "\033[3~" /* - * Enable the linux yield/usleep hack, which can dramatically improve - * performance without hurting. See command.C for details. + * Default separating chars for multiple-click selection + * Space and tab are separate separating characters and are not settable */ -#if __linux__ -# define LINUX_YIELD_HACK 1 -#endif +#define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|}" + +/* + * Width of the term internal border + */ +#define INTERNALBORDERWIDTH 2 + +/* + * Width of the term external border + */ +#define EXTERNALBORDERWIDTH 0 + +/* + * Default number of extra dots between lines + */ +#define LINESPACE 0 + +/* + * Default number of extra dots between columns + */ +#define LETTERSPACE 0 + +/* + * Default number of lines in the scrollback buffer + */ +#define SAVELINES 1000 #endif