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.312 by sf-exg, Tue Dec 27 11:09:31 2011 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 2012 UTC

… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
793 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 793
796 pty = ptytty::create (); 794 pty = ptytty::create ();
797 795
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
808 create_windows (argc, argv); 796 create_windows (argc, argv);
809 797
810 init_xlocale (); 798 init_xlocale ();
811 799
812 scr_poweron (); // initialize screen 800 scr_poweron (); // initialize screen
… …
825 if (option (Opt_transparent)) 813 if (option (Opt_transparent))
826 { 814 {
827 bg_set_transparent (); 815 bg_set_transparent ();
828 816
829 if (rs [Rs_blurradius]) 817 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]); 818 root_effects.set_blur (rs [Rs_blurradius]);
831 819
832 if (ISSET_PIXCOLOR (Color_tint)) 820 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]); 821 root_effects.set_tint (pix_colors_focused [Color_tint]);
834 822
835 if (rs [Rs_shade]) 823 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]); 824 root_effects.set_shade (rs [Rs_shade]);
837 825
838 bg_set_root_pixmap (); 826 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask); 827 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root); 828 rootwin_ev.start (display, display->root);
841 } 829 }
842#endif 830#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 } 831 }
851#endif 832#endif
852 833
853#if ENABLE_PERL 834#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 835 rootwin_ev.start (display, display->root);
855#endif 836#endif
856 837
857 set_colorfgbg (); 838 init_done = 1;
858 839
859 init_command (cmd_argv); 840 init_command (cmd_argv);
860 841
861 if (pty->pty >= 0) 842 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 843 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
907void 888void
908rxvt_term::init_env () 889rxvt_term::init_env ()
909{ 890{
910 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
911 896
912#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
914 * 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 * (for the first non-loopback interface) that we get from 900 * (for the first non-loopback interface) that we get from
… …
932 917
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 919
935 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
936 921
922 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 924
939 /* add entries to the environment: 925 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
946 */ 932 */
947 putenv (env_display); 933 putenv (env_display);
948 putenv (env_windowid); 934 putenv (env_windowid);
949 935
950 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
952 938
953#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 941#endif
956 942
… …
980void 966void
981rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
982{ 968{
983 set_environ (envv); 969 set_environ (envv);
984 970
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 971 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
988 973
989 if (!this->locale) 974 if (!this->locale)
990 { 975 {
… …
1001 986
1002 987
1003 this->locale = strdup (this->locale); 988 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
1005 mbstate.reset (); 990 mbstate.reset ();
1006#endif
1007 991
1008#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 993 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 994 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1188/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
1190void 1174void
1191rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
1192{ 1176{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1178 {
1195 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
1196 1180
1197 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1182 /* bright colors */
… …
1293} 1277}
1294 1278
1295void 1279void
1296rxvt_term::set_icon (const char *file) 1280rxvt_term::set_icon (const char *file)
1297{ 1281{
1298#ifdef HAVE_AFTERIMAGE
1299 init_asv ();
1300
1301 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1302 if (!im)
1303 {
1304 rxvt_warn ("Loading image icon failed, continuing without.\n");
1305 return;
1306 }
1307
1308 unsigned int w = im->width;
1309 unsigned int h = im->height;
1310
1311 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1312 {
1313 rxvt_warn ("Icon image too big, continuing without.\n");
1314 destroy_asimage (&im);
1315 return;
1316 }
1317
1318 ASImage *result = scale_asimage (asv, im,
1319 w, h, ASA_ARGB32,
1320 100, ASIMAGE_QUALITY_DEFAULT);
1321 destroy_asimage (&im);
1322
1323 if (!result)
1324 {
1325 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1326 return;
1327 }
1328
1329 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1330 if (buffer)
1331 {
1332 ARGB32 *asbuf = result->alt.argb32;
1333 buffer [0] = w;
1334 buffer [1] = h;
1335
1336 for (unsigned int i = 0; i < w * h; ++i)
1337 buffer [i + 2] = asbuf [i];
1338
1339 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1340 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1341 free (buffer);
1342 }
1343 else
1344 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1345
1346 destroy_asimage (&result);
1347#endif
1348
1349#ifdef HAVE_PIXBUF 1282#ifdef HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1284 if (!pixbuf)
1352 { 1285 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1408 &attributes);
1476 1409
1477 this->parent = top; 1410 this->parent = top;
1478 1411
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1412 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1413 set_icon_name (rs [Rs_iconName]);
1484 1414
1485 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
… …
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1549 1479
1550 /* the vt window */ 1480 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1553 width, height, 1483 vt_width, vt_height,
1554 0, 1484 0,
1555 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1557 1487
1558 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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