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.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.250 by sasha, Wed Sep 12 21:06:08 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 ();
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);
… …
1043 1038
1044 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 1041 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1048#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 1044 xpmb = "default;";
1050#endif 1045#endif
1051 break; 1046 break;
1052 } 1047 }
1053 1048
… …
1149 1144
1150 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1152 width, height); 1147 width, height);
1153 1148
1154#ifdef XPM_BACKGROUND 1149#ifdef HAVE_BG_PIXMAP
1155 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156 if (bgPixmap.window_size_sensitive ()) 1150 if (bgPixmap.window_size_sensitive ())
1157 bgPixmap.render (); 1151 update_background ();
1158#endif 1152#endif
1159 1153
1160 scr_clear (); 1154 scr_clear ();
1161 } 1155 }
1162 1156
… …
1706 1700
1707 XFree (preedit_attr); 1701 XFree (preedit_attr);
1708} 1702}
1709#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1710 1704
1705void
1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1763
1711/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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