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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.158 by root, Tue Jan 3 23:40:58 2006 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
… …
193 pty.put (); 206 pty.put ();
194} 207}
195 208
196rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
197{ 210{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 214
200 emergency_cleanup (); 215 emergency_cleanup ();
201 216
202#if ENABLE_STYLES 217#if ENABLE_STYLES
… …
284 delete argv; 299 delete argv;
285 300
286#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
287 delete keyboard; 302 delete keyboard;
288#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
289} 313}
290 314
291void 315void
292rxvt_term::destroy () 316rxvt_term::destroy ()
293{ 317{
… …
458 482
459#if MENUBAR_MAX 483#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
461#endif 485#endif
462#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
493 {
494 rxvt_perl.init ();
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
465#endif 497#endif
466 498
467 create_windows (argc, argv); 499 create_windows (argc, argv);
468 500
469 dDisp; 501 dDisp;
… …
475#if 0 507#if 0
476 XSynchronize (disp, True); 508 XSynchronize (disp, True);
477#endif 509#endif
478 510
479#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 512 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
482#endif 514#endif
483#if (MENUBAR_MAX) 515#if (MENUBAR_MAX)
484 if (menubar_visible ()) 516 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 517 XMapWindow (disp, menuBar.win);
486#endif 518#endif
487#ifdef TRANSPARENT 519#ifdef TRANSPARENT
488 if (options & Opt_transparent) 520 if (OPTION (Opt_transparent))
489 { 521 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 522 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 523 check_our_parents ();
492 rootwin_ev.start (display, display->root); 524 rootwin_ev.start (display, display->root);
493 } 525 }
… …
503 free (cmd_argv); 535 free (cmd_argv);
504 536
505 pty_ev.start (pty.pty, EVENT_READ); 537 pty_ev.start (pty.pty, EVENT_READ);
506 538
507 check_ev.start (); 539 check_ev.start ();
540
541 PERL_INVOKE ((this, HOOK_START, DT_END));
508 542
509 return true; 543 return true;
510} 544}
511 545
512static struct sig_handlers 546static struct sig_handlers
… …
520 554
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 557 if (pid == (*t)->cmd_pid)
524 { 558 {
525 (*t)->destroy (); 559 (*t)->child_exit ();
526 break; 560 break;
527 } 561 }
528 } 562 }
529 563
530 /* 564 /*
… …
670 704
671#ifdef UTMP_SUPPORT 705#ifdef UTMP_SUPPORT
672void 706void
673rxvt_term::privileged_utmp (rxvt_privaction action) 707rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 708{
675 if ((options & Opt_utmpInhibit) 709 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 710 || !pty.name || !*pty.name)
677 return; 711 return;
678 712
679 rxvt_privileges (RESTORE); 713 rxvt_privileges (RESTORE);
680 714
… …
718 if (rs[Rs_geometry]) 752 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 753 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 754
721 if (flags & WidthValue) 755 if (flags & WidthValue)
722 { 756 {
723 ncol = BOUND_POSITIVE_INT16 (w); 757 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 758 szHint.flags |= USSize;
725 } 759 }
726 760
727 if (flags & HeightValue) 761 if (flags & HeightValue)
728 { 762 {
729 nrow = BOUND_POSITIVE_INT16 (h); 763 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 764 szHint.flags |= USSize;
731 } 765 }
732 766
733 if (flags & XValue) 767 if (flags & XValue)
734 { 768 {
… …
772 806
773 if (scrollbar_visible ()) 807 if (scrollbar_visible ())
774 { 808 {
775 sb_w = scrollbar_TotalWidth (); 809 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 810 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 811 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 812 window_vt_x += sb_w;
779 } 813 }
780 814
781 if (menubar_visible ()) 815 if (menubar_visible ())
782 { 816 {
… …
795 szHint.width = newwidth; 829 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 830 width = newwidth - szHint.base_width;
797 } 831 }
798 else 832 else
799 { 833 {
800 MIN_IT (width, max_width); 834 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 835 szHint.width = szHint.base_width + width;
802 } 836 }
803 837
804 if (newheight && newheight - szHint.base_height < max_height) 838 if (newheight && newheight - szHint.base_height < max_height)
805 { 839 {
806 szHint.height = newheight; 840 szHint.height = newheight;
807 height = newheight - szHint.base_height; 841 height = newheight - szHint.base_height;
808 } 842 }
809 else 843 else
810 { 844 {
811 MIN_IT (height, max_height); 845 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 846 szHint.height = szHint.base_height + height;
813 } 847 }
814 848
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 850 window_sb_x = szHint.width - sb_w;
817 851
818 if (recalc_x) 852 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 854 if (recalc_y)
… …
889 prop.height += lineSpace; 923 prop.height += lineSpace;
890 fs->set_prop (prop); 924 fs->set_prop (prop);
891 925
892 fwidth = prop.width; 926 fwidth = prop.width;
893 fheight = prop.height; 927 fheight = prop.height;
894 fweight = prop.weight; 928 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 929
898 for (int style = 1; style < 4; style++) 930 for (int style = 1; style < 4; style++)
899 { 931 {
900#if ENABLE_STYLES 932#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 933 const char *res = rs[Rs_font + style];
… …
935 return true; 967 return true;
936} 968}
937 969
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 970void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 971{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 972 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 973 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 974 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 975}
945 976
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 977void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 978{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 979 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 980 char *s = rxvt_wcstoutf8 (ws);
951 981
952 XChangeProperty (display->display, parent[0], 982 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,

Diff Legend

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