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.154 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.169 by root, Tue Jan 10 18:09:22 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
50# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
51#endif 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}
52 65
53vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
54 67
55static char curlocale[128]; 68static char curlocale[128], savelocale[128];
56 69
57bool 70bool
58rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
59{ 72{
60 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 74 return false;
62 75
63 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
65 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);
66} 92}
67 93
68#if ENABLE_COMBINING 94#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
70 96
… …
195 pty.put (); 221 pty.put ();
196} 222}
197 223
198rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
199{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
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
204#if ENABLE_STYLES 232#if ENABLE_STYLES
… …
260 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
261 289
262 delete pix_colors_focused; 290 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 291#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 292 delete pix_colors_unfocused;
293#endif
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
265#endif 296#endif
266 297
267 displays.put (display); 298 displays.put (display);
268 299
269 scr_release (); 300 scr_release ();
… …
473#ifdef HAVE_SCROLLBARS 504#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 505 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 506 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 507#endif
477 508
509#if ENABLE_PERL
510 if (!rs[Rs_perl_ext_1])
511 rs[Rs_perl_ext_1] = "default";
512
513 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
514 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
515 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
516 {
517#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518 // ignore some perl-related arguments if some bozo installed us set[ug]id
519 if (rxvt_tainted ())
520 {
521 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523 {
524 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0;
527 }
528 }
529#endif
530 rxvt_perl.init ();
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 }
533#endif
534
478 create_windows (argc, argv); 535 create_windows (argc, argv);
479 536
480 dDisp; 537 dDisp;
481 538
482 init_xlocale (); 539 init_xlocale ();
… …
511 568
512 init_command (cmd_argv); 569 init_command (cmd_argv);
513 570
514 free (cmd_argv); 571 free (cmd_argv);
515 572
573 if (pty.pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 574 pty_ev.start (pty.pty, EVENT_READ);
517 575
518 check_ev.start (); 576 check_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
519 579
520 return true; 580 return true;
521} 581}
522 582
523static struct sig_handlers 583static struct sig_handlers
… …
584 /* signal (SIGURG, SIG_DFL); */ 644 /* signal (SIGURG, SIG_DFL); */
585 645
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 647 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 648 XSetIOErrorHandler (rxvt_xioerror_handler);
649
650#ifdef USE_XGETDEFAULT
651 XrmInitialize ();
652#endif
589} 653}
590 654
591/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
629 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
631void 695void
632rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
633{ 697{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__) 698#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
653 */ 712 */
654 seteuid (getuid ()); 713 seteuid (getuid ());
655 setegid (getgid ()); 714 setegid (getgid ());
656 break; 715 break;
657 case SAVE: 716 case SAVE:
658 euid = geteuid (); 717 saved_euid = geteuid ();
659 egid = getegid (); 718 saved_egid = getegid ();
660 break; 719 break;
661 case RESTORE: 720 case RESTORE:
662 seteuid (euid); 721 seteuid (saved_euid);
663 setegid (egid); 722 setegid (saved_egid);
664 break; 723 break;
665 } 724 }
666# else 725# else
667 switch (action) 726 switch (action)
668 { 727 {
… …
900 prop.height += lineSpace; 959 prop.height += lineSpace;
901 fs->set_prop (prop); 960 fs->set_prop (prop);
902 961
903 fwidth = prop.width; 962 fwidth = prop.width;
904 fheight = prop.height; 963 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 964 fbase = prop.ascent;
906 965
907 for (int style = 1; style < 4; style++) 966 for (int style = 1; style < 4; style++)
908 { 967 {
909#if ENABLE_STYLES 968#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 969 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 1060 i = atoi (color);
1002 1061
1003 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 1063 { /* bright colors */
1005 i -= 8; 1064 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1009 goto done; 1067 goto done;
1010# endif
1011 } 1068 }
1012 1069
1013 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 1071 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1199 } 1256 }
1200 1257
1201 if (menubar_visible ()) 1258 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win, 1259 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0, 1260 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1261 width, menuBar_TotalHeight ());
1205 1262
1206 XMoveResizeWindow (disp, vt, 1263 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1264 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1265 width, height);
1209 1266
1210 scr_clear (); 1267 scr_clear ();
1211#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1269 resize_pixmap ();
1213#endif 1270#endif

Diff Legend

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