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.187 by root, Tue Jan 17 16:22:41 2006 UTC

… …
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64} 64}
65 65
66bool 66void
67rxvt_push_locale (const char *locale) 67rxvt_push_locale (const char *locale)
68{ 68{
69 strcpy (savelocale, curlocale); 69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 70 rxvt_set_locale (locale);
71} 71}
… …
145#if TRANSPARENT 145#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 147#endif
148#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif 150#endif
154#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 153#endif
157#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
197void rxvt_term::emergency_cleanup () 194void rxvt_term::emergency_cleanup ()
198{ 195{
199 if (cmd_pid) 196 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 197 kill (-cmd_pid, SIGHUP);
201 198
202#ifdef UTMP_SUPPORT 199 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 200}
208 201
209rxvt_term::~rxvt_term () 202rxvt_term::~rxvt_term ()
210{ 203{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
227 220
228 selection_clear (); 221 selection_clear ();
229 222
230#ifdef USE_XIM 223#ifdef USE_XIM
231 im_destroy (); 224 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 225#endif
236#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 229#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 244#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 249#endif
260 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (disp, gc);
261 251
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; 252 delete drawable;
268 // destroy all windows 253 // destroy all windows
269 if (parent[0]) 254 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (disp, parent[0]);
271 } 256 }
272 257
273 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 259 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 261 delete pix_colors_unfocused;
278#endif 262#endif
279 263
… …
328 im_ev.stop (display); 312 im_ev.stop (display);
329#endif 313#endif
330#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
332#endif 316#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT 317#if TRANSPARENT
337 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
338#endif 319#endif
339 incr_ev.stop (); 320 incr_ev.stop ();
340 termwin_ev.stop (display); 321 termwin_ev.stop (display);
… …
363} 344}
364 345
365void 346void
366rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
367{ 348{
368 SET_R (this); 349 make_current ();
369 350
370 delete this; 351 delete this;
371} 352}
372 353
373/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
465bool 446bool
466rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
467{ 448{
468 SET_R (this); 449 SET_R (this);
469
470 set_locale (""); 450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
471 452
472 if (!init_vars ()) 453 if (!init_vars ())
473 return false; 454 return false;
474 455
475 init_secondary (); 456 init_secondary ();
… …
478 459
479#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 461 keyboard->register_done ();
481#endif 462#endif
482 463
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 465 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 467#endif
490 468
… …
494 472
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 { 476 {
499 rxvt_perl.init (); 477 rxvt_perl.init (this);
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 } 479 }
502#endif 480#endif
503 481
482 pty = rxvt_new_ptytty ();
483
504 create_windows (argc, argv); 484 create_windows (argc, argv);
505 485
506 dDisp; 486 dDisp;
507 487
508 init_xlocale (); 488 init_xlocale ();
509 489
510 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
511 491
512#if 0 492#if 0
513 XSynchronize (disp, True); 493 XSynchronize (disp, True);
514#endif 494#endif
515 495
516#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
519#endif 499#endif
520#if (MENUBAR_MAX)
521 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win);
523#endif
524#ifdef TRANSPARENT 500#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
526 { 502 {
527 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
528 check_our_parents (); 504 check_our_parents ();
… …
537 513
538 init_command (cmd_argv); 514 init_command (cmd_argv);
539 515
540 free (cmd_argv); 516 free (cmd_argv);
541 517
542 if (pty.pty >= 0) 518 if (pty->pty >= 0)
543 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
544 520
545 check_ev.start (); 521 check_ev.start ();
546 522
547 HOOK_INVOKE ((this, HOOK_START, DT_END)); 523 HOOK_INVOKE ((this, HOOK_START, DT_END));
548 524
… …
587 sw_int (this, &sig_handlers::sig_term) 563 sw_int (this, &sig_handlers::sig_term)
588 { 564 {
589 } 565 }
590} sig_handlers; 566} sig_handlers;
591 567
568char **rxvt_environ; // startup environment
569
592void 570void
593rxvt_init () 571rxvt_init ()
594{ 572{
595 /* 573 uid_t uid = getuid ();
596 * Save and then give up any super-user privileges 574 gid_t gid = getgid ();
597 * If we need privileges in any area then we must specifically request it. 575
598 * We should only need to be root in these cases: 576 // before doing anything else, check for setuid/setgid operation,
599 * 1. write utmp entries on some systems 577 // start the helper process and drop privileges
600 * 2. chown tty on some systems 578 if (uid != geteuid ()
601 */ 579 || 1 //D
602 rxvt_privileges (SAVE); 580 || gid != getegid ())
603 rxvt_privileges (IGNORE); 581 {
582#if PTYTTY_HELPER
583 rxvt_ptytty_server ();
584#else
585 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586#endif
587
588 // drop privileges
589#if HAVE_SETRESUID
590 setresgid (gid, gid, gid);
591 setresuid (uid, uid, uid);
592#elif HAVE_SETREUID
593 setregid (gid, gid);
594 setreuid (uid, uid);
595#elif HAVE_SETUID
596 setgid (gid);
597 setuid (uid);
598#endif
599
600 if (uid != geteuid ()
601 || gid != getegid ())
602 rxvt_fatal ("unable to drop privileges, aborting.\n");
603 }
604
605 rxvt_environ = environ;
604 606
605 signal (SIGHUP, SIG_IGN); 607 signal (SIGHUP, SIG_IGN);
606 signal (SIGPIPE, SIG_IGN); 608 signal (SIGPIPE, SIG_IGN);
607 609
608 sig_handlers.sw_chld.start (SIGCHLD); 610 sig_handlers.sw_chld.start (SIGCHLD);
… …
613 /* signal (SIGURG, SIG_DFL); */ 615 /* signal (SIGURG, SIG_DFL); */
614 616
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 617 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 618 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 619 XSetIOErrorHandler (rxvt_xioerror_handler);
620
621 XrmInitialize ();
618} 622}
619 623
620/* ------------------------------------------------------------------------- * 624/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 625 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 626 * ------------------------------------------------------------------------- */
… …
651 rxvt_fatal ("memory allocation failure. aborting.\n"); 655 rxvt_fatal ("memory allocation failure. aborting.\n");
652 656
653 return p; 657 return p;
654} 658}
655 659
656/* ------------------------------------------------------------------------- *
657 * PRIVILEGED OPERATIONS *
658 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */
660void
661rxvt_privileges (rxvt_privaction action)
662{
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__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a))
673# define HAVE_SETEUID
674# endif
675# ifdef HAVE_SETEUID
676 switch (action)
677 {
678 case IGNORE:
679 /*
680 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required
682 */
683 seteuid (getuid ());
684 setegid (getgid ());
685 break;
686 case SAVE:
687 euid = geteuid ();
688 egid = getegid ();
689 break;
690 case RESTORE:
691 seteuid (euid);
692 setegid (egid);
693 break;
694 }
695# else
696 switch (action)
697 {
698 case IGNORE:
699 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */
702 case SAVE:
703 /* FALLTHROUGH */
704 case RESTORE:
705 break;
706 }
707# endif
708#endif
709}
710
711#ifdef UTMP_SUPPORT
712void
713rxvt_term::privileged_utmp (rxvt_privaction action)
714{
715 if (OPTION (Opt_utmpInhibit)
716 || !pty.name || !*pty.name)
717 return;
718
719 rxvt_privileges (RESTORE);
720
721 if (action == SAVE)
722 makeutent (pty.name, rs[Rs_display_name]);
723 else
724 cleanutent ();
725
726 rxvt_privileges (IGNORE);
727}
728#endif
729
730/*----------------------------------------------------------------------*/ 660/*----------------------------------------------------------------------*/
731/* 661/*
732 * window size/position calculcations for XSizeHint and other storage. 662 * window size/position calculcations for XSizeHint and other storage.
733 * if width/height are non-zero then override calculated width/height 663 * if width/height are non-zero then override calculated width/height
734 */ 664 */
735void 665void
736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 666rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737{ 667{
738 short recalc_x, recalc_y; 668 short recalc_x, recalc_y;
739 int x, y, sb_w, mb_h, flags; 669 int x, y, sb_w, flags;
740 unsigned int w, h; 670 unsigned int w, h;
741 unsigned int max_width, max_height; 671 unsigned int max_width, max_height;
742 dDisp; 672 dDisp;
743 673
744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
805 max_width = MAX_COLS * fwidth; 735 max_width = MAX_COLS * fwidth;
806 max_height = MAX_ROWS * fheight; 736 max_height = MAX_ROWS * fheight;
807 737
808 szHint.base_width = szHint.base_height = 2 * int_bwidth; 738 szHint.base_width = szHint.base_height = 2 * int_bwidth;
809 739
810 sb_w = mb_h = 0; 740 sb_w = 0;
811 window_vt_x = window_vt_y = int_bwidth; 741 window_vt_x = window_vt_y = int_bwidth;
812 742
813 if (scrollbar_visible ()) 743 if (scrollBar.state)
814 { 744 {
815 sb_w = scrollbar_TotalWidth (); 745 sb_w = scrollbar_TotalWidth ();
816 szHint.base_width += sb_w; 746 szHint.base_width += sb_w;
817 if (!OPTION (Opt_scrollBar_right)) 747 if (!OPTION (Opt_scrollBar_right))
818 window_vt_x += sb_w; 748 window_vt_x += sb_w;
819 } 749 }
820 750
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; 751 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 752 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 753 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 754 szHint.min_height = szHint.base_height + szHint.height_inc;
832 755
… …
850 { 773 {
851 min_it (height, max_height); 774 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 775 szHint.height = szHint.base_height + height;
853 } 776 }
854 777
855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 778 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 779 window_sb_x = szHint.width - sb_w;
857 780
858 if (recalc_x) 781 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860 if (recalc_y) 783 if (recalc_y)
… …
874 * Called after a window size change. 797 * Called after a window size change.
875 */ 798 */
876void 799void
877rxvt_term::tt_winch () 800rxvt_term::tt_winch ()
878{ 801{
879 if (pty.pty < 0) 802 if (pty->pty < 0)
880 return; 803 return;
881 804
882 struct winsize ws; 805 struct winsize ws;
883 806
884 ws.ws_col = ncol; 807 ws.ws_col = ncol;
885 ws.ws_row = nrow; 808 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 809 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 810 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 811 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 812
890#if 0 813#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 814 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 815 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 816 kill (-cmd_pid, SIGWINCH);
… …
1215 1138
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1140
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1141 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1142 {
1220 if (scrollbar_visible ()) 1143 if (scrollBar.state)
1221 { 1144 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1145 XMoveResizeWindow (disp, scrollBar.win,
1223 window_sb_x, 0, 1146 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1147 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1148 resize_scrollbar ();
1226 } 1149 }
1227
1228 if (menubar_visible ())
1229 XMoveResizeWindow (disp, menuBar.win,
1230 window_vt_x, 0,
1231 width, menuBar_TotalHeight ());
1232 1150
1233 XMoveResizeWindow (disp, vt, 1151 XMoveResizeWindow (disp, vt,
1234 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1235 width, height); 1153 width, height);
1236 1154
… …
1420 XRectangle rect, status_rect, needed_rect; 1338 XRectangle rect, status_rect, needed_rect;
1421 unsigned long fg, bg; 1339 unsigned long fg, bg;
1422 const char *p; 1340 const char *p;
1423 char **s; 1341 char **s;
1424 XIMStyles *xim_styles; 1342 XIMStyles *xim_styles;
1343
1344 set_environ (envv);
1425 1345
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1347 return false;
1428 1348
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1595 int i; 1515 int i;
1596 const char *p; 1516 const char *p;
1597 char **s; 1517 char **s;
1598 char buf[IMBUFSIZ]; 1518 char buf[IMBUFSIZ];
1599 1519
1600 SET_R (this); 1520 make_current ();
1601 1521
1602 im_destroy (); 1522 im_destroy ();
1603 1523
1604 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605 if (Input_Context) 1525 if (Input_Context)

Diff Legend

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