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.284 by sf-exg, Fri Oct 15 21:59:25 2010 UTC vs.
Revision 1.289 by root, Mon Jan 3 03:05:47 2011 UTC

… …
60#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 62#include <sys/types.h>
63#include <sys/socket.h> 63#include <sys/socket.h>
64 64
65/* these next two are probably only on Sun (not Solaris) */ 65/* these next is probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H 66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h> 67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif 68#endif
72 69
73#include <netinet/in.h> 70#include <netinet/in.h>
74#include <arpa/inet.h> 71#include <arpa/inet.h>
75#include <net/if.h> 72#include <net/if.h>
… …
143 140
144 return rval; 141 return rval;
145} 142}
146#endif 143#endif
147 144
148const char *const def_colorName[] = 145static const char *const def_colorName[] =
149 { 146 {
150 COLOR_FOREGROUND, 147 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 148 COLOR_BACKGROUND,
152 /* low-intensity colors */ 149 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 150 "rgb:00/00/00", // 0: black (Black)
… …
634 set_output_threshold (OUTPUT_LEVEL_WARNING); 631 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif 632#endif
636 633
637#ifdef HAVE_PIXBUF 634#ifdef HAVE_PIXBUF
638 g_type_init (); 635 g_type_init ();
639 gdk_pixbuf_xlib_init_with_depth (dpy, display->screen, depth);
640#endif 636#endif
641 637
642#if ENABLE_PERL 638#if ENABLE_PERL
643 if (!rs[Rs_perl_ext_1]) 639 if (!rs[Rs_perl_ext_1])
644 rs[Rs_perl_ext_1] = "default"; 640 rs[Rs_perl_ext_1] = "default";
… …
891 887
892/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
893void 889void
894rxvt_term::init_env () 890rxvt_term::init_env ()
895{ 891{
896 int i;
897 char *val; 892 char *val;
898 893
899#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
900 /* Fixup display_name for export over pty to any interested terminal 895 /* 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 896 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
915 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
916 911
917 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
918 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
919 914
920 i = strlen (val);
921 env_display = (char *)rxvt_malloc (i + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
922 916
923 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
924 918
925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
926 920
… …
1508#if ENABLE_EWMH 1502#if ENABLE_EWMH
1509 xa[XA_NET_WM_PING], 1503 xa[XA_NET_WM_PING],
1510#endif 1504#endif
1511 }; 1505 };
1512 1506
1513 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1514 1508
1515#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
1516 if (rs[Rs_transient_for]) 1510 if (rs[Rs_transient_for])
1517 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1518#endif 1512#endif

Diff Legend

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