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.290 by sf-exg, Mon Jan 3 10:32:08 2011 UTC vs.
Revision 1.297 by sf-exg, Mon Aug 15 11:01:54 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.
… …
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#endif
640
641#if ENABLE_PERL 632#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 633 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 634 rs[Rs_perl_ext_1] = "default";
644 635
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 636 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
811 802
812 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
815 { 806 {
816 bgPixmap.set_target (this); 807 bg_init ();
817 bgPixmap.invalidate ();
818 808
819#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
821 { 811 {
822 bgPixmap.set_transparent (); 812 bg_set_transparent ();
823 813
824 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
826 816
827 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
829 819
830 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
832 822
833 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
836 } 826 }
837#endif 827#endif
838 828
… …
842 const char *p = rs[Rs_backgroundPixmap]; 832 const char *p = rs[Rs_backgroundPixmap];
843 833
844 if ((p = strchr (p, ';')) != 0) 834 if ((p = strchr (p, ';')) != 0)
845 { 835 {
846 p++; 836 p++;
847 bgPixmap.set_geometry (p); 837 bg_set_geometry (p);
848 } 838 }
849 else 839 else
850 bgPixmap.set_defaultGeometry (); 840 bg_set_default_geometry ();
851 841
852 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 842 if (bg_set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ()) 843 if (!bg_window_position_sensitive ())
854 update_background (); 844 update_background ();
855 } 845 }
856#endif 846#endif
857 } 847 }
858#endif 848#endif
… …
875#if ENABLE_XEMBED 865#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 866 if (rs[Rs_embed])
877 { 867 {
878 long info[2] = { 0, XEMBED_MAPPED }; 868 long info[2] = { 0, XEMBED_MAPPED };
879 869
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 871 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 872 }
883#endif 873#endif
884 874
885 XMapWindow (dpy, vt); 875 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]); 876 XMapWindow (dpy, parent);
887 877
888 refresh_check (); 878 refresh_check ();
889} 879}
890 880
891/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
… …
917 907
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 909
920 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
921 911
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 913
924 /* add entries to the environment: 914 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
927 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1324 buffer [1] = h; 1314 buffer [1] = h;
1325 1315
1326 for (unsigned int i = 0; i < w * h; ++i) 1316 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i]; 1317 buffer [i + 2] = asbuf [i];
1328 1318
1329 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer); 1321 free (buffer);
1332 } 1322 }
1333 else 1323 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1381 } 1371 }
1382 1372
1383 row += rowstride; 1373 row += rowstride;
1384 } 1374 }
1385 1375
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer); 1378 free (buffer);
1389 } 1379 }
1390 else 1380 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1393 g_object_unref (pixbuf); 1383 g_object_unref (pixbuf);
1394#endif 1384#endif
1395} 1385}
1396 1386
1397/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1398/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1399void 1389void
1400rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1401{ 1391{
1402 XClassHint classHint; 1392 XClassHint classHint;
1403 XWMHints wmHint; 1393 XWMHints wmHint;
… …
1449 } 1439 }
1450#endif 1440#endif
1451 1441
1452 window_calc (0, 0); 1442 window_calc (0, 0);
1453 1443
1454 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1455 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1456 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1457 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1458 1448
1459 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1462 ext_bwidth, 1452 ext_bwidth,
1463 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1455 &attributes);
1466 1456
1467 this->parent[0] = top; 1457 this->parent = top;
1468 1458
1469 old_width = szHint.width; 1459 old_width = szHint.width;
1470 old_height = szHint.height; 1460 old_height = szHint.height;
1471 1461
1472 set_title (rs [Rs_title]); 1462 set_title (rs [Rs_title]);
… …
1505#if ENABLE_EWMH 1495#if ENABLE_EWMH
1506 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1507#endif 1497#endif
1508 }; 1498 };
1509 1499
1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1511 1501
1512#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1513 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1515#endif 1505#endif

Diff Legend

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