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.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.189 by root, Thu Jan 19 09:47:15 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
… …
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 150#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#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
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
187#ifdef USE_XIM 169#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
189#endif 171#endif
190 termwin_ev (this, &rxvt_term::x_cb), 172 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 176 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
… …
212void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
213{ 196{
214 if (cmd_pid) 197 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
216 199
217#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 201}
223 202
224rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
225{ 204{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
242 221
243 selection_clear (); 222 selection_clear ();
244 223
245#ifdef USE_XIM 224#ifdef USE_XIM
246 im_destroy (); 225 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 226#endif
251#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 230#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 245#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 250#endif
275 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (disp, gc);
276 252
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; 253 delete drawable;
283 // destroy all windows 254 // destroy all windows
284 if (parent[0]) 255 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (disp, parent[0]);
286 } 257 }
… …
315#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
316 delete keyboard; 287 delete keyboard;
317#endif 288#endif
318} 289}
319 290
291// child has exited, usually destroys
320void 292void
321rxvt_term::child_exit () 293rxvt_term::child_cb (child_watcher &w, int status)
322{ 294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
323 cmd_pid = 0; 297 cmd_pid = 0;
324 298
325 if (!OPTION (Opt_hold)) 299 if (!OPTION (Opt_hold))
326 destroy (); 300 destroy ();
327} 301}
… …
341#if USE_XIM 315#if USE_XIM
342 im_ev.stop (display); 316 im_ev.stop (display);
343#endif 317#endif
344#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 320#endif
350#if TRANSPARENT 321#if TRANSPARENT
351 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
352#endif 323#endif
353 incr_ev.stop (); 324 incr_ev.stop ();
… …
492 463
493#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 465 keyboard->register_done ();
495#endif 466#endif
496 467
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 468#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 469 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 470 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 471#endif
504 472
… …
508 476
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 { 480 {
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 (); 481 rxvt_perl.init (this);
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 } 483 }
530#endif 484#endif
485
486 pty = rxvt_new_ptytty ();
531 487
532 create_windows (argc, argv); 488 create_windows (argc, argv);
533 489
534 dDisp; 490 dDisp;
535 491
… …
543 499
544#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
547#endif 503#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif
552#ifdef TRANSPARENT 504#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 505 if (OPTION (Opt_transparent))
554 { 506 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
556 check_our_parents (); 508 check_our_parents ();
… …
565 517
566 init_command (cmd_argv); 518 init_command (cmd_argv);
567 519
568 free (cmd_argv); 520 free (cmd_argv);
569 521
570 if (pty.pty >= 0) 522 if (pty->pty >= 0)
571 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
572 524
573 check_ev.start (); 525 check_ev.start ();
574 526
575 HOOK_INVOKE ((this, HOOK_START, DT_END)); 527 HOOK_INVOKE ((this, HOOK_START, DT_END));
576 528
577 return true; 529 return true;
578} 530}
579 531
580static struct sig_handlers 532static struct sig_handlers
581{ 533{
582 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
583 535
584 void sig_chld (sig_watcher &w)
585 {
586 // we are being called for every SIGCHLD, find the corresponding term
587 int pid;
588
589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591 if (pid == (*t)->cmd_pid)
592 {
593 (*t)->child_exit ();
594 break;
595 }
596 }
597
598 /* 536 /*
599 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
600 */ 538 */
601 void 539 void
602 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
… …
608 signal (w.signum, SIG_DFL); 546 signal (w.signum, SIG_DFL);
609 kill (getpid (), w.signum); 547 kill (getpid (), w.signum);
610 } 548 }
611 549
612 sig_handlers () 550 sig_handlers ()
613 : sw_chld (this, &sig_handlers::sig_chld),
614 sw_term (this, &sig_handlers::sig_term), 551 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 552 sw_int (this, &sig_handlers::sig_term)
616 { 553 {
617 } 554 }
618} sig_handlers; 555} sig_handlers;
619 556
620char **rxvt_environ; // startup environment 557char **rxvt_environ; // startup environment
621 558
622void 559void
623rxvt_init () 560rxvt_init ()
624{ 561{
562 uid_t uid = getuid ();
563 gid_t gid = getgid ();
564
565 // before doing anything else, check for setuid/setgid operation,
566 // start the helper process and drop privileges
567 if (uid != geteuid ()
568 || gid != getegid ())
569 {
570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592
625 rxvt_environ = environ; 593 rxvt_environ = environ;
626
627 /*
628 * Save and then give up any super-user privileges
629 * If we need privileges in any area then we must specifically request it.
630 * We should only need to be root in these cases:
631 * 1. write utmp entries on some systems
632 * 2. chown tty on some systems
633 */
634 rxvt_privileges (SAVE);
635 rxvt_privileges (IGNORE);
636 594
637 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
638 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
639 597
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM); 598 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT); 599 sig_handlers.sw_int.start (SIGINT);
643 600
644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
645 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
… …
685 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
686 643
687 return p; 644 return p;
688} 645}
689 646
690/* ------------------------------------------------------------------------- *
691 * PRIVILEGED OPERATIONS *
692 * ------------------------------------------------------------------------- */
693/* take care of suid/sgid super-user (root) privileges */
694void
695rxvt_privileges (rxvt_privaction action)
696{
697#if ! defined(__CYGWIN32__)
698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
699 /* setreuid () is the poor man's setuid (), seteuid () */
700# define seteuid(a) setreuid(-1, (a))
701# define setegid(a) setregid(-1, (a))
702# define HAVE_SETEUID
703# endif
704# ifdef HAVE_SETEUID
705 switch (action)
706 {
707 case IGNORE:
708 /*
709 * change effective uid/gid - not real uid/gid - so we can switch
710 * back to root later, as required
711 */
712 setegid (getgid ());
713 seteuid (getuid ());
714 break;
715 case SAVE:
716 saved_egid = getegid ();
717 saved_euid = geteuid ();
718 break;
719 case RESTORE:
720 setegid (saved_egid);
721 seteuid (saved_euid);
722 break;
723 }
724# else
725 switch (action)
726 {
727 case IGNORE:
728 setgid (getgid ());
729 setuid (getuid ());
730 /* FALLTHROUGH */
731 case SAVE:
732 /* FALLTHROUGH */
733 case RESTORE:
734 break;
735 }
736# endif
737#endif
738}
739
740#ifdef UTMP_SUPPORT
741void
742rxvt_term::privileged_utmp (rxvt_privaction action)
743{
744 if (OPTION (Opt_utmpInhibit)
745 || !pty.name || !*pty.name)
746 return;
747
748 rxvt_privileges (RESTORE);
749
750 if (action == SAVE)
751 makeutent (pty.name, rs[Rs_display_name]);
752 else
753 cleanutent ();
754
755 rxvt_privileges (IGNORE);
756}
757#endif
758
759/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
760/* 648/*
761 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
762 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
763 */ 651 */
764void 652void
765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766{ 654{
767 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
768 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
769 unsigned int w, h; 657 unsigned int w, h;
770 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
771 dDisp; 659 dDisp;
772 660
773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
834 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
835 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
836 724
837 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
838 726
839 sb_w = mb_h = 0; 727 sb_w = 0;
840 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
841 729
842 if (scrollbar_visible ()) 730 if (scrollBar.state)
843 { 731 {
844 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
845 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
846 if (!OPTION (Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
847 window_vt_x += sb_w; 735 window_vt_x += sb_w;
848 } 736 }
849 737
850 if (menubar_visible ())
851 {
852 mb_h = menuBar_TotalHeight ();
853 szHint.base_height += mb_h;
854 window_vt_y += mb_h;
855 }
856
857 szHint.width_inc = fwidth; 738 szHint.width_inc = fwidth;
858 szHint.height_inc = fheight; 739 szHint.height_inc = fheight;
859 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
860 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
861 742
… …
879 { 760 {
880 min_it (height, max_height); 761 min_it (height, max_height);
881 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
882 } 763 }
883 764
884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
885 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
886 767
887 if (recalc_x) 768 if (recalc_x)
888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
889 if (recalc_y) 770 if (recalc_y)
… …
903 * Called after a window size change. 784 * Called after a window size change.
904 */ 785 */
905void 786void
906rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
907{ 788{
908 if (pty.pty < 0) 789 if (pty->pty < 0)
909 return; 790 return;
910 791
911 struct winsize ws; 792 struct winsize ws;
912 793
913 ws.ws_col = ncol; 794 ws.ws_col = ncol;
914 ws.ws_row = nrow; 795 ws.ws_row = nrow;
915 ws.ws_xpixel = width; 796 ws.ws_xpixel = width;
916 ws.ws_ypixel = height; 797 ws.ws_ypixel = height;
917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
918 799
919#if 0 800#if 0
920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
921 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
922 kill (-cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
… …
1244 1125
1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1246 1127
1247 if (fix_screen || newwidth != old_width || newheight != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 { 1129 {
1249 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1250 { 1131 {
1251 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1252 window_sb_x, 0, 1133 window_sb_x, 0,
1253 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1254 resize_scrollbar (); 1135 resize_scrollbar ();
1255 } 1136 }
1256
1257 if (menubar_visible ())
1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
1260 width, menuBar_TotalHeight ());
1261 1137
1262 XMoveResizeWindow (disp, vt, 1138 XMoveResizeWindow (disp, vt,
1263 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1264 width, height); 1140 width, height);
1265 1141

Diff Legend

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