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.291 by sf-exg, Sun Jan 23 12:28:47 2011 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.
… …
53# endif 53# endif
54#endif 54#endif
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
58#endif 63#endif
59 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>
… …
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#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
640
641#if ENABLE_PERL 637#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
644 640
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
793 if (chdir (path)) 789 if (chdir (path))
794 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");
795 } 791 }
796 792
797 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 795
800 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
801 807
802 create_windows (argc, argv); 808 create_windows (argc, argv);
803 809
804 init_xlocale (); 810 init_xlocale ();
805 811
… …
811 817
812 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
815 { 821 {
816 bgPixmap.set_target (this); 822 bg_init ();
817 823
818#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
819 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
820 { 826 {
821 bgPixmap.set_transparent (); 827 bg_set_transparent ();
822 828
823 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
824 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
825 831
826 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
827 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
828 834
829 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
830 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
831 837
832 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
833 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
834 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
835 } 841 }
836#endif 842#endif
837 843
838#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
840 { 846 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bgPixmap.set_geometry (p);
847 }
848 else
849 bgPixmap.set_defaultGeometry ();
850
851 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 847 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bgPixmap.window_position_sensitive ()) 848 if (!bg_window_position_sensitive ())
853 update_background (); 849 update_background ();
854 } 850 }
855#endif 851#endif
856 } 852 }
857#endif 853#endif
… …
874#if ENABLE_XEMBED 870#if ENABLE_XEMBED
875 if (rs[Rs_embed]) 871 if (rs[Rs_embed])
876 { 872 {
877 long info[2] = { 0, XEMBED_MAPPED }; 873 long info[2] = { 0, XEMBED_MAPPED };
878 874
879 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 875 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 876 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 877 }
882#endif 878#endif
883 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
884 XMapWindow (dpy, vt); 892 XMapWindow (dpy, vt);
885 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
886 906
887 refresh_check (); 907 refresh_check ();
888} 908}
889 909
890/*----------------------------------------------------------------------*/ 910/*----------------------------------------------------------------------*/
… …
916 936
917 env_display = (char *)rxvt_malloc (strlen (val) + 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
… …
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");
… …
1380 } 1400 }
1381 1401
1382 row += rowstride; 1402 row += rowstride;
1383 } 1403 }
1384 1404
1385 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1405 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1406 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer); 1407 free (buffer);
1388 } 1408 }
1389 else 1409 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1410 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1392 g_object_unref (pixbuf); 1412 g_object_unref (pixbuf);
1393#endif 1413#endif
1394} 1414}
1395 1415
1396/*----------------------------------------------------------------------*/ 1416/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1417/* Open and map the window */
1398void 1418void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1419rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1420{
1401 XClassHint classHint; 1421 XClassHint classHint;
1402 XWMHints wmHint; 1422 XWMHints wmHint;
… …
1448 } 1468 }
1449#endif 1469#endif
1450 1470
1451 window_calc (0, 0); 1471 window_calc (0, 0);
1452 1472
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1473 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1474 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1475 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1476 attributes.colormap = cmap;
1457 1477
1458 top = XCreateWindow (dpy, parent, 1478 top = XCreateWindow (dpy, parent,
… …
1461 ext_bwidth, 1481 ext_bwidth,
1462 depth, InputOutput, visual, 1482 depth, InputOutput, visual,
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1483 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1484 &attributes);
1465 1485
1466 this->parent[0] = top; 1486 this->parent = top;
1467 1487
1468 old_width = szHint.width; 1488 old_width = szHint.width;
1469 old_height = szHint.height; 1489 old_height = szHint.height;
1470 1490
1471 set_title (rs [Rs_title]); 1491 set_title (rs [Rs_title]);
… …
1504#if ENABLE_EWMH 1524#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1525 xa[XA_NET_WM_PING],
1506#endif 1526#endif
1507 }; 1527 };
1508 1528
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1529 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1530
1511#if ENABLE_FRILLS 1531#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1532 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1533 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1534#endif

Diff Legend

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