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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.188 by root, Wed Jan 18 08:33:34 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
… …
87 72
88void 73void
89rxvt_pop_locale () 74rxvt_pop_locale ()
90{ 75{
91 rxvt_set_locale (savelocale); 76 rxvt_set_locale (savelocale);
92}
93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
100} 77}
101 78
102#if ENABLE_COMBINING 79#if ENABLE_COMBINING
103class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
104 81
… …
168#if TRANSPARENT 145#if TRANSPARENT
169 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
170#endif 147#endif
171#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
172 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
173#endif
174#ifdef MENUBAR
175 menubar_ev (this, &rxvt_term::x_cb),
176#endif 150#endif
177#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
178 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179#endif 153#endif
180#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
220void rxvt_term::emergency_cleanup () 194void rxvt_term::emergency_cleanup ()
221{ 195{
222 if (cmd_pid) 196 if (cmd_pid)
223 kill (-cmd_pid, SIGHUP); 197 kill (-cmd_pid, SIGHUP);
224 198
225#ifdef UTMP_SUPPORT 199 delete pty; pty = 0;
226 privileged_utmp (RESTORE);
227#endif
228
229 pty.put ();
230} 200}
231 201
232rxvt_term::~rxvt_term () 202rxvt_term::~rxvt_term ()
233{ 203{
234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
250 220
251 selection_clear (); 221 selection_clear ();
252 222
253#ifdef USE_XIM 223#ifdef USE_XIM
254 im_destroy (); 224 im_destroy ();
255#endif
256#ifdef MENUBAR
257 if (menubarGC) XFreeGC (disp, menubarGC);
258#endif 225#endif
259#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
260 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
261 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (disp, ShadowGC);
262#endif 229#endif
… …
273 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (disp, upArrow);
274 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (disp, downArrow);
275 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (disp, upArrowHi);
276 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (disp, downArrowHi);
277#endif 244#endif
278#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
279 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (disp, topShadowGC);
280 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (disp, botShadowGC);
281 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
282#endif 249#endif
283 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (disp, gc);
284 251
285#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286 delete menuBar.drawable;
287 //if (menuBar.win)
288 // XDestroyWindow (disp, menuBar.win);
289#endif
290 delete drawable; 252 delete drawable;
291 // destroy all windows 253 // destroy all windows
292 if (parent[0]) 254 if (parent[0])
293 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (disp, parent[0]);
294 } 256 }
… …
349#if USE_XIM 311#if USE_XIM
350 im_ev.stop (display); 312 im_ev.stop (display);
351#endif 313#endif
352#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
353 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
354#endif
355#if MENUBAR
356 menubar_ev.stop (display);
357#endif 316#endif
358#if TRANSPARENT 317#if TRANSPARENT
359 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
360#endif 319#endif
361 incr_ev.stop (); 320 incr_ev.stop ();
… …
500 459
501#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
502 keyboard->register_done (); 461 keyboard->register_done ();
503#endif 462#endif
504 463
505#if MENUBAR_MAX
506 menubar_read (rs[Rs_menu]);
507#endif
508#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
509 if (OPTION (Opt_scrollBar)) 465 if (OPTION (Opt_scrollBar))
510 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
511#endif 467#endif
512 468
… …
516 472
517 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 { 476 {
521#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522 // ignore some perl-related arguments if some bozo installed us set[ug]id
523 if (rxvt_tainted ())
524 {
525 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527 {
528 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0;
531 }
532 }
533#endif
534 rxvt_perl.init (); 477 rxvt_perl.init (this);
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537 } 479 }
538#endif 480#endif
481
482 pty = rxvt_new_ptytty ();
539 483
540 create_windows (argc, argv); 484 create_windows (argc, argv);
541 485
542 dDisp; 486 dDisp;
543 487
… …
551 495
552#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
553 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
554 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
555#endif 499#endif
556#if (MENUBAR_MAX)
557 if (menubar_visible ())
558 XMapWindow (disp, menuBar.win);
559#endif
560#ifdef TRANSPARENT 500#ifdef TRANSPARENT
561 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
562 { 502 {
563 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
564 check_our_parents (); 504 check_our_parents ();
… …
573 513
574 init_command (cmd_argv); 514 init_command (cmd_argv);
575 515
576 free (cmd_argv); 516 free (cmd_argv);
577 517
578 if (pty.pty >= 0) 518 if (pty->pty >= 0)
579 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
580 520
581 check_ev.start (); 521 check_ev.start ();
582 522
583 HOOK_INVOKE ((this, HOOK_START, DT_END)); 523 HOOK_INVOKE ((this, HOOK_START, DT_END));
584 524
… …
628char **rxvt_environ; // startup environment 568char **rxvt_environ; // startup environment
629 569
630void 570void
631rxvt_init () 571rxvt_init ()
632{ 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 || gid != getegid ())
580 {
581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586
587 // drop privileges
588#if HAVE_SETRESUID
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603
633 rxvt_environ = environ; 604 rxvt_environ = environ;
634
635 /*
636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it.
638 * We should only need to be root in these cases:
639 * 1. write utmp entries on some systems
640 * 2. chown tty on some systems
641 */
642 rxvt_privileges (SAVE);
643 rxvt_privileges (IGNORE);
644 605
645 signal (SIGHUP, SIG_IGN); 606 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 607 signal (SIGPIPE, SIG_IGN);
647 608
648 sig_handlers.sw_chld.start (SIGCHLD); 609 sig_handlers.sw_chld.start (SIGCHLD);
… …
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
694 655
695 return p; 656 return p;
696} 657}
697 658
698/* ------------------------------------------------------------------------- *
699 * PRIVILEGED OPERATIONS *
700 * ------------------------------------------------------------------------- */
701/* take care of suid/sgid super-user (root) privileges */
702void
703rxvt_privileges (rxvt_privaction action)
704{
705#if ! defined(__CYGWIN32__)
706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707 /* setreuid () is the poor man's setuid (), seteuid () */
708# define seteuid(a) setreuid(-1, (a))
709# define setegid(a) setregid(-1, (a))
710# define HAVE_SETEUID
711# endif
712# ifdef HAVE_SETEUID
713 switch (action)
714 {
715 case IGNORE:
716 /*
717 * change effective uid/gid - not real uid/gid - so we can switch
718 * back to root later, as required
719 */
720 setegid (getgid ());
721 seteuid (getuid ());
722 break;
723 case SAVE:
724 saved_egid = getegid ();
725 saved_euid = geteuid ();
726 break;
727 case RESTORE:
728 setegid (saved_egid);
729 seteuid (saved_euid);
730 break;
731 }
732# else
733 switch (action)
734 {
735 case IGNORE:
736 setgid (getgid ());
737 setuid (getuid ());
738 /* FALLTHROUGH */
739 case SAVE:
740 /* FALLTHROUGH */
741 case RESTORE:
742 break;
743 }
744# endif
745#endif
746}
747
748#ifdef UTMP_SUPPORT
749void
750rxvt_term::privileged_utmp (rxvt_privaction action)
751{
752 if (OPTION (Opt_utmpInhibit)
753 || !pty.name || !*pty.name)
754 return;
755
756 rxvt_privileges (RESTORE);
757
758 if (action == SAVE)
759 makeutent (pty.name, rs[Rs_display_name]);
760 else
761 cleanutent ();
762
763 rxvt_privileges (IGNORE);
764}
765#endif
766
767/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
768/* 660/*
769 * window size/position calculcations for XSizeHint and other storage. 661 * window size/position calculcations for XSizeHint and other storage.
770 * if width/height are non-zero then override calculated width/height 662 * if width/height are non-zero then override calculated width/height
771 */ 663 */
772void 664void
773rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774{ 666{
775 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
776 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, flags;
777 unsigned int w, h; 669 unsigned int w, h;
778 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
779 dDisp; 671 dDisp;
780 672
781 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
842 max_width = MAX_COLS * fwidth; 734 max_width = MAX_COLS * fwidth;
843 max_height = MAX_ROWS * fheight; 735 max_height = MAX_ROWS * fheight;
844 736
845 szHint.base_width = szHint.base_height = 2 * int_bwidth; 737 szHint.base_width = szHint.base_height = 2 * int_bwidth;
846 738
847 sb_w = mb_h = 0; 739 sb_w = 0;
848 window_vt_x = window_vt_y = int_bwidth; 740 window_vt_x = window_vt_y = int_bwidth;
849 741
850 if (scrollbar_visible ()) 742 if (scrollBar.state)
851 { 743 {
852 sb_w = scrollbar_TotalWidth (); 744 sb_w = scrollbar_TotalWidth ();
853 szHint.base_width += sb_w; 745 szHint.base_width += sb_w;
854 if (!OPTION (Opt_scrollBar_right)) 746 if (!OPTION (Opt_scrollBar_right))
855 window_vt_x += sb_w; 747 window_vt_x += sb_w;
856 } 748 }
857 749
858 if (menubar_visible ())
859 {
860 mb_h = menuBar_TotalHeight ();
861 szHint.base_height += mb_h;
862 window_vt_y += mb_h;
863 }
864
865 szHint.width_inc = fwidth; 750 szHint.width_inc = fwidth;
866 szHint.height_inc = fheight; 751 szHint.height_inc = fheight;
867 szHint.min_width = szHint.base_width + szHint.width_inc; 752 szHint.min_width = szHint.base_width + szHint.width_inc;
868 szHint.min_height = szHint.base_height + szHint.height_inc; 753 szHint.min_height = szHint.base_height + szHint.height_inc;
869 754
… …
887 { 772 {
888 min_it (height, max_height); 773 min_it (height, max_height);
889 szHint.height = szHint.base_height + height; 774 szHint.height = szHint.base_height + height;
890 } 775 }
891 776
892 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 777 if (scrollBar.state && OPTION (Opt_scrollBar_right))
893 window_sb_x = szHint.width - sb_w; 778 window_sb_x = szHint.width - sb_w;
894 779
895 if (recalc_x) 780 if (recalc_x)
896 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
897 if (recalc_y) 782 if (recalc_y)
… …
911 * Called after a window size change. 796 * Called after a window size change.
912 */ 797 */
913void 798void
914rxvt_term::tt_winch () 799rxvt_term::tt_winch ()
915{ 800{
916 if (pty.pty < 0) 801 if (pty->pty < 0)
917 return; 802 return;
918 803
919 struct winsize ws; 804 struct winsize ws;
920 805
921 ws.ws_col = ncol; 806 ws.ws_col = ncol;
922 ws.ws_row = nrow; 807 ws.ws_row = nrow;
923 ws.ws_xpixel = width; 808 ws.ws_xpixel = width;
924 ws.ws_ypixel = height; 809 ws.ws_ypixel = height;
925 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 810 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926 811
927#if 0 812#if 0
928 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 813 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929 if (cmd_pid) /* force through to the command */ 814 if (cmd_pid) /* force through to the command */
930 kill (-cmd_pid, SIGWINCH); 815 kill (-cmd_pid, SIGWINCH);
… …
1252 1137
1253 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1254 1139
1255 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1256 { 1141 {
1257 if (scrollbar_visible ()) 1142 if (scrollBar.state)
1258 { 1143 {
1259 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (disp, scrollBar.win,
1260 window_sb_x, 0, 1145 window_sb_x, 0,
1261 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1262 resize_scrollbar (); 1147 resize_scrollbar ();
1263 } 1148 }
1264
1265 if (menubar_visible ())
1266 XMoveResizeWindow (disp, menuBar.win,
1267 window_vt_x, 0,
1268 width, menuBar_TotalHeight ());
1269 1149
1270 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (disp, vt,
1271 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1272 width, height); 1152 width, height);
1273 1153

Diff Legend

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