… | |
… | |
339 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
339 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
340 | |
340 | |
341 | /* |
341 | /* |
342 | * Open display, get options/resources and create the window |
342 | * Open display, get options/resources and create the window |
343 | */ |
343 | */ |
344 | { |
|
|
345 | TEMP_ENV; |
|
|
346 | |
344 | |
347 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
345 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
348 | rs[Rs_display_name] = ":0"; |
346 | rs[Rs_display_name] = ":0"; |
349 | |
347 | |
350 | get_options (r_argc, r_argv); |
348 | get_options (r_argc, r_argv); |
351 | |
349 | |
352 | if (!(display = displays.get (rs[Rs_display_name]))) |
350 | if (!(display = displays.get (rs[Rs_display_name]))) |
353 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
351 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
354 | } |
|
|
355 | |
352 | |
356 | extract_resources (); |
353 | extract_resources (); |
|
|
354 | |
357 | free (r_argv); |
355 | free (r_argv); |
358 | |
356 | |
359 | /* |
357 | /* |
360 | * set any defaults not already set |
358 | * set any defaults not already set |
361 | */ |
359 | */ |
… | |
… | |
580 | * This should support all European type languages. |
578 | * This should support all European type languages. |
581 | */ |
579 | */ |
582 | void |
580 | void |
583 | rxvt_term::set_locale (const char *locale) |
581 | rxvt_term::set_locale (const char *locale) |
584 | { |
582 | { |
585 | TEMP_ENV; |
583 | set_environ (envv); |
586 | |
584 | |
587 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
585 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
588 | free (this->locale); |
586 | free (this->locale); |
589 | this->locale = setlocale (LC_CTYPE, locale); |
587 | this->locale = setlocale (LC_CTYPE, locale); |
590 | |
588 | |
… | |
… | |
621 | } |
619 | } |
622 | |
620 | |
623 | void |
621 | void |
624 | rxvt_term::init_xlocale () |
622 | rxvt_term::init_xlocale () |
625 | { |
623 | { |
626 | TEMP_ENV; |
624 | set_environ (envv); |
627 | |
625 | |
628 | #ifdef USE_XIM |
626 | #ifdef USE_XIM |
629 | if (!locale) |
627 | if (!locale) |
630 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
628 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
631 | else |
629 | else |
… | |
… | |
1412 | * the slave. |
1410 | * the slave. |
1413 | */ |
1411 | */ |
1414 | void |
1412 | void |
1415 | rxvt_term::run_command (const char *const *argv) |
1413 | rxvt_term::run_command (const char *const *argv) |
1416 | { |
1414 | { |
1417 | TEMP_ENV; // not very temporary... |
|
|
1418 | |
|
|
1419 | #if ENABLE_FRILLS |
1415 | #if ENABLE_FRILLS |
1420 | if (rs[Rs_pty_fd]) |
1416 | if (rs[Rs_pty_fd]) |
1421 | { |
1417 | { |
1422 | pty.pty = atoi (rs[Rs_pty_fd]); |
1418 | pty.pty = atoi (rs[Rs_pty_fd]); |
1423 | |
1419 | |