From 0693f656553e4cdd75e43c905d835ece4cc00222 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sat, 31 Dec 2005 18:19:06 +0000
Subject: [PATCH] *** empty log message ***

---
 src/command.C | 18 ++++++++----------
 src/rxvt.h    | 10 +++++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/command.C b/src/command.C
index c2b66f76..03d66c2d 100644
--- a/src/command.C
+++ b/src/command.C
@@ -157,12 +157,10 @@ rxvt_term::iso14755_54 (int x, int y)
       x--;
     }
 }
-#endif
 
 void
 rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
 {
-#if ENABLE_OVERLAY
   rxvt_fontset *fs = FONTSET (r);
   rxvt_font *f = (*fs)[fs->find_font (ch)];
   wchar_t *chr, *alloc, ch2, *fname;
@@ -240,8 +238,8 @@ rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
   if (alloc)
     delete [] alloc;
 # endif
-#endif
 }
+#endif
 
 void
 rxvt_term::commit_iso14755 ()
@@ -4050,6 +4048,13 @@ rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), u
       /* extra handling for values with state unkept  */
       switch (arg[i])
         {
+#if ENABLE_STYLES
+          case 1021:
+            if (mode)
+              SET_OPTION (Opt_intensityStyles);
+            else
+              CLR_OPTION (Opt_intensityStyles);
+#endif
           case 1048:		/* alternative cursor save */
           case 1049:
             if (OPTION (Opt_secondaryScreen))
@@ -4142,13 +4147,6 @@ rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), u
               else
                 CLR_OPTION (Opt_scrollTtyKeypress);
               break;
-#if ENABLE_STYLES
-            case 1021:
-              if (state)
-                SET_OPTION (Opt_intensityStyles);
-              else
-                CLR_OPTION (Opt_intensityStyles);
-#endif
             case 1047:		/* secondary screen w/ clearing last */
               if (OPTION (Opt_secondaryScreen))
                 if (current_screen != PRIMARY)
diff --git a/src/rxvt.h b/src/rxvt.h
index ccce3fce..79ec5d9a 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -575,6 +575,7 @@ enum {
   Rs_boldFont,
   Rs_italicFont,
   Rs_boldItalicFont,
+  Rs_intensityStyles,
 #endif
   Rs_name,
   Rs_title,
@@ -638,7 +639,6 @@ enum {
   Rs_borderLess,
   Rs_lineSpace,
   Rs_cursorUnderline,
-  Rs_intensityStyles,
 #endif
 #if CURSOR_BLINK
   Rs_cursorBlink,
@@ -1485,7 +1485,9 @@ struct rxvt_term : zero_initialized, rxvt_vars {
     int base = GET_BASEFG (r);
 #ifndef NO_BRIGHTCOLOR
     if (r & RS_Bold
-        && (!ENABLE_STYLES || OPTION (Opt_intensityStyles))
+# if ENABLE_STYLES
+        && OPTION (Opt_intensityStyles)
+# endif
         && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
 #endif
@@ -1497,7 +1499,9 @@ struct rxvt_term : zero_initialized, rxvt_vars {
     int base = GET_BASEBG (r);
 #ifndef NO_BRIGHTCOLOR
     if (r & RS_Blink
-        && (!ENABLE_STYLES || OPTION (Opt_intensityStyles))
+# if ENABLE_STYLES
+        && OPTION (Opt_intensityStyles)
+# endif
         && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
 #endif
-- 
2.34.1