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.281 by sf-exg, Sun Aug 29 18:12:55 2010 UTC vs.
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
627 632
628 for (int i = NUM_RESOURCES; i--; ) 633 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 634 if (rs [i] == resval_undef)
630 rs [i] = 0; 635 rs [i] = 0;
631 636
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#if ENABLE_PERL 637#if ENABLE_PERL
638 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
639 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
640 640
641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
644 { 644 {
645 rxvt_perl.init (this); 645 rxvt_perl.init (this);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 646 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 647 }
648#endif 648#endif
649
650 // must be called after initialising the perl interpreter as it
651 // may invoke the `on_register_command' hook
652 extract_keysym_resources ();
649 653
650 /* 654 /*
651 * set any defaults not already set 655 * set any defaults not already set
652 */ 656 */
653 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
… …
789 if (chdir (path)) 793 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 } 795 }
792 796
793 if (option (Opt_scrollBar)) 797 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 799
796 pty = ptytty::create (); 800 pty = ptytty::create ();
801
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
797 811
798 create_windows (argc, argv); 812 create_windows (argc, argv);
799 813
800 init_xlocale (); 814 init_xlocale ();
801 815
… …
807 821
808 if (option (Opt_scrollBar)) 822 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 823 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP 824#ifdef HAVE_BG_PIXMAP
811 { 825 {
812 bgPixmap.set_target (this); 826 bg_init ();
813 bgPixmap.invalidate ();
814 827
815#ifdef ENABLE_TRANSPARENCY 828#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent)) 829 if (option (Opt_transparent))
817 { 830 {
818 bgPixmap.set_transparent (); 831 bg_set_transparent ();
819 832
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius]) 833 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 834 bg_set_blur (rs [Rs_blurradius]);
823#endif 835
824 if (ISSET_PIXCOLOR (Color_tint)) 836 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 837 bg_set_tint (pix_colors_focused [Color_tint]);
826 838
827 if (rs [Rs_shade]) 839 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 840 bg_set_shade (rs [Rs_shade]);
829 841
830 bgPixmap.set_root_pixmap (); 842 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 843 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 844 rootwin_ev.start (display, display->root);
833 } 845 }
834#endif 846#endif
835 847
836#ifdef BG_IMAGE_FROM_FILE 848#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 849 if (rs[Rs_backgroundPixmap])
838 { 850 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 851 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 852 if (!bg_window_position_sensitive ())
851 update_background (); 853 update_background ();
852 } 854 }
853#endif 855#endif
854 } 856 }
855#endif 857#endif
… …
872#if ENABLE_XEMBED 874#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 875 if (rs[Rs_embed])
874 { 876 {
875 long info[2] = { 0, XEMBED_MAPPED }; 877 long info[2] = { 0, XEMBED_MAPPED };
876 878
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 880 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 881 }
880#endif 882#endif
881 883
884#if HAVE_STARTUP_NOTIFICATION
885 SnDisplay *snDisplay;
886 SnLauncheeContext *snContext;
887
888 snDisplay = sn_display_new (dpy, NULL, NULL);
889 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
890
891 /* Tell the window manager that this window is part of the startup context */
892 if (snContext)
893 sn_launchee_context_setup_window (snContext, parent);
894#endif
895
882 XMapWindow (dpy, vt); 896 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 897 XMapWindow (dpy, parent);
898
899#if HAVE_STARTUP_NOTIFICATION
900 if (snContext)
901 {
902 /* Mark the startup process as complete */
903 sn_launchee_context_complete (snContext);
904
905 sn_launchee_context_unref (snContext);
906 }
907
908 sn_display_unref (snDisplay);
909#endif
884 910
885 refresh_check (); 911 refresh_check ();
886} 912}
887 913
888/*----------------------------------------------------------------------*/ 914/*----------------------------------------------------------------------*/
889void 915void
890rxvt_term::init_env () 916rxvt_term::init_env ()
891{ 917{
892 int i;
893 char *val; 918 char *val;
894 919
895#ifdef DISPLAY_IS_IP 920#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 921 /* Fixup display_name for export over pty to any interested terminal
897 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 922 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
911 val = XDisplayString (dpy); 936 val = XDisplayString (dpy);
912 937
913 if (rs[Rs_display_name] == NULL) 938 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 939 rs[Rs_display_name] = val; /* use broken `:0' value */
915 940
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 941 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 942
919 sprintf (env_display, "DISPLAY=%s", val); 943 sprintf (env_display, "DISPLAY=%s", val);
920 944
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 946
923 /* add entries to the environment: 947 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 948 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 949 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 950 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1323 buffer [1] = h; 1347 buffer [1] = h;
1324 1348
1325 for (unsigned int i = 0; i < w * h; ++i) 1349 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i]; 1350 buffer [i + 2] = asbuf [i];
1327 1351
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1354 free (buffer);
1331 } 1355 }
1332 else 1356 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334 1358
1335 destroy_asimage (&result); 1359 destroy_asimage (&result);
1336#endif 1360#endif
1361
1362#ifdef HAVE_PIXBUF
1363 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1364 if (!pixbuf)
1365 {
1366 rxvt_warn ("Loading image icon failed, continuing without.\n");
1367 return;
1368 }
1369
1370 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1371 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1372
1373 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1374 {
1375 rxvt_warn ("Icon image too big, continuing without.\n");
1376 g_object_unref (pixbuf);
1377 return;
1378 }
1379
1380 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1381 {
1382 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1383 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1384 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1385
1386 buffer [0] = w;
1387 buffer [1] = h;
1388 for (int i = 0; i < h; i++)
1389 {
1390 for (int j = 0; j < w; j++)
1391 {
1392 unsigned char *pixel = row + j * channels;
1393 long value;
1394
1395 if (channels == 4)
1396 value = pixel[3];
1397 else
1398 value = (unsigned char)0x00ff;
1399
1400 value = (value << 8) + pixel[0];
1401 value = (value << 8) + pixel[1];
1402 value = (value << 8) + pixel[2];
1403 buffer[(i * w + j) + 2] = value;
1404 }
1405
1406 row += rowstride;
1407 }
1408
1409 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1410 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1411 free (buffer);
1412 }
1413 else
1414 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1415
1416 g_object_unref (pixbuf);
1417#endif
1337} 1418}
1338 1419
1339/*----------------------------------------------------------------------*/ 1420/*----------------------------------------------------------------------*/
1340/* rxvt_Create_Windows () - Open and map the window */ 1421/* Open and map the window */
1341void 1422void
1342rxvt_term::create_windows (int argc, const char *const *argv) 1423rxvt_term::create_windows (int argc, const char *const *argv)
1343{ 1424{
1344 XClassHint classHint; 1425 XClassHint classHint;
1345 XWMHints wmHint; 1426 XWMHints wmHint;
… …
1391 } 1472 }
1392#endif 1473#endif
1393 1474
1394 window_calc (0, 0); 1475 window_calc (0, 0);
1395 1476
1396 /* sub-window placement & size in rxvt_resize_subwindows () */ 1477 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1397 attributes.background_pixel = pix_colors_focused [Color_border]; 1478 attributes.background_pixel = pix_colors_focused [Color_border];
1398 attributes.border_pixel = pix_colors_focused [Color_border]; 1479 attributes.border_pixel = pix_colors_focused [Color_border];
1399 attributes.colormap = cmap; 1480 attributes.colormap = cmap;
1400 1481
1401 top = XCreateWindow (dpy, parent, 1482 top = XCreateWindow (dpy, parent,
… …
1404 ext_bwidth, 1485 ext_bwidth,
1405 depth, InputOutput, visual, 1486 depth, InputOutput, visual,
1406 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1407 &attributes); 1488 &attributes);
1408 1489
1409 this->parent[0] = top; 1490 this->parent = top;
1410 1491
1411 old_width = szHint.width; 1492 old_width = szHint.width;
1412 old_height = szHint.height; 1493 old_height = szHint.height;
1413 1494
1414 set_title (rs [Rs_title]); 1495 set_title (rs [Rs_title]);
… …
1447#if ENABLE_EWMH 1528#if ENABLE_EWMH
1448 xa[XA_NET_WM_PING], 1529 xa[XA_NET_WM_PING],
1449#endif 1530#endif
1450 }; 1531 };
1451 1532
1452 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1533 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1453 1534
1454#if ENABLE_FRILLS 1535#if ENABLE_FRILLS
1455 if (rs[Rs_transient_for]) 1536 if (rs[Rs_transient_for])
1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1537 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457#endif 1538#endif

Diff Legend

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