--- rxvt-unicode/src/rxvt.h	2005/12/22 19:44:21	1.169
+++ rxvt-unicode/src/rxvt.h	2005/12/31 16:06:48	1.171
@@ -638,6 +638,7 @@
   Rs_borderLess,
   Rs_lineSpace,
   Rs_cursorUnderline,
+  Rs_intensityStyles,
 #endif
 #if CURSOR_BLINK
   Rs_cursorBlink,
@@ -829,18 +830,18 @@
 #define GET_BASEFG(x)           (((x) & RS_fgMask))
 #define GET_BASEBG(x)           (((x) & RS_bgMask)>>Color_Bits)
 #ifndef NO_BRIGHTCOLOR
-# define GET_FGCOLOR(x)                                          \
-    ((((x) & RS_Bold) == 0                                       \
-      || GET_BASEFG (x) < minCOLOR                               \
-      || GET_BASEFG (x) >= minBrightCOLOR)                       \
-     ? GET_BASEFG (x)                                            \
-     : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
-# define GET_BGCOLOR(x)                                          \
-    ((((x) & RS_Blink) == 0                                      \
-      || GET_BASEBG (x) < minCOLOR                               \
-      || GET_BASEBG (x) >= minBrightCOLOR)                       \
-     ? GET_BASEBG (x)                                            \
-     : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
+# define GET_FGCOLOR(x) (                                        \
+     !((x) & RS_Bold)                                            \
+     || (ENABLE_STYLES && !(options & Opt_intensityStyles))      \
+     || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
+       ? GET_BASEFG (x)                                          \
+       : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
+# define GET_BGCOLOR(x) (                                        \
+     !((x) & RS_Blink)                                           \
+     || (ENABLE_STYLES && !(options & Opt_intensityStyles))      \
+     || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
+       ? GET_BASEBG (x)                                          \
+       : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
 #else
 # define GET_FGCOLOR(x)         GET_BASEFG(x)
 # define GET_BGCOLOR(x)         GET_BASEBG(x)
@@ -961,6 +962,7 @@
 extern class rxvt_failure_exception { } rxvt_failure_exception;
 
 typedef callback1<void, const char *> log_callback;
+typedef callback1<int, int> getfd_callback;
 
 extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
 extern void rxvt_log (const char *fmt, ...);
@@ -1047,6 +1049,7 @@
 
 struct rxvt_term : zero_initialized, rxvt_vars {
   log_callback *log_hook;               // log error messages through this hook, if != 0
+  getfd_callback *getfd_hook;           // convert remote to local fd, if != 0
 
   struct mbstate  mbstate;              // current input multibyte state