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.314 by sf-exg, Mon Jan 9 15:30:17 2012 UTC vs.
Revision 1.317 by sf-exg, Mon Jan 9 21:12:08 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 (); 857 init_done = 1;
858 858
859 init_command (cmd_argv); 859 init_command (cmd_argv);
860 860
861 if (pty->pty >= 0) 861 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
907void 907void
908rxvt_term::init_env () 908rxvt_term::init_env ()
909{ 909{
910 char *val; 910 char *val;
911 char *env_display; 911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
912 char *env_term; 914 char *env_term;
913 915
914#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
916 * 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
934 936
935 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
936 938
937 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
938 940
941 env_windowid = (char *)rxvt_malloc (21);
939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
940 943
941 /* add entries to the environment: 944 /* add entries to the environment:
942 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
943 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
947 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
948 */ 951 */
949 putenv (env_display); 952 putenv (env_display);
950 putenv (env_windowid); 953 putenv (env_windowid);
951 954
952 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
953 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
954 957
955#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
956 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
957#endif 960#endif
958 961
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1548 1551
1549 /* the vt window */ 1552 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1552 width, height, 1555 vt_width, vt_height,
1553 0, 1556 0,
1554 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1556 1559
1557 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines