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.278 by sf-exg, Sun Aug 29 15:04:40 2010 UTC vs.
Revision 1.298 by sf-exg, Fri Aug 19 17:42:09 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.
… …
143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
627 627
628 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
630 rs [i] = 0; 630 rs [i] = 0;
631 631
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 632#if ENABLE_PERL
638 if (!rs[Rs_perl_ext_1]) 633 if (!rs[Rs_perl_ext_1])
639 rs[Rs_perl_ext_1] = "default"; 634 rs[Rs_perl_ext_1] = "default";
640 635
641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 636 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
807 802
808 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
811 { 806 {
812 bgPixmap.set_target (this); 807 bg_init ();
813 bgPixmap.invalidate ();
814 808
815#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
817 { 811 {
818 bgPixmap.set_transparent (); 812 bg_set_transparent ();
819 813
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
823#endif 816
824 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
826 819
827 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
829 822
830 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
833 } 826 }
834#endif 827#endif
835 828
836#ifdef BG_IMAGE_FROM_FILE 829#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 830 if (rs[Rs_backgroundPixmap])
838 { 831 {
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])) 832 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 833 if (!bg_window_position_sensitive ())
851 update_background (); 834 update_background ();
852 } 835 }
853#endif 836#endif
854 } 837 }
855#endif 838#endif
… …
872#if ENABLE_XEMBED 855#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 856 if (rs[Rs_embed])
874 { 857 {
875 long info[2] = { 0, XEMBED_MAPPED }; 858 long info[2] = { 0, XEMBED_MAPPED };
876 859
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 860 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 861 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 862 }
880#endif 863#endif
881 864
882 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 866 XMapWindow (dpy, parent);
884 867
885 refresh_check (); 868 refresh_check ();
886} 869}
887 870
888/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
889void 872void
890rxvt_term::init_env () 873rxvt_term::init_env ()
891{ 874{
892 int i;
893 char *val; 875 char *val;
894 876
895#ifdef DISPLAY_IS_IP 877#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 878 /* 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 879 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
911 val = XDisplayString (dpy); 893 val = XDisplayString (dpy);
912 894
913 if (rs[Rs_display_name] == NULL) 895 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 896 rs[Rs_display_name] = val; /* use broken `:0' value */
915 897
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 898 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 899
919 sprintf (env_display, "DISPLAY=%s", val); 900 sprintf (env_display, "DISPLAY=%s", val);
920 901
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 902 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 903
923 /* add entries to the environment: 904 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 905 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 906 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 907 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1292 { 1273 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return; 1275 return;
1295 } 1276 }
1296 1277
1297 int w = im->width; 1278 unsigned int w = im->width;
1298 int h = im->height; 1279 unsigned int h = im->height;
1280
1281 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1282 {
1283 rxvt_warn ("Icon image too big, continuing without.\n");
1284 destroy_asimage (&im);
1285 return;
1286 }
1299 1287
1300 ASImage *result = scale_asimage (asv, im, 1288 ASImage *result = scale_asimage (asv, im,
1301 w, h, ASA_ARGB32, 1289 w, h, ASA_ARGB32,
1302 100, ASIMAGE_QUALITY_DEFAULT); 1290 100, ASIMAGE_QUALITY_DEFAULT);
1303 destroy_asimage (&im); 1291 destroy_asimage (&im);
… …
1316 buffer [1] = h; 1304 buffer [1] = h;
1317 1305
1318 for (unsigned int i = 0; i < w * h; ++i) 1306 for (unsigned int i = 0; i < w * h; ++i)
1319 buffer [i + 2] = asbuf [i]; 1307 buffer [i + 2] = asbuf [i];
1320 1308
1321 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1309 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1322 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1310 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1323 free (buffer); 1311 free (buffer);
1324 } 1312 }
1325 else 1313 else
1326 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1314 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1327 1315
1328 destroy_asimage (&result); 1316 destroy_asimage (&result);
1329#endif 1317#endif
1318
1319#ifdef HAVE_PIXBUF
1320 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1321 if (!pixbuf)
1322 {
1323 rxvt_warn ("Loading image icon failed, continuing without.\n");
1324 return;
1325 }
1326
1327 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1328 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1329
1330 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1331 {
1332 rxvt_warn ("Icon image too big, continuing without.\n");
1333 g_object_unref (pixbuf);
1334 return;
1335 }
1336
1337 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1338 {
1339 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1340 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1342
1343 buffer [0] = w;
1344 buffer [1] = h;
1345 for (int i = 0; i < h; i++)
1346 {
1347 for (int j = 0; j < w; j++)
1348 {
1349 unsigned char *pixel = row + j * channels;
1350 long value;
1351
1352 if (channels == 4)
1353 value = pixel[3];
1354 else
1355 value = (unsigned char)0x00ff;
1356
1357 value = (value << 8) + pixel[0];
1358 value = (value << 8) + pixel[1];
1359 value = (value << 8) + pixel[2];
1360 buffer[(i * w + j) + 2] = value;
1361 }
1362
1363 row += rowstride;
1364 }
1365
1366 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1367 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1368 free (buffer);
1369 }
1370 else
1371 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1372
1373 g_object_unref (pixbuf);
1374#endif
1330} 1375}
1331 1376
1332/*----------------------------------------------------------------------*/ 1377/*----------------------------------------------------------------------*/
1333/* rxvt_Create_Windows () - Open and map the window */ 1378/* Open and map the window */
1334void 1379void
1335rxvt_term::create_windows (int argc, const char *const *argv) 1380rxvt_term::create_windows (int argc, const char *const *argv)
1336{ 1381{
1337 XClassHint classHint; 1382 XClassHint classHint;
1338 XWMHints wmHint; 1383 XWMHints wmHint;
… …
1384 } 1429 }
1385#endif 1430#endif
1386 1431
1387 window_calc (0, 0); 1432 window_calc (0, 0);
1388 1433
1389 /* sub-window placement & size in rxvt_resize_subwindows () */ 1434 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1390 attributes.background_pixel = pix_colors_focused [Color_border]; 1435 attributes.background_pixel = pix_colors_focused [Color_border];
1391 attributes.border_pixel = pix_colors_focused [Color_border]; 1436 attributes.border_pixel = pix_colors_focused [Color_border];
1392 attributes.colormap = cmap; 1437 attributes.colormap = cmap;
1393 1438
1394 top = XCreateWindow (dpy, parent, 1439 top = XCreateWindow (dpy, parent,
… …
1397 ext_bwidth, 1442 ext_bwidth,
1398 depth, InputOutput, visual, 1443 depth, InputOutput, visual,
1399 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1444 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1400 &attributes); 1445 &attributes);
1401 1446
1402 this->parent[0] = top; 1447 this->parent = top;
1403 1448
1404 old_width = szHint.width; 1449 old_width = szHint.width;
1405 old_height = szHint.height; 1450 old_height = szHint.height;
1406 1451
1407 set_title (rs [Rs_title]); 1452 set_title (rs [Rs_title]);
… …
1440#if ENABLE_EWMH 1485#if ENABLE_EWMH
1441 xa[XA_NET_WM_PING], 1486 xa[XA_NET_WM_PING],
1442#endif 1487#endif
1443 }; 1488 };
1444 1489
1445 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1490 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1446 1491
1447#if ENABLE_FRILLS 1492#if ENABLE_FRILLS
1448 if (rs[Rs_transient_for]) 1493 if (rs[Rs_transient_for])
1449 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1494 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1450#endif 1495#endif

Diff Legend

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