[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.168 by root, Wed Feb 1 21:15:33 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));
…		…
309	set (display);	310	set (display);
310		311
311	extract_resources ();	312	extract_resources ();
312		313
313	free (r_argv);	314	free (r_argv);
		315
		316	for (int i = NUM_RESOURCES; i--; )
		317	if (rs [i] == resval_undef)
		318	rs [i] = 0;
314		319
315	#if ENABLE_PERL	320	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	321	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	322	rs[Rs_perl_ext_1] = "default";
318		323
…		…
421	/* this is how xterm implements reverseVideo */	426	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	427	if (OPTION (Opt_reverseVideo))
423	{	428	{
424	if (!rs[Rs_color + Color_fg])	429	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	430	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		431
426	if (!rs[Rs_color + Color_bg])	432	if (!rs[Rs_color + Color_bg])
427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	433	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428	}	434	}
429	#endif	435	#endif
430		436
…		…
688	#ifndef NO_CURSORCOLOR	694	#ifndef NO_CURSORCOLOR
689	case Color_cursor2:	695	case Color_cursor2:
690	#endif	696	#endif
691	case Color_pointer_fg:	697	case Color_pointer_fg:
692	name = rs[Rs_color + Color_fg];	698	name = rs[Rs_color + Color_fg];
693	xcol = pix_colors[Color_fg];	699	xcol.set (this, name);
694	break;	700	break;
695	default:	701	default:
696	name = rs[Rs_color + Color_bg];	702	name = rs[Rs_color + Color_bg];
697	xcol = pix_colors[Color_bg];	703	xcol.set (this, name);
698	break;	704	break;
699	}	705	}
700	}	706	}
701	}	707	}
702		708
703	pix_colors[i] = xcol;	709	pix_colors[i] = xcol;
704	rs[Rs_color + i] = name;	710	rs[Rs_color + i] = name;
705	}	711	}
706		712
707	#ifdef OFF_FOCUS_FADING
708	if (rs[Rs_fade])
709	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
710	{
711	rgba c;
712	pix_colors[Color_fade].get (this, c);
713	pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
714	}
715	#endif
716
717	if (depth <= 2)	713	if (depth <= 2)
718	{	714	{
719	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	715	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
720	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	716	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
721	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	717	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
722	}	718	}
723		719
724	/*	720	/*
725	* get scrollBar shadow colors	721	* get scrollBar shadow colors
726	*	722	*
727	* The calculations of topShadow/bottomShadow values are adapted	723	* The calculations of topShadow/bottomShadow values are adapted
728	* from the fvwm window manager.	724	* from the fvwm window manager.
729	*/	725	*/
730	#ifdef KEEP_SCROLLCOLOR	726	#ifdef KEEP_SCROLLCOLOR
731
732	if (depth <= 2)	727	if (depth <= 2)
733	{	728	{
734	/* Monochrome */	729	/* Monochrome */
735	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	alias_color (Color_scroll, Color_fg);
736	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	alias_color (Color_topShadow, Color_bg);
737	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	alias_color (Color_bottomShadow, Color_bg);
738	}	733	}
739	else	734	else
740	{	735	{
741	rxvt_color xcol[2];	736	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
742	/* xcol[0] == white
743	* xcol[1] == top shadow
744	* xcol[2] == bot shadow */
745		737
746	xcol[1] = pix_colors[Color_scroll];
747	xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
748
749	rgba c0, c1;	738	rgba cscroll;
750		739	pix_colors [Color_scroll].get (cscroll);
751	xcol[0].get (this, c0);
752	xcol[1].get (this, c1);
753
754	xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
755		740
756	/* topShadowColor */	741	/* topShadowColor */
757	if (!xcol[1].set (this,	742	if (!pix_colors[Color_topShadow].set (this,
758	rgba (	743	rgba (
759	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	744	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
760	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	745	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
761	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	746	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762	c1.a) // pa1 vs. pa0: arbitrary	747	cscroll.a)
763	));	748	))
764	xcol[1] = pix_colors[Color_White];	749	alias_color (Color_topShadow, Color_White);
765
766	pix_colors[Color_topShadow] = xcol[1];
767	}	750	}
768	#endif /* KEEP_SCROLLCOLOR */	751	#endif /* KEEP_SCROLLCOLOR */
		752
		753	#ifdef OFF_FOCUS_FADING
		754	if (rs[Rs_fade])
		755	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		756	{
		757	rgba c;
		758	pix_colors [Color_fade].get (c);
		759	pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
		760	}
		761	#endif
769	}	762	}
770		763
771	/----------------------------------------------------------------------/	764	/----------------------------------------------------------------------/
772	/* color aliases, fg/bg bright-bold */	765	/* color aliases, fg/bg bright-bold */
773	void	766	void

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs. Revision 1.168 by root, Wed Feb 1 21:15:33 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.168 by root, Wed Feb 1 21:15:33 2006 UTC