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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 UTC

…		…
10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>	10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>	11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14	* - extensive modifications	14	* - extensive modifications
15	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16	* - QNX support
17	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18	*	16	*
19	* 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
20	* 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
21	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
22	* (at your option) any later version.	20	* (at your option) any later version.
…		…
36		34
37	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
38	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
39	#include "rxvtutil.h"	37	#include "rxvtutil.h"
40	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
41		40
42	#include <limits>	41	#include <limits>
43		42
44	#include <csignal>	43	#include <csignal>
		44
		45	#include <fcntl.h>
45		46
46	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
47	# define X_LOCALE	48	# define X_LOCALE
48	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
49	#else	50	#else
…		…
154	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
155	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
156	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
157	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
158	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
159	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
160	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
161	# else	162	# else
162	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163	# endif	164	# endif
164	/* high-intensity colors */	165	/* high-intensity colors */
165	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
166	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
250	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
251		252
252	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
253	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
254	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
255	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
256	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
257	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
258	NULL, /* Color_border */	259	NULL, /* Color_border */
259	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
260	NULL, /* Color_BD */	261	NULL, /* Color_BD */
261	NULL, /* Color_IT */	262	NULL, /* Color_IT */
262	NULL, /* Color_UL */	263	NULL, /* Color_UL */
263	NULL, /* Color_RV */	264	NULL, /* Color_RV */
264	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
266	NULL, // Color_underline	267	NULL, // Color_underline
267	#endif	268	#endif
268	#ifdef OPTION_HC	269	#ifdef OPTION_HC
269	NULL,	270	NULL,
270	#endif	271	#endif
271	#ifdef KEEP_SCROLLCOLOR	272	#ifdef HAVE_SCROLLBARS
272	COLOR_SCROLLBAR,	273	COLOR_SCROLLBAR,
		274	#endif
		275	#ifdef RXVT_SCROLLBAR
273	COLOR_SCROLLTROUGH,	276	COLOR_SCROLLTROUGH,
274	#endif /* KEEP_SCROLLCOLOR */	277	#endif
275	#if ENABLE_TRANSPARENCY	278	#if ENABLE_TRANSPARENCY
276	NULL,	279	NULL,
277	#endif	280	#endif
278	#if OFF_FOCUS_FADING	281	#if OFF_FOCUS_FADING
279	"rgb:00/00/00",	282	"rgb:00/00/00",
280	#endif	283	#endif
281	};	284	};
282		285
283	bool	286	void
284	rxvt_term::init_vars ()	287	rxvt_term::init_vars ()
285	{	288	{
286	pix_colors = //	289	pix_colors = pix_colors_focused;
287	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288	#ifdef OFF_FOCUS_FADING
289	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290	#endif
291
292		290
293	MEvent.time = CurrentTime;	291	MEvent.time = CurrentTime;
294	MEvent.button = AnyButton;	292	MEvent.button = AnyButton;
295	want_refresh = 1;	293	want_refresh = 1;
296	priv_modes = SavedModes = PrivMode_Default;	294	priv_modes = SavedModes = PrivMode_Default;
…		…
298	nrow = 24;	296	nrow = 24;
299	int_bwidth = INTERNALBORDERWIDTH;	297	int_bwidth = INTERNALBORDERWIDTH;
300	ext_bwidth = EXTERNALBORDERWIDTH;	298	ext_bwidth = EXTERNALBORDERWIDTH;
301	lineSpace = LINESPACE;	299	lineSpace = LINESPACE;
302	saveLines = SAVELINES;	300	saveLines = SAVELINES;
303	numpix_colors = TOTAL_COLORS;
304		301
305	refresh_type = SLOW_REFRESH;	302	refresh_type = SLOW_REFRESH;
306		303
307	oldcursor.row = oldcursor.col = -1;	304	oldcursor.row = oldcursor.col = -1;
308	last_bot = last_state = -1;
309		305
310	set_option (Opt_scrollBar);	306	set_option (Opt_scrollBar);
311	set_option (Opt_scrollTtyOutput);	307	set_option (Opt_scrollTtyOutput);
312	set_option (Opt_jumpScroll);	308	set_option (Opt_jumpScroll);
313	set_option (Opt_skipScroll);	309	set_option (Opt_skipScroll);
314	set_option (Opt_secondaryScreen);	310	set_option (Opt_secondaryScreen);
315	set_option (Opt_secondaryScroll);	311	set_option (Opt_secondaryScroll);
316	set_option (Opt_pastableTabs);	312	set_option (Opt_pastableTabs);
317	set_option (Opt_intensityStyles);	313	set_option (Opt_intensityStyles);
318	set_option (Opt_iso14755_52);	314	set_option (Opt_iso14755_52);
319		315	set_option (Opt_buffered);
320	return true;
321	}	316	}
322		317
323	void	318	static void
324	rxvt_term::init_secondary ()	319	init_secondary ()
325	{	320	{
326	int i;	321	int i;
327		322
328	/*
329	* Close all unused file descriptors
330	* We don't want them, we don't need them.
331	*/
332	if ((i = open ("/dev/null", O_RDONLY)) < 0)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
333	{	324	{
334	/* TODO: BOO HISS */
335	dup2 (STDERR_FILENO, STDIN_FILENO);	325	dup2 (STDERR_FILENO, STDIN_FILENO);
336	}	326	}
337	else if (i != STDIN_FILENO)	327	else if (i != STDIN_FILENO)
338	{	328	{
339	dup2 (i, STDIN_FILENO);	329	dup2 (i, STDIN_FILENO);
340	close (i);	330	close (i);
341	}	331	}
342		332
343	dup2 (STDERR_FILENO, STDOUT_FILENO);	333	dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345	#if 0 // schmorp sayz closing filies is murder
346	for (i = STDERR_FILENO + 1; i < num_fds; i++)
347	{
348	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349	if (i == 4 \|\| i == 7)
350	continue;
351	#endif
352	close (i);
353	}
354	#endif
355	}	334	}
356		335
357	/----------------------------------------------------------------------/	336	/----------------------------------------------------------------------/
358	const char **	337	const char **
359	rxvt_term::init_resources (int argc, const char const argv)	338	rxvt_term::init_resources (int argc, const char const argv)
…		…
416	if (rs[Rs_depth])	395	if (rs[Rs_depth])
417	select_visual (strtol (rs[Rs_depth], 0, 0));	396	select_visual (strtol (rs[Rs_depth], 0, 0));
418	#endif	397	#endif
419		398
420	#ifdef HAVE_AFTERIMAGE	399	#ifdef HAVE_AFTERIMAGE
		400	set_application_name ((char*)rs[Rs_name]);
		401	set_output_threshold (OUTPUT_LEVEL_WARNING);
421	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);	402	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422	#endif	403	#endif
423	free (r_argv);	404	free (r_argv);
424		405
425	for (int i = NUM_RESOURCES; i--; )	406	for (int i = NUM_RESOURCES; i--; )
…		…
538	color_aliases (Color_fg);	519	color_aliases (Color_fg);
539	color_aliases (Color_bg);	520	color_aliases (Color_bg);
540	#ifndef NO_CURSORCOLOR	521	#ifndef NO_CURSORCOLOR
541	color_aliases (Color_cursor);	522	color_aliases (Color_cursor);
542	color_aliases (Color_cursor2);	523	color_aliases (Color_cursor2);
543	#endif /* NO_CURSORCOLOR */	524	#endif /* NO_CURSORCOLOR */
544	color_aliases (Color_pointer_fg);	525	color_aliases (Color_pointer_fg);
545	color_aliases (Color_pointer_bg);	526	color_aliases (Color_pointer_bg);
546	color_aliases (Color_border);	527	color_aliases (Color_border);
547	#ifndef NO_BOLD_UNDERLINE_REVERSE	528	#ifndef NO_BOLD_UNDERLINE_REVERSE
548	color_aliases (Color_BD);	529	color_aliases (Color_BD);
549	color_aliases (Color_UL);	530	color_aliases (Color_UL);
550	color_aliases (Color_RV);	531	color_aliases (Color_RV);
551	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	532	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552		533
553	if (!rs[Rs_color + Color_border])	534	if (!rs[Rs_color + Color_border])
554	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	535	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555		536
556	return cmd_argv;	537	return cmd_argv;
		538	}
		539
		540	/----------------------------------------------------------------------/
		541	void
		542	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		543	{
		544	this->envv = envv;
		545
		546	SET_R (this);
		547	set_locale ("");
		548	set_environ (envv); // few things in X do not call setlocale :(
		549
		550	init_vars ();
		551
		552	init_secondary ();
		553
		554	const char **cmd_argv = init_resources (argc, argv);
		555
		556	#ifdef KEYSYM_RESOURCE
		557	keyboard->register_done ();
		558	#endif
		559
		560	#ifdef HAVE_SCROLLBARS
		561	if (option (Opt_scrollBar))
		562	scrollBar.setIdle (); /* set existence for size calculations */
		563	#endif
		564
		565	pty = ptytty::create ();
		566
		567	create_windows (argc, argv);
		568
		569	init_xlocale ();
		570
		571	scr_reset (); // initialize screen
		572
		573	#if 0
		574	XSynchronize (dpy, True);
		575	#endif
		576
		577	#ifdef HAVE_SCROLLBARS
		578	if (option (Opt_scrollBar))
		579	resize_scrollbar (); /* create and map scrollbar */
		580	#endif
		581	#ifdef HAVE_BG_PIXMAP
		582	{
		583	bgPixmap.set_target (this);
		584	bgPixmap.invalidate ();
		585
		586	#ifdef ENABLE_TRANSPARENCY
		587	if (option (Opt_transparent))
		588	{
		589	bgPixmap.set_transparent ();
		590
		591	#ifdef HAVE_AFTERIMAGE
		592	if (rs [Rs_blurradius])
		593	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		594	#endif
		595	if (ISSET_PIXCOLOR (Color_tint))
		596	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		597
		598	if (rs [Rs_shade])
		599	bgPixmap.set_shade (rs [Rs_shade]);
		600
		601	bgPixmap.set_root_pixmap ();
		602	XSelectInput (dpy, display->root, PropertyChangeMask);
		603	rootwin_ev.start (display, display->root);
		604	}
		605	#endif
		606
		607	#ifdef BG_IMAGE_FROM_FILE
		608	if (rs[Rs_backgroundPixmap])
		609	{
		610	const char *p = rs[Rs_backgroundPixmap];
		611
		612	if ((p = strchr (p, ';')) != 0)
		613	{
		614	p++;
		615	bgPixmap.set_geometry (p);
		616	}
		617	else
		618	bgPixmap.set_defaultGeometry ();
		619
		620	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		621	if (!bgPixmap.window_position_sensitive ())
		622	update_background ();
		623	}
		624	#endif
		625	}
		626	#endif
		627
		628	#if ENABLE_PERL
		629	rootwin_ev.start (display, display->root);
		630	#endif
		631
		632	set_colorfgbg ();
		633
		634	init_command (cmd_argv);
		635
		636	free (cmd_argv);
		637
		638	if (pty->pty >= 0)
		639	pty_ev.start (pty->pty, ev::READ);
		640
		641	HOOK_INVOKE ((this, HOOK_START, DT_END));
		642
		643	#if ENABLE_XEMBED
		644	if (rs[Rs_embed])
		645	{
		646	long info[2] = { 0, XEMBED_MAPPED };
		647
		648	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		649	32, PropModeReplace, (unsigned char *)&info, 2);
		650	}
		651	#endif
		652
		653	XMapWindow (dpy, vt);
		654	XMapWindow (dpy, parent[0]);
		655
		656	refresh_check ();
557	}	657	}
558		658
559	/----------------------------------------------------------------------/	659	/----------------------------------------------------------------------/
560	void	660	void
561	rxvt_term::init_env ()	661	rxvt_term::init_env ()
…		…
576	*/	676	*/
577	val = rxvt_network_display (rs[Rs_display_name]);	677	val = rxvt_network_display (rs[Rs_display_name]);
578	rs[Rs_display_name] = (const char *)val;	678	rs[Rs_display_name] = (const char *)val;
579		679
580	if (val == NULL)	680	if (val == NULL)
581	#endif /* DISPLAY_IS_IP */	681	#endif /* DISPLAY_IS_IP */
582	val = XDisplayString (dpy);	682	val = XDisplayString (dpy);
583		683
584	if (rs[Rs_display_name] == NULL)	684	if (rs[Rs_display_name] == NULL)
585	rs[Rs_display_name] = val; /* use broken `:0' value */	685	rs[Rs_display_name] = val; /* use broken `:0' value */
586		686
…		…
626	#ifdef HAVE_UNSETENV	726	#ifdef HAVE_UNSETENV
627	/* avoid passing old settings and confusing term size */	727	/* avoid passing old settings and confusing term size */
628	unsetenv ("LINES");	728	unsetenv ("LINES");
629	unsetenv ("COLUMNS");	729	unsetenv ("COLUMNS");
630	unsetenv ("TERMCAP"); /* terminfo should be okay */	730	unsetenv ("TERMCAP"); /* terminfo should be okay */
631	#endif /* HAVE_UNSETENV */	731	#endif /* HAVE_UNSETENV */
632	}	732	}
633		733
634	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
635	/*	735	/*
636	* This is more or less stolen straight from XFree86 xterm.	736	* This is more or less stolen straight from XFree86 xterm.
…		…
657		757
658	this->locale = "C";	758	this->locale = "C";
659	}	759	}
660		760
661		761
662	this->locale = rxvt_strdup (this->locale);	762	this->locale = strdup (this->locale);
663	SET_LOCALE (this->locale);	763	SET_LOCALE (this->locale);
664	mbstate.reset ();	764	mbstate.reset ();
665	#endif	765	#endif
666		766
667	#if HAVE_NL_LANGINFO	767	#if HAVE_NL_LANGINFO
…		…
747	int i;	847	int i;
748		848
749	#ifdef OFF_FOCUS_FADING	849	#ifdef OFF_FOCUS_FADING
750	pix_colors = pix_colors_focused;	850	pix_colors = pix_colors_focused;
751	#endif	851	#endif
752		852
753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	853	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754	{	854	{
755	const char *name = rs[Rs_color + i];	855	const char *name = rs[Rs_color + i];
756		856
757	if (!name)	857	if (!name)
…		…
810	* get scrollBar shadow colors	910	* get scrollBar shadow colors
811	*	911	*
812	* The calculations of topShadow/bottomShadow values are adapted	912	* The calculations of topShadow/bottomShadow values are adapted
813	* from the fvwm window manager.	913	* from the fvwm window manager.
814	*/	914	*/
815	#ifdef KEEP_SCROLLCOLOR	915	#ifdef RXVT_SCROLLBAR
816	if (depth <= 2)	916	if (depth <= 2)
817	{	917	{
818	/* Monochrome */	918	/* Monochrome */
819	alias_color (Color_scroll, Color_fg);	919	alias_color (Color_scroll, Color_fg);
820	alias_color (Color_topShadow, Color_bg);	920	alias_color (Color_topShadow, Color_bg);
…		…
835	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	935	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836	cscroll.a)	936	cscroll.a)
837	))	937	))
838	alias_color (Color_topShadow, Color_White);	938	alias_color (Color_topShadow, Color_White);
839	}	939	}
840	#endif /* KEEP_SCROLLCOLOR */	940	#endif
841		941
842	#ifdef OFF_FOCUS_FADING	942	#ifdef OFF_FOCUS_FADING
843	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	943	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844	update_fade_color (i);	944	update_fade_color (i);
845	#endif	945	#endif
…		…
853	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	953	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854	{	954	{
855	int i = atoi (rs[Rs_color + idx]);	955	int i = atoi (rs[Rs_color + idx]);
856		956
857	if (i >= 8 && i <= 15)	957	if (i >= 8 && i <= 15)
858	{ /* bright colors */	958	/* bright colors */
859	i -= 8;
860	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	959	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861	return;	960	else if (i >= 0 && i <= 7)
862	}	961	/* normal colors */
863
864	if (i >= 0 && i <= 7) /* normal colors */
865	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	962	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866	}	963	}
867	}	964	}
868		965
869	/----------------------------------------------------------------------/	966	/----------------------------------------------------------------------/
…		…
1085	termwin_ev.start (display, top);	1182	termwin_ev.start (display, top);
1086		1183
1087	/* vt cursor: Black-on-White is standard, but this is more popular */	1184	/* vt cursor: Black-on-White is standard, but this is more popular */
1088	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1185	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1089		1186
1090	#ifdef HAVE_SCROLLBARS
1091	/* cursor scrollBar: Black-on-White */
1092	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093	#endif
1094
1095	/* the vt window */	1187	/* the vt window */
1096	vt = XCreateSimpleWindow (dpy, top,	1188	vt = XCreateSimpleWindow (dpy, top,
1097	window_vt_x, window_vt_y,	1189	window_vt_x, window_vt_y,
1098	width, height,	1190	width, height,
1099	0,	1191	0,
…		…
1123	GCForeground \| GCBackground \| GCGraphicsExposures,	1215	GCForeground \| GCBackground \| GCGraphicsExposures,
1124	&gcvalue);	1216	&gcvalue);
1125		1217
1126	drawable = new rxvt_drawable (this, vt);	1218	drawable = new rxvt_drawable (this, vt);
1127		1219
1128	#ifdef RXVT_SCROLLBAR
1129	gcvalue.foreground = pix_colors[Color_topShadow];
1130	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131	gcvalue.foreground = pix_colors[Color_bottomShadow];
1132	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135	#endif
1136
1137	#ifdef OFF_FOCUS_FADING	1220	#ifdef OFF_FOCUS_FADING
1138	// initially we are in unfocused state	1221	// initially we are in unfocused state
1139	if (rs[Rs_fade])	1222	if (rs[Rs_fade])
1140	pix_colors = pix_colors_unfocused;	1223	pix_colors = pix_colors_unfocused;
1141	#endif	1224	#endif
…		…
1146		1229
1147	/* ------------------------------------------------------------------------- *	1230	/* ------------------------------------------------------------------------- *
1148	* GET TTY CURRENT STATE *	1231	* GET TTY CURRENT STATE *
1149	* ------------------------------------------------------------------------- */	1232	* ------------------------------------------------------------------------- */
1150	void	1233	void
1151	rxvt_get_ttymode (ttymode_t *tio, int erase)	1234	rxvt_get_ttymode (struct termios *tio, int erase)
1152	{	1235	{
1153	/*	1236	/*
1154	* standard System V termios interface	1237	* standard System V termios interface
1155	*/	1238	*/
1156	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1239	if (tcgetattr (STDIN_FILENO, tio) < 0)
1157	{	1240	{
1158	// return error - use system defaults,	1241	// return error - use system defaults,
1159	// where possible, and zero elsewhere	1242	// where possible, and zero elsewhere
1160	memset (tio, 0, sizeof (ttymode_t));	1243	memset (tio, 0, sizeof (struct termios));
1161		1244
1162	tio->c_cc[VINTR] = CINTR;	1245	tio->c_cc[VINTR] = CINTR;
1163	tio->c_cc[VQUIT] = CQUIT;	1246	tio->c_cc[VQUIT] = CQUIT;
1164	tio->c_cc[VERASE] = CERASE;	1247	tio->c_cc[VERASE] = CERASE;
1165	#ifdef VERASE2	1248	#ifdef VERASE2
…		…
1229		1312
1230	/*	1313	/*
1231	* Debugging	1314	* Debugging
1232	*/	1315	*/
1233	#ifdef DEBUG_TTYMODE	1316	#ifdef DEBUG_TTYMODE
1234	#ifdef HAVE_TERMIOS_H
1235	/* c_iflag bits */	1317	/* c_iflag bits */
1236	fprintf (stderr, "Input flags\n");	1318	fprintf (stderr, "Input flags\n");
1237		1319
1238	/* cpp token stringize doesn't work on all machines <sigh> */	1320	/* cpp token stringize doesn't work on all machines <sigh> */
1239	# define FOO(flag,name) \	1321	# define FOO(flag,name) \
…		…
1302	FOO (VLNEXT, "VLNEXT");	1384	FOO (VLNEXT, "VLNEXT");
1303	# endif	1385	# endif
1304		1386
1305	fprintf (stderr, "\n");	1387	fprintf (stderr, "\n");
1306	# undef FOO	1388	# undef FOO
1307	# endif /* HAVE_TERMIOS_H */	1389	#endif /* DEBUG_TTYMODE */
1308	#endif /* DEBUG_TTYMODE */
1309	}	1390	}
1310		1391
1311	/----------------------------------------------------------------------/	1392	/----------------------------------------------------------------------/
1312	/*	1393	/*
1313	* Run the command in a subprocess and return a file descriptor for the	1394	* Run the command in a subprocess and return a file descriptor for the
…		…
1346	else	1427	else
1347	#endif	1428	#endif
1348	er = -1;	1429	er = -1;
1349		1430
1350	rxvt_get_ttymode (&tio, er);	1431	rxvt_get_ttymode (&tio, er);
1351	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1432	/* init terminal attributes */
		1433	cfsetospeed (&tio, BAUDRATE);
		1434	cfsetispeed (&tio, BAUDRATE);
		1435	tcsetattr (pty->tty, TCSANOW, &tio);
1352	pty->set_utf8_mode (enc_utf8);	1436	pty->set_utf8_mode (enc_utf8);
1353		1437
1354	/* set initial window size */	1438	/* set initial window size */
1355	tt_winch ();	1439	tt_winch ();
1356		1440
…		…
1416	rxvt_term::run_child (const char const argv)	1500	rxvt_term::run_child (const char const argv)
1417	{	1501	{
1418	char *login;	1502	char *login;
1419		1503
1420	if (option (Opt_console))	1504	if (option (Opt_console))
		1505	{
1421	{ /* be virtual console, fail silently */	1506	/* be virtual console, fail silently */
1422	#ifdef TIOCCONS	1507	#ifdef TIOCCONS
1423	unsigned int on = 1;	1508	unsigned int on = 1;
1424		1509
1425	ioctl (STDIN_FILENO, TIOCCONS, &on);	1510	ioctl (STDIN_FILENO, TIOCCONS, &on);
1426	#elif defined (SRIOCSREDIR)	1511	#elif defined (SRIOCSREDIR)
…		…
1428		1513
1429	fd = open (CONSOLE, O_WRONLY, 0);	1514	fd = open (CONSOLE, O_WRONLY, 0);
1430	if (fd >= 0)	1515	if (fd >= 0)
1431	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1516	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432	close (fd);	1517	close (fd);
1433	#endif /* SRIOCSREDIR */	1518	#endif /* SRIOCSREDIR */
1434	}	1519	}
1435		1520
1436	/* reset signals and spin off the command interpreter */	1521	/* reset signals and spin off the command interpreter */
1437	signal (SIGINT, SIG_DFL);	1522	signal (SIGINT, SIG_DFL);
1438	signal (SIGQUIT, SIG_DFL);	1523	signal (SIGQUIT, SIG_DFL);
…		…
1445	*/	1530	*/
1446	#ifdef SIGTSTP	1531	#ifdef SIGTSTP
1447	signal (SIGTSTP, SIG_IGN);	1532	signal (SIGTSTP, SIG_IGN);
1448	signal (SIGTTIN, SIG_IGN);	1533	signal (SIGTTIN, SIG_IGN);
1449	signal (SIGTTOU, SIG_IGN);	1534	signal (SIGTTOU, SIG_IGN);
1450	#endif /* SIGTSTP */	1535	#endif /* SIGTSTP */
1451		1536
1452	// unblock signals (signals are blocked by iom.C	1537	// unblock signals (signals are blocked by iom.C
1453	sigset_t ss;	1538	sigset_t ss;
1454	sigemptyset (&ss);	1539	sigemptyset (&ss);
1455	sigprocmask (SIG_SETMASK, &ss, 0);	1540	sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs. Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 UTC