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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.197 by root, Sun Jan 22 20:39:47 2006 UTC

… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
178 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
179 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
… …
447 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
448} 451}
449 452
450/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
451bool 454bool
452rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 456{
457 this->envv = envv;
458
454 SET_R (this); 459 SET_R (this);
455 set_locale (""); 460 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 461 set_environ (envv); // few things in X do not call setlocale :(
457 462
458 if (!init_vars ()) 463 if (!init_vars ())
… …
464 469
465#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 471 keyboard->register_done ();
467#endif 472#endif
468 473
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar)) 475 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
485#endif 477#endif
486 478
487 pty = rxvt_new_ptytty (); 479 pty = ptytty::create ();
488 480
489 create_windows (argc, argv); 481 create_windows (argc, argv);
490 482
491 dDisp; 483 dDisp;
492 484
… …
558char **rxvt_environ; // startup environment 550char **rxvt_environ; // startup environment
559 551
560void 552void
561rxvt_init () 553rxvt_init ()
562{ 554{
563 uid_t uid = getuid (); 555 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 556
594 rxvt_environ = environ; 557 rxvt_environ = environ;
595 558
596 signal (SIGHUP, SIG_IGN); 559 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 560 signal (SIGPIPE, SIG_IGN);
… …
1068 * -------------------------------------------------------------------- */ 1031 * -------------------------------------------------------------------- */
1069void 1032void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1034{
1072 int fix_screen; 1035 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1036 int old_width = szHint.width;
1037 int old_height = szHint.height;
1074 dDisp; 1038 dDisp;
1075 1039
1076 window_calc (newwidth, newheight); 1040 window_calc (newwidth, newheight);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (disp, parent[0], &szHint);
1078 1042
… …
1100 { 1064 {
1101 x -= x1; 1065 x -= x1;
1102 y -= y1; 1066 y -= y1;
1103 } 1067 }
1104 1068
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1109 1073
1110 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1112 dx = 0; 1076 dx = 0;
… …
1145 resize_pixmap (); 1109 resize_pixmap ();
1146#endif 1110#endif
1147 } 1111 }
1148 1112
1149 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1114 scr_reset ();
1164
1165 if (curr_screen >= 0) /* this is not the first time through */
1166 {
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171
1172 old_width = szHint.width;
1173 old_height = szHint.height;
1174 1115
1175#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1176 if (pixmap) 1117 if (pixmap)
1177 scr_touch (false); 1118 scr_touch (false);
1178#endif 1119#endif

Diff Legend

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