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.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.238 by sasha, Fri Aug 3 05:33:04 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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 ENABLE_TRANSPARENCY
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_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
… …
265 } 273 }
266 274
267 clear (); 275 clear ();
268 } 276 }
269 277
270 delete pix_colors_focused; 278 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
273#endif 281#endif
274 282
275 displays.put (display); 283 displays.put (display);
276 284
277 scr_release (); 285 scr_release ();
… …
302{ 310{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 312
305 cmd_pid = 0; 313 cmd_pid = 0;
306 314
307 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
308 destroy (); 316 destroy ();
309} 317}
310 318
311void 319void
312rxvt_term::destroy () 320rxvt_term::destroy ()
… …
326 im_ev.stop (display); 334 im_ev.stop (display);
327#endif 335#endif
328#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
330#endif 338#endif
331#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
333#endif 341#endif
334 incr_ev.stop (); 342 incr_ev.stop ();
335 termwin_ev.stop (display); 343 termwin_ev.stop (display);
336 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
476#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 485 keyboard->register_done ();
478#endif 486#endif
479 487
480#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 491#endif
484 492
485 pty = ptytty::create (); 493 pty = ptytty::create ();
486 494
… …
493#if 0 501#if 0
494 XSynchronize (dpy, True); 502 XSynchronize (dpy, True);
495#endif 503#endif
496 504
497#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
500#endif 508#endif
501#ifdef TRANSPARENT 509#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
503 { 511 {
504 XSelectInput (dpy, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents (); 513 check_our_parents ();
506 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
507 } 515 }
516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
508#endif 519#endif
509 520
510 set_colorfgbg (); 521 set_colorfgbg ();
511 522
512 init_command (cmd_argv); 523 init_command (cmd_argv);
… …
619 return p; 630 return p;
620} 631}
621 632
622/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
623/* 634/*
624 * window size/position calculcations for XSizeHint and other storage. 635 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 636 * if width/height are non-zero then override calculated width/height
626 */ 637 */
627void 638void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 640{
… …
701 if (scrollBar.state) 712 if (scrollBar.state)
702 { 713 {
703 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
705 716
706 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 718 window_vt_x += sb_w;
708 } 719 }
709 720
710 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
… …
732 { 743 {
733 min_it (height, max_height); 744 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
735 } 746 }
736 747
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
739 750
740 if (recalc_x) 751 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 753
… …
804 delete fontset[0]; 815 delete fontset[0];
805 fontset[0] = fs; 816 fontset[0] = fs;
806 817
807 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 819 prop.height += lineSpace;
820
809 fs->set_prop (prop); 821 fs->set_prop (prop, false);
810 822
811 fwidth = prop.width; 823 fwidth = prop.width;
812 fheight = prop.height; 824 fheight = prop.height;
813 fbase = prop.ascent; 825 fbase = prop.ascent;
814 826
… …
823 { 835 {
824 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
826 838
827 if (res) 839 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
829 else 844 else
830 { 845 {
831 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
832 847
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 848 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; 849 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
850
851 fs->set_prop (prop2, true);
835 } 852 }
836 853
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 854 }
840#else 855#else
841 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
842#endif 857#endif
843 } 858 }
… …
936 pix_colors_focused[idx] = xcol; 951 pix_colors_focused[idx] = xcol;
937 952
938 /* XSetWindowAttributes attr; */ 953 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */ 954 /* Cursor cursor; */
940done: 955done:
941
942#if OFF_FOCUS_FADING
943 if (rs[Rs_fade])
944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
949#endif
950
951 /*TODO: handle Color_BD, scrollbar background, etc. */ 956 /*TODO: handle Color_BD, scrollbar background, etc. */
952 957
958 update_fade_color (idx);
953 recolour_cursor (); 959 recolour_cursor ();
954 scr_recolour (); 960 scr_recolour ();
955} 961}
956 962
957#else 963#else
… …
1114 scr_reset (); 1120 scr_reset ();
1115 1121
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false); 1123 //scr_touch (false);
1118 1124
1119#ifdef XPM_BACKGROUND 1125#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
1120 if (pixmap) 1126 if (bgPixmap.pixmap)
1121 scr_touch (false); 1127 scr_touch (false);
1122#endif 1128#endif
1123 1129
1124#ifdef USE_XIM 1130#ifdef USE_XIM
1125 IMSetPosition (); 1131 IMSetPosition ();

Diff Legend

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