ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.297 by root, Tue Jan 31 16:43:55 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

2540#if TINTING 2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2542 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2544 2544
2545 rxvt_rgba c; 2545 rgba c;
2546 pix_colors_focused [Color_tint].get (this, c); 2546 pix_colors_focused [Color_tint].get (this, c);
2547 2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 } 2549 }
2550#endif 2550#endif
2574 * InheritPixmap transparency 2574 * InheritPixmap transparency
2575 */ 2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 { 2577 {
2578 oldp = parent[i]; 2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2580 &parent[i], &list, &n);
2581 XFree (list); 2580 XFree (list);
2582 2581
2583 if (parent[i] == display->root) 2582 if (parent[i] == display->root)
2584 { 2583 {
2585 if (oldp != None) 2584 if (oldp != None)
2593 } 2592 }
2594 2593
2595 n = 0; 2594 n = 0;
2596 2595
2597 if (pchanged) 2596 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++) 2597 for (; n < (unsigned int)i; n++)
2600 { 2598 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr); 2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 { 2602 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break; 2604 break;
2606 } 2605 }
2607 } 2606 }
2608 }
2609 2607
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2611 { 2609 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0; 2612 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */ 2613 /* XXX: also turn off Opt_transparent? */
3721void 3719void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3720rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3721{
3724 if (str[0] == '?' && !str[1]) 3722 if (str[0] == '?' && !str[1])
3725 { 3723 {
3726 rxvt_rgba c; 3724 rgba c;
3727 pix_colors_focused[color].get (this, c); 3725 pix_colors_focused[color].get (this, c);
3728 3726
3729#if XFT 3727#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3728 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3729 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3730 else
3733#endif 3731#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3733 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines