--- rxvt-unicode/src/command.C	2006/01/30 04:27:17	1.293
+++ rxvt-unicode/src/command.C	2006/01/31 19:53:30	1.300
@@ -2464,7 +2464,7 @@
 
   if (!i || prop == NULL
 #if TINTING
-      || !rs[Rs_color + Color_tint]
+      || !ISSET_PIXCOLOR (Color_tint)
 #endif
       )
     have_pixmap = 0;
@@ -2540,10 +2540,10 @@
 #if TINTING
           if (ISSET_PIXCOLOR (Color_tint))
             {
-              rxvt_rgba c;
               int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
 
-              pix_colors_focused[Color_tint].get (this, c);
+              rgba c;
+              pix_colors_focused [Color_tint].get (c);
 
               ShadeXImage (this, image, shade, c.r, c.g, c.b);
             }
@@ -2576,8 +2576,7 @@
       for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
         {
           oldp = parent[i];
-          XQueryTree (xdisp, parent[i - 1], &root,
-                      &parent[i], &list, &n);
+          XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
           XFree (list);
 
           if (parent[i] == display->root)
@@ -2595,19 +2594,18 @@
       n = 0;
 
       if (pchanged)
-        {
-          for (; n < (unsigned int)i; n++)
-            {
-              XGetWindowAttributes (xdisp, parent[n], &wattr);
-              if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
-                {
-                  n = (int) (sizeof (parent) / sizeof (Window)) + 1;
-                  break;
-                }
-            }
-        }
+        for (; n < (unsigned int)i; n++)
+          {
+            XGetWindowAttributes (xdisp, parent[n], &wattr);
+
+            if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
+              {
+                n = (int) (sizeof (parent) / sizeof (Window)) + 1;
+                break;
+              }
+          }
 
-      if (n > (int) (sizeof (parent) / sizeof (parent[0])))
+      if (n > (sizeof (parent) / sizeof (parent[0])))
         {
           XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
           XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
@@ -3093,7 +3091,7 @@
       case '+':
         scr_charset_set (3, (unsigned int)cmd_getc ());
         break;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case '6':
         scr_backindex ();
         break;
@@ -3104,7 +3102,7 @@
       case '8':
         scr_cursor (RESTORE);
         break;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case '9':
         scr_forwardindex ();
         break;
@@ -3507,7 +3505,7 @@
         scr_cursor (RESTORE);
         break;
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case CSI_74:
         process_window_ops (arg, nargs);
         break;
@@ -3524,7 +3522,7 @@
 }
 /*}}} */
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 /* ARGSUSED */
 void
 rxvt_term::process_window_ops (const int *args, unsigned int nargs)
@@ -3576,7 +3574,6 @@
                            (unsigned int) (args[1] * fheight));
         break;
 
-
       /*
        * reports - some output format copied from XTerm
        */
@@ -3723,11 +3720,11 @@
 {
   if (str[0] == '?' && !str[1])
     {
-      rxvt_rgba c;
-      pix_colors_focused[color].get (this, c);
+      rgba c;
+      pix_colors_focused[color].get (c);
 
 #if XFT
-      if (c.a != rxvt_rgba::MAX_CC)
+      if (c.a != rgba::MAX_CC)
         tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
       else
 #endif
@@ -3855,9 +3852,12 @@
 #if TRANSPARENT && TINTING
       case URxvt_Color_tint:
         process_color_seq (op, Color_tint, str, resp);
+
         check_our_parents ();
+
         if (am_transparent)
           want_full_refresh = want_refresh = 1;
+
         break;
 #endif
 
@@ -3946,7 +3946,7 @@
                      resp);
         break;
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case URxvt_locale:
         if (query)
           tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
@@ -4320,7 +4320,7 @@
 
           //case 50: // not variable spacing
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           case 90:
           case 91:		/* set bright fg color */
           case 92: