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.165 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.166 by root, Tue Jan 31 19:53:30 2006 UTC

297 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
298 298
299 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 301
302 // using a local pointer decreases code size a lot
302 xa = display->xa; 303 xa = display->xa;
303 304
304#if XFT 305#if XFT
305 if (rs[Rs_depth]) 306 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 307 set (display, strtol (rs[Rs_depth], 0, 0));
307 else 308 else
308#endif 309#endif
309 set (display); 310 set (display);
310 311
311 extract_resources (); 312 extract_resources ();
313
314 for (int i = NUM_RESOURCES; i--; )
315 if (rs [i] == resval_undef)
316 rs [i] = 0;
312 317
313 free (r_argv); 318 free (r_argv);
314 319
315#if ENABLE_PERL 320#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
708#ifdef OFF_FOCUS_FADING 713#ifdef OFF_FOCUS_FADING
709 if (rs[Rs_fade]) 714 if (rs[Rs_fade])
710 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
711 { 716 {
712 rgba c; 717 rgba c;
713 pix_colors[Color_fade].get (this, c); 718 pix_colors[Color_fade].get (c);
714 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c); 719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
715 } 720 }
716#endif 721#endif
717 722
718 if (depth <= 2) 723 if (depth <= 2)
747 xcol[1] = pix_colors[Color_scroll]; 752 xcol[1] = pix_colors[Color_scroll];
748 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC)); 753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
749 754
750 rgba c0, c1; 755 rgba c0, c1;
751 756
752 xcol[0].get (this, c0); 757 xcol[0].get (c0);
753 xcol[1].get (this, c1); 758 xcol[1].get (c1);
754 759
755 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]); 760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
756 761
757 /* topShadowColor */ 762 /* topShadowColor */
758 if (!xcol[1].set (this, 763 if (!xcol[1].set (this,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines