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.333 by mikachu, Tue Jul 29 13:50:05 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;
… …
803 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
804#endif 806#endif
805 807
806 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
808#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init (); 812 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 813#endif
833 814
834#if ENABLE_PERL 815#if ENABLE_PERL
835 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
836#endif 817#endif
… …
1004void 985void
1005rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1006{ 987{
1007 set_environ (envv); 988 set_environ (envv);
1008 989
1009#ifdef USE_XIM 990#if USE_XIM
1010 if (!locale) 991 if (!locale)
1011 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1012 else 993 else
1013 { 994 {
1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1277} 1258}
1278 1259
1279void 1260void
1280rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1281{ 1262{
1282#ifdef HAVE_PIXBUF 1263#if HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf) 1265 if (!pixbuf)
1285 { 1266 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return; 1268 return;
… …
1415 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1416 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
1417 1398
1418 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1419 wmHint.input = True; 1400 wmHint.input = True;
1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState
1402 : option (Opt_dockapp) ? WithdrawnState
1403 : NormalState;
1421 wmHint.window_group = top; 1404 wmHint.window_group = top;
1422 1405
1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1406 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1424 &szHint, &wmHint, &classHint); 1407 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH 1408#if ENABLE_EWMH
… …
1427 * set up icon hint 1410 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon 1411 * rs [Rs_iconfile] is path to icon
1429 */ 1412 */
1430 1413
1431 if (rs [Rs_iconfile]) 1414 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]); 1415 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif 1416#endif
1436 1417
1437#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
1438 if (mwmhints.flags) 1419 if (mwmhints.flags)
1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,

Diff Legend

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