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.326 by root, Sun Jun 3 10:42:34 2012 UTC vs.
Revision 1.335 by sf-exg, Thu Aug 21 15:58:29 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;
… …
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 660 pointerBlankDelay = i;
659 else 661 else
660 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
661#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
662 671
663 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 673 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
666 675
… …
803 XSynchronize (dpy, True); 812 XSynchronize (dpy, True);
804#endif 813#endif
805 814
806 if (option (Opt_scrollBar)) 815 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */ 816 scrollBar.resize (); /* create and map scrollbar */
817
808#ifdef HAVE_BG_PIXMAP 818#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init (); 819 bg_init ();
811
812#ifdef ENABLE_TRANSPARENCY
813 if (option (Opt_transparent))
814 {
815 bg_set_transparent ();
816
817 if (rs [Rs_blurradius])
818 root_effects.set_blur (rs [Rs_blurradius]);
819
820 if (ISSET_PIXCOLOR (Color_tint))
821 root_effects.set_tint (pix_colors_focused [Color_tint]);
822
823 if (rs [Rs_shade])
824 root_effects.set_shade (rs [Rs_shade]);
825
826 bg_set_root_pixmap ();
827 XSelectInput (dpy, display->root, PropertyChangeMask);
828 rootwin_ev.start (display, display->root);
829 }
830#endif
831 }
832#endif 820#endif
833 821
834#if ENABLE_PERL 822#if ENABLE_PERL
835 rootwin_ev.start (display, display->root); 823 rootwin_ev.start (display, display->root);
836#endif 824#endif
… …
1004void 992void
1005rxvt_term::init_xlocale () 993rxvt_term::init_xlocale ()
1006{ 994{
1007 set_environ (envv); 995 set_environ (envv);
1008 996
1009#ifdef USE_XIM 997#if USE_XIM
1010 if (!locale) 998 if (!locale)
1011 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 999 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1012 else 1000 else
1013 { 1001 {
1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1002 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1277} 1265}
1278 1266
1279void 1267void
1280rxvt_term::set_icon (const char *file) 1268rxvt_term::set_icon (const char *file)
1281{ 1269{
1282#ifdef HAVE_PIXBUF 1270#if HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1271 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf) 1272 if (!pixbuf)
1285 { 1273 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return; 1275 return;
… …
1415 classHint.res_name = (char *)rs[Rs_name]; 1403 classHint.res_name = (char *)rs[Rs_name];
1416 classHint.res_class = (char *)RESCLASS; 1404 classHint.res_class = (char *)RESCLASS;
1417 1405
1418 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1406 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1419 wmHint.input = True; 1407 wmHint.input = True;
1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1408 wmHint.initial_state = option (Opt_iconic) ? IconicState
1409 : option (Opt_dockapp) ? WithdrawnState
1410 : NormalState;
1421 wmHint.window_group = top; 1411 wmHint.window_group = top;
1422 1412
1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1413 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1424 &szHint, &wmHint, &classHint); 1414 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH 1415#if ENABLE_EWMH
… …
1427 * set up icon hint 1417 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon 1418 * rs [Rs_iconfile] is path to icon
1429 */ 1419 */
1430 1420
1431 if (rs [Rs_iconfile]) 1421 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]); 1422 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif 1423#endif
1436 1424
1437#if ENABLE_FRILLS 1425#if ENABLE_FRILLS
1438 if (mwmhints.flags) 1426 if (mwmhints.flags)
1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1427 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,

Diff Legend

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