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.315 by sf-exg, Mon Jan 9 15:34:56 2012 UTC vs.
Revision 1.316 by sf-exg, Mon Jan 9 15:45:45 2012 UTC

852 852
853#if ENABLE_PERL 853#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
855#endif 855#endif
856 856
857 set_colorfgbg ();
858 init_done = 1; 857 init_done = 1;
859 858
860 init_command (cmd_argv); 859 init_command (cmd_argv);
861 860
862 if (pty->pty >= 0) 861 if (pty->pty >= 0)
908void 907void
909rxvt_term::init_env () 908rxvt_term::init_env ()
910{ 909{
911 char *val; 910 char *val;
912 char *env_display; 911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
913 char *env_term; 914 char *env_term;
914 915
915#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 918 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
935 936
936 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
937 938
938 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
939 940
941 env_windowid = (char *)rxvt_malloc (21);
940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
941 943
942 /* add entries to the environment: 944 /* add entries to the environment:
943 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
944 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
948 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
949 */ 951 */
950 putenv (env_display); 952 putenv (env_display);
951 putenv (env_windowid); 953 putenv (env_windowid);
952 954
953 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
954 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
955 957
956#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
957 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
958#endif 960#endif
959 961

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines