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.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 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.
… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53static char curlocale[128], savelocale[128]; 58static char curlocale[128], savelocale[128];
54 59
55bool 60bool
… …
206 pty.put (); 211 pty.put ();
207} 212}
208 213
209rxvt_term::~rxvt_term () 214rxvt_term::~rxvt_term ()
210{ 215{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 216 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 217
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 219
215 emergency_cleanup (); 220 emergency_cleanup ();
216 221
… …
273 // TODO: free pixcolours, colours should become part of rxvt_display 278 // TODO: free pixcolours, colours should become part of rxvt_display
274 279
275 delete pix_colors_focused; 280 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 281#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 282 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
278#endif 286#endif
279 287
280 displays.put (display); 288 displays.put (display);
281 289
282 scr_release (); 290 scr_release ();
… …
487 if (OPTION (Opt_scrollBar)) 495 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 497#endif
490 498
491#if ENABLE_PERL 499#if ENABLE_PERL
500 if (!rs[Rs_perl_ext_1])
501 rs[Rs_perl_ext_1] = "default";
502
503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
492 rxvt_perl.init (); 524 rxvt_perl.init (tainted);
493#endif
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526 }
527#endif
496 528
497 create_windows (argc, argv); 529 create_windows (argc, argv);
498 530
499 dDisp; 531 dDisp;
500 532
… …
530 562
531 init_command (cmd_argv); 563 init_command (cmd_argv);
532 564
533 free (cmd_argv); 565 free (cmd_argv);
534 566
567 if (pty.pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 568 pty_ev.start (pty.pty, EVENT_READ);
536 569
537 check_ev.start (); 570 check_ev.start ();
538 571
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
540 573
541 return true; 574 return true;
542} 575}
543 576
544static struct sig_handlers 577static struct sig_handlers
… …
605 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
606 639
607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608 // TODO: handle this with exceptions and tolerate the memory loss 641 // TODO: handle this with exceptions and tolerate the memory loss
609 XSetIOErrorHandler (rxvt_xioerror_handler); 642 XSetIOErrorHandler (rxvt_xioerror_handler);
643
644#ifdef USE_XGETDEFAULT
645 XrmInitialize ();
646#endif
610} 647}
611 648
612/* ------------------------------------------------------------------------- * 649/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS * 650 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */ 651 * ------------------------------------------------------------------------- */
… …
650 * ------------------------------------------------------------------------- */ 687 * ------------------------------------------------------------------------- */
651/* take care of suid/sgid super-user (root) privileges */ 688/* take care of suid/sgid super-user (root) privileges */
652void 689void
653rxvt_privileges (rxvt_privaction action) 690rxvt_privileges (rxvt_privaction action)
654{ 691{
655#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
656 static uid_t euid;
657 static gid_t egid;
658#endif
659
660#if ! defined(__CYGWIN32__) 692#if ! defined(__CYGWIN32__)
661# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662 /* setreuid () is the poor man's setuid (), seteuid () */ 694 /* setreuid () is the poor man's setuid (), seteuid () */
663# define seteuid(a) setreuid(-1, (a)) 695# define seteuid(a) setreuid(-1, (a))
664# define setegid(a) setregid(-1, (a)) 696# define setegid(a) setregid(-1, (a))
… …
674 */ 706 */
675 seteuid (getuid ()); 707 seteuid (getuid ());
676 setegid (getgid ()); 708 setegid (getgid ());
677 break; 709 break;
678 case SAVE: 710 case SAVE:
679 euid = geteuid (); 711 saved_euid = geteuid ();
680 egid = getegid (); 712 saved_egid = getegid ();
681 break; 713 break;
682 case RESTORE: 714 case RESTORE:
683 seteuid (euid); 715 seteuid (saved_euid);
684 setegid (egid); 716 setegid (saved_egid);
685 break; 717 break;
686 } 718 }
687# else 719# else
688 switch (action) 720 switch (action)
689 { 721 {
… …
921 prop.height += lineSpace; 953 prop.height += lineSpace;
922 fs->set_prop (prop); 954 fs->set_prop (prop);
923 955
924 fwidth = prop.width; 956 fwidth = prop.width;
925 fheight = prop.height; 957 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 958 fbase = prop.ascent;
927 959
928 for (int style = 1; style < 4; style++) 960 for (int style = 1; style < 4; style++)
929 { 961 {
930#if ENABLE_STYLES 962#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 963 const char *res = rs[Rs_font + style];
… …
1022 i = atoi (color); 1054 i = atoi (color);
1023 1055
1024 if (i >= 8 && i <= 15) 1056 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 1057 { /* bright colors */
1026 i -= 8; 1058 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1059 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx); 1060 SET_PIXCOLOR (idx);
1030 goto done; 1061 goto done;
1031# endif
1032 } 1062 }
1033 1063
1034 if (i >= 0 && i <= 7) 1064 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 1065 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1066 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1220 } 1250 }
1221 1251
1222 if (menubar_visible ()) 1252 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win, 1253 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0, 1254 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1255 width, menuBar_TotalHeight ());
1226 1256
1227 XMoveResizeWindow (disp, vt, 1257 XMoveResizeWindow (disp, vt,
1228 window_vt_x, window_vt_y, 1258 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1259 width, height);
1230 1260
1231 scr_clear (); 1261 scr_clear ();
1232#ifdef XPM_BACKGROUND 1262#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1263 resize_pixmap ();
1234#endif 1264#endif

Diff Legend

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