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.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC vs.
Revision 1.301 by mikachu, Sun Nov 13 16:03:31 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])
… …
789 if (chdir (path)) 789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 } 791 }
792 792
793 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 795
796 pty = ptytty::create (); 796 pty = ptytty::create ();
797
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
797 807
798 create_windows (argc, argv); 808 create_windows (argc, argv);
799 809
800 init_xlocale (); 810 init_xlocale ();
801 811
… …
807 817
808 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
811 { 821 {
812 bgPixmap.set_target (this); 822 bg_init ();
813 bgPixmap.invalidate ();
814 823
815#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
817 { 826 {
818 bgPixmap.set_transparent (); 827 bg_set_transparent ();
819 828
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
823#endif 831
824 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
826 834
827 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
829 837
830 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
833 } 841 }
834#endif 842#endif
835 843
836#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
838 { 846 {
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])) 847 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 848 if (!bg_window_position_sensitive ())
851 update_background (); 849 update_background ();
852 } 850 }
853#endif 851#endif
854 } 852 }
855#endif 853#endif
… …
872#if ENABLE_XEMBED 870#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 871 if (rs[Rs_embed])
874 { 872 {
875 long info[2] = { 0, XEMBED_MAPPED }; 873 long info[2] = { 0, XEMBED_MAPPED };
876 874
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 875 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 876 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 877 }
880#endif 878#endif
881 879
880#if HAVE_STARTUP_NOTIFICATION
881 SnDisplay *snDisplay;
882 SnLauncheeContext *snContext;
883
884 snDisplay = sn_display_new (dpy, NULL, NULL);
885 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
886
887 /* Tell the window manager that this window is part of the startup context */
888 if (snContext)
889 sn_launchee_context_setup_window (snContext, parent);
890#endif
891
882 XMapWindow (dpy, vt); 892 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 893 XMapWindow (dpy, parent);
894
895#if HAVE_STARTUP_NOTIFICATION
896 if (snContext)
897 {
898 /* Mark the startup process as complete */
899 sn_launchee_context_complete (snContext);
900
901 sn_launchee_context_unref (snContext);
902 }
903
904 sn_display_unref (snDisplay);
905#endif
884 906
885 refresh_check (); 907 refresh_check ();
886} 908}
887 909
888/*----------------------------------------------------------------------*/ 910/*----------------------------------------------------------------------*/
889void 911void
890rxvt_term::init_env () 912rxvt_term::init_env ()
891{ 913{
892 int i;
893 char *val; 914 char *val;
894 915
895#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 917 /* 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 918 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
911 val = XDisplayString (dpy); 932 val = XDisplayString (dpy);
912 933
913 if (rs[Rs_display_name] == NULL) 934 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 935 rs[Rs_display_name] = val; /* use broken `:0' value */
915 936
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 938
919 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
920 940
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 942
923 /* add entries to the environment: 943 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 944 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 945 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 946 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1292 { 1312 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1313 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return; 1314 return;
1295 } 1315 }
1296 1316
1297 int w = im->width; 1317 unsigned int w = im->width;
1298 int h = im->height; 1318 unsigned int h = im->height;
1299 1319
1300 if (!IN_RANGE_INC (w, 1, 32767) || !IN_RANGE_INC (h, 1, 32767)) 1320 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1301 { 1321 {
1302 rxvt_warn ("Icon image too big, continuing without.\n"); 1322 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im); 1323 destroy_asimage (&im);
1304 return; 1324 return;
1305 } 1325 }
… …
1323 buffer [1] = h; 1343 buffer [1] = h;
1324 1344
1325 for (unsigned int i = 0; i < w * h; ++i) 1345 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i]; 1346 buffer [i + 2] = asbuf [i];
1327 1347
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1348 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1349 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1350 free (buffer);
1331 } 1351 }
1332 else 1352 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1353 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334 1354
1335 destroy_asimage (&result); 1355 destroy_asimage (&result);
1336#endif 1356#endif
1357
1358#ifdef HAVE_PIXBUF
1359 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1360 if (!pixbuf)
1361 {
1362 rxvt_warn ("Loading image icon failed, continuing without.\n");
1363 return;
1364 }
1365
1366 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1367 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1368
1369 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1370 {
1371 rxvt_warn ("Icon image too big, continuing without.\n");
1372 g_object_unref (pixbuf);
1373 return;
1374 }
1375
1376 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1377 {
1378 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1379 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1380 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1381
1382 buffer [0] = w;
1383 buffer [1] = h;
1384 for (int i = 0; i < h; i++)
1385 {
1386 for (int j = 0; j < w; j++)
1387 {
1388 unsigned char *pixel = row + j * channels;
1389 long value;
1390
1391 if (channels == 4)
1392 value = pixel[3];
1393 else
1394 value = (unsigned char)0x00ff;
1395
1396 value = (value << 8) + pixel[0];
1397 value = (value << 8) + pixel[1];
1398 value = (value << 8) + pixel[2];
1399 buffer[(i * w + j) + 2] = value;
1400 }
1401
1402 row += rowstride;
1403 }
1404
1405 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1406 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1407 free (buffer);
1408 }
1409 else
1410 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1411
1412 g_object_unref (pixbuf);
1413#endif
1337} 1414}
1338 1415
1339/*----------------------------------------------------------------------*/ 1416/*----------------------------------------------------------------------*/
1340/* rxvt_Create_Windows () - Open and map the window */ 1417/* Open and map the window */
1341void 1418void
1342rxvt_term::create_windows (int argc, const char *const *argv) 1419rxvt_term::create_windows (int argc, const char *const *argv)
1343{ 1420{
1344 XClassHint classHint; 1421 XClassHint classHint;
1345 XWMHints wmHint; 1422 XWMHints wmHint;
… …
1391 } 1468 }
1392#endif 1469#endif
1393 1470
1394 window_calc (0, 0); 1471 window_calc (0, 0);
1395 1472
1396 /* sub-window placement & size in rxvt_resize_subwindows () */ 1473 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1397 attributes.background_pixel = pix_colors_focused [Color_border]; 1474 attributes.background_pixel = pix_colors_focused [Color_border];
1398 attributes.border_pixel = pix_colors_focused [Color_border]; 1475 attributes.border_pixel = pix_colors_focused [Color_border];
1399 attributes.colormap = cmap; 1476 attributes.colormap = cmap;
1400 1477
1401 top = XCreateWindow (dpy, parent, 1478 top = XCreateWindow (dpy, parent,
… …
1404 ext_bwidth, 1481 ext_bwidth,
1405 depth, InputOutput, visual, 1482 depth, InputOutput, visual,
1406 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1483 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1407 &attributes); 1484 &attributes);
1408 1485
1409 this->parent[0] = top; 1486 this->parent = top;
1410 1487
1411 old_width = szHint.width; 1488 old_width = szHint.width;
1412 old_height = szHint.height; 1489 old_height = szHint.height;
1413 1490
1414 set_title (rs [Rs_title]); 1491 set_title (rs [Rs_title]);
… …
1447#if ENABLE_EWMH 1524#if ENABLE_EWMH
1448 xa[XA_NET_WM_PING], 1525 xa[XA_NET_WM_PING],
1449#endif 1526#endif
1450 }; 1527 };
1451 1528
1452 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1529 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1453 1530
1454#if ENABLE_FRILLS 1531#if ENABLE_FRILLS
1455 if (rs[Rs_transient_for]) 1532 if (rs[Rs_transient_for])
1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1533 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457#endif 1534#endif

Diff Legend

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