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.168 by root, Sun Jan 8 08:49:20 2006 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 2006 UTC

… …
76 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
78 return true; 78 return true;
79} 79}
80 80
81bool 81void
82rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
83{ 83{
84 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
86} 86}
… …
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
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
296#endif 292#endif
297 293
298 displays.put (display); 294 displays.put (display);
299 295
300 scr_release (); 296 scr_release ();
… …
483bool 479bool
484rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
485{ 481{
486 SET_R (this); 482 SET_R (this);
487 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
488 set_locale (""); 489 set_locale ("");
489 490
490 if (!init_vars ()) 491 if (!init_vars ())
491 return false; 492 return false;
492 493
493 init_secondary (); 494 init_secondary ();
494 495
495 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
496 497
497#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
498 keyboard->register_done (); 499 keyboard->register_done ();
499#endif 500#endif
500 501
501#if MENUBAR_MAX 502#if MENUBAR_MAX
502 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
503#endif 504#endif
504#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
505 if (OPTION (Opt_scrollBar)) 506 if (OPTION (Opt_scrollBar))
506 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
507#endif 508#endif
509 }
508 510
509#if ENABLE_PERL 511#if ENABLE_PERL
510 if (!rs[Rs_perl_ext_1]) 512 if (!rs[Rs_perl_ext_1])
511 rs[Rs_perl_ext_1] = "default"; 513 rs[Rs_perl_ext_1] = "default";
512 514
… …
526 rs[Rs_perl_eval] = 0; 528 rs[Rs_perl_eval] = 0;
527 } 529 }
528 } 530 }
529#endif 531#endif
530 rxvt_perl.init (); 532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 } 535 }
533#endif 536#endif
534 537
538 {
539 TEMP_ENV;
540
535 create_windows (argc, argv); 541 create_windows (argc, argv);
536 542
537 dDisp; 543 dDisp;
538 544
539 init_xlocale (); 545 init_xlocale ();
540 546
541 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
542 548
543#if 0 549#if 0
544 XSynchronize (disp, True); 550 XSynchronize (disp, True);
545#endif 551#endif
546 552
547#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
548 if (OPTION (Opt_scrollBar)) 554 if (OPTION (Opt_scrollBar))
549 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
550#endif 556#endif
551#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
552 if (menubar_visible ()) 558 if (menubar_visible ())
553 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
554#endif 560#endif
555#ifdef TRANSPARENT 561#ifdef TRANSPARENT
556 if (OPTION (Opt_transparent)) 562 if (OPTION (Opt_transparent))
557 { 563 {
558 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
559 check_our_parents (); 565 check_our_parents ();
560 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
561 } 567 }
562#endif 568#endif
563 569
564 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
565 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
566 572
567 set_colorfgbg (); 573 set_colorfgbg ();
568 574
569 init_command (cmd_argv); 575 init_command (cmd_argv);
570 576
571 free (cmd_argv); 577 free (cmd_argv);
572 578
573 if (pty.pty >= 0) 579 if (pty.pty >= 0)
574 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
575 581
576 check_ev.start (); 582 check_ev.start ();
577 583
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
579 586
580 return true; 587 return true;
581} 588}
582 589
583static struct sig_handlers 590static struct sig_handlers
… …
645 652
646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
647 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
648 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
649 656
650#ifdef USE_XGETDEFAULT
651 XrmInitialize (); 657 XrmInitialize ();
652#endif
653} 658}
654 659
655/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
656 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
657 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
708 case IGNORE: 713 case IGNORE:
709 /* 714 /*
710 * 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
711 * back to root later, as required 716 * back to root later, as required
712 */ 717 */
718 setegid (getgid ());
713 seteuid (getuid ()); 719 seteuid (getuid ());
714 setegid (getgid ());
715 break; 720 break;
716 case SAVE: 721 case SAVE:
722 saved_egid = getegid ();
717 saved_euid = geteuid (); 723 saved_euid = geteuid ();
718 saved_egid = getegid ();
719 break; 724 break;
720 case RESTORE: 725 case RESTORE:
726 setegid (saved_egid);
721 seteuid (saved_euid); 727 seteuid (saved_euid);
722 setegid (saved_egid);
723 break; 728 break;
724 } 729 }
725# else 730# else
726 switch (action) 731 switch (action)
727 { 732 {
728 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
729 setuid (getuid ()); 735 setuid (getuid ());
730 setgid (getgid ());
731 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
732 case SAVE: 737 case SAVE:
733 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
734 case RESTORE: 739 case RESTORE:
735 break; 740 break;
… …
1451 unsigned long fg, bg; 1456 unsigned long fg, bg;
1452 const char *p; 1457 const char *p;
1453 char **s; 1458 char **s;
1454 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1455 1460
1461 TEMP_ENV;
1462
1456 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1457 return false; 1464 return false;
1458 1465
1459 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1460 input_method = display->get_xim (locale, modifiers); 1467 input_method = display->get_xim (locale, modifiers);

Diff Legend

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