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.173 by root, Wed Jan 11 19:55:34 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 TEMP_ENV; // 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
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
496 531
497 create_windows (argc, argv); 532 create_windows (argc, argv);
498 533
499 dDisp; 534 dDisp;
500 535
501 init_xlocale (); 536 init_xlocale ();
502 537
503 scr_reset (); /* initialize screen */ 538 scr_reset (); // initialize screen
504 539
505#if 0 540#if 0
506 XSynchronize (disp, True); 541 XSynchronize (disp, True);
507#endif 542#endif
508 543
… …
530 565
531 init_command (cmd_argv); 566 init_command (cmd_argv);
532 567
533 free (cmd_argv); 568 free (cmd_argv);
534 569
570 if (pty.pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
536 572
537 check_ev.start (); 573 check_ev.start ();
538 574
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
540 576
541 return true; 577 return true;
542} 578}
543 579
544static struct sig_handlers 580static struct sig_handlers
… …
605 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
606 642
607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608 // TODO: handle this with exceptions and tolerate the memory loss 644 // TODO: handle this with exceptions and tolerate the memory loss
609 XSetIOErrorHandler (rxvt_xioerror_handler); 645 XSetIOErrorHandler (rxvt_xioerror_handler);
646
647 XrmInitialize ();
610} 648}
611 649
612/* ------------------------------------------------------------------------- * 650/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS * 651 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */ 652 * ------------------------------------------------------------------------- */
… …
650 * ------------------------------------------------------------------------- */ 688 * ------------------------------------------------------------------------- */
651/* take care of suid/sgid super-user (root) privileges */ 689/* take care of suid/sgid super-user (root) privileges */
652void 690void
653rxvt_privileges (rxvt_privaction action) 691rxvt_privileges (rxvt_privaction action)
654{ 692{
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__) 693#if ! defined(__CYGWIN32__)
661# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 694# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662 /* setreuid () is the poor man's setuid (), seteuid () */ 695 /* setreuid () is the poor man's setuid (), seteuid () */
663# define seteuid(a) setreuid(-1, (a)) 696# define seteuid(a) setreuid(-1, (a))
664# define setegid(a) setregid(-1, (a)) 697# define setegid(a) setregid(-1, (a))
… …
670 case IGNORE: 703 case IGNORE:
671 /* 704 /*
672 * change effective uid/gid - not real uid/gid - so we can switch 705 * change effective uid/gid - not real uid/gid - so we can switch
673 * back to root later, as required 706 * back to root later, as required
674 */ 707 */
708 setegid (getgid ());
675 seteuid (getuid ()); 709 seteuid (getuid ());
676 setegid (getgid ());
677 break; 710 break;
678 case SAVE: 711 case SAVE:
679 euid = geteuid ();
680 egid = getegid (); 712 saved_egid = getegid ();
713 saved_euid = geteuid ();
681 break; 714 break;
682 case RESTORE: 715 case RESTORE:
683 seteuid (euid);
684 setegid (egid); 716 setegid (saved_egid);
717 seteuid (saved_euid);
685 break; 718 break;
686 } 719 }
687# else 720# else
688 switch (action) 721 switch (action)
689 { 722 {
690 case IGNORE: 723 case IGNORE:
724 setgid (getgid ());
691 setuid (getuid ()); 725 setuid (getuid ());
692 setgid (getgid ());
693 /* FALLTHROUGH */ 726 /* FALLTHROUGH */
694 case SAVE: 727 case SAVE:
695 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
696 case RESTORE: 729 case RESTORE:
697 break; 730 break;
… …
921 prop.height += lineSpace; 954 prop.height += lineSpace;
922 fs->set_prop (prop); 955 fs->set_prop (prop);
923 956
924 fwidth = prop.width; 957 fwidth = prop.width;
925 fheight = prop.height; 958 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 959 fbase = prop.ascent;
927 960
928 for (int style = 1; style < 4; style++) 961 for (int style = 1; style < 4; style++)
929 { 962 {
930#if ENABLE_STYLES 963#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 964 const char *res = rs[Rs_font + style];
… …
1022 i = atoi (color); 1055 i = atoi (color);
1023 1056
1024 if (i >= 8 && i <= 15) 1057 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 1058 { /* bright colors */
1026 i -= 8; 1059 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1060 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx); 1061 SET_PIXCOLOR (idx);
1030 goto done; 1062 goto done;
1031# endif
1032 } 1063 }
1033 1064
1034 if (i >= 0 && i <= 7) 1065 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 1066 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1067 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1220 } 1251 }
1221 1252
1222 if (menubar_visible ()) 1253 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win, 1254 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0, 1255 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1256 width, menuBar_TotalHeight ());
1226 1257
1227 XMoveResizeWindow (disp, vt, 1258 XMoveResizeWindow (disp, vt,
1228 window_vt_x, window_vt_y, 1259 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1260 width, height);
1230 1261
1231 scr_clear (); 1262 scr_clear ();
1232#ifdef XPM_BACKGROUND 1263#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1264 resize_pixmap ();
1234#endif 1265#endif
… …
1414 XRectangle rect, status_rect, needed_rect; 1445 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1446 unsigned long fg, bg;
1416 const char *p; 1447 const char *p;
1417 char **s; 1448 char **s;
1418 XIMStyles *xim_styles; 1449 XIMStyles *xim_styles;
1450
1451 TEMP_ENV;
1419 1452
1420 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1453 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421 return false; 1454 return false;
1422 1455
1423 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1456 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));

Diff Legend

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