[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

                                  0L, 1L, False, XA_PIXMAP, &atype, &aformat,
                                  &nitems, &bytes_after, &prop) == Success);
   if (!i || prop == NULL
 #if TINTING
-      || !rs[Rs_color + Color_tint]
+      || !ISSET_PIXCOLOR (Color_tint)
 #endif
       )
     have_pixmap = 0;
   else
     {
             XFreePixmap (xdisp, pixmap);
 #if TINTING
           if (ISSET_PIXCOLOR (Color_tint))
             {
-              rxvt_rgba c;
               int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
+              rgba c;
-              pix_colors_focused[Color_tint].get (this, c);
+              pix_colors_focused [Color_tint].get (this, c);
               ShadeXImage (this, image, shade, c.r, c.g, c.b);
             }
 #endif
        * InheritPixmap transparency
        */
       for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
         {
           oldp = parent[i];
-          XQueryTree (xdisp, parent[i - 1], &root,
+          XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
-                      &parent[i], &list, &n);
           XFree (list);
           if (parent[i] == display->root)
             {
               if (oldp != None)
         }
       n = 0;
       if (pchanged)
-        {
-          for (; n < (unsigned int)i; n++)
+        for (; n < (unsigned int)i; n++)
-            {
+          {
-              XGetWindowAttributes (xdisp, parent[n], &wattr);
+            XGetWindowAttributes (xdisp, parent[n], &wattr);
-              if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
+            if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
-                {
+              {
-                  n = (int) (sizeof (parent) / sizeof (Window)) + 1;
+                n = (int) (sizeof (parent) / sizeof (Window)) + 1;
-                  break;
+                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]);
           am_transparent = 0;
           /* XXX: also turn off Opt_transparent? */
 void
 rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
 {
   if (str[0] == '?' && !str[1])
     {
-      rxvt_rgba c;
+      rgba c;
       pix_colors_focused[color].get (this, 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
         tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
     }
         break;
 #endif
 #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
       case Rxvt_Pixmap:
         {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC vs. Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC