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.225 by root, Wed Jul 5 22:46:14 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 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 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 }
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
554#if ENABLE_PERL
555 rootwin_ev.start (display, display->root);
508#endif 556#endif
509 557
510 set_colorfgbg (); 558 set_colorfgbg ();
511 559
512 init_command (cmd_argv); 560 init_command (cmd_argv);
… …
619 return p; 667 return p;
620} 668}
621 669
622/*----------------------------------------------------------------------*/ 670/*----------------------------------------------------------------------*/
623/* 671/*
624 * window size/position calculcations for XSizeHint and other storage. 672 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 673 * if width/height are non-zero then override calculated width/height
626 */ 674 */
627void 675void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 677{
… …
701 if (scrollBar.state) 749 if (scrollBar.state)
702 { 750 {
703 sb_w = scrollbar_TotalWidth (); 751 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 752 szHint.base_width += sb_w;
705 753
706 if (!OPTION (Opt_scrollBar_right)) 754 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 755 window_vt_x += sb_w;
708 } 756 }
709 757
710 szHint.width_inc = fwidth; 758 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 759 szHint.height_inc = fheight;
… …
732 { 780 {
733 min_it (height, max_height); 781 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 782 szHint.height = szHint.base_height + height;
735 } 783 }
736 784
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 785 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 786 window_sb_x = szHint.width - sb_w;
739 787
740 if (recalc_x) 788 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 790
… …
804 delete fontset[0]; 852 delete fontset[0];
805 fontset[0] = fs; 853 fontset[0] = fs;
806 854
807 prop = (*fs)[1]->properties (); 855 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 856 prop.height += lineSpace;
857
809 fs->set_prop (prop); 858 fs->set_prop (prop, false);
810 859
811 fwidth = prop.width; 860 fwidth = prop.width;
812 fheight = prop.height; 861 fheight = prop.height;
813 fbase = prop.ascent; 862 fbase = prop.ascent;
814 863
… …
823 { 872 {
824 fontset[style] = fs = new rxvt_fontset (this); 873 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 874 rxvt_fontprop prop2 = prop;
826 875
827 if (res) 876 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 877 {
878 fs->populate (res);
879 fs->set_prop (prop2, false);
880 }
829 else 881 else
830 { 882 {
831 res = fontset[0]->fontdesc; 883 fs->populate (fontset[0]->fontdesc);
832 884
833 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;
834 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);
835 } 889 }
836 890
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 891 }
840#else 892#else
841 fontset[style] = fontset[0]; 893 fontset[style] = fontset[0];
842#endif 894#endif
843 } 895 }
… …
850 } 902 }
851 903
852 return true; 904 return true;
853} 905}
854 906
907void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 909{
857 XChangeProperty (dpy, parent[0], 910 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 913}
861 914
915void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 917{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
866 920
867 XChangeProperty (dpy, parent[0], 921 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 945#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 947#endif
894} 948}
895 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
896#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 954 rxvt_color xcol;
901 int i; 955 int i;
902 956
903 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
904 return; 958 return;
… …
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
942 996
943 update_fade_color (idx); 997 update_fade_color (idx);
944 recolour_cursor (); 998 recolour_cursor ();
945 scr_recolour (); 999 scr_recolour ();
946}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
951 1002
952void 1003void
953rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
954{ 1005{
955 XColor fg, bg; 1006 XColor fg, bg;
… …
987 1038
988 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1041 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1044 xpmb = "default;";
994#endif 1045#endif
995 break; 1046 break;
996 } 1047 }
997 1048
… …
1093 1144
1094 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1096 width, height); 1147 width, height);
1097 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1098 scr_clear (); 1154 scr_clear ();
1099#ifdef XPM_BACKGROUND
1100 resize_pixmap ();
1101#endif
1102 } 1155 }
1103 1156
1104 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1105 scr_reset (); 1158 scr_reset ();
1106 1159
1107 // 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
1108 //scr_touch (false); 1161 //scr_touch (false);
1109 1162
1110#ifdef XPM_BACKGROUND 1163#ifdef HAVE_BG_PIXMAP
1111 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)
1112 scr_touch (false); 1166// scr_touch (false);
1113#endif 1167#endif
1114 1168
1115#ifdef USE_XIM 1169#ifdef USE_XIM
1116 IMSetPosition (); 1170 IMSetPosition ();
1117#endif 1171#endif
… …
1646 1700
1647 XFree (preedit_attr); 1701 XFree (preedit_attr);
1648} 1702}
1649#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1650 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
1651/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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