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.186 by root, Tue Jan 17 15:41:33 2006 UTC

… …
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 162#endif
163#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 165#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 168#endif
172#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 170 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
212void rxvt_term::emergency_cleanup () 209void rxvt_term::emergency_cleanup ()
213{ 210{
214 if (cmd_pid) 211 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
216 213
217#ifdef UTMP_SUPPORT 214 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 215}
223 216
224rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
225{ 218{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
242 235
243 selection_clear (); 236 selection_clear ();
244 237
245#ifdef USE_XIM 238#ifdef USE_XIM
246 im_destroy (); 239 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 240#endif
251#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 244#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 259#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 264#endif
275 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (disp, gc);
276 266
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; 267 delete drawable;
283 // destroy all windows 268 // destroy all windows
284 if (parent[0]) 269 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (disp, parent[0]);
286 } 271 }
287 272
288 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 274 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 276 delete pix_colors_unfocused;
293#endif 277#endif
294 278
… …
343 im_ev.stop (display); 327 im_ev.stop (display);
344#endif 328#endif
345#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
347#endif 331#endif
348#if MENUBAR
349 menubar_ev.stop (display);
350#endif
351#if TRANSPARENT 332#if TRANSPARENT
352 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
353#endif 334#endif
354 incr_ev.stop (); 335 incr_ev.stop ();
355 termwin_ev.stop (display); 336 termwin_ev.stop (display);
… …
378} 359}
379 360
380void 361void
381rxvt_term::destroy_cb (time_watcher &w) 362rxvt_term::destroy_cb (time_watcher &w)
382{ 363{
383 SET_R (this); 364 make_current ();
384 365
385 delete this; 366 delete this;
386} 367}
387 368
388/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
… …
479/*----------------------------------------------------------------------*/ 460/*----------------------------------------------------------------------*/
480bool 461bool
481rxvt_term::init (int argc, const char *const *argv) 462rxvt_term::init (int argc, const char *const *argv)
482{ 463{
483 SET_R (this); 464 SET_R (this);
484 TEMP_ENV; // few things in X do not call setlocale :(
485
486 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
487 467
488 if (!init_vars ()) 468 if (!init_vars ())
489 return false; 469 return false;
490 470
491 init_secondary (); 471 init_secondary ();
… …
494 474
495#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
496 keyboard->register_done (); 476 keyboard->register_done ();
497#endif 477#endif
498 478
499#if MENUBAR_MAX
500 menubar_read (rs[Rs_menu]);
501#endif
502#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
504 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
505#endif 482#endif
506 483
… …
523 rs[Rs_perl_lib] = 0; 500 rs[Rs_perl_lib] = 0;
524 rs[Rs_perl_eval] = 0; 501 rs[Rs_perl_eval] = 0;
525 } 502 }
526 } 503 }
527#endif 504#endif
528 rxvt_perl.init (); 505 rxvt_perl.init (this);
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 } 507 }
531#endif 508#endif
509
510 pty = rxvt_new_ptytty ();
532 511
533 create_windows (argc, argv); 512 create_windows (argc, argv);
534 513
535 dDisp; 514 dDisp;
536 515
… …
544 523
545#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 525 if (OPTION (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
548#endif 527#endif
549#if (MENUBAR_MAX)
550 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win);
552#endif
553#ifdef TRANSPARENT 528#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 529 if (OPTION (Opt_transparent))
555 { 530 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
557 check_our_parents (); 532 check_our_parents ();
… …
566 541
567 init_command (cmd_argv); 542 init_command (cmd_argv);
568 543
569 free (cmd_argv); 544 free (cmd_argv);
570 545
571 if (pty.pty >= 0) 546 if (pty->pty >= 0)
572 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
573 548
574 check_ev.start (); 549 check_ev.start ();
575 550
576 HOOK_INVOKE ((this, HOOK_START, DT_END)); 551 HOOK_INVOKE ((this, HOOK_START, DT_END));
577 552
… …
616 sw_int (this, &sig_handlers::sig_term) 591 sw_int (this, &sig_handlers::sig_term)
617 { 592 {
618 } 593 }
619} sig_handlers; 594} sig_handlers;
620 595
596char **rxvt_environ; // startup environment
597
621void 598void
622rxvt_init () 599rxvt_init ()
623{ 600{
601 uid_t uid = getuid ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632
633 rxvt_environ = environ;
634
624 /* 635 /*
625 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
626 * If we need privileges in any area then we must specifically request it. 637 * If we need privileges in any area then we must specifically request it.
627 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
628 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
… …
704 case IGNORE: 715 case IGNORE:
705 /* 716 /*
706 * change effective uid/gid - not real uid/gid - so we can switch 717 * change effective uid/gid - not real uid/gid - so we can switch
707 * back to root later, as required 718 * back to root later, as required
708 */ 719 */
720 setegid (getgid ());
709 seteuid (getuid ()); 721 seteuid (getuid ());
710 setegid (getgid ());
711 break; 722 break;
712 case SAVE: 723 case SAVE:
724 saved_egid = getegid ();
713 saved_euid = geteuid (); 725 saved_euid = geteuid ();
714 saved_egid = getegid ();
715 break; 726 break;
716 case RESTORE: 727 case RESTORE:
728 setegid (saved_egid);
717 seteuid (saved_euid); 729 seteuid (saved_euid);
718 setegid (saved_egid);
719 break; 730 break;
720 } 731 }
721# else 732# else
722 switch (action) 733 switch (action)
723 { 734 {
724 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
725 setuid (getuid ()); 737 setuid (getuid ());
726 setgid (getgid ());
727 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
728 case SAVE: 739 case SAVE:
729 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
730 case RESTORE: 741 case RESTORE:
731 break; 742 break;
732 } 743 }
733# endif 744# endif
734#endif 745#endif
735} 746}
736 747
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/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
757/* 749/*
758 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
759 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
760 */ 752 */
761void 753void
762rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
763{ 755{
764 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
765 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
766 unsigned int w, h; 758 unsigned int w, h;
767 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
768 dDisp; 760 dDisp;
769 761
770 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
831 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
832 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
833 825
834 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
835 827
836 sb_w = mb_h = 0; 828 sb_w = 0;
837 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
838 830
839 if (scrollbar_visible ()) 831 if (scrollBar.state)
840 { 832 {
841 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
842 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
843 if (!OPTION (Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
844 window_vt_x += sb_w; 836 window_vt_x += sb_w;
845 } 837 }
846 838
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; 839 szHint.width_inc = fwidth;
855 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
856 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
857 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
858 843
… …
876 { 861 {
877 min_it (height, max_height); 862 min_it (height, max_height);
878 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
879 } 864 }
880 865
881 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
882 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
883 868
884 if (recalc_x) 869 if (recalc_x)
885 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
886 if (recalc_y) 871 if (recalc_y)
… …
900 * Called after a window size change. 885 * Called after a window size change.
901 */ 886 */
902void 887void
903rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
904{ 889{
905 if (pty.pty < 0) 890 if (pty->pty < 0)
906 return; 891 return;
907 892
908 struct winsize ws; 893 struct winsize ws;
909 894
910 ws.ws_col = ncol; 895 ws.ws_col = ncol;
911 ws.ws_row = nrow; 896 ws.ws_row = nrow;
912 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
913 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
914 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
915 900
916#if 0 901#if 0
917 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
918 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
919 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
1241 1226
1242 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1243 1228
1244 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1245 { 1230 {
1246 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1247 { 1232 {
1248 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1249 window_sb_x, 0, 1234 window_sb_x, 0,
1250 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1251 resize_scrollbar (); 1236 resize_scrollbar ();
1252 } 1237 }
1253
1254 if (menubar_visible ())
1255 XMoveResizeWindow (disp, menuBar.win,
1256 window_vt_x, 0,
1257 width, menuBar_TotalHeight ());
1258 1238
1259 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1260 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1261 width, height); 1241 width, height);
1262 1242
… …
1447 unsigned long fg, bg; 1427 unsigned long fg, bg;
1448 const char *p; 1428 const char *p;
1449 char **s; 1429 char **s;
1450 XIMStyles *xim_styles; 1430 XIMStyles *xim_styles;
1451 1431
1452 TEMP_ENV; 1432 set_environ (envv);
1453 1433
1454 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1455 return false; 1435 return false;
1456 1436
1457 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1623 int i; 1603 int i;
1624 const char *p; 1604 const char *p;
1625 char **s; 1605 char **s;
1626 char buf[IMBUFSIZ]; 1606 char buf[IMBUFSIZ];
1627 1607
1628 SET_R (this); 1608 make_current ();
1629 1609
1630 im_destroy (); 1610 im_destroy ();
1631 1611
1632 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1633 if (Input_Context) 1613 if (Input_Context)

Diff Legend

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