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.178 by root, Mon Jan 16 08:29:57 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
… …
256 if (parent[0]) 284 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
258 } 286 }
259 287
260 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 289 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
265#endif 292#endif
266 293
… …
350} 377}
351 378
352void 379void
353rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
354{ 381{
355 SET_R (this); 382 make_current ();
356 383
357 delete this; 384 delete this;
358} 385}
359 386
360/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
451/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
452bool 479bool
453rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
454{ 481{
455 SET_R (this); 482 SET_R (this);
456
457 set_locale (""); 483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
458 485
459 if (!init_vars ()) 486 if (!init_vars ())
460 return false; 487 return false;
461 488
462 init_secondary (); 489 init_secondary ();
… …
473#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 503#endif
477 504
505#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
531
478 create_windows (argc, argv); 532 create_windows (argc, argv);
479 533
480 dDisp; 534 dDisp;
481 535
482 init_xlocale (); 536 init_xlocale ();
483 537
484 scr_reset (); /* initialize screen */ 538 scr_reset (); // initialize screen
485 539
486#if 0 540#if 0
487 XSynchronize (disp, True); 541 XSynchronize (disp, True);
488#endif 542#endif
489 543
… …
511 565
512 init_command (cmd_argv); 566 init_command (cmd_argv);
513 567
514 free (cmd_argv); 568 free (cmd_argv);
515 569
570 if (pty.pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
517 572
518 check_ev.start (); 573 check_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
519 576
520 return true; 577 return true;
521} 578}
522 579
523static struct sig_handlers 580static struct sig_handlers
… …
558 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
559 { 616 {
560 } 617 }
561} sig_handlers; 618} sig_handlers;
562 619
620char **rxvt_environ; // startup environment
621
563void 622void
564rxvt_init () 623rxvt_init ()
565{ 624{
625 rxvt_environ = environ;
626
566 /* 627 /*
567 * Save and then give up any super-user privileges 628 * Save and then give up any super-user privileges
568 * If we need privileges in any area then we must specifically request it. 629 * If we need privileges in any area then we must specifically request it.
569 * We should only need to be root in these cases: 630 * We should only need to be root in these cases:
570 * 1. write utmp entries on some systems 631 * 1. write utmp entries on some systems
… …
584 /* signal (SIGURG, SIG_DFL); */ 645 /* signal (SIGURG, SIG_DFL); */
585 646
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 647 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 648 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 649 XSetIOErrorHandler (rxvt_xioerror_handler);
650
651 XrmInitialize ();
589} 652}
590 653
591/* ------------------------------------------------------------------------- * 654/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 655 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 656 * ------------------------------------------------------------------------- */
… …
629 * ------------------------------------------------------------------------- */ 692 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */ 693/* take care of suid/sgid super-user (root) privileges */
631void 694void
632rxvt_privileges (rxvt_privaction action) 695rxvt_privileges (rxvt_privaction action)
633{ 696{
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__) 697#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */ 699 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a)) 700# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a)) 701# define setegid(a) setregid(-1, (a))
… …
649 case IGNORE: 707 case IGNORE:
650 /* 708 /*
651 * change effective uid/gid - not real uid/gid - so we can switch 709 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required 710 * back to root later, as required
653 */ 711 */
712 setegid (getgid ());
654 seteuid (getuid ()); 713 seteuid (getuid ());
655 setegid (getgid ());
656 break; 714 break;
657 case SAVE: 715 case SAVE:
658 euid = geteuid ();
659 egid = getegid (); 716 saved_egid = getegid ();
717 saved_euid = geteuid ();
660 break; 718 break;
661 case RESTORE: 719 case RESTORE:
662 seteuid (euid);
663 setegid (egid); 720 setegid (saved_egid);
721 seteuid (saved_euid);
664 break; 722 break;
665 } 723 }
666# else 724# else
667 switch (action) 725 switch (action)
668 { 726 {
669 case IGNORE: 727 case IGNORE:
728 setgid (getgid ());
670 setuid (getuid ()); 729 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */ 730 /* FALLTHROUGH */
673 case SAVE: 731 case SAVE:
674 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
675 case RESTORE: 733 case RESTORE:
676 break; 734 break;
… …
900 prop.height += lineSpace; 958 prop.height += lineSpace;
901 fs->set_prop (prop); 959 fs->set_prop (prop);
902 960
903 fwidth = prop.width; 961 fwidth = prop.width;
904 fheight = prop.height; 962 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 963 fbase = prop.ascent;
906 964
907 for (int style = 1; style < 4; style++) 965 for (int style = 1; style < 4; style++)
908 { 966 {
909#if ENABLE_STYLES 967#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 968 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 1059 i = atoi (color);
1002 1060
1003 if (i >= 8 && i <= 15) 1061 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 1062 { /* bright colors */
1005 i -= 8; 1063 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 1065 SET_PIXCOLOR (idx);
1009 goto done; 1066 goto done;
1010# endif
1011 } 1067 }
1012 1068
1013 if (i >= 0 && i <= 7) 1069 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 1070 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1199 } 1255 }
1200 1256
1201 if (menubar_visible ()) 1257 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win, 1258 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0, 1259 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1260 width, menuBar_TotalHeight ());
1205 1261
1206 XMoveResizeWindow (disp, vt, 1262 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1263 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1264 width, height);
1209 1265
1210 scr_clear (); 1266 scr_clear ();
1211#ifdef XPM_BACKGROUND 1267#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1268 resize_pixmap ();
1213#endif 1269#endif
… …
1393 XRectangle rect, status_rect, needed_rect; 1449 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1450 unsigned long fg, bg;
1395 const char *p; 1451 const char *p;
1396 char **s; 1452 char **s;
1397 XIMStyles *xim_styles; 1453 XIMStyles *xim_styles;
1454
1455 set_environ (envv);
1398 1456
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1458 return false;
1401 1459
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1568 int i; 1626 int i;
1569 const char *p; 1627 const char *p;
1570 char **s; 1628 char **s;
1571 char buf[IMBUFSIZ]; 1629 char buf[IMBUFSIZ];
1572 1630
1573 SET_R (this); 1631 make_current ();
1574 1632
1575 im_destroy (); 1633 im_destroy ();
1576 1634
1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578 if (Input_Context) 1636 if (Input_Context)

Diff Legend

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