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.315 by sf-exg, Mon Jan 9 15:34:56 2012 UTC vs.
Revision 1.330 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
590 xa = display->xa; 588 xa = display->xa;
591 589
592 set (display); 590 set (display);
593 extract_resources (); 591 extract_resources ();
594 592
595#if XFT 593#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
597 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));
598#endif 598#endif
599 599
600 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
602 rs [i] = 0; 602 rs [i] = 0;
… …
793 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
794 scrollBar.state = SB_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 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
807
808 create_windows (argc, argv); 798 create_windows (argc, argv);
809 799
810 init_xlocale (); 800 init_xlocale ();
811 801
812 scr_poweron (); // initialize screen 802 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
816#endif 806#endif
817 807
818 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
820#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 812 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
842#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 }
851#endif 813#endif
852 814
853#if ENABLE_PERL 815#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
855#endif 817#endif
856 818
857 set_colorfgbg ();
858 init_done = 1; 819 init_done = 1;
859 820
860 init_command (cmd_argv); 821 init_command (cmd_argv);
861 822
862 if (pty->pty >= 0) 823 if (pty->pty >= 0)
… …
908void 869void
909rxvt_term::init_env () 870rxvt_term::init_env ()
910{ 871{
911 char *val; 872 char *val;
912 char *env_display; 873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
913 char *env_term; 876 char *env_term;
914 877
915#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
935 898
936 env_display = (char *)rxvt_malloc (strlen (val) + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
937 900
938 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
939 902
903 env_windowid = (char *)rxvt_malloc (21);
940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
941 905
942 /* add entries to the environment: 906 /* add entries to the environment:
943 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
944 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
… …
948 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
949 */ 913 */
950 putenv (env_display); 914 putenv (env_display);
951 putenv (env_windowid); 915 putenv (env_windowid);
952 916
953 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
954 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
955 919
956#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
957 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
958#endif 922#endif
959 923
… …
983void 947void
984rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
985{ 949{
986 set_environ (envv); 950 set_environ (envv);
987 951
988#if HAVE_XSETLOCALE || HAVE_SETLOCALE
989 free (this->locale); 952 free (this->locale);
990 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
991 954
992 if (!this->locale) 955 if (!this->locale)
993 { 956 {
… …
1004 967
1005 968
1006 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
1007 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
1008 mbstate.reset (); 971 mbstate.reset ();
1009#endif
1010 972
1011#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
1012 char *codeset = nl_langinfo (CODESET); 974 char *codeset = nl_langinfo (CODESET);
1013 // /^UTF.?8/i 975 // /^UTF.?8/i
1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1023void 985void
1024rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1025{ 987{
1026 set_environ (envv); 988 set_environ (envv);
1027 989
1028#ifdef USE_XIM 990#if USE_XIM
1029 if (!locale) 991 if (!locale)
1030 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1031 else 993 else
1032 { 994 {
1033 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1191/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
1192/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
1193void 1155void
1194rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
1195{ 1157{
1196 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1197 { 1159 {
1198 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
1199 1161
1200 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
1201 /* bright colors */ 1163 /* bright colors */
… …
1296} 1258}
1297 1259
1298void 1260void
1299rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1300{ 1262{
1301#ifdef HAVE_AFTERIMAGE
1302 init_asv ();
1303
1304 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1305 if (!im)
1306 {
1307 rxvt_warn ("Loading image icon failed, continuing without.\n");
1308 return;
1309 }
1310
1311 unsigned int w = im->width;
1312 unsigned int h = im->height;
1313
1314 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1315 {
1316 rxvt_warn ("Icon image too big, continuing without.\n");
1317 destroy_asimage (&im);
1318 return;
1319 }
1320
1321 ASImage *result = scale_asimage (asv, im,
1322 w, h, ASA_ARGB32,
1323 100, ASIMAGE_QUALITY_DEFAULT);
1324 destroy_asimage (&im);
1325
1326 if (!result)
1327 {
1328 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1329 return;
1330 }
1331
1332 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1333 if (buffer)
1334 {
1335 ARGB32 *asbuf = result->alt.argb32;
1336 buffer [0] = w;
1337 buffer [1] = h;
1338
1339 for (unsigned int i = 0; i < w * h; ++i)
1340 buffer [i + 2] = asbuf [i];
1341
1342 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1343 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1344 free (buffer);
1345 }
1346 else
1347 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1348
1349 destroy_asimage (&result);
1350#endif
1351
1352#ifdef HAVE_PIXBUF 1263#if HAVE_PIXBUF
1353 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1354 if (!pixbuf) 1265 if (!pixbuf)
1355 { 1266 {
1356 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1357 return; 1268 return;
… …
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1549 1460
1550 /* the vt window */ 1461 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1553 width, height, 1464 vt_width, vt_height,
1554 0, 1465 0,
1555 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1557 1468
1558 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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