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.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.253 by ayin, Mon Oct 15 07:33:48 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#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
155#endif 158#endif
156#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
157 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
158#endif 161#endif
159#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
198#endif 201#endif
199} 202}
200 203
201// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
202// for use before an emergency exit 205// for use before an emergency exit
206void
203void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
204{ 208{
205 if (cmd_pid) 209 if (cmd_pid)
206 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
207 211
208 pty_ev.stop (); 212 pty_ev.stop ();
… …
307{ 311{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 313
310 cmd_pid = 0; 314 cmd_pid = 0;
311 315
312 if (!OPTION (Opt_hold)) 316 if (!option (Opt_hold))
313 destroy (); 317 destroy ();
314} 318}
315 319
316void 320void
317rxvt_term::destroy () 321rxvt_term::destroy ()
… …
331 im_ev.stop (display); 335 im_ev.stop (display);
332#endif 336#endif
333#if HAVE_SCROLLBARS 337#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 338 scrollbar_ev.stop (display);
335#endif 339#endif
336#if TRANSPARENT || ENABLE_PERL 340#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 341 rootwin_ev.stop (display);
338#endif 342#endif
339 incr_ev.stop (); 343 incr_ev.stop ();
340 termwin_ev.stop (display); 344 termwin_ev.stop (display);
341 vt_ev.stop (display); 345 vt_ev.stop (display);
… …
481#ifdef KEYSYM_RESOURCE 485#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 486 keyboard->register_done ();
483#endif 487#endif
484 488
485#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 490 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 492#endif
489 493
490 pty = ptytty::create (); 494 pty = ptytty::create ();
491 495
… …
498#if 0 502#if 0
499 XSynchronize (dpy, True); 503 XSynchronize (dpy, True);
500#endif 504#endif
501 505
502#ifdef HAVE_SCROLLBARS 506#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 507 if (option (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 508 resize_scrollbar (); /* create and map scrollbar */
505#endif 509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
506#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
507 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
508 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526
527 bgPixmap.set_root_pixmap ();
509 XSelectInput (dpy, display->root, PropertyChangeMask); 528 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 529 rootwin_ev.start (display, display->root);
512 } 530 }
513#endif 531#endif
532
533#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL)
535 {
536 const char *p = rs[Rs_backgroundPixmap];
537
538 if ((p = strchr (p, ';')) != NULL)
539 {
540 p++;
541 bgPixmap.set_geometry (p);
542 }
543 else
544 bgPixmap.set_defaultGeometry ();
545
546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
549 }
550#endif
551 }
552#endif
553
514#if ENABLE_PERL 554#if ENABLE_PERL
515 rootwin_ev.start (display, display->root); 555 rootwin_ev.start (display, display->root);
516#endif 556#endif
517 557
518 set_colorfgbg (); 558 set_colorfgbg ();
… …
627 return p; 667 return p;
628} 668}
629 669
630/*----------------------------------------------------------------------*/ 670/*----------------------------------------------------------------------*/
631/* 671/*
632 * window size/position calculcations for XSizeHint and other storage. 672 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 673 * if width/height are non-zero then override calculated width/height
634 */ 674 */
635void 675void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 677{
… …
709 if (scrollBar.state) 749 if (scrollBar.state)
710 { 750 {
711 sb_w = scrollbar_TotalWidth (); 751 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 752 szHint.base_width += sb_w;
713 753
714 if (!OPTION (Opt_scrollBar_right)) 754 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 755 window_vt_x += sb_w;
716 } 756 }
717 757
718 szHint.width_inc = fwidth; 758 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 759 szHint.height_inc = fheight;
… …
740 { 780 {
741 min_it (height, max_height); 781 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 782 szHint.height = szHint.base_height + height;
743 } 783 }
744 784
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 785 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 786 window_sb_x = szHint.width - sb_w;
747 787
748 if (recalc_x) 788 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 790
… …
812 delete fontset[0]; 852 delete fontset[0];
813 fontset[0] = fs; 853 fontset[0] = fs;
814 854
815 prop = (*fs)[1]->properties (); 855 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 856 prop.height += lineSpace;
857
817 fs->set_prop (prop); 858 fs->set_prop (prop, false);
818 859
819 fwidth = prop.width; 860 fwidth = prop.width;
820 fheight = prop.height; 861 fheight = prop.height;
821 fbase = prop.ascent; 862 fbase = prop.ascent;
822 863
… …
831 { 872 {
832 fontset[style] = fs = new rxvt_fontset (this); 873 fontset[style] = fs = new rxvt_fontset (this);
833 rxvt_fontprop prop2 = prop; 874 rxvt_fontprop prop2 = prop;
834 875
835 if (res) 876 if (res)
836 prop2.weight = prop2.slant = rxvt_fontprop::unset; 877 {
878 fs->populate (res);
879 fs->set_prop (prop2, false);
880 }
837 else 881 else
838 { 882 {
839 res = fontset[0]->fontdesc; 883 fs->populate (fontset[0]->fontdesc);
840 884
841 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 885 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 886 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
887
888 fs->set_prop (prop2, true);
843 } 889 }
844 890
845 fs->populate (res);
846 fs->set_prop (prop2);
847 } 891 }
848#else 892#else
849 fontset[style] = fontset[0]; 893 fontset[style] = fontset[0];
850#endif 894#endif
851 } 895 }
… …
858 } 902 }
859 903
860 return true; 904 return true;
861} 905}
862 906
907void
863void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
864{ 909{
865 XChangeProperty (dpy, parent[0], 910 XChangeProperty (dpy, parent[0],
866 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
867 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
868} 913}
869 914
915void
870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871{ 917{
872 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
873 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
874 920
875 XChangeProperty (dpy, parent[0], 921 XChangeProperty (dpy, parent[0],
… …
899#if ENABLE_EWMH 945#if ENABLE_EWMH
900 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901#endif 947#endif
902} 948}
903 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
904#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
905void
906rxvt_term::set_window_color (int idx, const char *color)
907{
908 rxvt_color xcol; 954 rxvt_color xcol;
909 int i; 955 int i;
910 956
911 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
912 return; 958 return;
… …
949 /*TODO: handle Color_BD, scrollbar background, etc. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
950 996
951 update_fade_color (idx); 997 update_fade_color (idx);
952 recolour_cursor (); 998 recolour_cursor ();
953 scr_recolour (); 999 scr_recolour ();
954}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
959 1002
960void 1003void
961rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
962{ 1005{
963 XColor fg, bg; 1006 XColor fg, bg;
… …
995 1038
996 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1041 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1044 xpmb = "default;";
1002#endif 1045#endif
1003 break; 1046 break;
1004 } 1047 }
1005 1048
… …
1101 1144
1102 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1104 width, height); 1147 width, height);
1105 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1106 scr_clear (); 1154 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1155 }
1111 1156
1112 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1113 scr_reset (); 1158 scr_reset ();
1114 1159
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false); 1161 //scr_touch (false);
1117 1162
1118#ifdef XPM_BACKGROUND 1163#ifdef HAVE_BG_PIXMAP
1119 if (pixmap) 1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1165// if (bgPixmap.pixmap)
1120 scr_touch (false); 1166// scr_touch (false);
1121#endif 1167#endif
1122 1168
1123#ifdef USE_XIM 1169#ifdef USE_XIM
1124 IMSetPosition (); 1170 IMSetPosition ();
1125#endif 1171#endif
… …
1654 1700
1655 XFree (preedit_attr); 1701 XFree (preedit_attr);
1656} 1702}
1657#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1658 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
1659/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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