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.176 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC

… …
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
66vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
67 52
68static char curlocale[128], savelocale[128]; 53static char curlocale[128], savelocale[128];
69 54
70bool 55bool
… …
160#if TRANSPARENT 145#if TRANSPARENT
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 147#endif
163#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif 150#endif
169#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 153#endif
172#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
212void rxvt_term::emergency_cleanup () 194void rxvt_term::emergency_cleanup ()
213{ 195{
214 if (cmd_pid) 196 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 197 kill (-cmd_pid, SIGHUP);
216 198
217#ifdef UTMP_SUPPORT 199 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 200}
223 201
224rxvt_term::~rxvt_term () 202rxvt_term::~rxvt_term ()
225{ 203{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
242 220
243 selection_clear (); 221 selection_clear ();
244 222
245#ifdef USE_XIM 223#ifdef USE_XIM
246 im_destroy (); 224 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 225#endif
251#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 229#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 244#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 249#endif
275 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (disp, gc);
276 251
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 252 delete drawable;
283 // destroy all windows 253 // destroy all windows
284 if (parent[0]) 254 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (disp, parent[0]);
286 } 256 }
… …
342 im_ev.stop (display); 312 im_ev.stop (display);
343#endif 313#endif
344#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
346#endif 316#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif
350#if TRANSPARENT 317#if TRANSPARENT
351 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
352#endif 319#endif
353 incr_ev.stop (); 320 incr_ev.stop ();
354 termwin_ev.stop (display); 321 termwin_ev.stop (display);
… …
377} 344}
378 345
379void 346void
380rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
381{ 348{
382 SET_R (this); 349 make_current ();
383 350
384 delete this; 351 delete this;
385} 352}
386 353
387/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
478/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
479bool 446bool
480rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
481{ 448{
482 SET_R (this); 449 SET_R (this);
450 set_locale ("");
483 set_environ (envv); // few things in X do not call setlocale :( 451 set_environ (envv); // few things in X do not call setlocale :(
484
485 set_locale ("");
486 452
487 if (!init_vars ()) 453 if (!init_vars ())
488 return false; 454 return false;
489 455
490 init_secondary (); 456 init_secondary ();
… …
493 459
494#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
495 keyboard->register_done (); 461 keyboard->register_done ();
496#endif 462#endif
497 463
498#if MENUBAR_MAX
499 menubar_read (rs[Rs_menu]);
500#endif
501#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar)) 465 if (OPTION (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
504#endif 467#endif
505 468
… …
509 472
510 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
511 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
512 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
513 { 476 {
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
527 rxvt_perl.init (); 477 rxvt_perl.init (this);
528 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 } 479 }
531#endif 480#endif
481
482 pty = rxvt_new_ptytty ();
532 483
533 create_windows (argc, argv); 484 create_windows (argc, argv);
534 485
535 dDisp; 486 dDisp;
536 487
… …
544 495
545#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
548#endif 499#endif
549#if (MENUBAR_MAX)
550 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win);
552#endif
553#ifdef TRANSPARENT 500#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
555 { 502 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
557 check_our_parents (); 504 check_our_parents ();
… …
566 513
567 init_command (cmd_argv); 514 init_command (cmd_argv);
568 515
569 free (cmd_argv); 516 free (cmd_argv);
570 517
571 if (pty.pty >= 0) 518 if (pty->pty >= 0)
572 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
573 520
574 check_ev.start (); 521 check_ev.start ();
575 522
576 HOOK_INVOKE ((this, HOOK_START, DT_END)); 523 HOOK_INVOKE ((this, HOOK_START, DT_END));
577 524
… …
621char **rxvt_environ; // startup environment 568char **rxvt_environ; // startup environment
622 569
623void 570void
624rxvt_init () 571rxvt_init ()
625{ 572{
573 uid_t uid = getuid ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || 1 //D
580 || gid != getegid ())
581 {
582#if PTYTTY_HELPER
583 rxvt_ptytty_server ();
584#else
585 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586#endif
587
588 // drop privileges
589#if HAVE_SETRESUID
590 setresgid (gid, gid, gid);
591 setresuid (uid, uid, uid);
592#elif HAVE_SETREUID
593 setregid (gid, gid);
594 setreuid (uid, uid);
595#elif HAVE_SETUID
596 setgid (gid);
597 setuid (uid);
598#endif
599
600 if (uid != geteuid ()
601 || gid != getegid ())
602 rxvt_fatal ("unable to drop privileges, aborting.\n");
603 }
604
626 rxvt_environ = environ; 605 rxvt_environ = environ;
627
628 /*
629 * Save and then give up any super-user privileges
630 * If we need privileges in any area then we must specifically request it.
631 * We should only need to be root in these cases:
632 * 1. write utmp entries on some systems
633 * 2. chown tty on some systems
634 */
635 rxvt_privileges (SAVE);
636 rxvt_privileges (IGNORE);
637 606
638 signal (SIGHUP, SIG_IGN); 607 signal (SIGHUP, SIG_IGN);
639 signal (SIGPIPE, SIG_IGN); 608 signal (SIGPIPE, SIG_IGN);
640 609
641 sig_handlers.sw_chld.start (SIGCHLD); 610 sig_handlers.sw_chld.start (SIGCHLD);
… …
686 rxvt_fatal ("memory allocation failure. aborting.\n"); 655 rxvt_fatal ("memory allocation failure. aborting.\n");
687 656
688 return p; 657 return p;
689} 658}
690 659
691/* ------------------------------------------------------------------------- *
692 * PRIVILEGED OPERATIONS *
693 * ------------------------------------------------------------------------- */
694/* take care of suid/sgid super-user (root) privileges */
695void
696rxvt_privileges (rxvt_privaction action)
697{
698#if ! defined(__CYGWIN32__)
699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
700 /* setreuid () is the poor man's setuid (), seteuid () */
701# define seteuid(a) setreuid(-1, (a))
702# define setegid(a) setregid(-1, (a))
703# define HAVE_SETEUID
704# endif
705# ifdef HAVE_SETEUID
706 switch (action)
707 {
708 case IGNORE:
709 /*
710 * change effective uid/gid - not real uid/gid - so we can switch
711 * back to root later, as required
712 */
713 setegid (getgid ());
714 seteuid (getuid ());
715 break;
716 case SAVE:
717 saved_egid = getegid ();
718 saved_euid = geteuid ();
719 break;
720 case RESTORE:
721 setegid (saved_egid);
722 seteuid (saved_euid);
723 break;
724 }
725# else
726 switch (action)
727 {
728 case IGNORE:
729 setgid (getgid ());
730 setuid (getuid ());
731 /* FALLTHROUGH */
732 case SAVE:
733 /* FALLTHROUGH */
734 case RESTORE:
735 break;
736 }
737# endif
738#endif
739}
740
741#ifdef UTMP_SUPPORT
742void
743rxvt_term::privileged_utmp (rxvt_privaction action)
744{
745 if (OPTION (Opt_utmpInhibit)
746 || !pty.name || !*pty.name)
747 return;
748
749 rxvt_privileges (RESTORE);
750
751 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]);
753 else
754 cleanutent ();
755
756 rxvt_privileges (IGNORE);
757}
758#endif
759
760/*----------------------------------------------------------------------*/ 660/*----------------------------------------------------------------------*/
761/* 661/*
762 * window size/position calculcations for XSizeHint and other storage. 662 * window size/position calculcations for XSizeHint and other storage.
763 * if width/height are non-zero then override calculated width/height 663 * if width/height are non-zero then override calculated width/height
764 */ 664 */
765void 665void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 666rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 667{
768 short recalc_x, recalc_y; 668 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 669 int x, y, sb_w, flags;
770 unsigned int w, h; 670 unsigned int w, h;
771 unsigned int max_width, max_height; 671 unsigned int max_width, max_height;
772 dDisp; 672 dDisp;
773 673
774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
835 max_width = MAX_COLS * fwidth; 735 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 736 max_height = MAX_ROWS * fheight;
837 737
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 738 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 739
840 sb_w = mb_h = 0; 740 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 741 window_vt_x = window_vt_y = int_bwidth;
842 742
843 if (scrollbar_visible ()) 743 if (scrollBar.state)
844 { 744 {
845 sb_w = scrollbar_TotalWidth (); 745 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 746 szHint.base_width += sb_w;
847 if (!OPTION (Opt_scrollBar_right)) 747 if (!OPTION (Opt_scrollBar_right))
848 window_vt_x += sb_w; 748 window_vt_x += sb_w;
849 } 749 }
850 750
851 if (menubar_visible ())
852 {
853 mb_h = menuBar_TotalHeight ();
854 szHint.base_height += mb_h;
855 window_vt_y += mb_h;
856 }
857
858 szHint.width_inc = fwidth; 751 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 752 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 753 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 754 szHint.min_height = szHint.base_height + szHint.height_inc;
862 755
… …
880 { 773 {
881 min_it (height, max_height); 774 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 775 szHint.height = szHint.base_height + height;
883 } 776 }
884 777
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 778 if (scrollBar.state && OPTION (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 779 window_sb_x = szHint.width - sb_w;
887 780
888 if (recalc_x) 781 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890 if (recalc_y) 783 if (recalc_y)
… …
904 * Called after a window size change. 797 * Called after a window size change.
905 */ 798 */
906void 799void
907rxvt_term::tt_winch () 800rxvt_term::tt_winch ()
908{ 801{
909 if (pty.pty < 0) 802 if (pty->pty < 0)
910 return; 803 return;
911 804
912 struct winsize ws; 805 struct winsize ws;
913 806
914 ws.ws_col = ncol; 807 ws.ws_col = ncol;
915 ws.ws_row = nrow; 808 ws.ws_row = nrow;
916 ws.ws_xpixel = width; 809 ws.ws_xpixel = width;
917 ws.ws_ypixel = height; 810 ws.ws_ypixel = height;
918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 811 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919 812
920#if 0 813#if 0
921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 814 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922 if (cmd_pid) /* force through to the command */ 815 if (cmd_pid) /* force through to the command */
923 kill (-cmd_pid, SIGWINCH); 816 kill (-cmd_pid, SIGWINCH);
… …
1245 1138
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1140
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1141 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1142 {
1250 if (scrollbar_visible ()) 1143 if (scrollBar.state)
1251 { 1144 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1145 XMoveResizeWindow (disp, scrollBar.win,
1253 window_sb_x, 0, 1146 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1147 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1148 resize_scrollbar ();
1256 } 1149 }
1257
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262 1150
1263 XMoveResizeWindow (disp, vt, 1151 XMoveResizeWindow (disp, vt,
1264 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1265 width, height); 1153 width, height);
1266 1154
… …
1627 int i; 1515 int i;
1628 const char *p; 1516 const char *p;
1629 char **s; 1517 char **s;
1630 char buf[IMBUFSIZ]; 1518 char buf[IMBUFSIZ];
1631 1519
1632 SET_R (this); 1520 make_current ();
1633 1521
1634 im_destroy (); 1522 im_destroy ();
1635 1523
1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637 if (Input_Context) 1525 if (Input_Context)

Diff Legend

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