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.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.252 by ayin, Mon Oct 8 07:05:23 2007 UTC

… …
148} 148}
149#endif 149#endif
150 150
151rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
152 : 152 :
153#if TRANSPARENT || 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 check_our_aprents_ev(this, &rxvt_term::check_our_parents_cb), 155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
156#endif 158#endif
157#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
158 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
159#endif 161#endif
160#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
332 im_ev.stop (display); 334 im_ev.stop (display);
333#endif 335#endif
334#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
335 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
336#endif 338#endif
337#if TRANSPARENT || ENABLE_PERL 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
338 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
339#endif 341#endif
340 incr_ev.stop (); 342 incr_ev.stop ();
341 termwin_ev.stop (display); 343 termwin_ev.stop (display);
342 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
502 504
503#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
504 if (option (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
505 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
506#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
507#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
508 if (option (Opt_transparent)) 514 if (option (Opt_transparent))
509 { 515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
510 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
511 check_our_parents ();
512 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
513 } 529 }
514#endif 530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
515#if ENABLE_PERL 553#if ENABLE_PERL
516 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
517#endif 555#endif
518 556
519 set_colorfgbg (); 557 set_colorfgbg ();
… …
628 return p; 666 return p;
629} 667}
630 668
631/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
632/* 670/*
633 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
634 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
635 */ 673 */
636void 674void
637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638{ 676{
… …
904#if ENABLE_EWMH 942#if ENABLE_EWMH
905 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
906#endif 944#endif
907} 945}
908 946
947void
948rxvt_term::set_window_color (int idx, const char *color)
949{
909#ifdef XTERM_COLOR_CHANGE 950#ifdef XTERM_COLOR_CHANGE
910void
911rxvt_term::set_window_color (int idx, const char *color)
912{
913 rxvt_color xcol; 951 rxvt_color xcol;
914 int i; 952 int i;
915 953
916 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
917 return; 955 return;
… …
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
955 993
956 update_fade_color (idx); 994 update_fade_color (idx);
957 recolour_cursor (); 995 recolour_cursor ();
958 scr_recolour (); 996 scr_recolour ();
959}
960
961#else
962# define set_window_color (idx,color) ((void)0)
963#endif /* XTERM_COLOR_CHANGE */ 997#endif /* XTERM_COLOR_CHANGE */
998}
964 999
965void 1000void
966rxvt_term::recolour_cursor () 1001rxvt_term::recolour_cursor ()
967{ 1002{
968 XColor fg, bg; 1003 XColor fg, bg;
… …
1000 1035
1001 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 1037 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 1038 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 1039 sprintf (bstr, "%d", (i - Color_Black));
1005#ifdef XPM_BACKGROUND 1040#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 1041 xpmb = "default;";
1007#endif 1042#endif
1008 break; 1043 break;
1009 } 1044 }
1010 1045
… …
1106 1141
1107 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1108 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1109 width, height); 1144 width, height);
1110 1145
1146#ifdef HAVE_BG_PIXMAP
1147 if (bgPixmap.window_size_sensitive ())
1148 update_background ();
1149#endif
1150
1111 scr_clear (); 1151 scr_clear ();
1112#ifdef XPM_BACKGROUND
1113 resize_pixmap ();
1114#endif
1115 } 1152 }
1116 1153
1117 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1118 scr_reset (); 1155 scr_reset ();
1119 1156
1120 // 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
1121 //scr_touch (false); 1158 //scr_touch (false);
1122 1159
1123#ifdef XPM_BACKGROUND 1160#ifdef HAVE_BG_PIXMAP
1124 if (pixmap) 1161// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1162// if (bgPixmap.pixmap)
1125 scr_touch (false); 1163// scr_touch (false);
1126#endif 1164#endif
1127 1165
1128#ifdef USE_XIM 1166#ifdef USE_XIM
1129 IMSetPosition (); 1167 IMSetPosition ();
1130#endif 1168#endif
… …
1659 1697
1660 XFree (preedit_attr); 1698 XFree (preedit_attr);
1661} 1699}
1662#endif /* USE_XIM */ 1700#endif /* USE_XIM */
1663 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
1664/*----------------------- end-of-file (C source) -----------------------*/ 1761/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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