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.171 by root, Wed Jan 11 03:13:26 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
… …
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 }
287 257
288 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 259 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 261 delete pix_colors_unfocused;
293#endif 262#endif
294 263
… …
343 im_ev.stop (display); 312 im_ev.stop (display);
344#endif 313#endif
345#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
347#endif 316#endif
348#if MENUBAR
349 menubar_ev.stop (display);
350#endif
351#if TRANSPARENT 317#if TRANSPARENT
352 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
353#endif 319#endif
354 incr_ev.stop (); 320 incr_ev.stop ();
355 termwin_ev.stop (display); 321 termwin_ev.stop (display);
… …
378} 344}
379 345
380void 346void
381rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
382{ 348{
383 SET_R (this); 349 make_current ();
384 350
385 delete this; 351 delete this;
386} 352}
387 353
388/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
479/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
480bool 446bool
481rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
482{ 448{
483 SET_R (this); 449 SET_R (this);
484 TEMP_ENV; // few things in X do not call setlocale :(
485
486 set_locale (""); 450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
487 452
488 if (!init_vars ()) 453 if (!init_vars ())
489 return false; 454 return false;
490 455
491 init_secondary (); 456 init_secondary ();
… …
494 459
495#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
496 keyboard->register_done (); 461 keyboard->register_done ();
497#endif 462#endif
498 463
499#if MENUBAR_MAX
500 menubar_read (rs[Rs_menu]);
501#endif
502#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 465 if (OPTION (Opt_scrollBar))
504 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
505#endif 467#endif
506 468
… …
510 472
511 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
512 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
513 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
514 { 476 {
515#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
516 // ignore some perl-related arguments if some bozo installed us set[ug]id
517 if (rxvt_tainted ())
518 {
519 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
520 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
521 {
522 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
523 rs[Rs_perl_lib] = 0;
524 rs[Rs_perl_eval] = 0;
525 }
526 }
527#endif
528 rxvt_perl.init (); 477 rxvt_perl.init (this);
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
… …
616 sw_int (this, &sig_handlers::sig_term) 563 sw_int (this, &sig_handlers::sig_term)
617 { 564 {
618 } 565 }
619} sig_handlers; 566} sig_handlers;
620 567
568char **rxvt_environ; // startup environment
569
621void 570void
622rxvt_init () 571rxvt_init ()
623{ 572{
624 /* 573 uid_t uid = getuid ();
625 * Save and then give up any super-user privileges 574 gid_t gid = getgid ();
626 * If we need privileges in any area then we must specifically request it. 575
627 * We should only need to be root in these cases: 576 // before doing anything else, check for setuid/setgid operation,
628 * 1. write utmp entries on some systems 577 // start the helper process and drop privileges
629 * 2. chown tty on some systems 578 if (uid != geteuid ()
630 */ 579 || gid != getegid ())
631 rxvt_privileges (SAVE); 580 {
632 rxvt_privileges (IGNORE); 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
604 rxvt_environ = environ;
633 605
634 signal (SIGHUP, SIG_IGN); 606 signal (SIGHUP, SIG_IGN);
635 signal (SIGPIPE, SIG_IGN); 607 signal (SIGPIPE, SIG_IGN);
636 608
637 sig_handlers.sw_chld.start (SIGCHLD); 609 sig_handlers.sw_chld.start (SIGCHLD);
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
683 655
684 return p; 656 return p;
685} 657}
686 658
687/* ------------------------------------------------------------------------- *
688 * PRIVILEGED OPERATIONS *
689 * ------------------------------------------------------------------------- */
690/* take care of suid/sgid super-user (root) privileges */
691void
692rxvt_privileges (rxvt_privaction action)
693{
694#if ! defined(__CYGWIN32__)
695# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
696 /* setreuid () is the poor man's setuid (), seteuid () */
697# define seteuid(a) setreuid(-1, (a))
698# define setegid(a) setregid(-1, (a))
699# define HAVE_SETEUID
700# endif
701# ifdef HAVE_SETEUID
702 switch (action)
703 {
704 case IGNORE:
705 /*
706 * change effective uid/gid - not real uid/gid - so we can switch
707 * back to root later, as required
708 */
709 seteuid (getuid ());
710 setegid (getgid ());
711 break;
712 case SAVE:
713 saved_euid = geteuid ();
714 saved_egid = getegid ();
715 break;
716 case RESTORE:
717 seteuid (saved_euid);
718 setegid (saved_egid);
719 break;
720 }
721# else
722 switch (action)
723 {
724 case IGNORE:
725 setuid (getuid ());
726 setgid (getgid ());
727 /* FALLTHROUGH */
728 case SAVE:
729 /* FALLTHROUGH */
730 case RESTORE:
731 break;
732 }
733# endif
734#endif
735}
736
737#ifdef UTMP_SUPPORT
738void
739rxvt_term::privileged_utmp (rxvt_privaction action)
740{
741 if (OPTION (Opt_utmpInhibit)
742 || !pty.name || !*pty.name)
743 return;
744
745 rxvt_privileges (RESTORE);
746
747 if (action == SAVE)
748 makeutent (pty.name, rs[Rs_display_name]);
749 else
750 cleanutent ();
751
752 rxvt_privileges (IGNORE);
753}
754#endif
755
756/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
757/* 660/*
758 * window size/position calculcations for XSizeHint and other storage. 661 * window size/position calculcations for XSizeHint and other storage.
759 * if width/height are non-zero then override calculated width/height 662 * if width/height are non-zero then override calculated width/height
760 */ 663 */
761void 664void
762rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
763{ 666{
764 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
765 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, flags;
766 unsigned int w, h; 669 unsigned int w, h;
767 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
768 dDisp; 671 dDisp;
769 672
770 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",
… …
831 max_width = MAX_COLS * fwidth; 734 max_width = MAX_COLS * fwidth;
832 max_height = MAX_ROWS * fheight; 735 max_height = MAX_ROWS * fheight;
833 736
834 szHint.base_width = szHint.base_height = 2 * int_bwidth; 737 szHint.base_width = szHint.base_height = 2 * int_bwidth;
835 738
836 sb_w = mb_h = 0; 739 sb_w = 0;
837 window_vt_x = window_vt_y = int_bwidth; 740 window_vt_x = window_vt_y = int_bwidth;
838 741
839 if (scrollbar_visible ()) 742 if (scrollBar.state)
840 { 743 {
841 sb_w = scrollbar_TotalWidth (); 744 sb_w = scrollbar_TotalWidth ();
842 szHint.base_width += sb_w; 745 szHint.base_width += sb_w;
843 if (!OPTION (Opt_scrollBar_right)) 746 if (!OPTION (Opt_scrollBar_right))
844 window_vt_x += sb_w; 747 window_vt_x += sb_w;
845 } 748 }
846 749
847 if (menubar_visible ())
848 {
849 mb_h = menuBar_TotalHeight ();
850 szHint.base_height += mb_h;
851 window_vt_y += mb_h;
852 }
853
854 szHint.width_inc = fwidth; 750 szHint.width_inc = fwidth;
855 szHint.height_inc = fheight; 751 szHint.height_inc = fheight;
856 szHint.min_width = szHint.base_width + szHint.width_inc; 752 szHint.min_width = szHint.base_width + szHint.width_inc;
857 szHint.min_height = szHint.base_height + szHint.height_inc; 753 szHint.min_height = szHint.base_height + szHint.height_inc;
858 754
… …
876 { 772 {
877 min_it (height, max_height); 773 min_it (height, max_height);
878 szHint.height = szHint.base_height + height; 774 szHint.height = szHint.base_height + height;
879 } 775 }
880 776
881 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 777 if (scrollBar.state && OPTION (Opt_scrollBar_right))
882 window_sb_x = szHint.width - sb_w; 778 window_sb_x = szHint.width - sb_w;
883 779
884 if (recalc_x) 780 if (recalc_x)
885 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
886 if (recalc_y) 782 if (recalc_y)
… …
900 * Called after a window size change. 796 * Called after a window size change.
901 */ 797 */
902void 798void
903rxvt_term::tt_winch () 799rxvt_term::tt_winch ()
904{ 800{
905 if (pty.pty < 0) 801 if (pty->pty < 0)
906 return; 802 return;
907 803
908 struct winsize ws; 804 struct winsize ws;
909 805
910 ws.ws_col = ncol; 806 ws.ws_col = ncol;
911 ws.ws_row = nrow; 807 ws.ws_row = nrow;
912 ws.ws_xpixel = width; 808 ws.ws_xpixel = width;
913 ws.ws_ypixel = height; 809 ws.ws_ypixel = height;
914 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 810 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
915 811
916#if 0 812#if 0
917 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 813 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
918 if (cmd_pid) /* force through to the command */ 814 if (cmd_pid) /* force through to the command */
919 kill (-cmd_pid, SIGWINCH); 815 kill (-cmd_pid, SIGWINCH);
… …
1241 1137
1242 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1243 1139
1244 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1245 { 1141 {
1246 if (scrollbar_visible ()) 1142 if (scrollBar.state)
1247 { 1143 {
1248 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (disp, scrollBar.win,
1249 window_sb_x, 0, 1145 window_sb_x, 0,
1250 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1251 resize_scrollbar (); 1147 resize_scrollbar ();
1252 } 1148 }
1253
1254 if (menubar_visible ())
1255 XMoveResizeWindow (disp, menuBar.win,
1256 window_vt_x, 0,
1257 width, menuBar_TotalHeight ());
1258 1149
1259 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (disp, vt,
1260 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1261 width, height); 1152 width, height);
1262 1153
… …
1447 unsigned long fg, bg; 1338 unsigned long fg, bg;
1448 const char *p; 1339 const char *p;
1449 char **s; 1340 char **s;
1450 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1451 1342
1452 TEMP_ENV; 1343 set_environ (envv);
1453 1344
1454 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1455 return false; 1346 return false;
1456 1347
1457 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1623 int i; 1514 int i;
1624 const char *p; 1515 const char *p;
1625 char **s; 1516 char **s;
1626 char buf[IMBUFSIZ]; 1517 char buf[IMBUFSIZ];
1627 1518
1628 SET_R (this); 1519 make_current ();
1629 1520
1630 im_destroy (); 1521 im_destroy ();
1631 1522
1632 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1633 if (Input_Context) 1524 if (Input_Context)

Diff Legend

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