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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.249 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.252 by ayin, Mon Oct 8 07:05:23 2007 UTC

… …
527 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
529 } 529 }
530#endif 530#endif
531 531
532#ifdef XPM_BACKGROUND 532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL) 533 if (rs[Rs_backgroundPixmap] != NULL)
534 { 534 {
535 const char *p = rs[Rs_backgroundPixmap]; 535 const char *p = rs[Rs_backgroundPixmap];
536 536
537 if ((p = strchr (p, ';')) != NULL) 537 if ((p = strchr (p, ';')) != NULL)
… …
942#if ENABLE_EWMH 942#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 944#endif
945} 945}
946 946
947void
948rxvt_term::set_window_color (int idx, const char *color)
949{
947#ifdef XTERM_COLOR_CHANGE 950#ifdef XTERM_COLOR_CHANGE
948void
949rxvt_term::set_window_color (int idx, const char *color)
950{
951 rxvt_color xcol; 951 rxvt_color xcol;
952 int i; 952 int i;
953 953
954 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
955 return; 955 return;
… …
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
993 993
994 update_fade_color (idx); 994 update_fade_color (idx);
995 recolour_cursor (); 995 recolour_cursor ();
996 scr_recolour (); 996 scr_recolour ();
997}
998
999#else
1000# define set_window_color (idx,color) ((void)0)
1001#endif /* XTERM_COLOR_CHANGE */ 997#endif /* XTERM_COLOR_CHANGE */
998}
1002 999
1003void 1000void
1004rxvt_term::recolour_cursor () 1001rxvt_term::recolour_cursor ()
1005{ 1002{
1006 XColor fg, bg; 1003 XColor fg, bg;
… …
1038 1035
1039 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 1037 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 1038 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 1039 sprintf (bstr, "%d", (i - Color_Black));
1043#ifdef XPM_BACKGROUND 1040#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 1041 xpmb = "default;";
1045#endif 1042#endif
1046 break; 1043 break;
1047 } 1044 }
1048 1045
… …
1733 1730
1734#ifdef HAVE_BG_PIXMAP 1731#ifdef HAVE_BG_PIXMAP
1735int 1732int
1736rxvt_term::update_background () 1733rxvt_term::update_background ()
1737{ 1734{
1738 bgPixmap.invalidate(); 1735 bgPixmap.invalidate ();
1739 1736
1740 /* no chance of real time refresh if we are blurring ! */ 1737 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1738 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render(); 1739 bgPixmap.render ();
1743 else 1740 else
1744 { 1741 {
1745 update_background_ev.stop (); 1742 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering()) 1743 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05); 1744 update_background_ev.start (NOW + .05);

Diff Legend

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