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.157 by root, Tue Jan 3 18:11:34 2006 UTC vs.
Revision 1.177 by root, Mon Jan 16 06:37:52 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}
72 87
73void 88void
74rxvt_pop_locale () 89rxvt_pop_locale ()
75{ 90{
76 rxvt_set_locale (savelocale); 91 rxvt_set_locale (savelocale);
92}
93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
77} 100}
78 101
79#if ENABLE_COMBINING 102#if ENABLE_COMBINING
80class rxvt_composite_vec rxvt_composite; 103class rxvt_composite_vec rxvt_composite;
81 104
… …
206 pty.put (); 229 pty.put ();
207} 230}
208 231
209rxvt_term::~rxvt_term () 232rxvt_term::~rxvt_term ()
210{ 233{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 235
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 236 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 237
215 emergency_cleanup (); 238 emergency_cleanup ();
216 239
… …
269 if (parent[0]) 292 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 293 XDestroyWindow (disp, parent[0]);
271 } 294 }
272 295
273 // TODO: free pixcolours, colours should become part of rxvt_display 296 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 297 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 298#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 299 delete pix_colors_unfocused;
278#endif 300#endif
279 301
… …
363} 385}
364 386
365void 387void
366rxvt_term::destroy_cb (time_watcher &w) 388rxvt_term::destroy_cb (time_watcher &w)
367{ 389{
368 SET_R (this); 390 make_current ();
369 391
370 delete this; 392 delete this;
371} 393}
372 394
373/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 486/*----------------------------------------------------------------------*/
465bool 487bool
466rxvt_term::init (int argc, const char *const *argv) 488rxvt_term::init (int argc, const char *const *argv)
467{ 489{
468 SET_R (this); 490 SET_R (this);
469
470 set_locale (""); 491 set_locale ("");
492 set_environ (envv); // few things in X do not call setlocale :(
471 493
472 if (!init_vars ()) 494 if (!init_vars ())
473 return false; 495 return false;
474 496
475 init_secondary (); 497 init_secondary ();
… …
487 if (OPTION (Opt_scrollBar)) 509 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 510 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 511#endif
490 512
491#if ENABLE_PERL 513#if ENABLE_PERL
514 if (!rs[Rs_perl_ext_1])
515 rs[Rs_perl_ext_1] = "default";
516
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) 517 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
493 { 520 {
521#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522 // ignore some perl-related arguments if some bozo installed us set[ug]id
523 if (rxvt_tainted ())
524 {
525 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527 {
528 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0;
531 }
532 }
533#endif
494 rxvt_perl.init (); 534 rxvt_perl.init ();
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 536 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
496 } 537 }
497#endif 538#endif
498 539
499 create_windows (argc, argv); 540 create_windows (argc, argv);
500 541
501 dDisp; 542 dDisp;
502 543
503 init_xlocale (); 544 init_xlocale ();
504 545
505 scr_reset (); /* initialize screen */ 546 scr_reset (); // initialize screen
506 547
507#if 0 548#if 0
508 XSynchronize (disp, True); 549 XSynchronize (disp, True);
509#endif 550#endif
510 551
… …
532 573
533 init_command (cmd_argv); 574 init_command (cmd_argv);
534 575
535 free (cmd_argv); 576 free (cmd_argv);
536 577
578 if (pty.pty >= 0)
537 pty_ev.start (pty.pty, EVENT_READ); 579 pty_ev.start (pty.pty, EVENT_READ);
538 580
539 check_ev.start (); 581 check_ev.start ();
540 582
541 PERL_INVOKE ((this, HOOK_START, DT_END)); 583 HOOK_INVOKE ((this, HOOK_START, DT_END));
542 584
543 return true; 585 return true;
544} 586}
545 587
546static struct sig_handlers 588static struct sig_handlers
… …
581 sw_int (this, &sig_handlers::sig_term) 623 sw_int (this, &sig_handlers::sig_term)
582 { 624 {
583 } 625 }
584} sig_handlers; 626} sig_handlers;
585 627
628char **rxvt_environ; // startup environment
629
586void 630void
587rxvt_init () 631rxvt_init ()
588{ 632{
633 rxvt_environ = environ;
634
589 /* 635 /*
590 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
591 * If we need privileges in any area then we must specifically request it. 637 * If we need privileges in any area then we must specifically request it.
592 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
593 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
… …
607 /* signal (SIGURG, SIG_DFL); */ 653 /* signal (SIGURG, SIG_DFL); */
608 654
609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss 656 // TODO: handle this with exceptions and tolerate the memory loss
611 XSetIOErrorHandler (rxvt_xioerror_handler); 657 XSetIOErrorHandler (rxvt_xioerror_handler);
658
659 XrmInitialize ();
612} 660}
613 661
614/* ------------------------------------------------------------------------- * 662/* ------------------------------------------------------------------------- *
615 * MEMORY ALLOCATION WRAPPERS * 663 * MEMORY ALLOCATION WRAPPERS *
616 * ------------------------------------------------------------------------- */ 664 * ------------------------------------------------------------------------- */
… …
652 * ------------------------------------------------------------------------- */ 700 * ------------------------------------------------------------------------- */
653/* take care of suid/sgid super-user (root) privileges */ 701/* take care of suid/sgid super-user (root) privileges */
654void 702void
655rxvt_privileges (rxvt_privaction action) 703rxvt_privileges (rxvt_privaction action)
656{ 704{
657#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
658 static uid_t euid;
659 static gid_t egid;
660#endif
661
662#if ! defined(__CYGWIN32__) 705#if ! defined(__CYGWIN32__)
663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664 /* setreuid () is the poor man's setuid (), seteuid () */ 707 /* setreuid () is the poor man's setuid (), seteuid () */
665# define seteuid(a) setreuid(-1, (a)) 708# define seteuid(a) setreuid(-1, (a))
666# define setegid(a) setregid(-1, (a)) 709# define setegid(a) setregid(-1, (a))
… …
672 case IGNORE: 715 case IGNORE:
673 /* 716 /*
674 * change effective uid/gid - not real uid/gid - so we can switch 717 * change effective uid/gid - not real uid/gid - so we can switch
675 * back to root later, as required 718 * back to root later, as required
676 */ 719 */
720 setegid (getgid ());
677 seteuid (getuid ()); 721 seteuid (getuid ());
678 setegid (getgid ());
679 break; 722 break;
680 case SAVE: 723 case SAVE:
681 euid = geteuid ();
682 egid = getegid (); 724 saved_egid = getegid ();
725 saved_euid = geteuid ();
683 break; 726 break;
684 case RESTORE: 727 case RESTORE:
685 seteuid (euid);
686 setegid (egid); 728 setegid (saved_egid);
729 seteuid (saved_euid);
687 break; 730 break;
688 } 731 }
689# else 732# else
690 switch (action) 733 switch (action)
691 { 734 {
692 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
693 setuid (getuid ()); 737 setuid (getuid ());
694 setgid (getgid ());
695 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
696 case SAVE: 739 case SAVE:
697 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
698 case RESTORE: 741 case RESTORE:
699 break; 742 break;
… …
923 prop.height += lineSpace; 966 prop.height += lineSpace;
924 fs->set_prop (prop); 967 fs->set_prop (prop);
925 968
926 fwidth = prop.width; 969 fwidth = prop.width;
927 fheight = prop.height; 970 fheight = prop.height;
928 fbase = (*fs)[1]->ascent; 971 fbase = prop.ascent;
929 972
930 for (int style = 1; style < 4; style++) 973 for (int style = 1; style < 4; style++)
931 { 974 {
932#if ENABLE_STYLES 975#if ENABLE_STYLES
933 const char *res = rs[Rs_font + style]; 976 const char *res = rs[Rs_font + style];
… …
1024 i = atoi (color); 1067 i = atoi (color);
1025 1068
1026 if (i >= 8 && i <= 15) 1069 if (i >= 8 && i <= 15)
1027 { /* bright colors */ 1070 { /* bright colors */
1028 i -= 8; 1071 i -= 8;
1029# ifndef NO_BRIGHTCOLOR
1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031 SET_PIXCOLOR (idx); 1073 SET_PIXCOLOR (idx);
1032 goto done; 1074 goto done;
1033# endif
1034 } 1075 }
1035 1076
1036 if (i >= 0 && i <= 7) 1077 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 1078 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1079 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1222 } 1263 }
1223 1264
1224 if (menubar_visible ()) 1265 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win, 1266 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0, 1267 window_vt_x, 0,
1227 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1268 width, menuBar_TotalHeight ());
1228 1269
1229 XMoveResizeWindow (disp, vt, 1270 XMoveResizeWindow (disp, vt,
1230 window_vt_x, window_vt_y, 1271 window_vt_x, window_vt_y,
1231 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1272 width, height);
1232 1273
1233 scr_clear (); 1274 scr_clear ();
1234#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1276 resize_pixmap ();
1236#endif 1277#endif
… …
1416 XRectangle rect, status_rect, needed_rect; 1457 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1458 unsigned long fg, bg;
1418 const char *p; 1459 const char *p;
1419 char **s; 1460 char **s;
1420 XIMStyles *xim_styles; 1461 XIMStyles *xim_styles;
1462
1463 set_environ (envv);
1421 1464
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1465 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1466 return false;
1424 1467
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1468 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1591 int i; 1634 int i;
1592 const char *p; 1635 const char *p;
1593 char **s; 1636 char **s;
1594 char buf[IMBUFSIZ]; 1637 char buf[IMBUFSIZ];
1595 1638
1596 SET_R (this); 1639 make_current ();
1597 1640
1598 im_destroy (); 1641 im_destroy ();
1599 1642
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1643 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1644 if (Input_Context)

Diff Legend

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