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.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.287 by sf-exg, Sat Dec 18 14:00:43 2010 UTC

143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
634 set_output_threshold (OUTPUT_LEVEL_WARNING); 634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif 635#endif
636 636
637#ifdef HAVE_PIXBUF 637#ifdef HAVE_PIXBUF
638 g_type_init (); 638 g_type_init ();
639 gdk_pixbuf_xlib_init (dpy, display->screen);
640#endif 639#endif
641 640
642#if ENABLE_PERL 641#if ENABLE_PERL
643 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
644 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
891 890
892/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
893void 892void
894rxvt_term::init_env () 893rxvt_term::init_env ()
895{ 894{
896 int i;
897 char *val; 895 char *val;
898 896
899#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
900 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
901 * 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
915 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
916 914
917 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
918 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
919 917
920 i = strlen (val);
921 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
922 919
923 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
924 921
925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
926 923

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines