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.175 by root, Thu Jan 12 00:35:39 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 }
… …
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 331#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#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 ();
354 termwin_ev.stop (display); 336 termwin_ev.stop (display);
… …
377} 359}
378 360
379void 361void
380rxvt_term::destroy_cb (time_watcher &w) 362rxvt_term::destroy_cb (time_watcher &w)
381{ 363{
382 SET_R (this); 364 make_current ();
383 365
384 delete this; 366 delete this;
385} 367}
386 368
387/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
… …
478/*----------------------------------------------------------------------*/ 460/*----------------------------------------------------------------------*/
479bool 461bool
480rxvt_term::init (int argc, const char *const *argv) 462rxvt_term::init (int argc, const char *const *argv)
481{ 463{
482 SET_R (this); 464 SET_R (this);
483 TEMP_ENV; // few things in X do not call setlocale :(
484
485 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
486 467
487 if (!init_vars ()) 468 if (!init_vars ())
488 return false; 469 return false;
489 470
490 init_secondary (); 471 init_secondary ();
… …
493 474
494#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
495 keyboard->register_done (); 476 keyboard->register_done ();
496#endif 477#endif
497 478
498#if MENUBAR_MAX
499 menubar_read (rs[Rs_menu]);
500#endif
501#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
504#endif 482#endif
505 483
… …
522 rs[Rs_perl_lib] = 0; 500 rs[Rs_perl_lib] = 0;
523 rs[Rs_perl_eval] = 0; 501 rs[Rs_perl_eval] = 0;
524 } 502 }
525 } 503 }
526#endif 504#endif
527 rxvt_perl.init (); 505 rxvt_perl.init (this);
528 setlocale (LC_CTYPE, curlocale); // perl init destroys this info
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
… …
621char **rxvt_environ; // startup environment 596char **rxvt_environ; // startup environment
622 597
623void 598void
624rxvt_init () 599rxvt_init ()
625{ 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
626 rxvt_environ = environ; 633 rxvt_environ = environ;
627 634
628 /* 635 /*
629 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
630 * 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.
… …
736 } 743 }
737# endif 744# endif
738#endif 745#endif
739} 746}
740 747
741#ifdef UTMP_SUPPORT
742void
743rxvt_term::privileged_utmp (rxvt_privaction action)
744{
745 if (OPTION (Opt_utmpInhibit)
746 || !pty.name || !*pty.name)
747 return;
748
749 rxvt_privileges (RESTORE);
750
751 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]);
753 else
754 cleanutent ();
755
756 rxvt_privileges (IGNORE);
757}
758#endif
759
760/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
761/* 749/*
762 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
763 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
764 */ 752 */
765void 753void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 755{
768 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
770 unsigned int w, h; 758 unsigned int w, h;
771 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
772 dDisp; 760 dDisp;
773 761
774 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",
… …
835 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
837 825
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 827
840 sb_w = mb_h = 0; 828 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
842 830
843 if (scrollbar_visible ()) 831 if (scrollBar.state)
844 { 832 {
845 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
847 if (!OPTION (Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
848 window_vt_x += sb_w; 836 window_vt_x += sb_w;
849 } 837 }
850 838
851 if (menubar_visible ())
852 {
853 mb_h = menuBar_TotalHeight ();
854 szHint.base_height += mb_h;
855 window_vt_y += mb_h;
856 }
857
858 szHint.width_inc = fwidth; 839 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
862 843
… …
880 { 861 {
881 min_it (height, max_height); 862 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
883 } 864 }
884 865
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
887 868
888 if (recalc_x) 869 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890 if (recalc_y) 871 if (recalc_y)
… …
904 * Called after a window size change. 885 * Called after a window size change.
905 */ 886 */
906void 887void
907rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
908{ 889{
909 if (pty.pty < 0) 890 if (pty->pty < 0)
910 return; 891 return;
911 892
912 struct winsize ws; 893 struct winsize ws;
913 894
914 ws.ws_col = ncol; 895 ws.ws_col = ncol;
915 ws.ws_row = nrow; 896 ws.ws_row = nrow;
916 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
917 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919 900
920#if 0 901#if 0
921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
923 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
1245 1226
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1228
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1230 {
1250 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1251 { 1232 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1253 window_sb_x, 0, 1234 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1236 resize_scrollbar ();
1256 } 1237 }
1257
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262 1238
1263 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1264 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1265 width, height); 1241 width, height);
1266 1242
… …
1451 unsigned long fg, bg; 1427 unsigned long fg, bg;
1452 const char *p; 1428 const char *p;
1453 char **s; 1429 char **s;
1454 XIMStyles *xim_styles; 1430 XIMStyles *xim_styles;
1455 1431
1456 TEMP_ENV; 1432 set_environ (envv);
1457 1433
1458 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1459 return false; 1435 return false;
1460 1436
1461 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1627 int i; 1603 int i;
1628 const char *p; 1604 const char *p;
1629 char **s; 1605 char **s;
1630 char buf[IMBUFSIZ]; 1606 char buf[IMBUFSIZ];
1631 1607
1632 SET_R (this); 1608 make_current ();
1633 1609
1634 im_destroy (); 1610 im_destroy ();
1635 1611
1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637 if (Input_Context) 1613 if (Input_Context)

Diff Legend

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