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.224 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.247 by ayin, Tue Aug 28 16:56:40 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 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!option (Opt_transparent))
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
508#endif 555#endif
509 556
510 set_colorfgbg (); 557 set_colorfgbg ();
511 558
512 init_command (cmd_argv); 559 init_command (cmd_argv);
… …
619 return p; 666 return p;
620} 667}
621 668
622/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
623/* 670/*
624 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
626 */ 673 */
627void 674void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 676{
… …
701 if (scrollBar.state) 748 if (scrollBar.state)
702 { 749 {
703 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
705 752
706 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 754 window_vt_x += sb_w;
708 } 755 }
709 756
710 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
… …
732 { 779 {
733 min_it (height, max_height); 780 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
735 } 782 }
736 783
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
739 786
740 if (recalc_x) 787 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 789
… …
804 delete fontset[0]; 851 delete fontset[0];
805 fontset[0] = fs; 852 fontset[0] = fs;
806 853
807 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 855 prop.height += lineSpace;
856
809 fs->set_prop (prop); 857 fs->set_prop (prop, false);
810 858
811 fwidth = prop.width; 859 fwidth = prop.width;
812 fheight = prop.height; 860 fheight = prop.height;
813 fbase = prop.ascent; 861 fbase = prop.ascent;
814 862
… …
823 { 871 {
824 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
826 874
827 if (res) 875 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
829 else 880 else
830 { 881 {
831 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
832 883
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 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; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
835 } 888 }
836 889
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 890 }
840#else 891#else
841 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
842#endif 893#endif
843 } 894 }
… …
936 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
937 988
938 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */ 990 /* Cursor cursor; */
940done: 991done:
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. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
952 993
994 update_fade_color (idx);
953 recolour_cursor (); 995 recolour_cursor ();
954 scr_recolour (); 996 scr_recolour ();
955} 997}
956 998
957#else 999#else
… …
1102 1144
1103 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1105 width, height); 1147 width, height);
1106 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1107 scr_clear (); 1154 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1155 }
1112 1156
1113 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1114 scr_reset (); 1158 scr_reset ();
1115 1159
1116 // 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
1117 //scr_touch (false); 1161 //scr_touch (false);
1118 1162
1119#ifdef XPM_BACKGROUND 1163#ifdef HAVE_BG_PIXMAP
1120 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)
1121 scr_touch (false); 1166// scr_touch (false);
1122#endif 1167#endif
1123 1168
1124#ifdef USE_XIM 1169#ifdef USE_XIM
1125 IMSetPosition (); 1170 IMSetPosition ();
1126#endif 1171#endif

Diff Legend

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