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.333 by mikachu, Tue Jul 29 13:50:05 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 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 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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;
… …
519#endif 519#endif
520 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
523#endif 523#endif
524#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
525 NULL, 525 NULL,
526#endif 526#endif
527#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 528 "rgb:00/00/00",
529#endif 529#endif
… …
588 xa = display->xa; 588 xa = display->xa;
589 589
590 set (display); 590 set (display);
591 extract_resources (); 591 extract_resources ();
592 592
593#if XFT 593#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 598#endif
597 599
598 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
600 rs [i] = 0; 602 rs [i] = 0;
… …
791 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 795
794 pty = ptytty::create (); 796 pty = ptytty::create ();
795 797
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); 798 create_windows (argc, argv);
807 799
808 init_xlocale (); 800 init_xlocale ();
809 801
810 scr_poweron (); // initialize screen 802 scr_poweron (); // initialize screen
… …
813 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
814#endif 806#endif
815 807
816 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
817 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
818#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
819 {
820 bg_init (); 812 bg_init ();
821
822#ifdef ENABLE_TRANSPARENCY
823 if (option (Opt_transparent))
824 {
825 bg_set_transparent ();
826
827 if (rs [Rs_blurradius])
828 bg_set_blur (rs [Rs_blurradius]);
829
830 if (ISSET_PIXCOLOR (Color_tint))
831 bg_set_tint (pix_colors_focused [Color_tint]);
832
833 if (rs [Rs_shade])
834 bg_set_shade (rs [Rs_shade]);
835
836 bg_set_root_pixmap ();
837 XSelectInput (dpy, display->root, PropertyChangeMask);
838 rootwin_ev.start (display, display->root);
839 }
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
848 }
849#endif 813#endif
850 814
851#if ENABLE_PERL 815#if ENABLE_PERL
852 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
853#endif 817#endif
… …
1021void 985void
1022rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1023{ 987{
1024 set_environ (envv); 988 set_environ (envv);
1025 989
1026#ifdef USE_XIM 990#if USE_XIM
1027 if (!locale) 991 if (!locale)
1028 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 993 else
1030 { 994 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1294} 1258}
1295 1259
1296void 1260void
1297rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1298{ 1262{
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 1263#if HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf) 1265 if (!pixbuf)
1353 { 1266 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return; 1268 return;
… …
1483 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1484 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
1485 1398
1486 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1487 wmHint.input = True; 1400 wmHint.input = True;
1488 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState
1402 : option (Opt_dockapp) ? WithdrawnState
1403 : NormalState;
1489 wmHint.window_group = top; 1404 wmHint.window_group = top;
1490 1405
1491 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1406 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1492 &szHint, &wmHint, &classHint); 1407 &szHint, &wmHint, &classHint);
1493#if ENABLE_EWMH 1408#if ENABLE_EWMH
… …
1495 * set up icon hint 1410 * set up icon hint
1496 * rs [Rs_iconfile] is path to icon 1411 * rs [Rs_iconfile] is path to icon
1497 */ 1412 */
1498 1413
1499 if (rs [Rs_iconfile]) 1414 if (rs [Rs_iconfile])
1500 {
1501 set_icon (rs [Rs_iconfile]); 1415 set_icon (rs [Rs_iconfile]);
1502 }
1503#endif 1416#endif
1504 1417
1505#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
1506 if (mwmhints.flags) 1419 if (mwmhints.flags)
1507 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,

Diff Legend

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