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.153 by root, Tue Dec 27 12:23:37 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"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
50# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
51#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}
52 65
53vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
54 67
55static char curlocale[128]; 68static char curlocale[128], savelocale[128];
56 69
57bool 70bool
58rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
59{ 72{
60 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 74 return false;
62 75
63 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
65 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);
66} 92}
67 93
68#if ENABLE_COMBINING 94#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
70 96
… …
195 pty.put (); 221 pty.put ();
196} 222}
197 223
198rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
199{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 229
202 emergency_cleanup (); 230 emergency_cleanup ();
203 231
204#if ENABLE_STYLES 232#if ENABLE_STYLES
… …
293void 321void
294rxvt_term::child_exit () 322rxvt_term::child_exit ()
295{ 323{
296 cmd_pid = 0; 324 cmd_pid = 0;
297 325
298 if (!(options & Opt_hold)) 326 if (!OPTION (Opt_hold))
299 destroy (); 327 destroy ();
300} 328}
301 329
302void 330void
303rxvt_term::destroy () 331rxvt_term::destroy ()
… …
469 497
470#if MENUBAR_MAX 498#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]); 499 menubar_read (rs[Rs_menu]);
472#endif 500#endif
473#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 502 if (OPTION (Opt_scrollBar))
475 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 }
476#endif 530#endif
477 531
478 create_windows (argc, argv); 532 create_windows (argc, argv);
479 533
480 dDisp; 534 dDisp;
… …
486#if 0 540#if 0
487 XSynchronize (disp, True); 541 XSynchronize (disp, True);
488#endif 542#endif
489 543
490#ifdef HAVE_SCROLLBARS 544#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 545 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 546 resize_scrollbar (); /* create and map scrollbar */
493#endif 547#endif
494#if (MENUBAR_MAX) 548#if (MENUBAR_MAX)
495 if (menubar_visible ()) 549 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win); 550 XMapWindow (disp, menuBar.win);
497#endif 551#endif
498#ifdef TRANSPARENT 552#ifdef TRANSPARENT
499 if (options & Opt_transparent) 553 if (OPTION (Opt_transparent))
500 { 554 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 555 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 556 check_our_parents ();
503 rootwin_ev.start (display, display->root); 557 rootwin_ev.start (display, display->root);
504 } 558 }
… …
511 565
512 init_command (cmd_argv); 566 init_command (cmd_argv);
513 567
514 free (cmd_argv); 568 free (cmd_argv);
515 569
570 if (pty.pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
517 572
518 check_ev.start (); 573 check_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
519 576
520 return true; 577 return true;
521} 578}
522 579
523static struct sig_handlers 580static struct sig_handlers
… …
584 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
585 642
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 644 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 645 XSetIOErrorHandler (rxvt_xioerror_handler);
646
647 XrmInitialize ();
589} 648}
590 649
591/* ------------------------------------------------------------------------- * 650/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 651 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 652 * ------------------------------------------------------------------------- */
… …
629 * ------------------------------------------------------------------------- */ 688 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */ 689/* take care of suid/sgid super-user (root) privileges */
631void 690void
632rxvt_privileges (rxvt_privaction action) 691rxvt_privileges (rxvt_privaction action)
633{ 692{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__) 693#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 694# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */ 695 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a)) 696# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a)) 697# define setegid(a) setregid(-1, (a))
… …
653 */ 707 */
654 seteuid (getuid ()); 708 seteuid (getuid ());
655 setegid (getgid ()); 709 setegid (getgid ());
656 break; 710 break;
657 case SAVE: 711 case SAVE:
658 euid = geteuid (); 712 saved_euid = geteuid ();
659 egid = getegid (); 713 saved_egid = getegid ();
660 break; 714 break;
661 case RESTORE: 715 case RESTORE:
662 seteuid (euid); 716 seteuid (saved_euid);
663 setegid (egid); 717 setegid (saved_egid);
664 break; 718 break;
665 } 719 }
666# else 720# else
667 switch (action) 721 switch (action)
668 { 722 {
… …
681 735
682#ifdef UTMP_SUPPORT 736#ifdef UTMP_SUPPORT
683void 737void
684rxvt_term::privileged_utmp (rxvt_privaction action) 738rxvt_term::privileged_utmp (rxvt_privaction action)
685{ 739{
686 if ((options & Opt_utmpInhibit) 740 if (OPTION (Opt_utmpInhibit)
687 || !pty.name || !*pty.name) 741 || !pty.name || !*pty.name)
688 return; 742 return;
689 743
690 rxvt_privileges (RESTORE); 744 rxvt_privileges (RESTORE);
691 745
… …
783 837
784 if (scrollbar_visible ()) 838 if (scrollbar_visible ())
785 { 839 {
786 sb_w = scrollbar_TotalWidth (); 840 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 841 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 842 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 843 window_vt_x += sb_w;
790 } 844 }
791 845
792 if (menubar_visible ()) 846 if (menubar_visible ())
793 { 847 {
… …
821 { 875 {
822 min_it (height, max_height); 876 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 877 szHint.height = szHint.base_height + height;
824 } 878 }
825 879
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 880 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 881 window_sb_x = szHint.width - sb_w;
828 882
829 if (recalc_x) 883 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 884 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 885 if (recalc_y)
… …
900 prop.height += lineSpace; 954 prop.height += lineSpace;
901 fs->set_prop (prop); 955 fs->set_prop (prop);
902 956
903 fwidth = prop.width; 957 fwidth = prop.width;
904 fheight = prop.height; 958 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 959 fbase = prop.ascent;
906 960
907 for (int style = 1; style < 4; style++) 961 for (int style = 1; style < 4; style++)
908 { 962 {
909#if ENABLE_STYLES 963#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 964 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 1055 i = atoi (color);
1002 1056
1003 if (i >= 8 && i <= 15) 1057 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 1058 { /* bright colors */
1005 i -= 8; 1059 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1060 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 1061 SET_PIXCOLOR (idx);
1009 goto done; 1062 goto done;
1010# endif
1011 } 1063 }
1012 1064
1013 if (i >= 0 && i <= 7) 1065 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 1066 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1067 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1199 } 1251 }
1200 1252
1201 if (menubar_visible ()) 1253 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win, 1254 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0, 1255 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1256 width, menuBar_TotalHeight ());
1205 1257
1206 XMoveResizeWindow (disp, vt, 1258 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1259 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1260 width, height);
1209 1261
1210 scr_clear (); 1262 scr_clear ();
1211#ifdef XPM_BACKGROUND 1263#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1264 resize_pixmap ();
1213#endif 1265#endif

Diff Legend

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