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.166 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.185 by root, Tue Jan 17 15:17:39 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
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif 281#endif
282 282
283 displays.put (display); 283 displays.put (display);
284 284
285 scr_release (); 285 scr_release ();
… …
331 im_ev.stop (display); 331 im_ev.stop (display);
332#endif 332#endif
333#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
335#endif 335#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif
339#if TRANSPARENT 336#if TRANSPARENT
340 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
341#endif 338#endif
342 incr_ev.stop (); 339 incr_ev.stop ();
343 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
366} 363}
367 364
368void 365void
369rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
370{ 367{
371 SET_R (this); 368 make_current ();
372 369
373 delete this; 370 delete this;
374} 371}
375 372
376/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
467/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
468bool 465bool
469rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
470{ 467{
471 SET_R (this); 468 SET_R (this);
472
473 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
474 471
475 if (!init_vars ()) 472 if (!init_vars ())
476 return false; 473 return false;
477 474
478 init_secondary (); 475 init_secondary ();
… …
481 478
482#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 480 keyboard->register_done ();
484#endif 481#endif
485 482
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 486#endif
493 487
… …
497 491
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 { 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
502 rxvt_perl.init (); 509 rxvt_perl.init (this);
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 } 511 }
505#endif 512#endif
506 513
514 pty = rxvt_new_ptytty ();
515
507 create_windows (argc, argv); 516 create_windows (argc, argv);
508 517
509 dDisp; 518 dDisp;
510 519
511 init_xlocale (); 520 init_xlocale ();
512 521
513 scr_reset (); /* initialize screen */ 522 scr_reset (); // initialize screen
514 523
515#if 0 524#if 0
516 XSynchronize (disp, True); 525 XSynchronize (disp, True);
517#endif 526#endif
518 527
519#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
522#endif 531#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 532#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
529 { 534 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
531 check_our_parents (); 536 check_our_parents ();
… …
540 545
541 init_command (cmd_argv); 546 init_command (cmd_argv);
542 547
543 free (cmd_argv); 548 free (cmd_argv);
544 549
545 if (pty.pty >= 0) 550 if (pty->pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
547 552
548 check_ev.start (); 553 check_ev.start ();
549 554
550 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
551 556
… …
590 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
591 { 596 {
592 } 597 }
593} sig_handlers; 598} sig_handlers;
594 599
600char **rxvt_environ; // startup environment
601
595void 602void
596rxvt_init () 603rxvt_init ()
597{ 604{
605 rxvt_environ = environ;
606
598 /* 607 /*
599 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
600 * 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.
601 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
602 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
617 626
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
621 630
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 631 XrmInitialize ();
624#endif
625} 632}
626 633
627/* ------------------------------------------------------------------------- * 634/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 635 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 636 * ------------------------------------------------------------------------- */
… …
665 * ------------------------------------------------------------------------- */ 672 * ------------------------------------------------------------------------- */
666/* take care of suid/sgid super-user (root) privileges */ 673/* take care of suid/sgid super-user (root) privileges */
667void 674void
668rxvt_privileges (rxvt_privaction action) 675rxvt_privileges (rxvt_privaction action)
669{ 676{
670#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
671 static uid_t euid;
672 static gid_t egid;
673#endif
674
675#if ! defined(__CYGWIN32__) 677#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */ 679 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a)) 680# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a)) 681# define setegid(a) setregid(-1, (a))
… …
685 case IGNORE: 687 case IGNORE:
686 /* 688 /*
687 * 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
688 * back to root later, as required 690 * back to root later, as required
689 */ 691 */
692 setegid (getgid ());
690 seteuid (getuid ()); 693 seteuid (getuid ());
691 setegid (getgid ());
692 break; 694 break;
693 case SAVE: 695 case SAVE:
694 euid = geteuid ();
695 egid = getegid (); 696 saved_egid = getegid ();
697 saved_euid = geteuid ();
696 break; 698 break;
697 case RESTORE: 699 case RESTORE:
698 seteuid (euid);
699 setegid (egid); 700 setegid (saved_egid);
701 seteuid (saved_euid);
700 break; 702 break;
701 } 703 }
702# else 704# else
703 switch (action) 705 switch (action)
704 { 706 {
705 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
706 setuid (getuid ()); 709 setuid (getuid ());
707 setgid (getgid ());
708 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
709 case SAVE: 711 case SAVE:
710 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
711 case RESTORE: 713 case RESTORE:
712 break; 714 break;
713 } 715 }
714# endif 716# endif
715#endif 717#endif
716} 718}
717 719
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736
737/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
738/* 721/*
739 * window size/position calculcations for XSizeHint and other storage. 722 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 723 * if width/height are non-zero then override calculated width/height
741 */ 724 */
742void 725void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 727{
745 short recalc_x, recalc_y; 728 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 729 int x, y, sb_w, flags;
747 unsigned int w, h; 730 unsigned int w, h;
748 unsigned int max_width, max_height; 731 unsigned int max_width, max_height;
749 dDisp; 732 dDisp;
750 733
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
812 max_width = MAX_COLS * fwidth; 795 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 796 max_height = MAX_ROWS * fheight;
814 797
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 798 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 799
817 sb_w = mb_h = 0; 800 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 801 window_vt_x = window_vt_y = int_bwidth;
819 802
820 if (scrollbar_visible ()) 803 if (scrollBar.state)
821 { 804 {
822 sb_w = scrollbar_TotalWidth (); 805 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 806 szHint.base_width += sb_w;
824 if (!OPTION (Opt_scrollBar_right)) 807 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 808 window_vt_x += sb_w;
826 } 809 }
827 810
828 if (menubar_visible ())
829 {
830 mb_h = menuBar_TotalHeight ();
831 szHint.base_height += mb_h;
832 window_vt_y += mb_h;
833 }
834
835 szHint.width_inc = fwidth; 811 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 812 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 813 szHint.min_width = szHint.base_width + szHint.width_inc;
838 szHint.min_height = szHint.base_height + szHint.height_inc; 814 szHint.min_height = szHint.base_height + szHint.height_inc;
839 815
… …
857 { 833 {
858 min_it (height, max_height); 834 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 835 szHint.height = szHint.base_height + height;
860 } 836 }
861 837
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 838 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 839 window_sb_x = szHint.width - sb_w;
864 840
865 if (recalc_x) 841 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
867 if (recalc_y) 843 if (recalc_y)
… …
881 * Called after a window size change. 857 * Called after a window size change.
882 */ 858 */
883void 859void
884rxvt_term::tt_winch () 860rxvt_term::tt_winch ()
885{ 861{
886 if (pty.pty < 0) 862 if (pty->pty < 0)
887 return; 863 return;
888 864
889 struct winsize ws; 865 struct winsize ws;
890 866
891 ws.ws_col = ncol; 867 ws.ws_col = ncol;
892 ws.ws_row = nrow; 868 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 869 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 870 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 871 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 872
897#if 0 873#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 874 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 875 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 876 kill (-cmd_pid, SIGWINCH);
… …
1222 1198
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1200
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1201 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1202 {
1227 if (scrollbar_visible ()) 1203 if (scrollBar.state)
1228 { 1204 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1205 XMoveResizeWindow (disp, scrollBar.win,
1230 window_sb_x, 0, 1206 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1207 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1208 resize_scrollbar ();
1233 } 1209 }
1234
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239 1210
1240 XMoveResizeWindow (disp, vt, 1211 XMoveResizeWindow (disp, vt,
1241 window_vt_x, window_vt_y, 1212 window_vt_x, window_vt_y,
1242 width, height); 1213 width, height);
1243 1214
… …
1427 XRectangle rect, status_rect, needed_rect; 1398 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1399 unsigned long fg, bg;
1429 const char *p; 1400 const char *p;
1430 char **s; 1401 char **s;
1431 XIMStyles *xim_styles; 1402 XIMStyles *xim_styles;
1403
1404 set_environ (envv);
1432 1405
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1407 return false;
1435 1408
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1602 int i; 1575 int i;
1603 const char *p; 1576 const char *p;
1604 char **s; 1577 char **s;
1605 char buf[IMBUFSIZ]; 1578 char buf[IMBUFSIZ];
1606 1579
1607 SET_R (this); 1580 make_current ();
1608 1581
1609 im_destroy (); 1582 im_destroy ();
1610 1583
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1585 if (Input_Context)

Diff Legend

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