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.179 by root, Mon Jan 16 08:48:09 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 }
… …
341#if USE_XIM 326#if USE_XIM
342 im_ev.stop (display); 327 im_ev.stop (display);
343#endif 328#endif
344#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 331#endif
350#if TRANSPARENT 332#if TRANSPARENT
351 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
352#endif 334#endif
353 incr_ev.stop (); 335 incr_ev.stop ();
… …
492 474
493#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 476 keyboard->register_done ();
495#endif 477#endif
496 478
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 482#endif
504 483
… …
526 rxvt_perl.init (this); 505 rxvt_perl.init (this);
527 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
528 } 507 }
529#endif 508#endif
530 509
510 pty = rxvt_new_ptytty ();
511
531 create_windows (argc, argv); 512 create_windows (argc, argv);
532 513
533 dDisp; 514 dDisp;
534 515
535 init_xlocale (); 516 init_xlocale ();
… …
542 523
543#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
544 if (OPTION (Opt_scrollBar)) 525 if (OPTION (Opt_scrollBar))
545 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
546#endif 527#endif
547#if (MENUBAR_MAX)
548 if (menubar_visible ())
549 XMapWindow (disp, menuBar.win);
550#endif
551#ifdef TRANSPARENT 528#ifdef TRANSPARENT
552 if (OPTION (Opt_transparent)) 529 if (OPTION (Opt_transparent))
553 { 530 {
554 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
555 check_our_parents (); 532 check_our_parents ();
… …
564 541
565 init_command (cmd_argv); 542 init_command (cmd_argv);
566 543
567 free (cmd_argv); 544 free (cmd_argv);
568 545
569 if (pty.pty >= 0) 546 if (pty->pty >= 0)
570 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
571 548
572 check_ev.start (); 549 check_ev.start ();
573 550
574 HOOK_INVOKE ((this, HOOK_START, DT_END)); 551 HOOK_INVOKE ((this, HOOK_START, DT_END));
575 552
… …
619char **rxvt_environ; // startup environment 596char **rxvt_environ; // startup environment
620 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
624 rxvt_environ = environ; 633 rxvt_environ = environ;
625 634
626 /* 635 /*
627 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
628 * 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.
… …
734 } 743 }
735# endif 744# endif
736#endif 745#endif
737} 746}
738 747
739#ifdef UTMP_SUPPORT
740void
741rxvt_term::privileged_utmp (rxvt_privaction action)
742{
743 if (OPTION (Opt_utmpInhibit)
744 || !pty.name || !*pty.name)
745 return;
746
747 rxvt_privileges (RESTORE);
748
749 if (action == SAVE)
750 makeutent (pty.name, rs[Rs_display_name]);
751 else
752 cleanutent ();
753
754 rxvt_privileges (IGNORE);
755}
756#endif
757
758/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
759/* 749/*
760 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
761 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
762 */ 752 */
763void 753void
764rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
765{ 755{
766 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
767 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
768 unsigned int w, h; 758 unsigned int w, h;
769 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
770 dDisp; 760 dDisp;
771 761
772 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",
… …
833 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
834 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
835 825
836 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
837 827
838 sb_w = mb_h = 0; 828 sb_w = 0;
839 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
840 830
841 if (scrollbar_visible ()) 831 if (scrollBar.state)
842 { 832 {
843 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
844 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
845 if (!OPTION (Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
846 window_vt_x += sb_w; 836 window_vt_x += sb_w;
847 } 837 }
848 838
849 if (menubar_visible ())
850 {
851 mb_h = menuBar_TotalHeight ();
852 szHint.base_height += mb_h;
853 window_vt_y += mb_h;
854 }
855
856 szHint.width_inc = fwidth; 839 szHint.width_inc = fwidth;
857 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
858 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
859 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
860 843
… …
878 { 861 {
879 min_it (height, max_height); 862 min_it (height, max_height);
880 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
881 } 864 }
882 865
883 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
884 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
885 868
886 if (recalc_x) 869 if (recalc_x)
887 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
888 if (recalc_y) 871 if (recalc_y)
… …
902 * Called after a window size change. 885 * Called after a window size change.
903 */ 886 */
904void 887void
905rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
906{ 889{
907 if (pty.pty < 0) 890 if (pty->pty < 0)
908 return; 891 return;
909 892
910 struct winsize ws; 893 struct winsize ws;
911 894
912 ws.ws_col = ncol; 895 ws.ws_col = ncol;
913 ws.ws_row = nrow; 896 ws.ws_row = nrow;
914 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
915 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
916 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
917 900
918#if 0 901#if 0
919 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
920 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
921 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
1243 1226
1244 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1245 1228
1246 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1247 { 1230 {
1248 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1249 { 1232 {
1250 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1251 window_sb_x, 0, 1234 window_sb_x, 0,
1252 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1253 resize_scrollbar (); 1236 resize_scrollbar ();
1254 } 1237 }
1255
1256 if (menubar_visible ())
1257 XMoveResizeWindow (disp, menuBar.win,
1258 window_vt_x, 0,
1259 width, menuBar_TotalHeight ());
1260 1238
1261 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1262 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1263 width, height); 1241 width, height);
1264 1242

Diff Legend

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