… | |
… | |
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 | /*----------------------------------------------------------------------*/ |
480 | bool |
479 | bool |
481 | rxvt_term::init (int argc, const char *const *argv) |
480 | rxvt_term::init (int argc, const char *const *argv) |
482 | { |
481 | { |
483 | SET_R (this); |
482 | SET_R (this); |
484 | TEMP_ENV; // few things in X do not call setlocale :( |
483 | set_environ (envv); // few things in X do not call setlocale :( |
485 | |
484 | |
486 | set_locale (""); |
485 | set_locale (""); |
487 | |
486 | |
488 | if (!init_vars ()) |
487 | if (!init_vars ()) |
489 | return false; |
488 | return false; |
… | |
… | |
524 | rs[Rs_perl_eval] = 0; |
523 | rs[Rs_perl_eval] = 0; |
525 | } |
524 | } |
526 | } |
525 | } |
527 | #endif |
526 | #endif |
528 | rxvt_perl.init (); |
527 | rxvt_perl.init (); |
|
|
528 | setlocale (LC_CTYPE, curlocale); // perl init destroys current locale |
529 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
529 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
530 | } |
530 | } |
531 | #endif |
531 | #endif |
532 | |
532 | |
533 | create_windows (argc, argv); |
533 | create_windows (argc, argv); |
… | |
… | |
616 | sw_int (this, &sig_handlers::sig_term) |
616 | sw_int (this, &sig_handlers::sig_term) |
617 | { |
617 | { |
618 | } |
618 | } |
619 | } sig_handlers; |
619 | } sig_handlers; |
620 | |
620 | |
|
|
621 | char **rxvt_environ; // startup environment |
|
|
622 | |
621 | void |
623 | void |
622 | rxvt_init () |
624 | rxvt_init () |
623 | { |
625 | { |
|
|
626 | rxvt_environ = environ; |
|
|
627 | |
624 | /* |
628 | /* |
625 | * Save and then give up any super-user privileges |
629 | * Save and then give up any super-user privileges |
626 | * If we need privileges in any area then we must specifically request it. |
630 | * If we need privileges in any area then we must specifically request it. |
627 | * We should only need to be root in these cases: |
631 | * We should only need to be root in these cases: |
628 | * 1. write utmp entries on some systems |
632 | * 1. write utmp entries on some systems |
… | |
… | |
704 | case IGNORE: |
708 | case IGNORE: |
705 | /* |
709 | /* |
706 | * change effective uid/gid - not real uid/gid - so we can switch |
710 | * change effective uid/gid - not real uid/gid - so we can switch |
707 | * back to root later, as required |
711 | * back to root later, as required |
708 | */ |
712 | */ |
|
|
713 | setegid (getgid ()); |
709 | seteuid (getuid ()); |
714 | seteuid (getuid ()); |
710 | setegid (getgid ()); |
|
|
711 | break; |
715 | break; |
712 | case SAVE: |
716 | case SAVE: |
|
|
717 | saved_egid = getegid (); |
713 | saved_euid = geteuid (); |
718 | saved_euid = geteuid (); |
714 | saved_egid = getegid (); |
|
|
715 | break; |
719 | break; |
716 | case RESTORE: |
720 | case RESTORE: |
|
|
721 | setegid (saved_egid); |
717 | seteuid (saved_euid); |
722 | seteuid (saved_euid); |
718 | setegid (saved_egid); |
|
|
719 | break; |
723 | break; |
720 | } |
724 | } |
721 | # else |
725 | # else |
722 | switch (action) |
726 | switch (action) |
723 | { |
727 | { |
724 | case IGNORE: |
728 | case IGNORE: |
|
|
729 | setgid (getgid ()); |
725 | setuid (getuid ()); |
730 | setuid (getuid ()); |
726 | setgid (getgid ()); |
|
|
727 | /* FALLTHROUGH */ |
731 | /* FALLTHROUGH */ |
728 | case SAVE: |
732 | case SAVE: |
729 | /* FALLTHROUGH */ |
733 | /* FALLTHROUGH */ |
730 | case RESTORE: |
734 | case RESTORE: |
731 | break; |
735 | break; |
… | |
… | |
1447 | unsigned long fg, bg; |
1451 | unsigned long fg, bg; |
1448 | const char *p; |
1452 | const char *p; |
1449 | char **s; |
1453 | char **s; |
1450 | XIMStyles *xim_styles; |
1454 | XIMStyles *xim_styles; |
1451 | |
1455 | |
1452 | TEMP_ENV; |
1456 | set_environ (envv); |
1453 | |
1457 | |
1454 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1458 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1455 | return false; |
1459 | return false; |
1456 | |
1460 | |
1457 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1461 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |