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.325 by sf-exg, Thu May 31 05:53:46 2012 UTC vs.
Revision 1.336 by sf-exg, Wed Sep 3 18:20:37 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 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 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
519#endif 519#endif
520 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
523#endif 523#endif
524#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
525 NULL, 525 NULL,
526#endif 526#endif
527#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 528 "rgb:00/00/00",
529#endif 529#endif
… …
588 xa = display->xa; 588 xa = display->xa;
589 589
590 set (display); 590 set (display);
591 extract_resources (); 591 extract_resources ();
592 592
593#if XFT 593#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 598#endif
597 599
598 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
600 rs [i] = 0; 602 rs [i] = 0;
… …
610 rxvt_perl.init (this); 612 rxvt_perl.init (this);
611 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
612 } 614 }
613#endif 615#endif
614 616
615 // must be called after initialising the perl interpreter as it
616 // may invoke the `on_register_command' hook
617 extract_keysym_resources (); 617 extract_keysym_resources ();
618 618
619 /* 619 /*
620 * set any defaults not already set 620 * set any defaults not already set
621 */ 621 */
… …
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 658 pointerBlankDelay = i;
659 else 659 else
660 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
661#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
662 669
663 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 671 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
666 673
… …
791 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 800
794 pty = ptytty::create (); 801 pty = ptytty::create ();
795 802
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
800
801 create_windows (argc, argv); 803 create_windows (argc, argv);
802 804
803 init_xlocale (); 805 init_xlocale ();
804 806
805 scr_poweron (); // initialize screen 807 scr_poweron (); // initialize screen
… …
808 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
809#endif 811#endif
810 812
811 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
812 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
813#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
814 {
815 bg_init (); 817 bg_init ();
816
817#ifdef ENABLE_TRANSPARENCY
818 if (option (Opt_transparent))
819 {
820 bg_set_transparent ();
821
822 if (rs [Rs_blurradius])
823 root_effects.set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 root_effects.set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 root_effects.set_shade (rs [Rs_shade]);
830
831 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root);
834 }
835#endif
836 }
837#endif 818#endif
838 819
839#if ENABLE_PERL 820#if ENABLE_PERL
840 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
841#endif 822#endif
… …
1009void 990void
1010rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1011{ 992{
1012 set_environ (envv); 993 set_environ (envv);
1013 994
1014#ifdef USE_XIM 995#if USE_XIM
1015 if (!locale) 996 if (!locale)
1016 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 998 else
1018 { 999 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1282} 1263}
1283 1264
1284void 1265void
1285rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1286{ 1267{
1287#ifdef HAVE_PIXBUF 1268#if HAVE_PIXBUF
1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289 if (!pixbuf) 1270 if (!pixbuf)
1290 { 1271 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return; 1273 return;
… …
1420 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1421 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1422 1403
1423 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1424 wmHint.input = True; 1405 wmHint.input = True;
1425 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1426 wmHint.window_group = top; 1409 wmHint.window_group = top;
1427 1410
1428 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1429 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1430#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1432 * set up icon hint 1415 * set up icon hint
1433 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1434 */ 1417 */
1435 1418
1436 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1437 {
1438 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1439 }
1440#endif 1421#endif
1441 1422
1442#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1443 if (mwmhints.flags) 1424 if (mwmhints.flags)
1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,

Diff Legend

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