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.155 by root, Mon Jan 2 15:35:43 2006 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.
… …
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]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
56rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
57{ 72{
58 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 74 return false;
60 75
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;
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);
64} 92}
65 93
66#if ENABLE_COMBINING 94#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
68 96
… …
193 pty.put (); 221 pty.put ();
194} 222}
195 223
196rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
197{ 225{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
199 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
… …
474 if (OPTION (Opt_scrollBar)) 502 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 504#endif
477 505
478#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
479 rxvt_perl.init (); 527 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
483 531
484 create_windows (argc, argv); 532 create_windows (argc, argv);
485 533
486 dDisp; 534 dDisp;
487 535
… …
517 565
518 init_command (cmd_argv); 566 init_command (cmd_argv);
519 567
520 free (cmd_argv); 568 free (cmd_argv);
521 569
570 if (pty.pty >= 0)
522 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
523 572
524 check_ev.start (); 573 check_ev.start ();
525 574
526 PERL_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
527 576
528 return true; 577 return true;
529} 578}
530 579
531static struct sig_handlers 580static struct sig_handlers
… …
592 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
593 642
594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595 // TODO: handle this with exceptions and tolerate the memory loss 644 // TODO: handle this with exceptions and tolerate the memory loss
596 XSetIOErrorHandler (rxvt_xioerror_handler); 645 XSetIOErrorHandler (rxvt_xioerror_handler);
646
647 XrmInitialize ();
597} 648}
598 649
599/* ------------------------------------------------------------------------- * 650/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS * 651 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */ 652 * ------------------------------------------------------------------------- */
… …
637 * ------------------------------------------------------------------------- */ 688 * ------------------------------------------------------------------------- */
638/* take care of suid/sgid super-user (root) privileges */ 689/* take care of suid/sgid super-user (root) privileges */
639void 690void
640rxvt_privileges (rxvt_privaction action) 691rxvt_privileges (rxvt_privaction action)
641{ 692{
642#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643 static uid_t euid;
644 static gid_t egid;
645#endif
646
647#if ! defined(__CYGWIN32__) 693#if ! defined(__CYGWIN32__)
648# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 694# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649 /* setreuid () is the poor man's setuid (), seteuid () */ 695 /* setreuid () is the poor man's setuid (), seteuid () */
650# define seteuid(a) setreuid(-1, (a)) 696# define seteuid(a) setreuid(-1, (a))
651# define setegid(a) setregid(-1, (a)) 697# define setegid(a) setregid(-1, (a))
… …
661 */ 707 */
662 seteuid (getuid ()); 708 seteuid (getuid ());
663 setegid (getgid ()); 709 setegid (getgid ());
664 break; 710 break;
665 case SAVE: 711 case SAVE:
666 euid = geteuid (); 712 saved_euid = geteuid ();
667 egid = getegid (); 713 saved_egid = getegid ();
668 break; 714 break;
669 case RESTORE: 715 case RESTORE:
670 seteuid (euid); 716 seteuid (saved_euid);
671 setegid (egid); 717 setegid (saved_egid);
672 break; 718 break;
673 } 719 }
674# else 720# else
675 switch (action) 721 switch (action)
676 { 722 {
… …
908 prop.height += lineSpace; 954 prop.height += lineSpace;
909 fs->set_prop (prop); 955 fs->set_prop (prop);
910 956
911 fwidth = prop.width; 957 fwidth = prop.width;
912 fheight = prop.height; 958 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 959 fbase = prop.ascent;
914 960
915 for (int style = 1; style < 4; style++) 961 for (int style = 1; style < 4; style++)
916 { 962 {
917#if ENABLE_STYLES 963#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 964 const char *res = rs[Rs_font + style];
… …
1009 i = atoi (color); 1055 i = atoi (color);
1010 1056
1011 if (i >= 8 && i <= 15) 1057 if (i >= 8 && i <= 15)
1012 { /* bright colors */ 1058 { /* bright colors */
1013 i -= 8; 1059 i -= 8;
1014# ifndef NO_BRIGHTCOLOR
1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1060 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016 SET_PIXCOLOR (idx); 1061 SET_PIXCOLOR (idx);
1017 goto done; 1062 goto done;
1018# endif
1019 } 1063 }
1020 1064
1021 if (i >= 0 && i <= 7) 1065 if (i >= 0 && i <= 7)
1022 { /* normal colors */ 1066 { /* normal colors */
1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1067 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1207 } 1251 }
1208 1252
1209 if (menubar_visible ()) 1253 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win, 1254 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0, 1255 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1256 width, menuBar_TotalHeight ());
1213 1257
1214 XMoveResizeWindow (disp, vt, 1258 XMoveResizeWindow (disp, vt,
1215 window_vt_x, window_vt_y, 1259 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1260 width, height);
1217 1261
1218 scr_clear (); 1262 scr_clear ();
1219#ifdef XPM_BACKGROUND 1263#ifdef XPM_BACKGROUND
1220 resize_pixmap (); 1264 resize_pixmap ();
1221#endif 1265#endif

Diff Legend

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