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.275 by sf-exg, Sat Aug 28 11:03:30 2010 UTC vs.
Revision 1.300 by sf-exg, Thu Sep 1 08:11:26 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])
… …
789 if (chdir (path)) 784 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 } 786 }
792 787
793 if (option (Opt_scrollBar)) 788 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 789 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 790
796 pty = ptytty::create (); 791 pty = ptytty::create ();
792
793#ifdef HAVE_AFTERIMAGE
794 set_application_name ((char *)rs[Rs_name]);
795 set_output_threshold (OUTPUT_LEVEL_WARNING);
796#endif
797
798 // must be called before create_windows, because the latter may call set_icon
799#ifdef HAVE_PIXBUF
800 g_type_init ();
801#endif
797 802
798 create_windows (argc, argv); 803 create_windows (argc, argv);
799 804
800 init_xlocale (); 805 init_xlocale ();
801 806
… …
807 812
808 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP 815#ifdef HAVE_BG_PIXMAP
811 { 816 {
812 bgPixmap.set_target (this); 817 bg_init ();
813 bgPixmap.invalidate ();
814 818
815#ifdef ENABLE_TRANSPARENCY 819#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent)) 820 if (option (Opt_transparent))
817 { 821 {
818 bgPixmap.set_transparent (); 822 bg_set_transparent ();
819 823
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius]) 824 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 825 bg_set_blur (rs [Rs_blurradius]);
823#endif 826
824 if (ISSET_PIXCOLOR (Color_tint)) 827 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 828 bg_set_tint (pix_colors_focused [Color_tint]);
826 829
827 if (rs [Rs_shade]) 830 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 831 bg_set_shade (rs [Rs_shade]);
829 832
830 bgPixmap.set_root_pixmap (); 833 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 834 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 835 rootwin_ev.start (display, display->root);
833 } 836 }
834#endif 837#endif
835 838
836#ifdef BG_IMAGE_FROM_FILE 839#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 840 if (rs[Rs_backgroundPixmap])
838 { 841 {
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])) 842 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 843 if (!bg_window_position_sensitive ())
851 update_background (); 844 update_background ();
852 } 845 }
853#endif 846#endif
854 } 847 }
855#endif 848#endif
… …
872#if ENABLE_XEMBED 865#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 866 if (rs[Rs_embed])
874 { 867 {
875 long info[2] = { 0, XEMBED_MAPPED }; 868 long info[2] = { 0, XEMBED_MAPPED };
876 869
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 871 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 872 }
880#endif 873#endif
881 874
882 XMapWindow (dpy, vt); 875 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 876 XMapWindow (dpy, parent);
884 877
885 refresh_check (); 878 refresh_check ();
886} 879}
887 880
888/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
889void 882void
890rxvt_term::init_env () 883rxvt_term::init_env ()
891{ 884{
892 int i;
893 char *val; 885 char *val;
894 886
895#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 888 /* 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 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
911 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
912 904
913 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
915 907
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 909
919 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
920 911
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 913
923 /* add entries to the environment: 914 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1279 1270
1280 if (i) 1271 if (i)
1281 ModMetaMask = modmasks[i - 1]; 1272 ModMetaMask = modmasks[i - 1];
1282} 1273}
1283 1274
1275void
1276rxvt_term::set_icon (const char *file)
1277{
1278#ifdef HAVE_AFTERIMAGE
1279 init_asv ();
1280
1281 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1282 if (!im)
1283 {
1284 rxvt_warn ("Loading image icon failed, continuing without.\n");
1285 return;
1286 }
1287
1288 unsigned int w = im->width;
1289 unsigned int h = im->height;
1290
1291 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1292 {
1293 rxvt_warn ("Icon image too big, continuing without.\n");
1294 destroy_asimage (&im);
1295 return;
1296 }
1297
1298 ASImage *result = scale_asimage (asv, im,
1299 w, h, ASA_ARGB32,
1300 100, ASIMAGE_QUALITY_DEFAULT);
1301 destroy_asimage (&im);
1302
1303 if (!result)
1304 {
1305 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1306 return;
1307 }
1308
1309 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1310 if (buffer)
1311 {
1312 ARGB32 *asbuf = result->alt.argb32;
1313 buffer [0] = w;
1314 buffer [1] = h;
1315
1316 for (unsigned int i = 0; i < w * h; ++i)
1317 buffer [i + 2] = asbuf [i];
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 destroy_asimage (&result);
1327#endif
1328
1329#ifdef HAVE_PIXBUF
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf)
1332 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return;
1335 }
1336
1337 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1338 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1339
1340 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1341 {
1342 rxvt_warn ("Icon image too big, continuing without.\n");
1343 g_object_unref (pixbuf);
1344 return;
1345 }
1346
1347 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1348 {
1349 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1350 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1351 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1352
1353 buffer [0] = w;
1354 buffer [1] = h;
1355 for (int i = 0; i < h; i++)
1356 {
1357 for (int j = 0; j < w; j++)
1358 {
1359 unsigned char *pixel = row + j * channels;
1360 long value;
1361
1362 if (channels == 4)
1363 value = pixel[3];
1364 else
1365 value = (unsigned char)0x00ff;
1366
1367 value = (value << 8) + pixel[0];
1368 value = (value << 8) + pixel[1];
1369 value = (value << 8) + pixel[2];
1370 buffer[(i * w + j) + 2] = value;
1371 }
1372
1373 row += rowstride;
1374 }
1375
1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1378 free (buffer);
1379 }
1380 else
1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1382
1383 g_object_unref (pixbuf);
1384#endif
1385}
1386
1284/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1285/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1286void 1389void
1287rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1288{ 1391{
1289 XClassHint classHint; 1392 XClassHint classHint;
1290 XWMHints wmHint; 1393 XWMHints wmHint;
… …
1336 } 1439 }
1337#endif 1440#endif
1338 1441
1339 window_calc (0, 0); 1442 window_calc (0, 0);
1340 1443
1341 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1342 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1343 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1344 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1345 1448
1346 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1349 ext_bwidth, 1452 ext_bwidth,
1350 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1351 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1352 &attributes); 1455 &attributes);
1353 1456
1354 this->parent[0] = top; 1457 this->parent = top;
1355 1458
1356 old_width = szHint.width; 1459 old_width = szHint.width;
1357 old_height = szHint.height; 1460 old_height = szHint.height;
1358 1461
1359 set_title (rs [Rs_title]); 1462 set_title (rs [Rs_title]);
… …
1368 wmHint.window_group = top; 1471 wmHint.window_group = top;
1369 1472
1370 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1371 &szHint, &wmHint, &classHint); 1474 &szHint, &wmHint, &classHint);
1372#if ENABLE_EWMH 1475#if ENABLE_EWMH
1373# ifdef HAVE_AFTERIMAGE
1374 /* 1476 /*
1375 * set up icon hint 1477 * set up icon hint
1376 * rs [Rs_iconfile] is path to icon 1478 * rs [Rs_iconfile] is path to icon
1377 */ 1479 */
1378 1480
1379 if (rs [Rs_iconfile]) 1481 if (rs [Rs_iconfile])
1380 { 1482 {
1381 init_asv (); 1483 set_icon (rs [Rs_iconfile]);
1382
1383 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1384 if (asv && im)
1385 {
1386 int w = im->width;
1387 int h = im->height;
1388 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1389 ASImage *result = scale_asimage (asv, im,
1390 w, h, ASA_ARGB32,
1391 100, ASIMAGE_QUALITY_DEFAULT);
1392 destroy_asimage (&im);
1393
1394 if (buffer && result)
1395 {
1396 ARGB32 *asbuf = result->alt.argb32;
1397 buffer [0] = w;
1398 buffer [1] = h;
1399
1400 for (unsigned int i = 0; i < w * h; ++i)
1401 buffer [i + 2] = asbuf [i];
1402
1403 destroy_asimage (&result);
1404 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1405 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1406 free (buffer);
1407 }
1408 else
1409 {
1410 if (!buffer)
1411 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1412
1413 if (!result)
1414 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1415 }
1416 }
1417 else
1418 rxvt_warn ("Loading image icon failed, continuing without.\n");
1419 } 1484 }
1420# endif
1421#endif 1485#endif
1422 1486
1423#if ENABLE_FRILLS 1487#if ENABLE_FRILLS
1424 if (mwmhints.flags) 1488 if (mwmhints.flags)
1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1431#if ENABLE_EWMH 1495#if ENABLE_EWMH
1432 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1433#endif 1497#endif
1434 }; 1498 };
1435 1499
1436 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1437 1501
1438#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1439 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1440 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1441#endif 1505#endif

Diff Legend

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