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.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC

… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT || ENABLE_PERL 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 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),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
193#endif 201#endif
194} 202}
195 203
196// 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.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
203 pty_ev.stop (); 212 pty_ev.stop ();
… …
265 } 274 }
266 275
267 clear (); 276 clear ();
268 } 277 }
269 278
270 delete pix_colors_focused; 279 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 281 delete [] pix_colors_unfocused;
273#endif 282#endif
274 283
275 displays.put (display); 284 displays.put (display);
276 285
277 scr_release (); 286 scr_release ();
… …
302{ 311{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 313
305 cmd_pid = 0; 314 cmd_pid = 0;
306 315
307 if (!OPTION (Opt_hold)) 316 if (!option (Opt_hold))
308 destroy (); 317 destroy ();
309} 318}
310 319
311void 320void
312rxvt_term::destroy () 321rxvt_term::destroy ()
… …
326 im_ev.stop (display); 335 im_ev.stop (display);
327#endif 336#endif
328#if HAVE_SCROLLBARS 337#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 338 scrollbar_ev.stop (display);
330#endif 339#endif
331#if TRANSPARENT || ENABLE_PERL 340#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 341 rootwin_ev.stop (display);
333#endif 342#endif
334 incr_ev.stop (); 343 incr_ev.stop ();
335 termwin_ev.stop (display); 344 termwin_ev.stop (display);
336 vt_ev.stop (display); 345 vt_ev.stop (display);
… …
476#ifdef KEYSYM_RESOURCE 485#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 486 keyboard->register_done ();
478#endif 487#endif
479 488
480#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 490 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 492#endif
484 493
485 pty = ptytty::create (); 494 pty = ptytty::create ();
486 495
… …
493#if 0 502#if 0
494 XSynchronize (dpy, True); 503 XSynchronize (dpy, True);
495#endif 504#endif
496 505
497#ifdef HAVE_SCROLLBARS 506#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 507 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 508 resize_scrollbar (); /* create and map scrollbar */
500#endif 509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
501#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
503 { 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 ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 528 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 529 rootwin_ev.start (display, display->root);
507 } 530 }
508#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
509#if ENABLE_PERL 554#if ENABLE_PERL
510 rootwin_ev.start (display, display->root); 555 rootwin_ev.start (display, display->root);
511#endif 556#endif
512 557
513 set_colorfgbg (); 558 set_colorfgbg ();
… …
622 return p; 667 return p;
623} 668}
624 669
625/*----------------------------------------------------------------------*/ 670/*----------------------------------------------------------------------*/
626/* 671/*
627 * window size/position calculcations for XSizeHint and other storage. 672 * window size/position calculations for XSizeHint and other storage.
628 * if width/height are non-zero then override calculated width/height 673 * if width/height are non-zero then override calculated width/height
629 */ 674 */
630void 675void
631rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
632{ 677{
… …
704 if (scrollBar.state) 749 if (scrollBar.state)
705 { 750 {
706 sb_w = scrollbar_TotalWidth (); 751 sb_w = scrollbar_TotalWidth ();
707 szHint.base_width += sb_w; 752 szHint.base_width += sb_w;
708 753
709 if (!OPTION (Opt_scrollBar_right)) 754 if (!option (Opt_scrollBar_right))
710 window_vt_x += sb_w; 755 window_vt_x += sb_w;
711 } 756 }
712 757
713 szHint.width_inc = fwidth; 758 szHint.width_inc = fwidth;
714 szHint.height_inc = fheight; 759 szHint.height_inc = fheight;
… …
735 { 780 {
736 min_it (height, max_height); 781 min_it (height, max_height);
737 szHint.height = szHint.base_height + height; 782 szHint.height = szHint.base_height + height;
738 } 783 }
739 784
740 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 785 if (scrollBar.state && option (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w; 786 window_sb_x = szHint.width - sb_w;
742 787
743 if (recalc_x) 788 if (recalc_x)
744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745 790
… …
807 delete fontset[0]; 852 delete fontset[0];
808 fontset[0] = fs; 853 fontset[0] = fs;
809 854
810 prop = (*fs)[1]->properties (); 855 prop = (*fs)[1]->properties ();
811 prop.height += lineSpace; 856 prop.height += lineSpace;
857
812 fs->set_prop (prop); 858 fs->set_prop (prop, false);
813 859
814 fwidth = prop.width; 860 fwidth = prop.width;
815 fheight = prop.height; 861 fheight = prop.height;
816 fbase = prop.ascent; 862 fbase = prop.ascent;
817 863
… …
826 { 872 {
827 fontset[style] = fs = new rxvt_fontset (this); 873 fontset[style] = fs = new rxvt_fontset (this);
828 rxvt_fontprop prop2 = prop; 874 rxvt_fontprop prop2 = prop;
829 875
830 if (res) 876 if (res)
831 prop2.weight = prop2.slant = rxvt_fontprop::unset; 877 {
878 fs->populate (res);
879 fs->set_prop (prop2, false);
880 }
832 else 881 else
833 { 882 {
834 res = fontset[0]->fontdesc; 883 fs->populate (fontset[0]->fontdesc);
835 884
836 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;
837 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);
838 } 889 }
839 890
840 fs->populate (res);
841 fs->set_prop (prop2);
842 } 891 }
843#else 892#else
844 fontset[style] = fontset[0]; 893 fontset[style] = fontset[0];
845#endif 894#endif
846 } 895 }
… …
853 } 902 }
854 903
855 return true; 904 return true;
856} 905}
857 906
907void
858void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
859{ 909{
860 XChangeProperty (dpy, parent[0], 910 XChangeProperty (dpy, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 913}
864 914
915void
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 917{
867 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
869 920
870 XChangeProperty (dpy, parent[0], 921 XChangeProperty (dpy, parent[0],
… …
894#if ENABLE_EWMH 945#if ENABLE_EWMH
895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896#endif 947#endif
897} 948}
898 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
899#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
900void
901rxvt_term::set_window_color (int idx, const char *color)
902{
903 rxvt_color xcol; 954 rxvt_color xcol;
904 int i; 955 int i;
905 956
906 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
907 return; 958 return;
… …
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
945 996
946 update_fade_color (idx); 997 update_fade_color (idx);
947 recolour_cursor (); 998 recolour_cursor ();
948 scr_recolour (); 999 scr_recolour ();
949}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
954 1002
955void 1003void
956rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
957{ 1005{
958 XColor fg, bg; 1006 XColor fg, bg;
… …
990 1038
991 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
993 { 1041 {
994 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 1044 xpmb = "default;";
997#endif 1045#endif
998 break; 1046 break;
999 } 1047 }
1000 1048
… …
1096 1144
1097 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1098 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1099 width, height); 1147 width, height);
1100 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1101 scr_clear (); 1154 scr_clear ();
1102#ifdef XPM_BACKGROUND
1103 resize_pixmap ();
1104#endif
1105 } 1155 }
1106 1156
1107 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1108 scr_reset (); 1158 scr_reset ();
1109 1159
1110 // 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
1111 //scr_touch (false); 1161 //scr_touch (false);
1112 1162
1113#ifdef XPM_BACKGROUND 1163#ifdef HAVE_BG_PIXMAP
1114 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)
1115 scr_touch (false); 1166// scr_touch (false);
1116#endif 1167#endif
1117 1168
1118#ifdef USE_XIM 1169#ifdef USE_XIM
1119 IMSetPosition (); 1170 IMSetPosition ();
1120#endif 1171#endif
… …
1649 1700
1650 XFree (preedit_attr); 1701 XFree (preedit_attr);
1651} 1702}
1652#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1653 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
1654/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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