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.221 by root, Sun Feb 12 05:15:43 2006 UTC vs.
Revision 1.245 by sasha, Fri Aug 17 22:02:14 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 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
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
264 } 273 }
265 274
266 clear (); 275 clear ();
267 } 276 }
268 277
269 delete pix_colors_focused; 278 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
272#endif 281#endif
273 282
274 displays.put (display); 283 displays.put (display);
275 284
276 scr_release (); 285 scr_release ();
… …
301{ 310{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 312
304 cmd_pid = 0; 313 cmd_pid = 0;
305 314
306 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
307 destroy (); 316 destroy ();
308} 317}
309 318
310void 319void
311rxvt_term::destroy () 320rxvt_term::destroy ()
… …
325 im_ev.stop (display); 334 im_ev.stop (display);
326#endif 335#endif
327#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
329#endif 338#endif
330#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
331 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
332#endif 341#endif
333 incr_ev.stop (); 342 incr_ev.stop ();
334 termwin_ev.stop (display); 343 termwin_ev.stop (display);
335 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
475#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 485 keyboard->register_done ();
477#endif 486#endif
478 487
479#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 491#endif
483 492
484 pty = ptytty::create (); 493 pty = ptytty::create ();
485 494
… …
492#if 0 501#if 0
493 XSynchronize (dpy, True); 502 XSynchronize (dpy, True);
494#endif 503#endif
495 504
496#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
499#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
500#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
502 { 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 ();
503 XSelectInput (dpy, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
506 } 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);
507#endif 559#endif
508 560
509 set_colorfgbg (); 561 set_colorfgbg ();
510 562
511 init_command (cmd_argv); 563 init_command (cmd_argv);
… …
618 return p; 670 return p;
619} 671}
620 672
621/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
622/* 674/*
623 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
625 */ 677 */
626void 678void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 680{
… …
700 if (scrollBar.state) 752 if (scrollBar.state)
701 { 753 {
702 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
704 756
705 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 758 window_vt_x += sb_w;
707 } 759 }
708 760
709 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
… …
731 { 783 {
732 min_it (height, max_height); 784 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
734 } 786 }
735 787
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
738 790
739 if (recalc_x) 791 if (recalc_x)
740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 793
… …
803 delete fontset[0]; 855 delete fontset[0];
804 fontset[0] = fs; 856 fontset[0] = fs;
805 857
806 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 859 prop.height += lineSpace;
860
808 fs->set_prop (prop); 861 fs->set_prop (prop, false);
809 862
810 fwidth = prop.width; 863 fwidth = prop.width;
811 fheight = prop.height; 864 fheight = prop.height;
812 fbase = prop.ascent; 865 fbase = prop.ascent;
813 866
… …
822 { 875 {
823 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
825 878
826 if (res) 879 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
828 else 884 else
829 { 885 {
830 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
831 887
832 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;
833 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);
834 } 892 }
835 893
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 894 }
839#else 895#else
840 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
841#endif 897#endif
842 } 898 }
… …
935 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
936 992
937 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 994 /* Cursor cursor; */
939done: 995done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
951 997
998 update_fade_color (idx);
952 recolour_cursor (); 999 recolour_cursor ();
953 scr_recolour (); 1000 scr_recolour ();
954} 1001}
955 1002
956#else 1003#else
… …
1101 1148
1102 XMoveResizeWindow (dpy, vt, 1149 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1104 width, height); 1151 width, height);
1105 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
1106 scr_clear (); 1159 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1160 }
1111 1161
1112 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1113 scr_reset (); 1163 scr_reset ();
1114 1164
1115 // 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
1116 //scr_touch (false); 1166 //scr_touch (false);
1117 1167
1118#ifdef XPM_BACKGROUND 1168#ifdef HAVE_BG_PIXMAP
1119 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)
1120 scr_touch (false); 1171// scr_touch (false);
1121#endif 1172#endif
1122 1173
1123#ifdef USE_XIM 1174#ifdef USE_XIM
1124 IMSetPosition (); 1175 IMSetPosition ();
1125#endif 1176#endif
… …
1621 || !focus 1672 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1674 || !IMisRunning ())
1624 return; 1675 return;
1625 1676
1626 if (input_style & XIMPreeditArea) 1677 if (input_style & XIMPreeditPosition)
1627 { 1678 {
1628 im_set_size (preedit_rect); 1679 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1681
1631 XSetICValues (Input_Context, 1682 XSetICValues (Input_Context,

Diff Legend

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