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.240 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.252 by ayin, Mon Oct 8 07:05:23 2007 UTC

… …
151rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
152 : 152 :
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif 155#endif
156#if ENABLE_TRANSPARENCY 156#if HAVE_BG_PIXMAP
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 157 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif 158#endif
159#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif 161#endif
162#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
506 if (option (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
508#endif 508#endif
509#ifdef HAVE_BG_PIXMAP 509#ifdef HAVE_BG_PIXMAP
510 { 510 {
511 bool changed = false;
512 bgPixmap.set_target (this); 511 bgPixmap.set_target (this);
513 512
514#ifdef ENABLE_TRANSPARENCY 513#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 514 if (option (Opt_transparent))
516 { 515 {
… …
521#endif 520#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 521 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 523 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 524 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527 525
528 bgPixmap.set_root_pixmap (); 526 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
531 } 529 }
532#endif 530#endif
533 531
534#ifdef XPM_BACKGROUND 532#ifdef BG_IMAGE_FROM_FILE
535 if (rs[Rs_backgroundPixmap] != NULL) 533 if (rs[Rs_backgroundPixmap] != NULL)
536 { 534 {
537 const char *p = rs[Rs_backgroundPixmap]; 535 const char *p = rs[Rs_backgroundPixmap];
538 536
539 if ((p = strchr (p, ';')) != NULL) 537 if ((p = strchr (p, ';')) != NULL)
… …
542 bgPixmap.set_geometry (p); 540 bgPixmap.set_geometry (p);
543 } 541 }
544 else 542 else
545 bgPixmap.set_defaultGeometry (); 543 bgPixmap.set_defaultGeometry ();
546 544
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]); 545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 } 548 }
549#endif 549#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 } 550 }
556#endif 551#endif
557 552
558#if ENABLE_PERL 553#if ENABLE_PERL
559 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
… …
947#if ENABLE_EWMH 942#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif 944#endif
950} 945}
951 946
947void
948rxvt_term::set_window_color (int idx, const char *color)
949{
952#ifdef XTERM_COLOR_CHANGE 950#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol; 951 rxvt_color xcol;
957 int i; 952 int i;
958 953
959 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
960 return; 955 return;
… …
997 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
998 993
999 update_fade_color (idx); 994 update_fade_color (idx);
1000 recolour_cursor (); 995 recolour_cursor ();
1001 scr_recolour (); 996 scr_recolour ();
1002}
1003
1004#else
1005# define set_window_color (idx,color) ((void)0)
1006#endif /* XTERM_COLOR_CHANGE */ 997#endif /* XTERM_COLOR_CHANGE */
998}
1007 999
1008void 1000void
1009rxvt_term::recolour_cursor () 1001rxvt_term::recolour_cursor ()
1010{ 1002{
1011 XColor fg, bg; 1003 XColor fg, bg;
… …
1043 1035
1044 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 1037 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 1038 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 1039 sprintf (bstr, "%d", (i - Color_Black));
1048#ifdef XPM_BACKGROUND 1040#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 1041 xpmb = "default;";
1050#endif 1042#endif
1051 break; 1043 break;
1052 } 1044 }
1053 1045
… …
1149 1141
1150 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1152 width, height); 1144 width, height);
1153 1145
1146#ifdef HAVE_BG_PIXMAP
1147 if (bgPixmap.window_size_sensitive ())
1148 update_background ();
1149#endif
1150
1154 scr_clear (); 1151 scr_clear ();
1155#ifdef XPM_BACKGROUND
1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1158#endif
1159 } 1152 }
1160 1153
1161 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1162 scr_reset (); 1155 scr_reset ();
1163 1156
1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1157 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 //scr_touch (false); 1158 //scr_touch (false);
1166 1159
1167#ifdef HAVE_BG_PIXMAP 1160#ifdef HAVE_BG_PIXMAP
1161// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168 if (bgPixmap.pixmap) 1162// if (bgPixmap.pixmap)
1169 scr_touch (false); 1163// scr_touch (false);
1170#endif 1164#endif
1171 1165
1172#ifdef USE_XIM 1166#ifdef USE_XIM
1173 IMSetPosition (); 1167 IMSetPosition ();
1174#endif 1168#endif
… …
1703 1697
1704 XFree (preedit_attr); 1698 XFree (preedit_attr);
1705} 1699}
1706#endif /* USE_XIM */ 1700#endif /* USE_XIM */
1707 1701
1702void
1703rxvt_term::get_window_origin (int &x, int &y)
1704{
1705 Window cr;
1706 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1707/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1708}
1709
1710Pixmap
1711rxvt_term::get_pixmap_property (int prop_id)
1712{
1713 if (prop_id > 0 && prop_id < NUM_XA)
1714 if (xa[prop_id])
1715 {
1716 int aformat;
1717 unsigned long nitems, bytes_after;
1718 Atom atype;
1719 unsigned char *prop = NULL;
1720 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1721 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1722 &nitems, &bytes_after, &prop);
1723 if (result == Success && prop && atype == XA_PIXMAP)
1724 {
1725 return *(Pixmap *)prop;
1726 }
1727 }
1728 return None;
1729}
1730
1731#ifdef HAVE_BG_PIXMAP
1732int
1733rxvt_term::update_background ()
1734{
1735 bgPixmap.invalidate ();
1736
1737 /* no chance of real time refresh if we are blurring ! */
1738 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1739 bgPixmap.render ();
1740 else
1741 {
1742 update_background_ev.stop ();
1743 if (!bgPixmap.need_client_side_rendering())
1744 update_background_ev.start (NOW + .05);
1745 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1746 update_background_ev.start (NOW + .2); /* very slow !!! */
1747 else
1748 update_background_ev.start (NOW + .07);
1749 }
1750 return 0;
1751}
1752
1753void
1754rxvt_term::update_background_cb (time_watcher &w)
1755{
1756 bgPixmap.render ();
1757}
1758
1759#endif /* HAVE_BG_PIXMAP */
1760
1708/*----------------------- end-of-file (C source) -----------------------*/ 1761/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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