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.245 by sasha, Fri Aug 17 22:02:14 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
… …
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 || ENABLE_PERL 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
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
501#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
503 { 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 ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
507 } 529 }
508#endif 530#endif
531
532#ifdef XPM_BACKGROUND
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 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
509#if ENABLE_PERL 557#if ENABLE_PERL
510 rootwin_ev.start (display, display->root); 558 rootwin_ev.start (display, display->root);
511#endif 559#endif
512 560
513 set_colorfgbg (); 561 set_colorfgbg ();
… …
622 return p; 670 return p;
623} 671}
624 672
625/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
626/* 674/*
627 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
628 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
629 */ 677 */
630void 678void
631rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
632{ 680{
… …
704 if (scrollBar.state) 752 if (scrollBar.state)
705 { 753 {
706 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
707 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
708 756
709 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
710 window_vt_x += sb_w; 758 window_vt_x += sb_w;
711 } 759 }
712 760
713 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
714 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
… …
735 { 783 {
736 min_it (height, max_height); 784 min_it (height, max_height);
737 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
738 } 786 }
739 787
740 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
742 790
743 if (recalc_x) 791 if (recalc_x)
744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745 793
… …
807 delete fontset[0]; 855 delete fontset[0];
808 fontset[0] = fs; 856 fontset[0] = fs;
809 857
810 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
811 prop.height += lineSpace; 859 prop.height += lineSpace;
860
812 fs->set_prop (prop); 861 fs->set_prop (prop, false);
813 862
814 fwidth = prop.width; 863 fwidth = prop.width;
815 fheight = prop.height; 864 fheight = prop.height;
816 fbase = prop.ascent; 865 fbase = prop.ascent;
817 866
… …
826 { 875 {
827 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
828 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
829 878
830 if (res) 879 if (res)
831 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
832 else 884 else
833 { 885 {
834 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
835 887
836 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 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; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
838 } 892 }
839 893
840 fs->populate (res);
841 fs->set_prop (prop2);
842 } 894 }
843#else 895#else
844 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
845#endif 897#endif
846 } 898 }
… …
1096 1148
1097 XMoveResizeWindow (dpy, vt, 1149 XMoveResizeWindow (dpy, vt,
1098 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1099 width, height); 1151 width, height);
1100 1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1101 scr_clear (); 1159 scr_clear ();
1102#ifdef XPM_BACKGROUND
1103 resize_pixmap ();
1104#endif
1105 } 1160 }
1106 1161
1107 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1108 scr_reset (); 1163 scr_reset ();
1109 1164
1110 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1111 //scr_touch (false); 1166 //scr_touch (false);
1112 1167
1113#ifdef XPM_BACKGROUND 1168#ifdef HAVE_BG_PIXMAP
1114 if (pixmap) 1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1115 scr_touch (false); 1171// scr_touch (false);
1116#endif 1172#endif
1117 1173
1118#ifdef USE_XIM 1174#ifdef USE_XIM
1119 IMSetPosition (); 1175 IMSetPosition ();
1120#endif 1176#endif

Diff Legend

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