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.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 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 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 }
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
557#if ENABLE_PERL
558 rootwin_ev.start (display, display->root);
508#endif 559#endif
509 560
510 set_colorfgbg (); 561 set_colorfgbg ();
511 562
512 init_command (cmd_argv); 563 init_command (cmd_argv);
… …
619 return p; 670 return p;
620} 671}
621 672
622/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
623/* 674/*
624 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
626 */ 677 */
627void 678void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 680{
… …
701 if (scrollBar.state) 752 if (scrollBar.state)
702 { 753 {
703 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
705 756
706 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 758 window_vt_x += sb_w;
708 } 759 }
709 760
710 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
… …
732 { 783 {
733 min_it (height, max_height); 784 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
735 } 786 }
736 787
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
739 790
740 if (recalc_x) 791 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 793
… …
804 delete fontset[0]; 855 delete fontset[0];
805 fontset[0] = fs; 856 fontset[0] = fs;
806 857
807 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 859 prop.height += lineSpace;
860
809 fs->set_prop (prop); 861 fs->set_prop (prop, false);
810 862
811 fwidth = prop.width; 863 fwidth = prop.width;
812 fheight = prop.height; 864 fheight = prop.height;
813 fbase = prop.ascent; 865 fbase = prop.ascent;
814 866
… …
823 { 875 {
824 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
826 878
827 if (res) 879 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
829 else 884 else
830 { 885 {
831 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
832 887
833 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;
834 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);
835 } 892 }
836 893
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 894 }
840#else 895#else
841 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
842#endif 897#endif
843 } 898 }
… …
1093 1148
1094 XMoveResizeWindow (dpy, vt, 1149 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1096 width, height); 1151 width, height);
1097 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
1098 scr_clear (); 1159 scr_clear ();
1099#ifdef XPM_BACKGROUND
1100 resize_pixmap ();
1101#endif
1102 } 1160 }
1103 1161
1104 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1105 scr_reset (); 1163 scr_reset ();
1106 1164
1107 // 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
1108 //scr_touch (false); 1166 //scr_touch (false);
1109 1167
1110#ifdef XPM_BACKGROUND 1168#ifdef HAVE_BG_PIXMAP
1111 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)
1112 scr_touch (false); 1171// scr_touch (false);
1113#endif 1172#endif
1114 1173
1115#ifdef USE_XIM 1174#ifdef USE_XIM
1116 IMSetPosition (); 1175 IMSetPosition ();
1117#endif 1176#endif

Diff Legend

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