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.220 by root, Sat Feb 11 10:53:37 2006 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 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
… …
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 bool changed = false;
512 bgPixmap.set_target (this);
513
500#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
502 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
503 XSelectInput (dpy, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
506 } 531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
507#endif 560#endif
508 561
509 set_colorfgbg (); 562 set_colorfgbg ();
510 563
511 init_command (cmd_argv); 564 init_command (cmd_argv);
… …
618 return p; 671 return p;
619} 672}
620 673
621/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
622/* 675/*
623 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
625 */ 678 */
626void 679void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 681{
… …
700 if (scrollBar.state) 753 if (scrollBar.state)
701 { 754 {
702 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
704 757
705 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 759 window_vt_x += sb_w;
707 } 760 }
708 761
709 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
… …
731 { 784 {
732 min_it (height, max_height); 785 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
734 } 787 }
735 788
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
738 791
739 if (recalc_x) 792 if (recalc_x)
740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 794
… …
803 delete fontset[0]; 856 delete fontset[0];
804 fontset[0] = fs; 857 fontset[0] = fs;
805 858
806 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 860 prop.height += lineSpace;
861
808 fs->set_prop (prop); 862 fs->set_prop (prop, false);
809 863
810 fwidth = prop.width; 864 fwidth = prop.width;
811 fheight = prop.height; 865 fheight = prop.height;
812 fbase = prop.ascent; 866 fbase = prop.ascent;
813 867
… …
822 { 876 {
823 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
825 879
826 if (res) 880 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
828 else 885 else
829 { 886 {
830 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
831 888
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 889 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; 890 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
891
892 fs->set_prop (prop2, true);
834 } 893 }
835 894
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 895 }
839#else 896#else
840 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
841#endif 898#endif
842 } 899 }
… …
935 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
936 993
937 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 995 /* Cursor cursor; */
939done: 996done:
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. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
951 998
999 update_fade_color (idx);
952 recolour_cursor (); 1000 recolour_cursor ();
953 scr_recolour (); 1001 scr_recolour ();
954} 1002}
955 1003
956#else 1004#else
… …
1101 1149
1102 XMoveResizeWindow (dpy, vt, 1150 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1104 width, height); 1152 width, height);
1105 1153
1154#ifdef XPM_BACKGROUND
1155 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156 if (bgPixmap.window_size_sensitive ())
1157 bgPixmap.render ();
1158#endif
1159
1106 scr_clear (); 1160 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1161 }
1111 1162
1112 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1113 scr_reset (); 1164 scr_reset ();
1114 1165
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false); 1167 //scr_touch (false);
1117 1168
1118#ifdef XPM_BACKGROUND 1169#ifdef HAVE_BG_PIXMAP
1119 if (pixmap) 1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap)
1120 scr_touch (false); 1172// scr_touch (false);
1121#endif 1173#endif
1122 1174
1123#ifdef USE_XIM 1175#ifdef USE_XIM
1124 IMSetPosition (); 1176 IMSetPosition ();
1125#endif 1177#endif
… …
1621 || !focus 1673 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1674 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1675 || !IMisRunning ())
1624 return; 1676 return;
1625 1677
1678 if (input_style & XIMPreeditPosition)
1679 {
1680 im_set_size (preedit_rect);
1681 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682
1683 XSetICValues (Input_Context,
1684 XNPreeditAttributes, preedit_attr, NULL);
1685 }
1686 else
1687 {
1626 /* Getting the necessary width of preedit area */ 1688 /* Getting the necessary width of preedit area */
1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1689 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1628 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1690 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1629 XFree (status_attr); 1691 XFree (status_attr);
1630 1692
1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1693 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1632 XFree (needed_rect); 1694 XFree (needed_rect);
1633 1695
1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1696 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1636 1698
1637 XSetICValues (Input_Context, 1699 XSetICValues (Input_Context,
1638 XNPreeditAttributes, preedit_attr, 1700 XNPreeditAttributes, preedit_attr,
1639 XNStatusAttributes, status_attr, 1701 XNStatusAttributes, status_attr,
1640 NULL); 1702 NULL);
1641 1703
1704 XFree (status_attr);
1705 }
1706
1642 XFree (preedit_attr); 1707 XFree (preedit_attr);
1643 XFree (status_attr);
1644} 1708}
1645#endif /* USE_XIM */ 1709#endif /* USE_XIM */
1646 1710
1647/*----------------------- end-of-file (C source) -----------------------*/ 1711/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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