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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.160 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.192 by root, Tue Jul 24 14:38:59 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
46	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
47	/* low-intensity colors */	47	/* low-intensity colors */
48	"rgb:00/00/00", // 0: black (Black)	48	"rgb:00/00/00", // 0: black (Black)
49	"rgb:cd/00/00", // 1: red (Red3)	49	"rgb:cd/00/00", // 1: red (Red3)
50	"rgb:00/cd/00", // 2: green (Green3)	50	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)	51	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"rgb:00/00/cd", // 4: blue (Blue3)	52	"rgb:00/00/cd", // 4: blue (Blue3)
53	"rgb:cd/00/cd", // 5: magenta (Magenta3)	53	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"rgb:00/cd/cd", // 6: cyan (Cyan3)	54	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	55	# ifdef XTERM_COLORS
56	"rgb:e5/e5/e5", // 7: white (Grey90)	56	"rgb:e5/e5/e5", // 7: white (Grey90)
…		…
183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186	#endif	186	#endif
187		187
188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(ENABLE_TRANSPARENCY)
189	pixmap = None;	189	pixmap = None;
190	#endif	190	#endif
191		191
192	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
194	options = DEFAULT_OPTIONS;
195	want_refresh = 1;	194	want_refresh = 1;
196	priv_modes = SavedModes = PrivMode_Default;	195	priv_modes = SavedModes = PrivMode_Default;
197	ncol = 80;	196	ncol = 80;
198	nrow = 24;	197	nrow = 24;
199	int_bwidth = INTERNALBORDERWIDTH;	198	int_bwidth = INTERNALBORDERWIDTH;
200	ext_bwidth = EXTERNALBORDERWIDTH;	199	ext_bwidth = EXTERNALBORDERWIDTH;
201	lineSpace = LINESPACE;	200	lineSpace = LINESPACE;
202	saveLines = SAVELINES;	201	saveLines = SAVELINES;
203	numpix_colors = TOTAL_COLORS;	202	numpix_colors = TOTAL_COLORS;
204		203
205	refresh_limit = 1;
206	refresh_type = SLOW_REFRESH;	204	refresh_type = SLOW_REFRESH;
207		205
208	oldcursor.row = oldcursor.col = -1;	206	oldcursor.row = oldcursor.col = -1;
209	#ifdef XPM_BACKGROUND	207	#ifdef XPM_BACKGROUND
210	/* bgPixmap.w = bgPixmap.h = 0; */	208	/* bgPixmap.w = bgPixmap.h = 0; */
211	bgPixmap.x = bgPixmap.y = 50;	209	bgPixmap.x = bgPixmap.y = 0;
212	bgPixmap.pixmap = None;	210	bgPixmap.pixmap = None;
213	#endif	211	#endif
214		212
215	last_bot = last_state = -1;	213	last_bot = last_state = -1;
		214
		215	set_option (Opt_scrollBar);
		216	set_option (Opt_scrollTtyOutput);
		217	set_option (Opt_jumpScroll);
		218	set_option (Opt_skipScroll);
		219	set_option (Opt_secondaryScreen);
		220	set_option (Opt_secondaryScroll);
		221	set_option (Opt_pastableTabs);
		222	set_option (Opt_intensityStyles);
		223	set_option (Opt_iso14755_52);
216		224
217	return true;	225	return true;
218	}	226	}
219		227
220	void	228	void
…		…
258	int i, r_argc;	266	int i, r_argc;
259	char *val;	267	char *val;
260	const char cmd_argv, r_argv;	268	const char cmd_argv, r_argv;
261		269
262	/*	270	/*
263	* Look for -exec option. Find => split and make cmd_argv[] of command args	271	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	272	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	273	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	274	if (!strcmp (argv[r_argc], "-e"))
267	break;	275	break;
268		276
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	277	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		278
271	for (i = 0; i < r_argc; i++)	279	for (i = 0; i < r_argc; i++)
…		…
297	get_options (r_argc, r_argv);	305	get_options (r_argc, r_argv);
298		306
299	if (!(display = displays.get (rs[Rs_display_name])))	307	if (!(display = displays.get (rs[Rs_display_name])))
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	308	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301		309
		310	// using a local pointer decreases code size a lot
302	xa = display->xa;	311	xa = display->xa;
303		312
304	#if ENABLE_FRILLS	313	set (display);
		314	extract_resources ();
		315
		316	#if XFT
305	if (rs[Rs_depth])	317	if (rs[Rs_depth])
306	set (display, strtol (rs[Rs_depth], 0, 0));	318	select_visual (strtol (rs[Rs_depth], 0, 0));
307	else
308	#endif	319	#endif
309	set (display);
310		320
311	extract_resources ();	321	#ifdef HAVE_AFTERIMAGE
312		322	//TODO: is this neccessary for future versions who check the global var whern the macro doesn'T set it?
		323	::dpy = NULL ; /* init global var from libAfter... */
		324	asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
		325	#endif
313	free (r_argv);	326	free (r_argv);
		327
		328	for (int i = NUM_RESOURCES; i--; )
		329	if (rs [i] == resval_undef)
		330	rs [i] = 0;
314		331
315	#if ENABLE_PERL	332	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	333	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	334	rs[Rs_perl_ext_1] = "default";
318		335
…		…
417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	434	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418	#endif	435	#endif
419		436
420	#ifdef XTERM_REVERSE_VIDEO	437	#ifdef XTERM_REVERSE_VIDEO
421	/* this is how xterm implements reverseVideo */	438	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	439	if (option (Opt_reverseVideo))
423	{	440	{
424	if (!rs[Rs_color + Color_fg])	441	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	442	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		443
426	if (!rs[Rs_color + Color_bg])	444	if (!rs[Rs_color + Color_bg])
427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	445	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428	}	446	}
429	#endif	447	#endif
430		448
…		…
432	if (!rs[Rs_color + i])	450	if (!rs[Rs_color + i])
433	rs[Rs_color + i] = def_colorName[i];	451	rs[Rs_color + i] = def_colorName[i];
434		452
435	#ifndef XTERM_REVERSE_VIDEO	453	#ifndef XTERM_REVERSE_VIDEO
436	/* this is how we implement reverseVideo */	454	/* this is how we implement reverseVideo */
437	if (OPTION (Opt_reverseVideo))	455	if (option (Opt_reverseVideo))
438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	456	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439	#endif	457	#endif
440		458
441	/* convenient aliases for setting fg/bg to colors */	459	/* convenient aliases for setting fg/bg to colors */
442	color_aliases (Color_fg);	460	color_aliases (Color_fg);
…		…
482	val = rxvt_network_display (rs[Rs_display_name]);	500	val = rxvt_network_display (rs[Rs_display_name]);
483	rs[Rs_display_name] = (const char *)val;	501	rs[Rs_display_name] = (const char *)val;
484		502
485	if (val == NULL)	503	if (val == NULL)
486	#endif /* DISPLAY_IS_IP */	504	#endif /* DISPLAY_IS_IP */
487	val = XDisplayString (xdisp);	505	val = XDisplayString (dpy);
488		506
489	if (rs[Rs_display_name] == NULL)	507	if (rs[Rs_display_name] == NULL)
490	rs[Rs_display_name] = val; /* use broken `:0' value */	508	rs[Rs_display_name] = val; /* use broken `:0' value */
491		509
492	i = strlen (val);	510	i = strlen (val);
…		…
616	* Initialize the command connection.	634	* Initialize the command connection.
617	* This should be called after the X server connection is established.	635	* This should be called after the X server connection is established.
618	*/	636	*/
619		637
620	#ifdef META8_OPTION	638	#ifdef META8_OPTION
621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	639	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622	#endif	640	#endif
623		641
624	get_ourmods ();	642	get_ourmods ();
625		643
626	if (!OPTION (Opt_scrollTtyOutput))	644	if (!option (Opt_scrollTtyOutput))
627	priv_modes \|= PrivMode_TtyOutputInh;	645	priv_modes \|= PrivMode_TtyOutputInh;
628	if (OPTION (Opt_scrollTtyKeypress))	646	if (option (Opt_scrollTtyKeypress))
629	priv_modes \|= PrivMode_Keypress;	647	priv_modes \|= PrivMode_Keypress;
630	if (!OPTION (Opt_jumpScroll))	648	if (!option (Opt_jumpScroll))
631	priv_modes \|= PrivMode_smoothScroll;	649	priv_modes \|= PrivMode_smoothScroll;
632		650
633	#ifndef NO_BACKSPACE_KEY	651	#ifndef NO_BACKSPACE_KEY
634	if (strcmp (key_backspace, "DEC") == 0)	652	if (strcmp (key_backspace, "DEC") == 0)
635	priv_modes \|= PrivMode_HaveBackSpace;	653	priv_modes \|= PrivMode_HaveBackSpace;
…		…
655	pix_colors = pix_colors_focused;	673	pix_colors = pix_colors_focused;
656	#endif	674	#endif
657		675
658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	676	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659	{	677	{
		678	const char *name = rs[Rs_color + i];
		679
		680	if (!name)
		681	continue;
		682
660	rxvt_color xcol;	683	rxvt_color xcol;
661		684
662	if (!rs[Rs_color + i])
663	continue;
664
665	if (!set_color (xcol, rs[Rs_color + i]))	685	if (!set_color (xcol, name))
666	{	686	{
667	#ifndef XTERM_REVERSE_VIDEO	687	#ifndef XTERM_REVERSE_VIDEO
668	if (i < 2 && OPTION (Opt_reverseVideo))	688	if (i < 2 && option (Opt_reverseVideo))
669	rs[Rs_color + i] = def_colorName[!i];	689	name = def_colorName [1 - i];
670	else	690	else
671	#endif	691	#endif
672	rs[Rs_color + i] = def_colorName[i];	692	name = def_colorName [i];
673		693
674	if (!rs[Rs_color + i])	694	if (!name)
675	continue;	695	continue;
676		696
677	if (!set_color (xcol, rs[Rs_color + i]))	697	if (!set_color (xcol, name))
678	{	698	{
679	switch (i)	699	switch (i)
680	{	700	{
681	case Color_fg:	701	case Color_fg:
682	case Color_bg:	702	case Color_bg:
683	/* fatal: need bg/fg color */
684	rxvt_warn ("unable to get foreground/background colour, continuing.\n");	703	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
		704	name = "";
685	break;	705	break;
686	#ifndef NO_CURSORCOLOR	706	#ifndef NO_CURSORCOLOR
687	case Color_cursor2:	707	case Color_cursor2:
688	xcol = pix_colors[Color_fg];	708	#endif
689	break;
690	#endif /* ! NO_CURSORCOLOR */
691	case Color_pointer_fg:	709	case Color_pointer_fg:
692	xcol = pix_colors[Color_fg];	710	name = rs[Rs_color + Color_fg];
		711	xcol.set (this, name);
693	break;	712	break;
694	default:	713	default:
695	xcol = pix_colors[Color_bg]; /* None */	714	name = rs[Rs_color + Color_bg];
		715	xcol.set (this, name);
696	break;	716	break;
697	}	717	}
698	}	718	}
699	}	719	}
700		720
701	pix_colors[i] = xcol;	721	pix_colors[i] = xcol;
702	SET_PIXCOLOR (i);	722	rs[Rs_color + i] = name;
703	}	723	}
704
705	#ifdef OFF_FOCUS_FADING
706	if (rs[Rs_fade])
707	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708	pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
709	#endif
710		724
711	if (depth <= 2)	725	if (depth <= 2)
712	{	726	{
713	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	727	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
714	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	728	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
715	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	729	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
716	}	730	}
717		731
718	/*	732	/*
719	* get scrollBar shadow colors	733	* get scrollBar shadow colors
720	*	734	*
721	* The calculations of topShadow/bottomShadow values are adapted	735	* The calculations of topShadow/bottomShadow values are adapted
722	* from the fvwm window manager.	736	* from the fvwm window manager.
723	*/	737	*/
724	#ifdef KEEP_SCROLLCOLOR	738	#ifdef KEEP_SCROLLCOLOR
725
726	if (depth <= 2)	739	if (depth <= 2)
727	{	740	{
728	/* Monochrome */	741	/* Monochrome */
729	pix_colors[Color_scroll] = pix_colors[Color_fg];	742	alias_color (Color_scroll, Color_fg);
730	pix_colors[Color_topShadow] = pix_colors[Color_bg];	743	alias_color (Color_topShadow, Color_bg);
731	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	744	alias_color (Color_bottomShadow, Color_bg);
732	}	745	}
733	else	746	else
734	{	747	{
735	rxvt_color xcol[2];	748	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
736	/* xcol[0] == white
737	* xcol[1] == top shadow
738	* xcol[2] == bot shadow */
739		749
740	xcol[1] = pix_colors[Color_scroll];	750	rgba cscroll;
741	xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));	751	pix_colors [Color_scroll].get (cscroll);
742
743	rxvt_rgba c0, c1;
744
745	xcol[0].get (this, c0);
746	xcol[1].get (this, c1);
747
748	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
749		752
750	/* topShadowColor */	753	/* topShadowColor */
751	if (!xcol[1].set (this,	754	if (!pix_colors[Color_topShadow].set (this,
752	rxvt_rgba (	755	rgba (
753	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	756	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
754	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	757	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
755	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	758	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
756	c1.a) // pa1 vs. pa0: arbitrary	759	cscroll.a)
757	));	760	))
758	xcol[1] = pix_colors[Color_White];	761	alias_color (Color_topShadow, Color_White);
759
760	pix_colors[Color_topShadow] = xcol[1];
761	}	762	}
762	#endif /* KEEP_SCROLLCOLOR */	763	#endif /* KEEP_SCROLLCOLOR */
		764
		765	#ifdef OFF_FOCUS_FADING
		766	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		767	update_fade_color (i);
		768	#endif
763	}	769	}
764		770
765	/----------------------------------------------------------------------/	771	/----------------------------------------------------------------------/
766	/* color aliases, fg/bg bright-bold */	772	/* color aliases, fg/bg bright-bold */
767	void	773	void
…		…
806		812
807	if (rsmod	813	if (rsmod
808	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	814	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
809	requestedmeta = rsmod[3] - '0';	815	requestedmeta = rsmod[3] - '0';
810		816
811	map = XGetModifierMapping (xdisp);	817	map = XGetModifierMapping (dpy);
812	kc = map->modifiermap;	818	kc = map->modifiermap;
813		819
814	for (i = 1; i < 6; i++)	820	for (i = 1; i < 6; i++)
815	{	821	{
816	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	822	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
818	for (j = map->max_keypermod; j--; k++)	824	for (j = map->max_keypermod; j--; k++)
819	{	825	{
820	if (kc[k] == 0)	826	if (kc[k] == 0)
821	break;	827	break;
822		828
823	switch (XKeycodeToKeysym (xdisp, kc[k], 0))	829	switch (XKeycodeToKeysym (dpy, kc[k], 0))
824	{	830	{
825	case XK_Num_Lock:	831	case XK_Num_Lock:
826	ModNumLockMask = modmasks[i - 1];	832	ModNumLockMask = modmasks[i - 1];
827	continue;	833	continue;
828		834
…		…
884	#endif	890	#endif
885	XGCValues gcvalue;	891	XGCValues gcvalue;
886	XSetWindowAttributes attributes;	892	XSetWindowAttributes attributes;
887	Window top, parent;	893	Window top, parent;
888		894
889	dLocal (Display *, xdisp);	895	dLocal (Display *, dpy);
890		896
891	/* grab colors before netscape does */	897	/* grab colors before netscape does */
892	Get_Colours ();	898	Get_Colours ();
893		899
894	if (!set_fonts ())	900	if (!set_fonts ())
895	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	901	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896		902
897	parent = display->root;	903	parent = display->root;
898		904
899	attributes.override_redirect = !!OPTION (Opt_override_redirect);	905	attributes.override_redirect = !!option (Opt_override_redirect);
900		906
901	#if ENABLE_FRILLS	907	#if ENABLE_FRILLS
902	if (OPTION (Opt_borderLess))	908	if (option (Opt_borderLess))
903	{	909	{
904	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)	910	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905	{	911	{
906	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	912	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
907	attributes.override_redirect = true;	913	attributes.override_redirect = true;
908	mwmhints.flags = 0;	914	mwmhints.flags = 0;
909	}	915	}
…		…
922	{	928	{
923	XWindowAttributes wattr;	929	XWindowAttributes wattr;
924		930
925	parent = strtol (rs[Rs_embed], 0, 0);	931	parent = strtol (rs[Rs_embed], 0, 0);
926		932
927	if (!XGetWindowAttributes (xdisp, parent, &wattr))	933	if (!XGetWindowAttributes (dpy, parent, &wattr))
928	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	934	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
929		935
930	window_calc (wattr.width, wattr.height);	936	window_calc (wattr.width, wattr.height);
931	}	937	}
932	#endif	938	#endif
…		…
936	/* sub-window placement & size in rxvt_resize_subwindows () */	942	/* sub-window placement & size in rxvt_resize_subwindows () */
937	attributes.background_pixel = pix_colors_focused [Color_border];	943	attributes.background_pixel = pix_colors_focused [Color_border];
938	attributes.border_pixel = pix_colors_focused [Color_border];	944	attributes.border_pixel = pix_colors_focused [Color_border];
939	attributes.colormap = cmap;	945	attributes.colormap = cmap;
940		946
941	top = XCreateWindow (xdisp, parent,	947	top = XCreateWindow (dpy, parent,
942	szHint.x, szHint.y,	948	szHint.x, szHint.y,
943	szHint.width, szHint.height,	949	szHint.width, szHint.height,
944	ext_bwidth,	950	ext_bwidth,
945	depth, InputOutput, visual,	951	depth, InputOutput, visual,
946	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	952	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
…		…
957	classHint.res_name = (char *)rs[Rs_name];	963	classHint.res_name = (char *)rs[Rs_name];
958	classHint.res_class = (char *)RESCLASS;	964	classHint.res_class = (char *)RESCLASS;
959		965
960	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	966	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
961	wmHint.input = True;	967	wmHint.input = True;
962	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	968	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963	wmHint.window_group = top;	969	wmHint.window_group = top;
964		970
965	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,	971	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966	&szHint, &wmHint, &classHint);	972	&szHint, &wmHint, &classHint);
967		973
968	#if ENABLE_FRILLS	974	#if ENABLE_FRILLS
969	if (mwmhints.flags)	975	if (mwmhints.flags)
970	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	976	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	977	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972	#endif	978	#endif
973		979
974	Atom protocols[] = {	980	Atom protocols[] = {
975	xa[XA_WM_DELETE_WINDOW],	981	xa[XA_WM_DELETE_WINDOW],
976	#if ENABLE_EWMH	982	#if ENABLE_EWMH
977	xa[XA_NET_WM_PING],	983	xa[XA_NET_WM_PING],
978	#endif	984	#endif
979	};	985	};
980		986
981	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	987	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982		988
983	#if ENABLE_FRILLS	989	#if ENABLE_FRILLS
984	if (rs[Rs_transient_for])	990	if (rs[Rs_transient_for])
985	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	991	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986	#endif	992	#endif
987		993
988	#if ENABLE_EWMH	994	#if ENABLE_EWMH
989	long pid = getpid ();	995	long pid = getpid ();
990		996
991	XChangeProperty (xdisp, top,	997	XChangeProperty (dpy, top,
992	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	998	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993	PropModeReplace, (unsigned char *)&pid, 1);	999	PropModeReplace, (unsigned char *)&pid, 1);
994		1000
995	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1001	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996	#endif	1002	#endif
997		1003
998	XSelectInput (xdisp, top,	1004	XSelectInput (dpy, top,
999	KeyPressMask	1005	KeyPressMask
1000	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1006	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1001	\| KeyReleaseMask	1007	\| KeyReleaseMask
1002	#endif	1008	#endif
1003	\| FocusChangeMask \| VisibilityChangeMask	1009	\| FocusChangeMask \| VisibilityChangeMask
1004	\| ExposureMask \| StructureNotifyMask);	1010	\| ExposureMask \| StructureNotifyMask);
1005		1011
1006	termwin_ev.start (display, top);	1012	termwin_ev.start (display, top);
1007		1013
1008	/* vt cursor: Black-on-White is standard, but this is more popular */	1014	/* vt cursor: Black-on-White is standard, but this is more popular */
1009	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);	1015	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010		1016
1011	#ifdef HAVE_SCROLLBARS	1017	#ifdef HAVE_SCROLLBARS
1012	/* cursor scrollBar: Black-on-White */	1018	/* cursor scrollBar: Black-on-White */
1013	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);	1019	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014	#endif	1020	#endif
1015		1021
1016	/* the vt window */	1022	/* the vt window */
1017	vt = XCreateSimpleWindow (xdisp, top,	1023	vt = XCreateSimpleWindow (dpy, top,
1018	window_vt_x, window_vt_y,	1024	window_vt_x, window_vt_y,
1019	width, height,	1025	width, height,
1020	0,	1026	0,
1021	pix_colors_focused[Color_fg],	1027	pix_colors_focused[Color_fg],
1022	pix_colors_focused[Color_bg]);	1028	pix_colors_focused[Color_bg]);
1023		1029
1024	attributes.bit_gravity = NorthWestGravity;	1030	attributes.bit_gravity = NorthWestGravity;
1025	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);	1031	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026		1032
1027	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1033	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1028		1034
1029	if (OPTION (Opt_pointerBlank))	1035	if (option (Opt_pointerBlank))
1030	vt_emask \|= PointerMotionMask;	1036	vt_emask \|= PointerMotionMask;
1031	else	1037	else
1032	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1038	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1033		1039
1034	vt_select_input ();	1040	vt_select_input ();
1035		1041
1036	vt_ev.start (display, vt);	1042	vt_ev.start (display, vt);
1037		1043
1038	#ifdef XPM_BACKGROUND	1044	#ifdef XPM_BACKGROUND
1039	if (rs[Rs_backgroundPixmap] != NULL	1045	if (rs[Rs_backgroundPixmap] != NULL
		1046	#ifndef HAVE_AFTERIMAGE
1040	&& !OPTION (Opt_transparent))	1047	&& !option (Opt_transparent)
		1048	#endif
		1049	)
1041	{	1050	{
1042	const char *p = rs[Rs_backgroundPixmap];	1051	const char *p = rs[Rs_backgroundPixmap];
1043		1052
1044	if ((p = strchr (p, ';')) != NULL)	1053	if ((p = strchr (p, ';')) != NULL)
1045	{	1054	{
…		…
1053	#endif	1062	#endif
1054		1063
1055	/* graphics context for the vt window */	1064	/* graphics context for the vt window */
1056	gcvalue.foreground = pix_colors[Color_fg];	1065	gcvalue.foreground = pix_colors[Color_fg];
1057	gcvalue.background = pix_colors[Color_bg];	1066	gcvalue.background = pix_colors[Color_bg];
1058	gcvalue.graphics_exposures = 1;	1067	gcvalue.graphics_exposures = 0;
1059		1068
1060	gc = XCreateGC (xdisp, vt,	1069	gc = XCreateGC (dpy, vt,
1061	GCForeground \| GCBackground \| GCGraphicsExposures,	1070	GCForeground \| GCBackground \| GCGraphicsExposures,
1062	&gcvalue);	1071	&gcvalue);
1063		1072
1064	drawable = new rxvt_drawable (this, vt);	1073	drawable = new rxvt_drawable (this, vt);
1065		1074
1066	#ifdef RXVT_SCROLLBAR	1075	#ifdef RXVT_SCROLLBAR
1067	gcvalue.foreground = pix_colors[Color_topShadow];	1076	gcvalue.foreground = pix_colors[Color_topShadow];
1068	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1077	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069	gcvalue.foreground = pix_colors[Color_bottomShadow];	1078	gcvalue.foreground = pix_colors[Color_bottomShadow];
1070	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1079	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];	1080	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1081	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073	#endif	1082	#endif
1074		1083
1075	#ifdef OFF_FOCUS_FADING	1084	#ifdef OFF_FOCUS_FADING
1076	// initially we are in unfocused state	1085	// initially we are in unfocused state
1077	if (rs[Rs_fade])	1086	if (rs[Rs_fade])
…		…
1086	* GET TTY CURRENT STATE *	1095	* GET TTY CURRENT STATE *
1087	* ------------------------------------------------------------------------- */	1096	* ------------------------------------------------------------------------- */
1088	void	1097	void
1089	rxvt_get_ttymode (ttymode_t *tio, int erase)	1098	rxvt_get_ttymode (ttymode_t *tio, int erase)
1090	{	1099	{
1091	#ifdef HAVE_TERMIOS_H
1092	/*	1100	/*
1093	* standard System V termios interface	1101	* standard System V termios interface
1094	*/	1102	*/
1095	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1103	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1096	{	1104	{
…		…
1163	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1171	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1164	# if defined (ECHOCTL) && defined (ECHOKE)	1172	# if defined (ECHOCTL) && defined (ECHOKE)
1165	\| ECHOCTL \| ECHOKE	1173	\| ECHOCTL \| ECHOKE
1166	# endif	1174	# endif
1167	\| ECHOE \| ECHOK);	1175	\| ECHOE \| ECHOK);
1168	# else /* HAVE_TERMIOS_H */
1169
1170	/*
1171	* sgtty interface
1172	*/
1173
1174	/* get parameters -- gtty */
1175	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1176	{
1177	tio->sg.sg_erase = CERASE; /* ^H */
1178	tio->sg.sg_kill = CKILL; /* ^U */
1179	}
1180
1181	if (erase != -1)
1182	tio->sg.sg_erase = (char)erase;
1183
1184	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1185
1186	/* get special characters */
1187	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1188	{
1189	tio->tc.t_intrc = CINTR; /* ^C */
1190	tio->tc.t_quitc = CQUIT; /* ^\ */
1191	tio->tc.t_startc = CSTART; /* ^Q */
1192	tio->tc.t_stopc = CSTOP; /* ^S */
1193	tio->tc.t_eofc = CEOF; /* ^D */
1194	tio->tc.t_brkc = -1;
1195	}
1196
1197	/* get local special chars */
1198	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1199	{
1200	tio->lc.t_suspc = CSUSP; /* ^Z */
1201	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1202	tio->lc.t_rprntc = CRPRNT; /* ^R */
1203	tio->lc.t_flushc = CFLUSH; /* ^O */
1204	tio->lc.t_werasc = CWERASE; /* ^W */
1205	tio->lc.t_lnextc = CLNEXT; /* ^V */
1206	}
1207	/* get line discipline */
1208	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1209	# ifdef NTTYDISC
1210	tio->line = NTTYDISC;
1211	# endif /* NTTYDISC */
1212
1213	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1214	#endif /* HAVE_TERMIOS_H */
1215		1176
1216	/*	1177	/*
1217	* Debugging	1178	* Debugging
1218	*/	1179	*/
1219	#ifdef DEBUG_TTYMODE	1180	#ifdef DEBUG_TTYMODE
…		…
1320	else	1281	else
1321	#endif	1282	#endif
1322	if (!pty->get ())	1283	if (!pty->get ())
1323	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1284	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324		1285
1325	pty->set_utf8_mode (enc_utf8);
1326
1327	/* set initial window size */
1328	tt_winch ();
1329
1330	int er;	1286	int er;
1331		1287
1332	#ifndef NO_BACKSPACE_KEY	1288	#ifndef NO_BACKSPACE_KEY
1333	if (key_backspace[0] && !key_backspace[1])	1289	if (key_backspace[0] && !key_backspace[1])
1334	er = key_backspace[0];	1290	er = key_backspace[0];
…		…
1337	else	1293	else
1338	#endif	1294	#endif
1339	er = -1;	1295	er = -1;
1340		1296
1341	rxvt_get_ttymode (&tio, er);	1297	rxvt_get_ttymode (&tio, er);
		1298	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
		1299	pty->set_utf8_mode (enc_utf8);
		1300
		1301	/* set initial window size */
		1302	tt_winch ();
1342		1303
1343	#if ENABLE_FRILLS	1304	#if ENABLE_FRILLS
1344	if (rs[Rs_pty_fd])	1305	if (rs[Rs_pty_fd])
1345	return;	1306	return;
1346	#endif	1307	#endif
…		…
1377	}	1338	}
1378		1339
1379	_exit (EXIT_FAILURE);	1340	_exit (EXIT_FAILURE);
1380		1341
1381	default:	1342	default:
1382	if (!OPTION (Opt_utmpInhibit))	1343	if (!option (Opt_utmpInhibit))
1383	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1344	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1384		1345
1385	pty->close_tty ();	1346	pty->close_tty ();
1386		1347
1387	child_ev.start (cmd_pid);	1348	child_ev.start (cmd_pid);
1388		1349
…		…
1401	int	1362	int
1402	rxvt_term::run_child (const char const argv)	1363	rxvt_term::run_child (const char const argv)
1403	{	1364	{
1404	char *login;	1365	char *login;
1405		1366
1406	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408	if (OPTION (Opt_console))	1367	if (option (Opt_console))
1409	{ /* be virtual console, fail silently */	1368	{ /* be virtual console, fail silently */
1410	#ifdef TIOCCONS	1369	#ifdef TIOCCONS
1411	unsigned int on = 1;	1370	unsigned int on = 1;
1412		1371
1413	ioctl (STDIN_FILENO, TIOCCONS, &on);	1372	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1462	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1421	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1463	shell = "/bin/sh";	1422	shell = "/bin/sh";
1464		1423
1465	argv0 = (const char *)rxvt_r_basename (shell);	1424	argv0 = (const char *)rxvt_r_basename (shell);
1466		1425
1467	if (OPTION (Opt_loginShell))	1426	if (option (Opt_loginShell))
1468	{	1427	{
1469	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1428	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1470		1429
1471	login[0] = '-';	1430	login[0] = '-';
1472	strcpy (&login[1], argv0);	1431	strcpy (&login[1], argv0);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.160 by root, Mon Jan 30 19:46:13 2006 UTC vs. Revision 1.192 by root, Tue Jul 24 14:38:59 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.160 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.192 by root, Tue Jul 24 14:38:59 2007 UTC