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.188 by root, Wed Jan 18 08:33:34 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
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif 262#endif
282 263
283 displays.put (display); 264 displays.put (display);
284 265
285 scr_release (); 266 scr_release ();
… …
331 im_ev.stop (display); 312 im_ev.stop (display);
332#endif 313#endif
333#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
335#endif 316#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif
339#if TRANSPARENT 317#if TRANSPARENT
340 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
341#endif 319#endif
342 incr_ev.stop (); 320 incr_ev.stop ();
343 termwin_ev.stop (display); 321 termwin_ev.stop (display);
… …
366} 344}
367 345
368void 346void
369rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
370{ 348{
371 SET_R (this); 349 make_current ();
372 350
373 delete this; 351 delete this;
374} 352}
375 353
376/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
467/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
468bool 446bool
469rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
470{ 448{
471 SET_R (this); 449 SET_R (this);
472
473 set_locale (""); 450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
474 452
475 if (!init_vars ()) 453 if (!init_vars ())
476 return false; 454 return false;
477 455
478 init_secondary (); 456 init_secondary ();
… …
481 459
482#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 461 keyboard->register_done ();
484#endif 462#endif
485 463
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 465 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 467#endif
493 468
… …
497 472
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 { 476 {
502 rxvt_perl.init (); 477 rxvt_perl.init (this);
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 } 479 }
505#endif 480#endif
506 481
482 pty = rxvt_new_ptytty ();
483
507 create_windows (argc, argv); 484 create_windows (argc, argv);
508 485
509 dDisp; 486 dDisp;
510 487
511 init_xlocale (); 488 init_xlocale ();
512 489
513 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
514 491
515#if 0 492#if 0
516 XSynchronize (disp, True); 493 XSynchronize (disp, True);
517#endif 494#endif
518 495
519#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
522#endif 499#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 500#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
529 { 502 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
531 check_our_parents (); 504 check_our_parents ();
… …
540 513
541 init_command (cmd_argv); 514 init_command (cmd_argv);
542 515
543 free (cmd_argv); 516 free (cmd_argv);
544 517
545 if (pty.pty >= 0) 518 if (pty->pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
547 520
548 check_ev.start (); 521 check_ev.start ();
549 522
550 HOOK_INVOKE ((this, HOOK_START, DT_END)); 523 HOOK_INVOKE ((this, HOOK_START, DT_END));
551 524
… …
590 sw_int (this, &sig_handlers::sig_term) 563 sw_int (this, &sig_handlers::sig_term)
591 { 564 {
592 } 565 }
593} sig_handlers; 566} sig_handlers;
594 567
568char **rxvt_environ; // startup environment
569
595void 570void
596rxvt_init () 571rxvt_init ()
597{ 572{
598 /* 573 uid_t uid = getuid ();
599 * Save and then give up any super-user privileges 574 gid_t gid = getgid ();
600 * If we need privileges in any area then we must specifically request it. 575
601 * We should only need to be root in these cases: 576 // before doing anything else, check for setuid/setgid operation,
602 * 1. write utmp entries on some systems 577 // start the helper process and drop privileges
603 * 2. chown tty on some systems 578 if (uid != geteuid ()
604 */ 579 || gid != getegid ())
605 rxvt_privileges (SAVE); 580 {
606 rxvt_privileges (IGNORE); 581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586
587 // drop privileges
588#if HAVE_SETRESUID
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603
604 rxvt_environ = environ;
607 605
608 signal (SIGHUP, SIG_IGN); 606 signal (SIGHUP, SIG_IGN);
609 signal (SIGPIPE, SIG_IGN); 607 signal (SIGPIPE, SIG_IGN);
610 608
611 sig_handlers.sw_chld.start (SIGCHLD); 609 sig_handlers.sw_chld.start (SIGCHLD);
… …
617 615
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 616 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 617 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 618 XSetIOErrorHandler (rxvt_xioerror_handler);
621 619
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 620 XrmInitialize ();
624#endif
625} 621}
626 622
627/* ------------------------------------------------------------------------- * 623/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 624 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 625 * ------------------------------------------------------------------------- */
… …
658 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
659 655
660 return p; 656 return p;
661} 657}
662 658
663/* ------------------------------------------------------------------------- *
664 * PRIVILEGED OPERATIONS *
665 * ------------------------------------------------------------------------- */
666/* take care of suid/sgid super-user (root) privileges */
667void
668rxvt_privileges (rxvt_privaction action)
669{
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__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 seteuid (getuid ());
691 setegid (getgid ());
692 break;
693 case SAVE:
694 euid = geteuid ();
695 egid = getegid ();
696 break;
697 case RESTORE:
698 seteuid (euid);
699 setegid (egid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setuid (getuid ());
707 setgid (getgid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
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/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
738/* 660/*
739 * window size/position calculcations for XSizeHint and other storage. 661 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 662 * if width/height are non-zero then override calculated width/height
741 */ 663 */
742void 664void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 666{
745 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, flags;
747 unsigned int w, h; 669 unsigned int w, h;
748 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
749 dDisp; 671 dDisp;
750 672
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
812 max_width = MAX_COLS * fwidth; 734 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 735 max_height = MAX_ROWS * fheight;
814 736
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 737 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 738
817 sb_w = mb_h = 0; 739 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 740 window_vt_x = window_vt_y = int_bwidth;
819 741
820 if (scrollbar_visible ()) 742 if (scrollBar.state)
821 { 743 {
822 sb_w = scrollbar_TotalWidth (); 744 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 745 szHint.base_width += sb_w;
824 if (!OPTION (Opt_scrollBar_right)) 746 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 747 window_vt_x += sb_w;
826 } 748 }
827 749
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; 750 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 751 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 752 szHint.min_width = szHint.base_width + szHint.width_inc;
838 szHint.min_height = szHint.base_height + szHint.height_inc; 753 szHint.min_height = szHint.base_height + szHint.height_inc;
839 754
… …
857 { 772 {
858 min_it (height, max_height); 773 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 774 szHint.height = szHint.base_height + height;
860 } 775 }
861 776
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 777 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 778 window_sb_x = szHint.width - sb_w;
864 779
865 if (recalc_x) 780 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
867 if (recalc_y) 782 if (recalc_y)
… …
881 * Called after a window size change. 796 * Called after a window size change.
882 */ 797 */
883void 798void
884rxvt_term::tt_winch () 799rxvt_term::tt_winch ()
885{ 800{
886 if (pty.pty < 0) 801 if (pty->pty < 0)
887 return; 802 return;
888 803
889 struct winsize ws; 804 struct winsize ws;
890 805
891 ws.ws_col = ncol; 806 ws.ws_col = ncol;
892 ws.ws_row = nrow; 807 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 808 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 809 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 810 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 811
897#if 0 812#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 813 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 814 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 815 kill (-cmd_pid, SIGWINCH);
… …
1222 1137
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1139
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1141 {
1227 if (scrollbar_visible ()) 1142 if (scrollBar.state)
1228 { 1143 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (disp, scrollBar.win,
1230 window_sb_x, 0, 1145 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1147 resize_scrollbar ();
1233 } 1148 }
1234
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239 1149
1240 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (disp, vt,
1241 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1242 width, height); 1152 width, height);
1243 1153
… …
1427 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1338 unsigned long fg, bg;
1429 const char *p; 1339 const char *p;
1430 char **s; 1340 char **s;
1431 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342
1343 set_environ (envv);
1432 1344
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1346 return false;
1435 1347
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1602 int i; 1514 int i;
1603 const char *p; 1515 const char *p;
1604 char **s; 1516 char **s;
1605 char buf[IMBUFSIZ]; 1517 char buf[IMBUFSIZ];
1606 1518
1607 SET_R (this); 1519 make_current ();
1608 1520
1609 im_destroy (); 1521 im_destroy ();
1610 1522
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1524 if (Input_Context)

Diff Legend

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