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.150 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.170 by root, Wed Jan 11 00:59:58 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
48# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
49#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
50 65
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
56rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
57{ 72{
58 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 74 return false;
60 75
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
64} 92}
65 93
66#if ENABLE_COMBINING 94#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
68 96
… …
193 pty.put (); 221 pty.put ();
194} 222}
195 223
196rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
197{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 229
200 emergency_cleanup (); 230 emergency_cleanup ();
201 231
202#if ENABLE_STYLES 232#if ENABLE_STYLES
… …
284 delete argv; 314 delete argv;
285 315
286#ifdef KEYSYM_RESOURCE 316#ifdef KEYSYM_RESOURCE
287 delete keyboard; 317 delete keyboard;
288#endif 318#endif
319}
320
321void
322rxvt_term::child_exit ()
323{
324 cmd_pid = 0;
325
326 if (!OPTION (Opt_hold))
327 destroy ();
289} 328}
290 329
291void 330void
292rxvt_term::destroy () 331rxvt_term::destroy ()
293{ 332{
… …
458 497
459#if MENUBAR_MAX 498#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 499 menubar_read (rs[Rs_menu]);
461#endif 500#endif
462#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 502 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
504#endif
505
506#if ENABLE_PERL
507 if (!rs[Rs_perl_ext_1])
508 rs[Rs_perl_ext_1] = "default";
509
510 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
511 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
512 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
513 {
514#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
515 // ignore some perl-related arguments if some bozo installed us set[ug]id
516 if (rxvt_tainted ())
517 {
518 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 {
521 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
522 rs[Rs_perl_lib] = 0;
523 rs[Rs_perl_eval] = 0;
524 }
525 }
526#endif
527 rxvt_perl.init ();
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
465#endif 530#endif
466 531
467 create_windows (argc, argv); 532 create_windows (argc, argv);
468 533
469 dDisp; 534 dDisp;
… …
475#if 0 540#if 0
476 XSynchronize (disp, True); 541 XSynchronize (disp, True);
477#endif 542#endif
478 543
479#ifdef HAVE_SCROLLBARS 544#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 545 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 546 resize_scrollbar (); /* create and map scrollbar */
482#endif 547#endif
483#if (MENUBAR_MAX) 548#if (MENUBAR_MAX)
484 if (menubar_visible ()) 549 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 550 XMapWindow (disp, menuBar.win);
486#endif 551#endif
487#ifdef TRANSPARENT 552#ifdef TRANSPARENT
488 if (options & Opt_transparent) 553 if (OPTION (Opt_transparent))
489 { 554 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 555 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 556 check_our_parents ();
492 rootwin_ev.start (display, display->root); 557 rootwin_ev.start (display, display->root);
493 } 558 }
… …
500 565
501 init_command (cmd_argv); 566 init_command (cmd_argv);
502 567
503 free (cmd_argv); 568 free (cmd_argv);
504 569
570 if (pty.pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
506 572
507 check_ev.start (); 573 check_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
508 576
509 return true; 577 return true;
510} 578}
511 579
512static struct sig_handlers 580static struct sig_handlers
… …
520 588
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 591 if (pid == (*t)->cmd_pid)
524 { 592 {
525 (*t)->destroy (); 593 (*t)->child_exit ();
526 break; 594 break;
527 } 595 }
528 } 596 }
529 597
530 /* 598 /*
… …
573 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
574 642
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 644 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 645 XSetIOErrorHandler (rxvt_xioerror_handler);
646
647 XrmInitialize ();
578} 648}
579 649
580/* ------------------------------------------------------------------------- * 650/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 651 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 652 * ------------------------------------------------------------------------- */
… …
618 * ------------------------------------------------------------------------- */ 688 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 689/* take care of suid/sgid super-user (root) privileges */
620void 690void
621rxvt_privileges (rxvt_privaction action) 691rxvt_privileges (rxvt_privaction action)
622{ 692{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__) 693#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 694# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 695 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 696# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 697# define setegid(a) setregid(-1, (a))
… …
642 */ 707 */
643 seteuid (getuid ()); 708 seteuid (getuid ());
644 setegid (getgid ()); 709 setegid (getgid ());
645 break; 710 break;
646 case SAVE: 711 case SAVE:
647 euid = geteuid (); 712 saved_euid = geteuid ();
648 egid = getegid (); 713 saved_egid = getegid ();
649 break; 714 break;
650 case RESTORE: 715 case RESTORE:
651 seteuid (euid); 716 seteuid (saved_euid);
652 setegid (egid); 717 setegid (saved_egid);
653 break; 718 break;
654 } 719 }
655# else 720# else
656 switch (action) 721 switch (action)
657 { 722 {
… …
670 735
671#ifdef UTMP_SUPPORT 736#ifdef UTMP_SUPPORT
672void 737void
673rxvt_term::privileged_utmp (rxvt_privaction action) 738rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 739{
675 if ((options & Opt_utmpInhibit) 740 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 741 || !pty.name || !*pty.name)
677 return; 742 return;
678 743
679 rxvt_privileges (RESTORE); 744 rxvt_privileges (RESTORE);
680 745
… …
718 if (rs[Rs_geometry]) 783 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 784 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 785
721 if (flags & WidthValue) 786 if (flags & WidthValue)
722 { 787 {
723 ncol = clamp (w, 0, MAX_POSITIVE_INT16); 788 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 789 szHint.flags |= USSize;
725 } 790 }
726 791
727 if (flags & HeightValue) 792 if (flags & HeightValue)
728 { 793 {
729 nrow = clamp (h, 0, MAX_POSITIVE_INT16); 794 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 795 szHint.flags |= USSize;
731 } 796 }
732 797
733 if (flags & XValue) 798 if (flags & XValue)
734 { 799 {
… …
772 837
773 if (scrollbar_visible ()) 838 if (scrollbar_visible ())
774 { 839 {
775 sb_w = scrollbar_TotalWidth (); 840 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 841 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 842 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 843 window_vt_x += sb_w;
779 } 844 }
780 845
781 if (menubar_visible ()) 846 if (menubar_visible ())
782 { 847 {
… …
810 { 875 {
811 min_it (height, max_height); 876 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 877 szHint.height = szHint.base_height + height;
813 } 878 }
814 879
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 880 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 881 window_sb_x = szHint.width - sb_w;
817 882
818 if (recalc_x) 883 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 884 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 885 if (recalc_y)
… …
889 prop.height += lineSpace; 954 prop.height += lineSpace;
890 fs->set_prop (prop); 955 fs->set_prop (prop);
891 956
892 fwidth = prop.width; 957 fwidth = prop.width;
893 fheight = prop.height; 958 fheight = prop.height;
894 fweight = prop.weight; 959 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 960
898 for (int style = 1; style < 4; style++) 961 for (int style = 1; style < 4; style++)
899 { 962 {
900#if ENABLE_STYLES 963#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 964 const char *res = rs[Rs_font + style];
… …
935 return true; 998 return true;
936} 999}
937 1000
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1001void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 1002{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 1003 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 1004 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1005 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 1006}
945 1007
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1008void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 1009{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 1010 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 1011 char *s = rxvt_wcstoutf8 (ws);
951 1012
952 XChangeProperty (display->display, parent[0], 1013 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1014 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 1055 i = atoi (color);
995 1056
996 if (i >= 8 && i <= 15) 1057 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1058 { /* bright colors */
998 i -= 8; 1059 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1060 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1061 SET_PIXCOLOR (idx);
1002 goto done; 1062 goto done;
1003# endif
1004 } 1063 }
1005 1064
1006 if (i >= 0 && i <= 7) 1065 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1066 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1067 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1192 } 1251 }
1193 1252
1194 if (menubar_visible ()) 1253 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1254 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1255 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1256 width, menuBar_TotalHeight ());
1198 1257
1199 XMoveResizeWindow (disp, vt, 1258 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1259 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1260 width, height);
1202 1261
1203 scr_clear (); 1262 scr_clear ();
1204#ifdef XPM_BACKGROUND 1263#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1264 resize_pixmap ();
1206#endif 1265#endif

Diff Legend

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