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.294 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.300 by root, Tue Jan 31 19:53:30 2006 UTC

… …
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2464 2464
2465 if (!i || prop == NULL 2465 if (!i || prop == NULL
2466#if TINTING 2466#if TINTING
2467 || !rs[Rs_color + Color_tint] 2467 || !ISSET_PIXCOLOR (Color_tint)
2468#endif 2468#endif
2469 ) 2469 )
2470 have_pixmap = 0; 2470 have_pixmap = 0;
2471 else 2471 else
2472 { 2472 {
… …
2538 XFreePixmap (xdisp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2539 2539
2540#if TINTING 2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2542 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545 2544
2545 rgba c;
2546 pix_colors_focused[Color_tint].get (this, c); 2546 pix_colors_focused [Color_tint].get (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
2551 2551
… …
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? */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3572 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3573 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3574 (unsigned int) (args[1] * fheight));
3577 break; 3575 break;
3578 3576
3579
3580 /* 3577 /*
3581 * reports - some output format copied from XTerm 3578 * reports - some output format copied from XTerm
3582 */ 3579 */
3583 case 11: /* report window state */ 3580 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
… …
3721void 3718void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3719rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3720{
3724 if (str[0] == '?' && !str[1]) 3721 if (str[0] == '?' && !str[1])
3725 { 3722 {
3726 rxvt_rgba c; 3723 rgba c;
3727 pix_colors_focused[color].get (this, c); 3724 pix_colors_focused[color].get (c);
3728 3725
3729#if XFT 3726#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3727 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); 3728 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3729 else
3733#endif 3730#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3731 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3732 }
… …
3853 break; 3850 break;
3854#endif 3851#endif
3855#if TRANSPARENT && TINTING 3852#if TRANSPARENT && TINTING
3856 case URxvt_Color_tint: 3853 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3854 process_color_seq (op, Color_tint, str, resp);
3855
3858 check_our_parents (); 3856 check_our_parents ();
3857
3859 if (am_transparent) 3858 if (am_transparent)
3860 want_full_refresh = want_refresh = 1; 3859 want_full_refresh = want_refresh = 1;
3860
3861 break; 3861 break;
3862#endif 3862#endif
3863 3863
3864 case Rxvt_Pixmap: 3864 case Rxvt_Pixmap:
3865 { 3865 {

Diff Legend

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