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.286 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.290 by sf-exg, Mon Jan 3 10:32:08 2011 UTC

890 890
891/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
892void 892void
893rxvt_term::init_env () 893rxvt_term::init_env ()
894{ 894{
895 int i;
896 char *val; 895 char *val;
897 896
898#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
899 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
900 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
914 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
915 914
916 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
917 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
918 917
919 i = strlen (val);
920 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
921 919
922 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
923 921
924 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
925 923
1507#if ENABLE_EWMH 1505#if ENABLE_EWMH
1508 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
1509#endif 1507#endif
1510 }; 1508 };
1511 1509
1512 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1513 1511
1514#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
1515 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
1516 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1517#endif 1515#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines