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.167 by root, Sun Jan 8 08:43:11 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
56vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
57 52
58static char curlocale[128], savelocale[128]; 53static char curlocale[128], savelocale[128];
59 54
60bool 55bool
… …
66 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
67 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
68 return true; 63 return true;
69} 64}
70 65
71bool 66void
72rxvt_push_locale (const char *locale) 67rxvt_push_locale (const char *locale)
73{ 68{
74 strcpy (savelocale, curlocale); 69 strcpy (savelocale, curlocale);
75 rxvt_set_locale (locale); 70 rxvt_set_locale (locale);
76} 71}
… …
150#if TRANSPARENT 145#if TRANSPARENT
151 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
152#endif 147#endif
153#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
154 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
155#endif
156#ifdef MENUBAR
157 menubar_ev (this, &rxvt_term::x_cb),
158#endif 150#endif
159#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
161#endif 153#endif
162#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
202void rxvt_term::emergency_cleanup () 194void rxvt_term::emergency_cleanup ()
203{ 195{
204 if (cmd_pid) 196 if (cmd_pid)
205 kill (-cmd_pid, SIGHUP); 197 kill (-cmd_pid, SIGHUP);
206 198
207#ifdef UTMP_SUPPORT 199 delete pty; pty = 0;
208 privileged_utmp (RESTORE);
209#endif
210
211 pty.put ();
212} 200}
213 201
214rxvt_term::~rxvt_term () 202rxvt_term::~rxvt_term ()
215{ 203{
216 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
232 220
233 selection_clear (); 221 selection_clear ();
234 222
235#ifdef USE_XIM 223#ifdef USE_XIM
236 im_destroy (); 224 im_destroy ();
237#endif
238#ifdef MENUBAR
239 if (menubarGC) XFreeGC (disp, menubarGC);
240#endif 225#endif
241#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
243 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (disp, ShadowGC);
244#endif 229#endif
… …
255 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (disp, upArrow);
256 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (disp, downArrow);
257 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (disp, upArrowHi);
258 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (disp, downArrowHi);
259#endif 244#endif
260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (disp, topShadowGC);
262 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (disp, botShadowGC);
263 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
264#endif 249#endif
265 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (disp, gc);
266 251
267#if defined(MENUBAR) && (MENUBAR_MAX > 1)
268 delete menuBar.drawable;
269 //if (menuBar.win)
270 // XDestroyWindow (disp, menuBar.win);
271#endif
272 delete drawable; 252 delete drawable;
273 // destroy all windows 253 // destroy all windows
274 if (parent[0]) 254 if (parent[0])
275 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (disp, parent[0]);
276 } 256 }
277 257
278 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
279
280 delete pix_colors_focused; 259 delete pix_colors_focused;
281#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
282 delete pix_colors_unfocused; 261 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
286#endif 262#endif
287 263
288 displays.put (display); 264 displays.put (display);
289 265
290 scr_release (); 266 scr_release ();
… …
336 im_ev.stop (display); 312 im_ev.stop (display);
337#endif 313#endif
338#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
339 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
340#endif 316#endif
341#if MENUBAR
342 menubar_ev.stop (display);
343#endif
344#if TRANSPARENT 317#if TRANSPARENT
345 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
346#endif 319#endif
347 incr_ev.stop (); 320 incr_ev.stop ();
348 termwin_ev.stop (display); 321 termwin_ev.stop (display);
… …
371} 344}
372 345
373void 346void
374rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
375{ 348{
376 SET_R (this); 349 make_current ();
377 350
378 delete this; 351 delete this;
379} 352}
380 353
381/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
472/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
473bool 446bool
474rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
475{ 448{
476 SET_R (this); 449 SET_R (this);
477
478 set_locale (""); 450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
479 452
480 if (!init_vars ()) 453 if (!init_vars ())
481 return false; 454 return false;
482 455
483 init_secondary (); 456 init_secondary ();
… …
486 459
487#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
488 keyboard->register_done (); 461 keyboard->register_done ();
489#endif 462#endif
490 463
491#if MENUBAR_MAX
492 menubar_read (rs[Rs_menu]);
493#endif
494#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
495 if (OPTION (Opt_scrollBar)) 465 if (OPTION (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
497#endif 467#endif
498 468
… …
502 472
503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506 { 476 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
524 rxvt_perl.init (tainted); 477 rxvt_perl.init (this);
525 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526 } 479 }
527#endif 480#endif
528 481
482 pty = rxvt_new_ptytty ();
483
529 create_windows (argc, argv); 484 create_windows (argc, argv);
530 485
531 dDisp; 486 dDisp;
532 487
533 init_xlocale (); 488 init_xlocale ();
534 489
535 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
536 491
537#if 0 492#if 0
538 XSynchronize (disp, True); 493 XSynchronize (disp, True);
539#endif 494#endif
540 495
541#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
542 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
543 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
544#endif 499#endif
545#if (MENUBAR_MAX)
546 if (menubar_visible ())
547 XMapWindow (disp, menuBar.win);
548#endif
549#ifdef TRANSPARENT 500#ifdef TRANSPARENT
550 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
551 { 502 {
552 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
553 check_our_parents (); 504 check_our_parents ();
… …
562 513
563 init_command (cmd_argv); 514 init_command (cmd_argv);
564 515
565 free (cmd_argv); 516 free (cmd_argv);
566 517
567 if (pty.pty >= 0) 518 if (pty->pty >= 0)
568 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
569 520
570 check_ev.start (); 521 check_ev.start ();
571 522
572 HOOK_INVOKE ((this, HOOK_START, DT_END)); 523 HOOK_INVOKE ((this, HOOK_START, DT_END));
573 524
… …
612 sw_int (this, &sig_handlers::sig_term) 563 sw_int (this, &sig_handlers::sig_term)
613 { 564 {
614 } 565 }
615} sig_handlers; 566} sig_handlers;
616 567
568char **rxvt_environ; // startup environment
569
617void 570void
618rxvt_init () 571rxvt_init ()
619{ 572{
620 /* 573 uid_t uid = getuid ();
621 * Save and then give up any super-user privileges 574 gid_t gid = getgid ();
622 * If we need privileges in any area then we must specifically request it. 575
623 * We should only need to be root in these cases: 576 // before doing anything else, check for setuid/setgid operation,
624 * 1. write utmp entries on some systems 577 // start the helper process and drop privileges
625 * 2. chown tty on some systems 578 if (uid != geteuid ()
626 */ 579 || 1 //D
627 rxvt_privileges (SAVE); 580 || gid != getegid ())
628 rxvt_privileges (IGNORE); 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
605 rxvt_environ = environ;
629 606
630 signal (SIGHUP, SIG_IGN); 607 signal (SIGHUP, SIG_IGN);
631 signal (SIGPIPE, SIG_IGN); 608 signal (SIGPIPE, SIG_IGN);
632 609
633 sig_handlers.sw_chld.start (SIGCHLD); 610 sig_handlers.sw_chld.start (SIGCHLD);
… …
639 616
640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 617 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641 // TODO: handle this with exceptions and tolerate the memory loss 618 // TODO: handle this with exceptions and tolerate the memory loss
642 XSetIOErrorHandler (rxvt_xioerror_handler); 619 XSetIOErrorHandler (rxvt_xioerror_handler);
643 620
644#ifdef USE_XGETDEFAULT
645 XrmInitialize (); 621 XrmInitialize ();
646#endif
647} 622}
648 623
649/* ------------------------------------------------------------------------- * 624/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS * 625 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */ 626 * ------------------------------------------------------------------------- */
… …
680 rxvt_fatal ("memory allocation failure. aborting.\n"); 655 rxvt_fatal ("memory allocation failure. aborting.\n");
681 656
682 return p; 657 return p;
683} 658}
684 659
685/* ------------------------------------------------------------------------- *
686 * PRIVILEGED OPERATIONS *
687 * ------------------------------------------------------------------------- */
688/* take care of suid/sgid super-user (root) privileges */
689void
690rxvt_privileges (rxvt_privaction action)
691{
692#if ! defined(__CYGWIN32__)
693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
694 /* setreuid () is the poor man's setuid (), seteuid () */
695# define seteuid(a) setreuid(-1, (a))
696# define setegid(a) setregid(-1, (a))
697# define HAVE_SETEUID
698# endif
699# ifdef HAVE_SETEUID
700 switch (action)
701 {
702 case IGNORE:
703 /*
704 * change effective uid/gid - not real uid/gid - so we can switch
705 * back to root later, as required
706 */
707 seteuid (getuid ());
708 setegid (getgid ());
709 break;
710 case SAVE:
711 saved_euid = geteuid ();
712 saved_egid = getegid ();
713 break;
714 case RESTORE:
715 seteuid (saved_euid);
716 setegid (saved_egid);
717 break;
718 }
719# else
720 switch (action)
721 {
722 case IGNORE:
723 setuid (getuid ());
724 setgid (getgid ());
725 /* FALLTHROUGH */
726 case SAVE:
727 /* FALLTHROUGH */
728 case RESTORE:
729 break;
730 }
731# endif
732#endif
733}
734
735#ifdef UTMP_SUPPORT
736void
737rxvt_term::privileged_utmp (rxvt_privaction action)
738{
739 if (OPTION (Opt_utmpInhibit)
740 || !pty.name || !*pty.name)
741 return;
742
743 rxvt_privileges (RESTORE);
744
745 if (action == SAVE)
746 makeutent (pty.name, rs[Rs_display_name]);
747 else
748 cleanutent ();
749
750 rxvt_privileges (IGNORE);
751}
752#endif
753
754/*----------------------------------------------------------------------*/ 660/*----------------------------------------------------------------------*/
755/* 661/*
756 * window size/position calculcations for XSizeHint and other storage. 662 * window size/position calculcations for XSizeHint and other storage.
757 * if width/height are non-zero then override calculated width/height 663 * if width/height are non-zero then override calculated width/height
758 */ 664 */
759void 665void
760rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 666rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
761{ 667{
762 short recalc_x, recalc_y; 668 short recalc_x, recalc_y;
763 int x, y, sb_w, mb_h, flags; 669 int x, y, sb_w, flags;
764 unsigned int w, h; 670 unsigned int w, h;
765 unsigned int max_width, max_height; 671 unsigned int max_width, max_height;
766 dDisp; 672 dDisp;
767 673
768 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",
… …
829 max_width = MAX_COLS * fwidth; 735 max_width = MAX_COLS * fwidth;
830 max_height = MAX_ROWS * fheight; 736 max_height = MAX_ROWS * fheight;
831 737
832 szHint.base_width = szHint.base_height = 2 * int_bwidth; 738 szHint.base_width = szHint.base_height = 2 * int_bwidth;
833 739
834 sb_w = mb_h = 0; 740 sb_w = 0;
835 window_vt_x = window_vt_y = int_bwidth; 741 window_vt_x = window_vt_y = int_bwidth;
836 742
837 if (scrollbar_visible ()) 743 if (scrollBar.state)
838 { 744 {
839 sb_w = scrollbar_TotalWidth (); 745 sb_w = scrollbar_TotalWidth ();
840 szHint.base_width += sb_w; 746 szHint.base_width += sb_w;
841 if (!OPTION (Opt_scrollBar_right)) 747 if (!OPTION (Opt_scrollBar_right))
842 window_vt_x += sb_w; 748 window_vt_x += sb_w;
843 } 749 }
844 750
845 if (menubar_visible ())
846 {
847 mb_h = menuBar_TotalHeight ();
848 szHint.base_height += mb_h;
849 window_vt_y += mb_h;
850 }
851
852 szHint.width_inc = fwidth; 751 szHint.width_inc = fwidth;
853 szHint.height_inc = fheight; 752 szHint.height_inc = fheight;
854 szHint.min_width = szHint.base_width + szHint.width_inc; 753 szHint.min_width = szHint.base_width + szHint.width_inc;
855 szHint.min_height = szHint.base_height + szHint.height_inc; 754 szHint.min_height = szHint.base_height + szHint.height_inc;
856 755
… …
874 { 773 {
875 min_it (height, max_height); 774 min_it (height, max_height);
876 szHint.height = szHint.base_height + height; 775 szHint.height = szHint.base_height + height;
877 } 776 }
878 777
879 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 778 if (scrollBar.state && OPTION (Opt_scrollBar_right))
880 window_sb_x = szHint.width - sb_w; 779 window_sb_x = szHint.width - sb_w;
881 780
882 if (recalc_x) 781 if (recalc_x)
883 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
884 if (recalc_y) 783 if (recalc_y)
… …
898 * Called after a window size change. 797 * Called after a window size change.
899 */ 798 */
900void 799void
901rxvt_term::tt_winch () 800rxvt_term::tt_winch ()
902{ 801{
903 if (pty.pty < 0) 802 if (pty->pty < 0)
904 return; 803 return;
905 804
906 struct winsize ws; 805 struct winsize ws;
907 806
908 ws.ws_col = ncol; 807 ws.ws_col = ncol;
909 ws.ws_row = nrow; 808 ws.ws_row = nrow;
910 ws.ws_xpixel = width; 809 ws.ws_xpixel = width;
911 ws.ws_ypixel = height; 810 ws.ws_ypixel = height;
912 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 811 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
913 812
914#if 0 813#if 0
915 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 814 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
916 if (cmd_pid) /* force through to the command */ 815 if (cmd_pid) /* force through to the command */
917 kill (-cmd_pid, SIGWINCH); 816 kill (-cmd_pid, SIGWINCH);
… …
1239 1138
1240 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1241 1140
1242 if (fix_screen || newwidth != old_width || newheight != old_height) 1141 if (fix_screen || newwidth != old_width || newheight != old_height)
1243 { 1142 {
1244 if (scrollbar_visible ()) 1143 if (scrollBar.state)
1245 { 1144 {
1246 XMoveResizeWindow (disp, scrollBar.win, 1145 XMoveResizeWindow (disp, scrollBar.win,
1247 window_sb_x, 0, 1146 window_sb_x, 0,
1248 scrollbar_TotalWidth (), szHint.height); 1147 scrollbar_TotalWidth (), szHint.height);
1249 resize_scrollbar (); 1148 resize_scrollbar ();
1250 } 1149 }
1251
1252 if (menubar_visible ())
1253 XMoveResizeWindow (disp, menuBar.win,
1254 window_vt_x, 0,
1255 width, menuBar_TotalHeight ());
1256 1150
1257 XMoveResizeWindow (disp, vt, 1151 XMoveResizeWindow (disp, vt,
1258 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1259 width, height); 1153 width, height);
1260 1154
… …
1444 XRectangle rect, status_rect, needed_rect; 1338 XRectangle rect, status_rect, needed_rect;
1445 unsigned long fg, bg; 1339 unsigned long fg, bg;
1446 const char *p; 1340 const char *p;
1447 char **s; 1341 char **s;
1448 XIMStyles *xim_styles; 1342 XIMStyles *xim_styles;
1343
1344 set_environ (envv);
1449 1345
1450 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1451 return false; 1347 return false;
1452 1348
1453 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1619 int i; 1515 int i;
1620 const char *p; 1516 const char *p;
1621 char **s; 1517 char **s;
1622 char buf[IMBUFSIZ]; 1518 char buf[IMBUFSIZ];
1623 1519
1624 SET_R (this); 1520 make_current ();
1625 1521
1626 im_destroy (); 1522 im_destroy ();
1627 1523
1628 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1629 if (Input_Context) 1525 if (Input_Context)

Diff Legend

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