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.180 by root, Mon Jan 16 15:00:20 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128], savelocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
… …
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 return true; 78 return true;
64} 79}
65 80
66bool 81void
67rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
68{ 83{
69 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
71} 86}
… …
145#if TRANSPARENT 160#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 162#endif
148#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif 165#endif
154#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 168#endif
157#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
227 239
228 selection_clear (); 240 selection_clear ();
229 241
230#ifdef USE_XIM 242#ifdef USE_XIM
231 im_destroy (); 243 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 244#endif
236#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 248#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 263#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 268#endif
260 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
261 270
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; 271 delete drawable;
268 // destroy all windows 272 // destroy all windows
269 if (parent[0]) 273 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
271 } 275 }
272 276
273 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 278 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
278#endif 281#endif
279 282
… …
328 im_ev.stop (display); 331 im_ev.stop (display);
329#endif 332#endif
330#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
332#endif 335#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT 336#if TRANSPARENT
337 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif 338#endif
339 incr_ev.stop (); 339 incr_ev.stop ();
340 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
363} 363}
364 364
365void 365void
366rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
367{ 367{
368 SET_R (this); 368 make_current ();
369 369
370 delete this; 370 delete this;
371} 371}
372 372
373/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
465bool 465bool
466rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
467{ 467{
468 SET_R (this); 468 SET_R (this);
469
470 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
471 471
472 if (!init_vars ()) 472 if (!init_vars ())
473 return false; 473 return false;
474 474
475 init_secondary (); 475 init_secondary ();
… …
478 478
479#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 480 keyboard->register_done ();
481#endif 481#endif
482 482
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 486#endif
490 487
… …
494 491
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 { 495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
499 rxvt_perl.init (); 509 rxvt_perl.init (this);
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 } 511 }
502#endif 512#endif
503 513
504 create_windows (argc, argv); 514 create_windows (argc, argv);
505 515
506 dDisp; 516 dDisp;
507 517
508 init_xlocale (); 518 init_xlocale ();
509 519
510 scr_reset (); /* initialize screen */ 520 scr_reset (); // initialize screen
511 521
512#if 0 522#if 0
513 XSynchronize (disp, True); 523 XSynchronize (disp, True);
514#endif 524#endif
515 525
516#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar)) 527 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
519#endif
520#if (MENUBAR_MAX)
521 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win);
523#endif 529#endif
524#ifdef TRANSPARENT 530#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent)) 531 if (OPTION (Opt_transparent))
526 { 532 {
527 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
… …
587 sw_int (this, &sig_handlers::sig_term) 593 sw_int (this, &sig_handlers::sig_term)
588 { 594 {
589 } 595 }
590} sig_handlers; 596} sig_handlers;
591 597
598char **rxvt_environ; // startup environment
599
592void 600void
593rxvt_init () 601rxvt_init ()
594{ 602{
603 rxvt_environ = environ;
604
595 /* 605 /*
596 * Save and then give up any super-user privileges 606 * Save and then give up any super-user privileges
597 * If we need privileges in any area then we must specifically request it. 607 * If we need privileges in any area then we must specifically request it.
598 * We should only need to be root in these cases: 608 * We should only need to be root in these cases:
599 * 1. write utmp entries on some systems 609 * 1. write utmp entries on some systems
… …
613 /* signal (SIGURG, SIG_DFL); */ 623 /* signal (SIGURG, SIG_DFL); */
614 624
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 625 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 626 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 627 XSetIOErrorHandler (rxvt_xioerror_handler);
628
629 XrmInitialize ();
618} 630}
619 631
620/* ------------------------------------------------------------------------- * 632/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 633 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 634 * ------------------------------------------------------------------------- */
… …
658 * ------------------------------------------------------------------------- */ 670 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */ 671/* take care of suid/sgid super-user (root) privileges */
660void 672void
661rxvt_privileges (rxvt_privaction action) 673rxvt_privileges (rxvt_privaction action)
662{ 674{
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__) 675#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */ 677 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a)) 678# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a)) 679# define setegid(a) setregid(-1, (a))
… …
678 case IGNORE: 685 case IGNORE:
679 /* 686 /*
680 * change effective uid/gid - not real uid/gid - so we can switch 687 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required 688 * back to root later, as required
682 */ 689 */
690 setegid (getgid ());
683 seteuid (getuid ()); 691 seteuid (getuid ());
684 setegid (getgid ());
685 break; 692 break;
686 case SAVE: 693 case SAVE:
687 euid = geteuid ();
688 egid = getegid (); 694 saved_egid = getegid ();
695 saved_euid = geteuid ();
689 break; 696 break;
690 case RESTORE: 697 case RESTORE:
691 seteuid (euid);
692 setegid (egid); 698 setegid (saved_egid);
699 seteuid (saved_euid);
693 break; 700 break;
694 } 701 }
695# else 702# else
696 switch (action) 703 switch (action)
697 { 704 {
698 case IGNORE: 705 case IGNORE:
706 setgid (getgid ());
699 setuid (getuid ()); 707 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */ 708 /* FALLTHROUGH */
702 case SAVE: 709 case SAVE:
703 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
704 case RESTORE: 711 case RESTORE:
705 break; 712 break;
… …
734 */ 741 */
735void 742void
736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737{ 744{
738 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
739 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, flags;
740 unsigned int w, h; 747 unsigned int w, h;
741 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
742 dDisp; 749 dDisp;
743 750
744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
805 max_width = MAX_COLS * fwidth; 812 max_width = MAX_COLS * fwidth;
806 max_height = MAX_ROWS * fheight; 813 max_height = MAX_ROWS * fheight;
807 814
808 szHint.base_width = szHint.base_height = 2 * int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
809 816
810 sb_w = mb_h = 0; 817 sb_w = 0;
811 window_vt_x = window_vt_y = int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
812 819
813 if (scrollbar_visible ()) 820 if (scrollBar.state)
814 { 821 {
815 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
816 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
817 if (!OPTION (Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
818 window_vt_x += sb_w; 825 window_vt_x += sb_w;
819 } 826 }
820 827
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; 828 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 829 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 830 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 831 szHint.min_height = szHint.base_height + szHint.height_inc;
832 832
… …
850 { 850 {
851 min_it (height, max_height); 851 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 852 szHint.height = szHint.base_height + height;
853 } 853 }
854 854
855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 855 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 856 window_sb_x = szHint.width - sb_w;
857 857
858 if (recalc_x) 858 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860 if (recalc_y) 860 if (recalc_y)
… …
1215 1215
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1217
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1218 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1219 {
1220 if (scrollbar_visible ()) 1220 if (scrollBar.state)
1221 { 1221 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1222 XMoveResizeWindow (disp, scrollBar.win,
1223 window_sb_x, 0, 1223 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1224 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1225 resize_scrollbar ();
1226 } 1226 }
1227
1228 if (menubar_visible ())
1229 XMoveResizeWindow (disp, menuBar.win,
1230 window_vt_x, 0,
1231 width, menuBar_TotalHeight ());
1232 1227
1233 XMoveResizeWindow (disp, vt, 1228 XMoveResizeWindow (disp, vt,
1234 window_vt_x, window_vt_y, 1229 window_vt_x, window_vt_y,
1235 width, height); 1230 width, height);
1236 1231
… …
1420 XRectangle rect, status_rect, needed_rect; 1415 XRectangle rect, status_rect, needed_rect;
1421 unsigned long fg, bg; 1416 unsigned long fg, bg;
1422 const char *p; 1417 const char *p;
1423 char **s; 1418 char **s;
1424 XIMStyles *xim_styles; 1419 XIMStyles *xim_styles;
1420
1421 set_environ (envv);
1425 1422
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1424 return false;
1428 1425
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1595 int i; 1592 int i;
1596 const char *p; 1593 const char *p;
1597 char **s; 1594 char **s;
1598 char buf[IMBUFSIZ]; 1595 char buf[IMBUFSIZ];
1599 1596
1600 SET_R (this); 1597 make_current ();
1601 1598
1602 im_destroy (); 1599 im_destroy ();
1603 1600
1604 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605 if (Input_Context) 1602 if (Input_Context)

Diff Legend

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