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.284 by sf-exg, Fri Oct 15 21:59:25 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#ifdef HAVE_PIXBUF
638 g_type_init ();
639 gdk_pixbuf_xlib_init_with_depth (dpy, display->screen, depth);
640#endif
641
642#if ENABLE_PERL 632#if ENABLE_PERL
643 if (!rs[Rs_perl_ext_1]) 633 if (!rs[Rs_perl_ext_1])
644 rs[Rs_perl_ext_1] = "default"; 634 rs[Rs_perl_ext_1] = "default";
645 635
646 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 636 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
812 802
813 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
816 { 806 {
817 bgPixmap.set_target (this); 807 bg_init ();
818 bgPixmap.invalidate ();
819 808
820#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
822 { 811 {
823 bgPixmap.set_transparent (); 812 bg_set_transparent ();
824 813
825 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
827 816
828 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
830 819
831 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
833 822
834 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
837 } 826 }
838#endif 827#endif
839 828
840#ifdef BG_IMAGE_FROM_FILE 829#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap]) 830 if (rs[Rs_backgroundPixmap])
842 { 831 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 832 if (bg_set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ()) 833 if (!bg_window_position_sensitive ())
855 update_background (); 834 update_background ();
856 } 835 }
857#endif 836#endif
858 } 837 }
859#endif 838#endif
… …
876#if ENABLE_XEMBED 855#if ENABLE_XEMBED
877 if (rs[Rs_embed]) 856 if (rs[Rs_embed])
878 { 857 {
879 long info[2] = { 0, XEMBED_MAPPED }; 858 long info[2] = { 0, XEMBED_MAPPED };
880 859
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 860 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2); 861 32, PropModeReplace, (unsigned char *)&info, 2);
883 } 862 }
884#endif 863#endif
885 864
886 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]); 866 XMapWindow (dpy, parent);
888 867
889 refresh_check (); 868 refresh_check ();
890} 869}
891 870
892/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
893void 872void
894rxvt_term::init_env () 873rxvt_term::init_env ()
895{ 874{
896 int i;
897 char *val; 875 char *val;
898 876
899#ifdef DISPLAY_IS_IP 877#ifdef DISPLAY_IS_IP
900 /* Fixup display_name for export over pty to any interested terminal 878 /* Fixup display_name for export over pty to any interested terminal
901 * 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
… …
915 val = XDisplayString (dpy); 893 val = XDisplayString (dpy);
916 894
917 if (rs[Rs_display_name] == NULL) 895 if (rs[Rs_display_name] == NULL)
918 rs[Rs_display_name] = val; /* use broken `:0' value */ 896 rs[Rs_display_name] = val; /* use broken `:0' value */
919 897
920 i = strlen (val);
921 env_display = (char *)rxvt_malloc (i + 9); 898 env_display = (char *)rxvt_malloc (strlen (val) + 9);
922 899
923 sprintf (env_display, "DISPLAY=%s", val); 900 sprintf (env_display, "DISPLAY=%s", val);
924 901
925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 902 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
926 903
927 /* add entries to the environment: 904 /* add entries to the environment:
928 * @ DISPLAY: in case we started with -display 905 * @ DISPLAY: in case we started with -display
929 * @ WINDOWID: X window id number of the window 906 * @ WINDOWID: X window id number of the window
930 * @ COLORTERM: terminal sub-name and also indicates its color 907 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1327 buffer [1] = h; 1304 buffer [1] = h;
1328 1305
1329 for (unsigned int i = 0; i < w * h; ++i) 1306 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i]; 1307 buffer [i + 2] = asbuf [i];
1331 1308
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1309 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1310 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer); 1311 free (buffer);
1335 } 1312 }
1336 else 1313 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1314 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1384 } 1361 }
1385 1362
1386 row += rowstride; 1363 row += rowstride;
1387 } 1364 }
1388 1365
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1366 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1367 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer); 1368 free (buffer);
1392 } 1369 }
1393 else 1370 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1371 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1396 g_object_unref (pixbuf); 1373 g_object_unref (pixbuf);
1397#endif 1374#endif
1398} 1375}
1399 1376
1400/*----------------------------------------------------------------------*/ 1377/*----------------------------------------------------------------------*/
1401/* rxvt_Create_Windows () - Open and map the window */ 1378/* Open and map the window */
1402void 1379void
1403rxvt_term::create_windows (int argc, const char *const *argv) 1380rxvt_term::create_windows (int argc, const char *const *argv)
1404{ 1381{
1405 XClassHint classHint; 1382 XClassHint classHint;
1406 XWMHints wmHint; 1383 XWMHints wmHint;
… …
1452 } 1429 }
1453#endif 1430#endif
1454 1431
1455 window_calc (0, 0); 1432 window_calc (0, 0);
1456 1433
1457 /* sub-window placement & size in rxvt_resize_subwindows () */ 1434 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1458 attributes.background_pixel = pix_colors_focused [Color_border]; 1435 attributes.background_pixel = pix_colors_focused [Color_border];
1459 attributes.border_pixel = pix_colors_focused [Color_border]; 1436 attributes.border_pixel = pix_colors_focused [Color_border];
1460 attributes.colormap = cmap; 1437 attributes.colormap = cmap;
1461 1438
1462 top = XCreateWindow (dpy, parent, 1439 top = XCreateWindow (dpy, parent,
… …
1465 ext_bwidth, 1442 ext_bwidth,
1466 depth, InputOutput, visual, 1443 depth, InputOutput, visual,
1467 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1444 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1468 &attributes); 1445 &attributes);
1469 1446
1470 this->parent[0] = top; 1447 this->parent = top;
1471 1448
1472 old_width = szHint.width; 1449 old_width = szHint.width;
1473 old_height = szHint.height; 1450 old_height = szHint.height;
1474 1451
1475 set_title (rs [Rs_title]); 1452 set_title (rs [Rs_title]);
… …
1508#if ENABLE_EWMH 1485#if ENABLE_EWMH
1509 xa[XA_NET_WM_PING], 1486 xa[XA_NET_WM_PING],
1510#endif 1487#endif
1511 }; 1488 };
1512 1489
1513 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1490 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1514 1491
1515#if ENABLE_FRILLS 1492#if ENABLE_FRILLS
1516 if (rs[Rs_transient_for]) 1493 if (rs[Rs_transient_for])
1517 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1494 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1518#endif 1495#endif

Diff Legend

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