… | |
… | |
402 | key_backspace = "DEC"; /* can toggle between \010 or \177 */ |
402 | key_backspace = "DEC"; /* can toggle between \010 or \177 */ |
403 | # endif |
403 | # endif |
404 | else |
404 | else |
405 | { |
405 | { |
406 | val = strdup (rs[Rs_backspace_key]); |
406 | val = strdup (rs[Rs_backspace_key]); |
407 | rxvt_Str_trim (val); |
|
|
408 | rxvt_Str_escaped (val); |
|
|
409 | key_backspace = val; |
407 | key_backspace = val; |
410 | } |
408 | } |
411 | #endif |
409 | #endif |
412 | |
410 | |
413 | #ifndef NO_DELETE_KEY |
411 | #ifndef NO_DELETE_KEY |
… | |
… | |
418 | key_delete = "\033[3~"; |
416 | key_delete = "\033[3~"; |
419 | # endif |
417 | # endif |
420 | else |
418 | else |
421 | { |
419 | { |
422 | val = strdup (rs[Rs_delete_key]); |
420 | val = strdup (rs[Rs_delete_key]); |
423 | rxvt_Str_trim (val); |
|
|
424 | rxvt_Str_escaped (val); |
|
|
425 | key_delete = val; |
421 | key_delete = val; |
426 | } |
422 | } |
427 | #endif |
423 | #endif |
428 | if (rs[Rs_answerbackstring]) |
|
|
429 | { |
|
|
430 | rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); |
|
|
431 | rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); |
|
|
432 | } |
|
|
433 | |
424 | |
434 | #ifdef HAVE_SCROLLBARS |
425 | #ifdef HAVE_SCROLLBARS |
435 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
426 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
436 | #endif |
427 | #endif |
437 | |
428 | |
… | |
… | |
506 | |
497 | |
507 | if (rs[Rs_display_name] == NULL) |
498 | if (rs[Rs_display_name] == NULL) |
508 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
499 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
509 | |
500 | |
510 | i = strlen (val); |
501 | i = strlen (val); |
511 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
502 | env_display = (char *)rxvt_malloc (i + 9); |
512 | |
503 | |
513 | sprintf (env_display, "DISPLAY=%s", val); |
504 | sprintf (env_display, "DISPLAY=%s", val); |
514 | |
505 | |
515 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
506 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
516 | |
507 | |
… | |
… | |
537 | else |
528 | else |
538 | putenv ("COLORTERM=" COLORTERMENVFULL); |
529 | putenv ("COLORTERM=" COLORTERMENVFULL); |
539 | |
530 | |
540 | if (rs[Rs_term_name] != NULL) |
531 | if (rs[Rs_term_name] != NULL) |
541 | { |
532 | { |
542 | env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); |
533 | env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); |
543 | sprintf (env_term, "TERM=%s", rs[Rs_term_name]); |
534 | sprintf (env_term, "TERM=%s", rs[Rs_term_name]); |
544 | putenv (env_term); |
535 | putenv (env_term); |
545 | } |
536 | } |
546 | else |
537 | else |
547 | putenv ("TERM=" TERMENV); |
538 | putenv ("TERM=" TERMENV); |
… | |
… | |
1399 | |
1390 | |
1400 | argv0 = (const char *)rxvt_r_basename (shell); |
1391 | argv0 = (const char *)rxvt_r_basename (shell); |
1401 | |
1392 | |
1402 | if (option (Opt_loginShell)) |
1393 | if (option (Opt_loginShell)) |
1403 | { |
1394 | { |
1404 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1395 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1405 | |
1396 | |
1406 | login[0] = '-'; |
1397 | login[0] = '-'; |
1407 | strcpy (&login[1], argv0); |
1398 | strcpy (&login[1], argv0); |
1408 | argv0 = login; |
1399 | argv0 = login; |
1409 | } |
1400 | } |