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.176 by root, Thu Jan 12 01:30:53 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
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}
65
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128], savelocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
… …
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;
64} 79}
65 80
66bool 81void
67rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
68{ 83{
69 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
71} 86}
… …
206 pty.put (); 221 pty.put ();
207} 222}
208 223
209rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
210{ 225{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 227
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 229
215 emergency_cleanup (); 230 emergency_cleanup ();
216 231
… …
269 if (parent[0]) 284 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
271 } 286 }
272 287
273 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 289 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
278#endif 292#endif
279 293
… …
464/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
465bool 479bool
466rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
467{ 481{
468 SET_R (this); 482 SET_R (this);
483 set_environ (envv); // few things in X do not call setlocale :(
469 484
470 set_locale (""); 485 set_locale ("");
471 486
472 if (!init_vars ()) 487 if (!init_vars ())
473 return false; 488 return false;
… …
487 if (OPTION (Opt_scrollBar)) 502 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 504#endif
490 505
491#if ENABLE_PERL 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
492 rxvt_perl.init (); 527 rxvt_perl.init ();
493#endif 528 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 }
531#endif
496 532
497 create_windows (argc, argv); 533 create_windows (argc, argv);
498 534
499 dDisp; 535 dDisp;
500 536
501 init_xlocale (); 537 init_xlocale ();
502 538
503 scr_reset (); /* initialize screen */ 539 scr_reset (); // initialize screen
504 540
505#if 0 541#if 0
506 XSynchronize (disp, True); 542 XSynchronize (disp, True);
507#endif 543#endif
508 544
… …
530 566
531 init_command (cmd_argv); 567 init_command (cmd_argv);
532 568
533 free (cmd_argv); 569 free (cmd_argv);
534 570
571 if (pty.pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 572 pty_ev.start (pty.pty, EVENT_READ);
536 573
537 check_ev.start (); 574 check_ev.start ();
538 575
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 576 HOOK_INVOKE ((this, HOOK_START, DT_END));
540 577
541 return true; 578 return true;
542} 579}
543 580
544static struct sig_handlers 581static struct sig_handlers
… …
579 sw_int (this, &sig_handlers::sig_term) 616 sw_int (this, &sig_handlers::sig_term)
580 { 617 {
581 } 618 }
582} sig_handlers; 619} sig_handlers;
583 620
621char **rxvt_environ; // startup environment
622
584void 623void
585rxvt_init () 624rxvt_init ()
586{ 625{
626 rxvt_environ = environ;
627
587 /* 628 /*
588 * Save and then give up any super-user privileges 629 * Save and then give up any super-user privileges
589 * If we need privileges in any area then we must specifically request it. 630 * If we need privileges in any area then we must specifically request it.
590 * We should only need to be root in these cases: 631 * We should only need to be root in these cases:
591 * 1. write utmp entries on some systems 632 * 1. write utmp entries on some systems
… …
605 /* signal (SIGURG, SIG_DFL); */ 646 /* signal (SIGURG, SIG_DFL); */
606 647
607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 648 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608 // TODO: handle this with exceptions and tolerate the memory loss 649 // TODO: handle this with exceptions and tolerate the memory loss
609 XSetIOErrorHandler (rxvt_xioerror_handler); 650 XSetIOErrorHandler (rxvt_xioerror_handler);
651
652 XrmInitialize ();
610} 653}
611 654
612/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
650 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
651/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
652void 695void
653rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
654{ 697{
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__) 698#if ! defined(__CYGWIN32__)
661# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
663# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
664# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
670 case IGNORE: 708 case IGNORE:
671 /* 709 /*
672 * change effective uid/gid - not real uid/gid - so we can switch 710 * change effective uid/gid - not real uid/gid - so we can switch
673 * back to root later, as required 711 * back to root later, as required
674 */ 712 */
713 setegid (getgid ());
675 seteuid (getuid ()); 714 seteuid (getuid ());
676 setegid (getgid ());
677 break; 715 break;
678 case SAVE: 716 case SAVE:
679 euid = geteuid ();
680 egid = getegid (); 717 saved_egid = getegid ();
718 saved_euid = geteuid ();
681 break; 719 break;
682 case RESTORE: 720 case RESTORE:
683 seteuid (euid);
684 setegid (egid); 721 setegid (saved_egid);
722 seteuid (saved_euid);
685 break; 723 break;
686 } 724 }
687# else 725# else
688 switch (action) 726 switch (action)
689 { 727 {
690 case IGNORE: 728 case IGNORE:
729 setgid (getgid ());
691 setuid (getuid ()); 730 setuid (getuid ());
692 setgid (getgid ());
693 /* FALLTHROUGH */ 731 /* FALLTHROUGH */
694 case SAVE: 732 case SAVE:
695 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
696 case RESTORE: 734 case RESTORE:
697 break; 735 break;
… …
921 prop.height += lineSpace; 959 prop.height += lineSpace;
922 fs->set_prop (prop); 960 fs->set_prop (prop);
923 961
924 fwidth = prop.width; 962 fwidth = prop.width;
925 fheight = prop.height; 963 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 964 fbase = prop.ascent;
927 965
928 for (int style = 1; style < 4; style++) 966 for (int style = 1; style < 4; style++)
929 { 967 {
930#if ENABLE_STYLES 968#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 969 const char *res = rs[Rs_font + style];
… …
1022 i = atoi (color); 1060 i = atoi (color);
1023 1061
1024 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 1063 { /* bright colors */
1026 i -= 8; 1064 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1030 goto done; 1067 goto done;
1031# endif
1032 } 1068 }
1033 1069
1034 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 1071 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1220 } 1256 }
1221 1257
1222 if (menubar_visible ()) 1258 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win, 1259 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0, 1260 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1261 width, menuBar_TotalHeight ());
1226 1262
1227 XMoveResizeWindow (disp, vt, 1263 XMoveResizeWindow (disp, vt,
1228 window_vt_x, window_vt_y, 1264 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1265 width, height);
1230 1266
1231 scr_clear (); 1267 scr_clear ();
1232#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1269 resize_pixmap ();
1234#endif 1270#endif
… …
1414 XRectangle rect, status_rect, needed_rect; 1450 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1451 unsigned long fg, bg;
1416 const char *p; 1452 const char *p;
1417 char **s; 1453 char **s;
1418 XIMStyles *xim_styles; 1454 XIMStyles *xim_styles;
1455
1456 set_environ (envv);
1419 1457
1420 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1458 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421 return false; 1459 return false;
1422 1460
1423 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1461 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));

Diff Legend

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