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.199 by root, Tue Jan 24 19:40:12 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
… …
538 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
539 */ 531 */
540 void 532 void
541 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
542 { 534 {
543#ifdef DEBUG_CMD
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL); 536 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
549 } 538 }
550 539
… …
558char **rxvt_environ; // startup environment 547char **rxvt_environ; // startup environment
559 548
560void 549void
561rxvt_init () 550rxvt_init ()
562{ 551{
563 uid_t uid = getuid (); 552 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 553
594 rxvt_environ = environ; 554 rxvt_environ = environ;
595 555
596 signal (SIGHUP, SIG_IGN); 556 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 557 signal (SIGPIPE, SIG_IGN);
… …
656 short recalc_x, recalc_y; 616 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 617 int x, y, sb_w, flags;
658 unsigned int w, h; 618 unsigned int w, h;
659 unsigned int max_width, max_height; 619 unsigned int max_width, max_height;
660 dDisp; 620 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 621
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 623 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 625
… …
771 if (recalc_y) 728 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
773 730
774 ncol = width / fwidth; 731 ncol = width / fwidth;
775 nrow = height / fheight; 732 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 733}
781 734
782/*----------------------------------------------------------------------*/ 735/*----------------------------------------------------------------------*/
783/* 736/*
784 * Tell the teletype handler what size the window is. 737 * Tell the teletype handler what size the window is.
… …
1068 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
1069void 1022void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1024{
1072 int fix_screen; 1025 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1026 int old_width = szHint.width;
1027 int old_height = szHint.height;
1074 dDisp; 1028 dDisp;
1075 1029
1076 window_calc (newwidth, newheight); 1030 window_calc (newwidth, newheight);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1031 XSetWMNormalHints (disp, parent[0], &szHint);
1078 1032
… …
1100 { 1054 {
1101 x -= x1; 1055 x -= x1;
1102 y -= y1; 1056 y -= y1;
1103 } 1057 }
1104 1058
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1061 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1062 dy = old_height - szHint.height;
1109 1063
1110 /* Check position of the center of the window */ 1064 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1065 if (x < x1) /* left half */
1112 dx = 0; 1066 dx = 0;
… …
1145 resize_pixmap (); 1099 resize_pixmap ();
1146#endif 1100#endif
1147 } 1101 }
1148 1102
1149 if (fix_screen || old_height == 0) 1103 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 (); 1104 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 1105
1175#ifdef XPM_BACKGROUND 1106#ifdef XPM_BACKGROUND
1176 if (pixmap) 1107 if (pixmap)
1177 scr_touch (false); 1108 scr_touch (false);
1178#endif 1109#endif
… …
1332 set_environ (envv); 1263 set_environ (envv);
1333 1264
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1266 return false;
1336 1267
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1268 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1269 if (input_method == NULL)
1340 return false; 1270 return false;
1341 1271
1342 xim = input_method->xim; 1272 xim = input_method->xim;
… …
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1419 im_destroy ();
1490 return false; 1420 return false;
1491 } 1421 }
1492 1422
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input ();
1425
1493 if (input_style & XIMPreeditArea) 1426 if (input_style & XIMPreeditArea)
1494 IMSetStatusPosition (); 1427 IMSetStatusPosition ();
1495 1428
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1429 return true;
1498} 1430}
1499 1431
1500void 1432void
1501rxvt_term::im_cb () 1433rxvt_term::im_cb ()
… …
1507 1439
1508 make_current (); 1440 make_current ();
1509 1441
1510 im_destroy (); 1442 im_destroy ();
1511 1443
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1444 if (Input_Context)
1514 return; 1445 return;
1515 1446
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1447#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1448 if (rs[Rs_imLocale])

Diff Legend

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