| … | |
… | |
| 294 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
294 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
| 295 | |
295 | |
| 296 | cmd_argv[i] = NULL; |
296 | cmd_argv[i] = NULL; |
| 297 | } |
297 | } |
| 298 | |
298 | |
| 299 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
299 | rs[Rs_name] = rxvt_basename (argv[0]); |
| 300 | |
300 | |
| 301 | /* |
301 | /* |
| 302 | * Open display, get options/resources and create the window |
302 | * Open display, get options/resources and create the window |
| 303 | */ |
303 | */ |
| 304 | |
304 | |
| … | |
… | |
| 347 | * set any defaults not already set |
347 | * set any defaults not already set |
| 348 | */ |
348 | */ |
| 349 | if (cmd_argv && cmd_argv[0]) |
349 | if (cmd_argv && cmd_argv[0]) |
| 350 | { |
350 | { |
| 351 | if (!rs[Rs_title]) |
351 | if (!rs[Rs_title]) |
| 352 | rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); |
352 | rs[Rs_title] = rxvt_basename (cmd_argv[0]); |
| 353 | if (!rs[Rs_iconName]) |
353 | if (!rs[Rs_iconName]) |
| 354 | rs[Rs_iconName] = rs[Rs_title]; |
354 | rs[Rs_iconName] = rs[Rs_title]; |
| 355 | } |
355 | } |
| 356 | else |
356 | else |
| 357 | { |
357 | { |
| … | |
… | |
| 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); |
| … | |
… | |
| 1395 | const char *argv0, *shell; |
1386 | const char *argv0, *shell; |
| 1396 | |
1387 | |
| 1397 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1388 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
| 1398 | shell = "/bin/sh"; |
1389 | shell = "/bin/sh"; |
| 1399 | |
1390 | |
| 1400 | argv0 = (const char *)rxvt_r_basename (shell); |
1391 | argv0 = (const char *)rxvt_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 | } |
