… | |
… | |
143 | |
143 | |
144 | return rval; |
144 | return rval; |
145 | } |
145 | } |
146 | #endif |
146 | #endif |
147 | |
147 | |
148 | const char *const def_colorName[] = |
148 | static 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) |
… | |
… | |
812 | if (option (Opt_scrollBar)) |
812 | if (option (Opt_scrollBar)) |
813 | scrollBar.resize (); /* create and map scrollbar */ |
813 | scrollBar.resize (); /* create and map scrollbar */ |
814 | #ifdef HAVE_BG_PIXMAP |
814 | #ifdef HAVE_BG_PIXMAP |
815 | { |
815 | { |
816 | bgPixmap.set_target (this); |
816 | bgPixmap.set_target (this); |
817 | bgPixmap.invalidate (); |
|
|
818 | |
817 | |
819 | #ifdef ENABLE_TRANSPARENCY |
818 | #ifdef ENABLE_TRANSPARENCY |
820 | if (option (Opt_transparent)) |
819 | if (option (Opt_transparent)) |
821 | { |
820 | { |
822 | bgPixmap.set_transparent (); |
821 | bgPixmap.set_transparent (); |
… | |
… | |
890 | |
889 | |
891 | /*----------------------------------------------------------------------*/ |
890 | /*----------------------------------------------------------------------*/ |
892 | void |
891 | void |
893 | rxvt_term::init_env () |
892 | rxvt_term::init_env () |
894 | { |
893 | { |
895 | int i; |
|
|
896 | char *val; |
894 | char *val; |
897 | |
895 | |
898 | #ifdef DISPLAY_IS_IP |
896 | #ifdef DISPLAY_IS_IP |
899 | /* Fixup display_name for export over pty to any interested terminal |
897 | /* 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 |
898 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
… | |
… | |
914 | val = XDisplayString (dpy); |
912 | val = XDisplayString (dpy); |
915 | |
913 | |
916 | if (rs[Rs_display_name] == NULL) |
914 | if (rs[Rs_display_name] == NULL) |
917 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
915 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
918 | |
916 | |
919 | i = strlen (val); |
|
|
920 | env_display = (char *)rxvt_malloc (i + 9); |
917 | env_display = (char *)rxvt_malloc (strlen (val) + 9); |
921 | |
918 | |
922 | sprintf (env_display, "DISPLAY=%s", val); |
919 | sprintf (env_display, "DISPLAY=%s", val); |
923 | |
920 | |
924 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
921 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
925 | |
922 | |
… | |
… | |
1507 | #if ENABLE_EWMH |
1504 | #if ENABLE_EWMH |
1508 | xa[XA_NET_WM_PING], |
1505 | xa[XA_NET_WM_PING], |
1509 | #endif |
1506 | #endif |
1510 | }; |
1507 | }; |
1511 | |
1508 | |
1512 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1509 | XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); |
1513 | |
1510 | |
1514 | #if ENABLE_FRILLS |
1511 | #if ENABLE_FRILLS |
1515 | if (rs[Rs_transient_for]) |
1512 | if (rs[Rs_transient_for]) |
1516 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1513 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1517 | #endif |
1514 | #endif |