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.171 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 2006 UTC

… …
284 if (parent[0]) 284 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
286 } 286 }
287 287
288 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 289 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
293#endif 292#endif
294 293
… …
479/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
480bool 479bool
481rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
482{ 481{
483 SET_R (this); 482 SET_R (this);
483
484 const char **cmd_argv;
485
486 {
484 TEMP_ENV; // few things in X do not call setlocale :( 487 TEMP_ENV; // few things in X do not call setlocale :(
485 488
486 set_locale (""); 489 set_locale ("");
487 490
488 if (!init_vars ()) 491 if (!init_vars ())
489 return false; 492 return false;
490 493
491 init_secondary (); 494 init_secondary ();
492 495
493 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
494 497
495#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
496 keyboard->register_done (); 499 keyboard->register_done ();
497#endif 500#endif
498 501
499#if MENUBAR_MAX 502#if MENUBAR_MAX
500 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
501#endif 504#endif
502#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 506 if (OPTION (Opt_scrollBar))
504 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
505#endif 508#endif
509 }
506 510
507#if ENABLE_PERL 511#if ENABLE_PERL
508 if (!rs[Rs_perl_ext_1]) 512 if (!rs[Rs_perl_ext_1])
509 rs[Rs_perl_ext_1] = "default"; 513 rs[Rs_perl_ext_1] = "default";
510 514
… …
524 rs[Rs_perl_eval] = 0; 528 rs[Rs_perl_eval] = 0;
525 } 529 }
526 } 530 }
527#endif 531#endif
528 rxvt_perl.init (); 532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 } 535 }
531#endif 536#endif
532 537
538 {
539 TEMP_ENV;
540
533 create_windows (argc, argv); 541 create_windows (argc, argv);
534 542
535 dDisp; 543 dDisp;
536 544
537 init_xlocale (); 545 init_xlocale ();
538 546
539 scr_reset (); // initialize screen 547 scr_reset (); // initialize screen
540 548
541#if 0 549#if 0
542 XSynchronize (disp, True); 550 XSynchronize (disp, True);
543#endif 551#endif
544 552
545#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 554 if (OPTION (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
548#endif 556#endif
549#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
550 if (menubar_visible ()) 558 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
552#endif 560#endif
553#ifdef TRANSPARENT 561#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 562 if (OPTION (Opt_transparent))
555 { 563 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
557 check_our_parents (); 565 check_our_parents ();
558 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
559 } 567 }
560#endif 568#endif
561 569
562 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
563 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
564 572
565 set_colorfgbg (); 573 set_colorfgbg ();
566 574
567 init_command (cmd_argv); 575 init_command (cmd_argv);
568 576
569 free (cmd_argv); 577 free (cmd_argv);
570 578
571 if (pty.pty >= 0) 579 if (pty.pty >= 0)
572 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
573 581
574 check_ev.start (); 582 check_ev.start ();
575 583
576 HOOK_INVOKE ((this, HOOK_START, DT_END)); 584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
577 586
578 return true; 587 return true;
579} 588}
580 589
581static struct sig_handlers 590static struct sig_handlers
… …
704 case IGNORE: 713 case IGNORE:
705 /* 714 /*
706 * change effective uid/gid - not real uid/gid - so we can switch 715 * change effective uid/gid - not real uid/gid - so we can switch
707 * back to root later, as required 716 * back to root later, as required
708 */ 717 */
718 setegid (getgid ());
709 seteuid (getuid ()); 719 seteuid (getuid ());
710 setegid (getgid ());
711 break; 720 break;
712 case SAVE: 721 case SAVE:
722 saved_egid = getegid ();
713 saved_euid = geteuid (); 723 saved_euid = geteuid ();
714 saved_egid = getegid ();
715 break; 724 break;
716 case RESTORE: 725 case RESTORE:
726 setegid (saved_egid);
717 seteuid (saved_euid); 727 seteuid (saved_euid);
718 setegid (saved_egid);
719 break; 728 break;
720 } 729 }
721# else 730# else
722 switch (action) 731 switch (action)
723 { 732 {
724 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
725 setuid (getuid ()); 735 setuid (getuid ());
726 setgid (getgid ());
727 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
728 case SAVE: 737 case SAVE:
729 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
730 case RESTORE: 739 case RESTORE:
731 break; 740 break;

Diff Legend

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