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.320 by sf-exg, Thu Jan 19 15:08:55 2012 UTC vs.
Revision 1.327 by root, Mon Jun 4 15:18:52 2012 UTC

… …
76#include <netinet/in.h> 76#include <netinet/in.h>
77#include <arpa/inet.h> 77#include <arpa/inet.h>
78#include <net/if.h> 78#include <net/if.h>
79#include <net/if_arp.h> 79#include <net/if_arp.h>
80 80
81static char * 81static char * ecb_cold
82rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
83{ 83{
84 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
85 struct ifconf ifc; 85 struct ifconf ifc;
86 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
791 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 793
794 pty = ptytty::create (); 794 pty = ptytty::create ();
795 795
796#ifdef HAVE_AFTERIMAGE
797 set_application_name ((char *)rs[Rs_name]);
798 set_output_threshold (OUTPUT_LEVEL_WARNING);
799#endif
800
801 // must be called before create_windows, because the latter may call set_icon
802#ifdef HAVE_PIXBUF
803 g_type_init ();
804#endif
805
806 create_windows (argc, argv); 796 create_windows (argc, argv);
807 797
808 init_xlocale (); 798 init_xlocale ();
809 799
810 scr_poweron (); // initialize screen 800 scr_poweron (); // initialize screen
… …
817 scrollBar.resize (); /* create and map scrollbar */ 807 scrollBar.resize (); /* create and map scrollbar */
818#ifdef HAVE_BG_PIXMAP 808#ifdef HAVE_BG_PIXMAP
819 { 809 {
820 bg_init (); 810 bg_init ();
821 811
822#ifdef ENABLE_TRANSPARENCY 812#if ENABLE_TRANSPARENCY
823 if (option (Opt_transparent)) 813 if (option (Opt_transparent))
824 { 814 {
825 bg_set_transparent (); 815 bg_set_transparent ();
826 816
827 if (rs [Rs_blurradius]) 817 if (rs [Rs_blurradius])
828 bg_set_blur (rs [Rs_blurradius]); 818 root_effects.set_blur (rs [Rs_blurradius]);
829 819
830 if (ISSET_PIXCOLOR (Color_tint)) 820 if (ISSET_PIXCOLOR (Color_tint))
831 bg_set_tint (pix_colors_focused [Color_tint]); 821 root_effects.set_tint (pix_colors_focused [Color_tint]);
832 822
833 if (rs [Rs_shade]) 823 if (rs [Rs_shade])
834 bg_set_shade (rs [Rs_shade]); 824 root_effects.set_shade (rs [Rs_shade]);
835 825
836 bg_set_root_pixmap (); 826 bg_set_root_pixmap ();
837 XSelectInput (dpy, display->root, PropertyChangeMask); 827 XSelectInput (dpy, display->root, PropertyChangeMask);
838 rootwin_ev.start (display, display->root); 828 rootwin_ev.start (display, display->root);
839 } 829 }
840#endif
841
842#ifdef BG_IMAGE_FROM_FILE
843 if (rs[Rs_backgroundPixmap])
844 if (bg_set_file (rs[Rs_backgroundPixmap]))
845 if (!bg_window_position_sensitive ())
846 update_background ();
847#endif 830#endif
848 } 831 }
849#endif 832#endif
850 833
851#if ENABLE_PERL 834#if ENABLE_PERL
… …
1021void 1004void
1022rxvt_term::init_xlocale () 1005rxvt_term::init_xlocale ()
1023{ 1006{
1024 set_environ (envv); 1007 set_environ (envv);
1025 1008
1026#ifdef USE_XIM 1009#if USE_XIM
1027 if (!locale) 1010 if (!locale)
1028 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 1012 else
1030 { 1013 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1294} 1277}
1295 1278
1296void 1279void
1297rxvt_term::set_icon (const char *file) 1280rxvt_term::set_icon (const char *file)
1298{ 1281{
1299#ifdef HAVE_AFTERIMAGE
1300 init_asv ();
1301
1302 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1303 if (!im)
1304 {
1305 rxvt_warn ("Loading image icon failed, continuing without.\n");
1306 return;
1307 }
1308
1309 unsigned int w = im->width;
1310 unsigned int h = im->height;
1311
1312 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1313 {
1314 rxvt_warn ("Icon image too big, continuing without.\n");
1315 destroy_asimage (&im);
1316 return;
1317 }
1318
1319 ASImage *result = scale_asimage (asv, im,
1320 w, h, ASA_ARGB32,
1321 100, ASIMAGE_QUALITY_DEFAULT);
1322 destroy_asimage (&im);
1323
1324 if (!result)
1325 {
1326 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1327 return;
1328 }
1329
1330 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1331 if (buffer)
1332 {
1333 ARGB32 *asbuf = result->alt.argb32;
1334 buffer [0] = w;
1335 buffer [1] = h;
1336
1337 for (unsigned int i = 0; i < w * h; ++i)
1338 buffer [i + 2] = asbuf [i];
1339
1340 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1341 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1342 free (buffer);
1343 }
1344 else
1345 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1346
1347 destroy_asimage (&result);
1348#endif
1349
1350#ifdef HAVE_PIXBUF 1282#if HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf) 1284 if (!pixbuf)
1353 { 1285 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return; 1287 return;

Diff Legend

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