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.294 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.300 by sf-exg, Thu Sep 1 08:11:26 2011 UTC

… …
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])
… …
793 if (chdir (path)) 784 if (chdir (path))
794 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");
795 } 786 }
796 787
797 if (option (Opt_scrollBar)) 788 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 789 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 790
800 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
801 802
802 create_windows (argc, argv); 803 create_windows (argc, argv);
803 804
804 init_xlocale (); 805 init_xlocale ();
805 806
… …
836#endif 837#endif
837 838
838#ifdef BG_IMAGE_FROM_FILE 839#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap]) 840 if (rs[Rs_backgroundPixmap])
840 { 841 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bg_set_geometry (p);
847 }
848 else
849 bg_set_default_geometry ();
850
851 if (bg_set_file (rs[Rs_backgroundPixmap])) 842 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ()) 843 if (!bg_window_position_sensitive ())
853 update_background (); 844 update_background ();
854 } 845 }
855#endif 846#endif
… …
1392 g_object_unref (pixbuf); 1383 g_object_unref (pixbuf);
1393#endif 1384#endif
1394} 1385}
1395 1386
1396/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1398void 1389void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1391{
1401 XClassHint classHint; 1392 XClassHint classHint;
1402 XWMHints wmHint; 1393 XWMHints wmHint;
… …
1448 } 1439 }
1449#endif 1440#endif
1450 1441
1451 window_calc (0, 0); 1442 window_calc (0, 0);
1452 1443
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1457 1448
1458 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1504#if ENABLE_EWMH 1495#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1506#endif 1497#endif
1507 }; 1498 };
1508 1499
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1501
1511#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1505#endif

Diff Legend

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