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.174 by root, Thu Jan 12 00:11:13 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
… …
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);
469 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
470 set_locale (""); 489 set_locale ("");
471 490
472 if (!init_vars ()) 491 if (!init_vars ())
473 return false; 492 return false;
474 493
475 init_secondary (); 494 init_secondary ();
476 495
477 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
478 497
479#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 499 keyboard->register_done ();
481#endif 500#endif
482 501
483#if MENUBAR_MAX 502#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
485#endif 504#endif
486#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 506 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 508#endif
509 }
490 510
491#if ENABLE_PERL 511#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) 515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
493 { 518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
494 rxvt_perl.init (); 532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
496 } 535 }
497#endif 536#endif
498 537
538 {
539 TEMP_ENV;
540
499 create_windows (argc, argv); 541 create_windows (argc, argv);
500 542
501 dDisp; 543 dDisp;
502 544
503 init_xlocale (); 545 init_xlocale ();
504 546
505 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
506 548
507#if 0 549#if 0
508 XSynchronize (disp, True); 550 XSynchronize (disp, True);
509#endif 551#endif
510 552
511#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
512 if (OPTION (Opt_scrollBar)) 554 if (OPTION (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
514#endif 556#endif
515#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
516 if (menubar_visible ()) 558 if (menubar_visible ())
517 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
518#endif 560#endif
519#ifdef TRANSPARENT 561#ifdef TRANSPARENT
520 if (OPTION (Opt_transparent)) 562 if (OPTION (Opt_transparent))
521 { 563 {
522 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
523 check_our_parents (); 565 check_our_parents ();
524 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
525 } 567 }
526#endif 568#endif
527 569
528 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
530 572
531 set_colorfgbg (); 573 set_colorfgbg ();
532 574
533 init_command (cmd_argv); 575 init_command (cmd_argv);
534 576
535 free (cmd_argv); 577 free (cmd_argv);
536 578
579 if (pty.pty >= 0)
537 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
538 581
539 check_ev.start (); 582 check_ev.start ();
540 583
541 PERL_INVOKE ((this, HOOK_START, DT_END)); 584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
542 586
543 return true; 587 return true;
544} 588}
545 589
546static struct sig_handlers 590static struct sig_handlers
… …
607 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
608 652
609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
611 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
656
657 XrmInitialize ();
612} 658}
613 659
614/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
615 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
616 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
652 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
653/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
654void 700void
655rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
656{ 702{
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__) 703#if ! defined(__CYGWIN32__)
663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
665# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
666# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
672 case IGNORE: 713 case IGNORE:
673 /* 714 /*
674 * change effective uid/gid - not real uid/gid - so we can switch 715 * change effective uid/gid - not real uid/gid - so we can switch
675 * back to root later, as required 716 * back to root later, as required
676 */ 717 */
718 setegid (getgid ());
677 seteuid (getuid ()); 719 seteuid (getuid ());
678 setegid (getgid ());
679 break; 720 break;
680 case SAVE: 721 case SAVE:
681 euid = geteuid ();
682 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
683 break; 724 break;
684 case RESTORE: 725 case RESTORE:
685 seteuid (euid);
686 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
687 break; 728 break;
688 } 729 }
689# else 730# else
690 switch (action) 731 switch (action)
691 { 732 {
692 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
693 setuid (getuid ()); 735 setuid (getuid ());
694 setgid (getgid ());
695 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
696 case SAVE: 737 case SAVE:
697 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
698 case RESTORE: 739 case RESTORE:
699 break; 740 break;
… …
923 prop.height += lineSpace; 964 prop.height += lineSpace;
924 fs->set_prop (prop); 965 fs->set_prop (prop);
925 966
926 fwidth = prop.width; 967 fwidth = prop.width;
927 fheight = prop.height; 968 fheight = prop.height;
928 fbase = (*fs)[1]->ascent; 969 fbase = prop.ascent;
929 970
930 for (int style = 1; style < 4; style++) 971 for (int style = 1; style < 4; style++)
931 { 972 {
932#if ENABLE_STYLES 973#if ENABLE_STYLES
933 const char *res = rs[Rs_font + style]; 974 const char *res = rs[Rs_font + style];
… …
1024 i = atoi (color); 1065 i = atoi (color);
1025 1066
1026 if (i >= 8 && i <= 15) 1067 if (i >= 8 && i <= 15)
1027 { /* bright colors */ 1068 { /* bright colors */
1028 i -= 8; 1069 i -= 8;
1029# ifndef NO_BRIGHTCOLOR
1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
1032 goto done; 1072 goto done;
1033# endif
1034 } 1073 }
1035 1074
1036 if (i >= 0 && i <= 7) 1075 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 1076 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1077 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1222 } 1261 }
1223 1262
1224 if (menubar_visible ()) 1263 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win, 1264 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0, 1265 window_vt_x, 0,
1227 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1266 width, menuBar_TotalHeight ());
1228 1267
1229 XMoveResizeWindow (disp, vt, 1268 XMoveResizeWindow (disp, vt,
1230 window_vt_x, window_vt_y, 1269 window_vt_x, window_vt_y,
1231 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1270 width, height);
1232 1271
1233 scr_clear (); 1272 scr_clear ();
1234#ifdef XPM_BACKGROUND 1273#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1274 resize_pixmap ();
1236#endif 1275#endif
… …
1416 XRectangle rect, status_rect, needed_rect; 1455 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1456 unsigned long fg, bg;
1418 const char *p; 1457 const char *p;
1419 char **s; 1458 char **s;
1420 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1460
1461 TEMP_ENV;
1421 1462
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1464 return false;
1424 1465
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));

Diff Legend

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