ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.206 by ayin, Mon Aug 13 07:17:48 2007 UTC vs.
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC

… …
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
… …
482/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
483void 474void
484rxvt_term::init_env () 475rxvt_term::init_env ()
485{ 476{
486 int i; 477 int i;
487 unsigned int u;
488 char *val; 478 char *val;
489 479
490#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
491 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
492 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
507 497
508 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
509 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
510 500
511 i = strlen (val); 501 i = strlen (val);
512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
513 503
514 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
515 505
516 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
517 507
… …
538 else 528 else
539 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
540 530
541 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
542 { 532 {
543 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);
544 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
545 putenv (env_term); 535 putenv (env_term);
546 } 536 }
547 else 537 else
548 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
1400 1390
1401 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_r_basename (shell);
1402 1392
1403 if (option (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1404 { 1394 {
1405 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1406 1396
1407 login[0] = '-'; 1397 login[0] = '-';
1408 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1409 argv0 = login; 1399 argv0 = login;
1410 } 1400 }

Diff Legend

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