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.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.184 by root, Tue Jan 17 12:22:59 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
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128], savelocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
… …
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 return true; 78 return true;
64} 79}
65 80
66bool 81void
67rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
68{ 83{
69 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
71} 86}
… …
145#if TRANSPARENT 160#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 162#endif
148#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif 165#endif
154#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 168#endif
157#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
201 213
202#ifdef UTMP_SUPPORT 214#ifdef UTMP_SUPPORT
203 privileged_utmp (RESTORE); 215 privileged_utmp (RESTORE);
204#endif 216#endif
205 217
206 pty.put (); 218 delete pty; pty = 0;
207} 219}
208 220
209rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
210{ 222{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
227 239
228 selection_clear (); 240 selection_clear ();
229 241
230#ifdef USE_XIM 242#ifdef USE_XIM
231 im_destroy (); 243 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 244#endif
236#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 248#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 263#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 268#endif
260 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
261 270
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 271 delete drawable;
268 // destroy all windows 272 // destroy all windows
269 if (parent[0]) 273 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
271 } 275 }
272 276
273 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 278 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
278#endif 281#endif
279 282
… …
328 im_ev.stop (display); 331 im_ev.stop (display);
329#endif 332#endif
330#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
332#endif 335#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT 336#if TRANSPARENT
337 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif 338#endif
339 incr_ev.stop (); 339 incr_ev.stop ();
340 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
363} 363}
364 364
365void 365void
366rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
367{ 367{
368 SET_R (this); 368 make_current ();
369 369
370 delete this; 370 delete this;
371} 371}
372 372
373/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
465bool 465bool
466rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
467{ 467{
468 SET_R (this); 468 SET_R (this);
469
470 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
471 471
472 if (!init_vars ()) 472 if (!init_vars ())
473 return false; 473 return false;
474 474
475 init_secondary (); 475 init_secondary ();
… …
478 478
479#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 480 keyboard->register_done ();
481#endif 481#endif
482 482
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 486#endif
490 487
… …
494 491
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 { 495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
499 rxvt_perl.init (); 509 rxvt_perl.init (this);
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 } 511 }
502#endif 512#endif
503 513
514 pty = rxvt_new_ptytty ();
515
504 create_windows (argc, argv); 516 create_windows (argc, argv);
505 517
506 dDisp; 518 dDisp;
507 519
508 init_xlocale (); 520 init_xlocale ();
509 521
510 scr_reset (); /* initialize screen */ 522 scr_reset (); // initialize screen
511 523
512#if 0 524#if 0
513 XSynchronize (disp, True); 525 XSynchronize (disp, True);
514#endif 526#endif
515 527
516#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
519#endif 531#endif
520#if (MENUBAR_MAX)
521 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win);
523#endif
524#ifdef TRANSPARENT 532#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
526 { 534 {
527 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
528 check_our_parents (); 536 check_our_parents ();
… …
537 545
538 init_command (cmd_argv); 546 init_command (cmd_argv);
539 547
540 free (cmd_argv); 548 free (cmd_argv);
541 549
542 if (pty.pty >= 0) 550 if (pty->pty >= 0)
543 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
544 552
545 check_ev.start (); 553 check_ev.start ();
546 554
547 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
548 556
… …
587 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
588 { 596 {
589 } 597 }
590} sig_handlers; 598} sig_handlers;
591 599
600char **rxvt_environ; // startup environment
601
592void 602void
593rxvt_init () 603rxvt_init ()
594{ 604{
605 rxvt_environ = environ;
606
595 /* 607 /*
596 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
597 * If we need privileges in any area then we must specifically request it. 609 * If we need privileges in any area then we must specifically request it.
598 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
599 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
613 /* signal (SIGURG, SIG_DFL); */ 625 /* signal (SIGURG, SIG_DFL); */
614 626
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
630
631 XrmInitialize ();
618} 632}
619 633
620/* ------------------------------------------------------------------------- * 634/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 635 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 636 * ------------------------------------------------------------------------- */
… …
658 * ------------------------------------------------------------------------- */ 672 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */ 673/* take care of suid/sgid super-user (root) privileges */
660void 674void
661rxvt_privileges (rxvt_privaction action) 675rxvt_privileges (rxvt_privaction action)
662{ 676{
663#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664 static uid_t euid;
665 static gid_t egid;
666#endif
667
668#if ! defined(__CYGWIN32__) 677#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */ 679 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a)) 680# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a)) 681# define setegid(a) setregid(-1, (a))
… …
678 case IGNORE: 687 case IGNORE:
679 /* 688 /*
680 * change effective uid/gid - not real uid/gid - so we can switch 689 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required 690 * back to root later, as required
682 */ 691 */
692 setegid (getgid ());
683 seteuid (getuid ()); 693 seteuid (getuid ());
684 setegid (getgid ());
685 break; 694 break;
686 case SAVE: 695 case SAVE:
687 euid = geteuid ();
688 egid = getegid (); 696 saved_egid = getegid ();
697 saved_euid = geteuid ();
689 break; 698 break;
690 case RESTORE: 699 case RESTORE:
691 seteuid (euid);
692 setegid (egid); 700 setegid (saved_egid);
701 seteuid (saved_euid);
693 break; 702 break;
694 } 703 }
695# else 704# else
696 switch (action) 705 switch (action)
697 { 706 {
698 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
699 setuid (getuid ()); 709 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
702 case SAVE: 711 case SAVE:
703 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
704 case RESTORE: 713 case RESTORE:
705 break; 714 break;
… …
710 719
711#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
712void 721void
713rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
714{ 723{
715 if (OPTION (Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
716 || !pty.name || !*pty.name)
717 return; 725 return;
718 726
719 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
720 728
721 if (action == SAVE) 729 if (action == SAVE)
722 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
723 else 731 else
724 cleanutent (); 732 pty->logout ();
725 733
726 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
727} 735}
728#endif 736#endif
729 737
… …
734 */ 742 */
735void 743void
736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737{ 745{
738 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
739 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
740 unsigned int w, h; 748 unsigned int w, h;
741 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
742 dDisp; 750 dDisp;
743 751
744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 752 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
805 max_width = MAX_COLS * fwidth; 813 max_width = MAX_COLS * fwidth;
806 max_height = MAX_ROWS * fheight; 814 max_height = MAX_ROWS * fheight;
807 815
808 szHint.base_width = szHint.base_height = 2 * int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
809 817
810 sb_w = mb_h = 0; 818 sb_w = 0;
811 window_vt_x = window_vt_y = int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
812 820
813 if (scrollbar_visible ()) 821 if (scrollBar.state)
814 { 822 {
815 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
816 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
817 if (!OPTION (Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
818 window_vt_x += sb_w; 826 window_vt_x += sb_w;
819 } 827 }
820 828
821 if (menubar_visible ())
822 {
823 mb_h = menuBar_TotalHeight ();
824 szHint.base_height += mb_h;
825 window_vt_y += mb_h;
826 }
827
828 szHint.width_inc = fwidth; 829 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 830 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
832 833
… …
850 { 851 {
851 min_it (height, max_height); 852 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 853 szHint.height = szHint.base_height + height;
853 } 854 }
854 855
855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
857 858
858 if (recalc_x) 859 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860 if (recalc_y) 861 if (recalc_y)
… …
874 * Called after a window size change. 875 * Called after a window size change.
875 */ 876 */
876void 877void
877rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
878{ 879{
879 if (pty.pty < 0) 880 if (pty->pty < 0)
880 return; 881 return;
881 882
882 struct winsize ws; 883 struct winsize ws;
883 884
884 ws.ws_col = ncol; 885 ws.ws_col = ncol;
885 ws.ws_row = nrow; 886 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 887 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 888 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 890
890#if 0 891#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
… …
1215 1216
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1218
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1220 {
1220 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1221 { 1222 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1223 window_sb_x, 0, 1224 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1226 resize_scrollbar ();
1226 } 1227 }
1227
1228 if (menubar_visible ())
1229 XMoveResizeWindow (disp, menuBar.win,
1230 window_vt_x, 0,
1231 width, menuBar_TotalHeight ());
1232 1228
1233 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1234 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1235 width, height); 1231 width, height);
1236 1232
… …
1420 XRectangle rect, status_rect, needed_rect; 1416 XRectangle rect, status_rect, needed_rect;
1421 unsigned long fg, bg; 1417 unsigned long fg, bg;
1422 const char *p; 1418 const char *p;
1423 char **s; 1419 char **s;
1424 XIMStyles *xim_styles; 1420 XIMStyles *xim_styles;
1421
1422 set_environ (envv);
1425 1423
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1425 return false;
1428 1426
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1595 int i; 1593 int i;
1596 const char *p; 1594 const char *p;
1597 char **s; 1595 char **s;
1598 char buf[IMBUFSIZ]; 1596 char buf[IMBUFSIZ];
1599 1597
1600 SET_R (this); 1598 make_current ();
1601 1599
1602 im_destroy (); 1600 im_destroy ();
1603 1601
1604 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605 if (Input_Context) 1603 if (Input_Context)

Diff Legend

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