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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.163 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.219 by ayin, Sun Oct 28 11:06: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>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
		10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
		11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
		12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	14	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	15	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	16	* - QNX support
14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	17	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
38		41
39	#include <limits>	42	#include <limits>
40		43
41	#include <csignal>	44	#include <csignal>
42		45
		46	#ifdef HAVE_XSETLOCALE
		47	# define X_LOCALE
		48	# include <X11/Xlocale.h>
		49	#else
		50	# ifdef HAVE_SETLOCALE
		51	# include <clocale>
		52	# endif
		53	#endif
		54
		55	#ifdef HAVE_NL_LANGINFO
		56	# include <langinfo.h>
		57	#endif
		58
		59	#ifdef DISPLAY_IS_IP
		60	/* On Solaris link with -lsocket and -lnsl */
		61	#include <sys/types.h>
		62	#include <sys/socket.h>
		63
		64	/* these next two are probably only on Sun (not Solaris) */
		65	#ifdef HAVE_SYS_SOCKIO_H
		66	#include <sys/sockio.h>
		67	#endif
		68	#ifdef HAVE_SYS_BYTEORDER_H
		69	#include <sys/byteorder.h>
		70	#endif
		71
		72	#include <netinet/in.h>
		73	#include <arpa/inet.h>
		74	#include <net/if.h>
		75	#include <net/if_arp.h>
		76
		77	static char *
		78	rxvt_network_display (const char *display)
		79	{
		80	char buffer[1024], *rval = NULL;
		81	struct ifconf ifc;
		82	struct ifreq *ifr;
		83	int i, skfd;
		84
		85	if (display[0] != ':' && strncmp (display, "unix:", 5))
		86	return (char ) display; / nothing to do */
		87
		88	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		89	ifc.ifc_buf = buffer;
		90
		91	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		92	{
		93	perror ("socket");
		94	return NULL;
		95	}
		96
		97	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		98	{
		99	perror ("SIOCGIFCONF");
		100	close (skfd);
		101	return NULL;
		102	}
		103
		104	for (i = 0, ifr = ifc.ifc_req;
		105	i < (ifc.ifc_len / sizeof (struct ifreq));
		106	i++, ifr++)
		107	{
		108	struct ifreq ifr2;
		109
		110	strcpy (ifr2.ifr_name, ifr->ifr_name);
		111
		112	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		113	{
		114	unsigned long addr;
		115	struct sockaddr_in *p_addr;
		116
		117	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		118	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		119
		120	/*
		121	* not "0.0.0.0" or "127.0.0.1" - so format the address
		122	*/
		123	if (addr && addr != 0x7F000001)
		124	{
		125	char *colon = strchr (display, ':');
		126
		127	if (colon == NULL)
		128	colon = ":0.0";
		129
		130	rval = rxvt_malloc (strlen (colon) + 16);
		131	sprintf (rval, "%d.%d.%d.%d%s",
		132	(int) ((addr >> 030) & 0xFF),
		133	(int) ((addr >> 020) & 0xFF),
		134	(int) ((addr >> 010) & 0xFF),
		135	(int) (addr & 0xFF), colon);
		136	break;
		137	}
		138	}
		139	}
		140
		141	close (skfd);
		142
		143	return rval;
		144	}
		145	#endif
		146
43	const char *const def_colorName[] =	147	const char *const def_colorName[] =
44	{	148	{
45	COLOR_FOREGROUND,	149	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	150	COLOR_BACKGROUND,
47	/* low-intensity colors */	151	/* low-intensity colors */
48	"rgb:00/00/00", // 0: black (Black)	152	"rgb:00/00/00", // 0: black (Black)
49	"rgb:cd/00/00", // 1: red (Red3)	153	"rgb:cd/00/00", // 1: red (Red3)
50	"rgb:00/cd/00", // 2: green (Green3)	154	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)	155	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"rgb:00/00/cd", // 4: blue (Blue3)	156	"rgb:00/00/cd", // 4: blue (Blue3)
53	"rgb:cd/00/cd", // 5: magenta (Magenta3)	157	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"rgb:00/cd/cd", // 6: cyan (Cyan3)	158	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	159	# ifdef XTERM_COLORS
56	"rgb:e5/e5/e5", // 7: white (Grey90)	160	"rgb:e5/e5/e5", // 7: white (Grey90)
…		…
166	#endif	270	#endif
167	#ifdef KEEP_SCROLLCOLOR	271	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
169	COLOR_SCROLLTROUGH,	273	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	274	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	275	#if ENABLE_TRANSPARENCY
172	NULL,	276	NULL,
173	#endif	277	#endif
174	#if OFF_FOCUS_FADING	278	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	279	"rgb:00/00/00",
176	#endif	280	#endif
…		…
183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	287	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184	#ifdef OFF_FOCUS_FADING	288	#ifdef OFF_FOCUS_FADING
185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	289	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186	#endif	290	#endif
187		291
188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
189	pixmap = None;
190	#endif
191		292
192	MEvent.time = CurrentTime;	293	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	294	MEvent.button = AnyButton;
194	options = DEFAULT_OPTIONS;
195	want_refresh = 1;	295	want_refresh = 1;
196	priv_modes = SavedModes = PrivMode_Default;	296	priv_modes = SavedModes = PrivMode_Default;
197	ncol = 80;	297	ncol = 80;
198	nrow = 24;	298	nrow = 24;
199	int_bwidth = INTERNALBORDERWIDTH;	299	int_bwidth = INTERNALBORDERWIDTH;
200	ext_bwidth = EXTERNALBORDERWIDTH;	300	ext_bwidth = EXTERNALBORDERWIDTH;
201	lineSpace = LINESPACE;	301	lineSpace = LINESPACE;
202	saveLines = SAVELINES;	302	saveLines = SAVELINES;
203	numpix_colors = TOTAL_COLORS;	303	numpix_colors = TOTAL_COLORS;
204		304
205	refresh_limit = 1;
206	refresh_type = SLOW_REFRESH;	305	refresh_type = SLOW_REFRESH;
207		306
208	oldcursor.row = oldcursor.col = -1;	307	oldcursor.row = oldcursor.col = -1;
209	#ifdef XPM_BACKGROUND
210	/* bgPixmap.w = bgPixmap.h = 0; */
211	bgPixmap.x = bgPixmap.y = 50;
212	bgPixmap.pixmap = None;
213	#endif
214
215	last_bot = last_state = -1;	308	last_bot = last_state = -1;
		309
		310	set_option (Opt_scrollBar);
		311	set_option (Opt_scrollTtyOutput);
		312	set_option (Opt_jumpScroll);
		313	set_option (Opt_skipScroll);
		314	set_option (Opt_secondaryScreen);
		315	set_option (Opt_secondaryScroll);
		316	set_option (Opt_pastableTabs);
		317	set_option (Opt_intensityStyles);
		318	set_option (Opt_iso14755_52);
216		319
217	return true;	320	return true;
218	}	321	}
219		322
220	void	323	void
…		…
229	if ((i = open ("/dev/null", O_RDONLY)) < 0)	332	if ((i = open ("/dev/null", O_RDONLY)) < 0)
230	{	333	{
231	/* TODO: BOO HISS */	334	/* TODO: BOO HISS */
232	dup2 (STDERR_FILENO, STDIN_FILENO);	335	dup2 (STDERR_FILENO, STDIN_FILENO);
233	}	336	}
234	else if (i > STDIN_FILENO)	337	else if (i != STDIN_FILENO)
235	{	338	{
236	dup2 (i, STDIN_FILENO);	339	dup2 (i, STDIN_FILENO);
237	close (i);	340	close (i);
238	}	341	}
239		342
…		…
254	/----------------------------------------------------------------------/	357	/----------------------------------------------------------------------/
255	const char **	358	const char **
256	rxvt_term::init_resources (int argc, const char const argv)	359	rxvt_term::init_resources (int argc, const char const argv)
257	{	360	{
258	int i, r_argc;	361	int i, r_argc;
259	char *val;
260	const char cmd_argv, r_argv;	362	const char cmd_argv, r_argv;
261		363
262	/*	364	/*
263	* Look for -exec option. Find => split and make cmd_argv[] of command args	365	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	366	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	367	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	368	if (!strcmp (argv[r_argc], "-e"))
267	break;	369	break;
		370
		371	if (r_argc == argc)
		372	cmd_argv = NULL;
		373	else if (!argv[r_argc + 1])
		374	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		375	else
		376	{
		377	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		378
		379	for (i = 0; i < argc - r_argc - 1; i++)
		380	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		381
		382	cmd_argv[i] = NULL;
		383	}
268		384
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	385	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		386
271	for (i = 0; i < r_argc; i++)	387	for (i = 0; i < r_argc; i++)
272	r_argv[i] = (const char *)argv[i];	388	r_argv[i] = (const char *)argv[i];
273		389
274	r_argv[i] = NULL;	390	r_argv[i] = NULL;
275		391
276	if (r_argc == argc)
277	cmd_argv = NULL;
278	else
279	{
280	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
281
282	for (i = 0; i < argc - r_argc - 1; i++)
283	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285	cmd_argv[i] = NULL;
286	}
287
288	rs[Rs_name] = rxvt_r_basename (argv[0]);	392	rs[Rs_name] = rxvt_basename (argv[0]);
289		393
290	/*	394	/*
291	* Open display, get options/resources and create the window	395	* Open display, get options/resources and create the window
292	*/	396	*/
293		397
…		…
295	rs[Rs_display_name] = ":0";	399	rs[Rs_display_name] = ":0";
296		400
297	get_options (r_argc, r_argv);	401	get_options (r_argc, r_argv);
298		402
299	if (!(display = displays.get (rs[Rs_display_name])))	403	if (!(display = displays.get (rs[Rs_display_name])))
		404	{
		405	free (r_argv);
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	406	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		407	}
301		408
		409	// using a local pointer decreases code size a lot
302	xa = display->xa;	410	xa = display->xa;
		411
		412	set (display);
		413	extract_resources ();
303		414
304	#if XFT	415	#if XFT
305	if (rs[Rs_depth])	416	if (rs[Rs_depth])
306	set (display, strtol (rs[Rs_depth], 0, 0));	417	select_visual (strtol (rs[Rs_depth], 0, 0));
307	else
308	#endif	418	#endif
309	set (display);
310		419
311	extract_resources ();	420	#ifdef HAVE_AFTERIMAGE
312		421	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		422	#endif
313	free (r_argv);	423	free (r_argv);
		424
		425	for (int i = NUM_RESOURCES; i--; )
		426	if (rs [i] == resval_undef)
		427	rs [i] = 0;
314		428
315	#if ENABLE_PERL	429	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	430	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	431	rs[Rs_perl_ext_1] = "default";
318		432
…		…
329	* set any defaults not already set	443	* set any defaults not already set
330	*/	444	*/
331	if (cmd_argv && cmd_argv[0])	445	if (cmd_argv && cmd_argv[0])
332	{	446	{
333	if (!rs[Rs_title])	447	if (!rs[Rs_title])
334	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	448	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335	if (!rs[Rs_iconName])	449	if (!rs[Rs_iconName])
336	rs[Rs_iconName] = rs[Rs_title];	450	rs[Rs_iconName] = rs[Rs_title];
337	}	451	}
338	else	452	else
339	{	453	{
…		…
377	rs[Rs_cutchars] = CUTCHARS;	491	rs[Rs_cutchars] = CUTCHARS;
378		492
379	#ifndef NO_BACKSPACE_KEY	493	#ifndef NO_BACKSPACE_KEY
380	if (!rs[Rs_backspace_key])	494	if (!rs[Rs_backspace_key])
381	# ifdef DEFAULT_BACKSPACE	495	# ifdef DEFAULT_BACKSPACE
382	key_backspace = DEFAULT_BACKSPACE;	496	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383	# else	497	# else
384	key_backspace = "DEC"; /* can toggle between \010 or \177 */	498	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385	# endif	499	# endif
386	else
387	{
388	val = strdup (rs[Rs_backspace_key]);
389	rxvt_Str_trim (val);
390	rxvt_Str_escaped (val);
391	key_backspace = val;
392	}
393	#endif	500	#endif
394		501
395	#ifndef NO_DELETE_KEY	502	#ifndef NO_DELETE_KEY
396	if (!rs[Rs_delete_key])	503	if (!rs[Rs_delete_key])
397	# ifdef DEFAULT_DELETE	504	# ifdef DEFAULT_DELETE
398	key_delete = DEFAULT_DELETE;	505	rs[Rs_delete_key] = DEFAULT_DELETE;
399	# else	506	# else
400	key_delete = "\033[3~";	507	rs[Rs_delete_key] = "\033[3~";
401	# endif
402	else
403	{
404	val = strdup (rs[Rs_delete_key]);
405	rxvt_Str_trim (val);
406	rxvt_Str_escaped (val);
407	key_delete = val;
408	}
409	#endif	508	# endif
410	if (rs[Rs_answerbackstring])	509	#endif
411	{
412	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414	}
415		510
416	#ifdef HAVE_SCROLLBARS	511	#ifdef HAVE_SCROLLBARS
417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	512	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418	#endif	513	#endif
419		514
420	#ifdef XTERM_REVERSE_VIDEO	515	#ifdef XTERM_REVERSE_VIDEO
421	/* this is how xterm implements reverseVideo */	516	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	517	if (option (Opt_reverseVideo))
423	{	518	{
424	if (!rs[Rs_color + Color_fg])	519	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	520	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		521
426	if (!rs[Rs_color + Color_bg])	522	if (!rs[Rs_color + Color_bg])
427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	523	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428	}	524	}
429	#endif	525	#endif
430		526
…		…
432	if (!rs[Rs_color + i])	528	if (!rs[Rs_color + i])
433	rs[Rs_color + i] = def_colorName[i];	529	rs[Rs_color + i] = def_colorName[i];
434		530
435	#ifndef XTERM_REVERSE_VIDEO	531	#ifndef XTERM_REVERSE_VIDEO
436	/* this is how we implement reverseVideo */	532	/* this is how we implement reverseVideo */
437	if (OPTION (Opt_reverseVideo))	533	if (option (Opt_reverseVideo))
438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	534	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439	#endif	535	#endif
440		536
441	/* convenient aliases for setting fg/bg to colors */	537	/* convenient aliases for setting fg/bg to colors */
442	color_aliases (Color_fg);	538	color_aliases (Color_fg);
…		…
463	/----------------------------------------------------------------------/	559	/----------------------------------------------------------------------/
464	void	560	void
465	rxvt_term::init_env ()	561	rxvt_term::init_env ()
466	{	562	{
467	int i;	563	int i;
468	unsigned int u;
469	char *val;	564	char *val;
470		565
471	#ifdef DISPLAY_IS_IP	566	#ifdef DISPLAY_IS_IP
472	/* Fixup display_name for export over pty to any interested terminal	567	/* Fixup display_name for export over pty to any interested terminal
473	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	568	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
482	val = rxvt_network_display (rs[Rs_display_name]);	577	val = rxvt_network_display (rs[Rs_display_name]);
483	rs[Rs_display_name] = (const char *)val;	578	rs[Rs_display_name] = (const char *)val;
484		579
485	if (val == NULL)	580	if (val == NULL)
486	#endif /* DISPLAY_IS_IP */	581	#endif /* DISPLAY_IS_IP */
487	val = XDisplayString (xdisp);	582	val = XDisplayString (dpy);
488		583
489	if (rs[Rs_display_name] == NULL)	584	if (rs[Rs_display_name] == NULL)
490	rs[Rs_display_name] = val; /* use broken `:0' value */	585	rs[Rs_display_name] = val; /* use broken `:0' value */
491		586
492	i = strlen (val);	587	i = strlen (val);
493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	588	env_display = (char *)rxvt_malloc (i + 9);
494		589
495	sprintf (env_display, "DISPLAY=%s", val);	590	sprintf (env_display, "DISPLAY=%s", val);
496		591
497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	592	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498		593
…		…
519	else	614	else
520	putenv ("COLORTERM=" COLORTERMENVFULL);	615	putenv ("COLORTERM=" COLORTERMENVFULL);
521		616
522	if (rs[Rs_term_name] != NULL)	617	if (rs[Rs_term_name] != NULL)
523	{	618	{
524	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	619	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	620	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526	putenv (env_term);	621	putenv (env_term);
527	}	622	}
528	else	623	else
529	putenv ("TERM=" TERMENV);	624	putenv ("TERM=" TERMENV);
…		…
616	* Initialize the command connection.	711	* Initialize the command connection.
617	* This should be called after the X server connection is established.	712	* This should be called after the X server connection is established.
618	*/	713	*/
619		714
620	#ifdef META8_OPTION	715	#ifdef META8_OPTION
621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	716	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622	#endif	717	#endif
623		718
624	get_ourmods ();	719	get_ourmods ();
625		720
626	if (!OPTION (Opt_scrollTtyOutput))	721	if (!option (Opt_scrollTtyOutput))
627	priv_modes \|= PrivMode_TtyOutputInh;	722	priv_modes \|= PrivMode_TtyOutputInh;
628	if (OPTION (Opt_scrollTtyKeypress))	723	if (option (Opt_scrollTtyKeypress))
629	priv_modes \|= PrivMode_Keypress;	724	priv_modes \|= PrivMode_Keypress;
630	if (!OPTION (Opt_jumpScroll))	725	if (!option (Opt_jumpScroll))
631	priv_modes \|= PrivMode_smoothScroll;	726	priv_modes \|= PrivMode_smoothScroll;
632		727
633	#ifndef NO_BACKSPACE_KEY	728	#ifndef NO_BACKSPACE_KEY
634	if (strcmp (key_backspace, "DEC") == 0)	729	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635	priv_modes \|= PrivMode_HaveBackSpace;	730	priv_modes \|= PrivMode_HaveBackSpace;
636	#endif	731	#endif
637		732
638	/* add value for scrollBar */	733	/* add value for scrollBar */
639	if (scrollBar.state)	734	if (scrollBar.state)
…		…
655	pix_colors = pix_colors_focused;	750	pix_colors = pix_colors_focused;
656	#endif	751	#endif
657		752
658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659	{	754	{
		755	const char *name = rs[Rs_color + i];
		756
		757	if (!name)
		758	continue;
		759
660	rxvt_color xcol;	760	rxvt_color xcol;
661		761
662	if (!rs[Rs_color + i])
663	continue;
664
665	if (!set_color (xcol, rs[Rs_color + i]))	762	if (!set_color (xcol, name))
666	{	763	{
667	#ifndef XTERM_REVERSE_VIDEO	764	#ifndef XTERM_REVERSE_VIDEO
668	if (i < 2 && OPTION (Opt_reverseVideo))	765	if (i < 2 && option (Opt_reverseVideo))
669	rs[Rs_color + i] = def_colorName[!i];	766	name = def_colorName [1 - i];
670	else	767	else
671	#endif	768	#endif
672	rs[Rs_color + i] = def_colorName[i];	769	name = def_colorName [i];
673		770
674	if (!rs[Rs_color + i])	771	if (!name)
675	continue;	772	continue;
676		773
677	if (!set_color (xcol, rs[Rs_color + i]))	774	if (!set_color (xcol, name))
678	{	775	{
679	switch (i)	776	switch (i)
680	{	777	{
681	case Color_fg:	778	case Color_fg:
682	case Color_bg:	779	case Color_bg:
683	/* fatal: need bg/fg color */
684	rxvt_warn ("unable to get foreground/background colour, continuing.\n");	780	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
		781	name = "";
685	break;	782	break;
686	#ifndef NO_CURSORCOLOR	783	#ifndef NO_CURSORCOLOR
687	case Color_cursor2:	784	case Color_cursor2:
688	xcol = pix_colors[Color_fg];	785	#endif
689	break;
690	#endif /* ! NO_CURSORCOLOR */
691	case Color_pointer_fg:	786	case Color_pointer_fg:
692	xcol = pix_colors[Color_fg];	787	name = rs[Rs_color + Color_fg];
		788	xcol.set (this, name);
693	break;	789	break;
694	default:	790	default:
695	xcol = pix_colors[Color_bg]; /* None */	791	name = rs[Rs_color + Color_bg];
		792	xcol.set (this, name);
696	break;	793	break;
697	}	794	}
698	}	795	}
699	}	796	}
700		797
701	pix_colors[i] = xcol;	798	pix_colors[i] = xcol;
702	SET_PIXCOLOR (i);	799	rs[Rs_color + i] = name;
703	}
704
705	#ifdef OFF_FOCUS_FADING
706	if (rs[Rs_fade])
707	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708	{
709	rxvt_rgba c;
710	pix_colors[Color_fade].get (this, c);
711	pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
712	}	800	}
713	#endif
714		801
715	if (depth <= 2)	802	if (depth <= 2)
716	{	803	{
717	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	804	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	805	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	806	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720	}	807	}
721		808
722	/*	809	/*
723	* get scrollBar shadow colors	810	* get scrollBar shadow colors
724	*	811	*
725	* The calculations of topShadow/bottomShadow values are adapted	812	* The calculations of topShadow/bottomShadow values are adapted
726	* from the fvwm window manager.	813	* from the fvwm window manager.
727	*/	814	*/
728	#ifdef KEEP_SCROLLCOLOR	815	#ifdef KEEP_SCROLLCOLOR
729
730	if (depth <= 2)	816	if (depth <= 2)
731	{	817	{
732	/* Monochrome */	818	/* Monochrome */
733	pix_colors[Color_scroll] = pix_colors[Color_fg];	819	alias_color (Color_scroll, Color_fg);
734	pix_colors[Color_topShadow] = pix_colors[Color_bg];	820	alias_color (Color_topShadow, Color_bg);
735	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	821	alias_color (Color_bottomShadow, Color_bg);
736	}	822	}
737	else	823	else
738	{	824	{
739	rxvt_color xcol[2];	825	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740	/* xcol[0] == white
741	* xcol[1] == top shadow
742	* xcol[2] == bot shadow */
743		826
744	xcol[1] = pix_colors[Color_scroll];	827	rgba cscroll;
745	xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));	828	pix_colors [Color_scroll].get (cscroll);
746
747	rxvt_rgba c0, c1;
748
749	xcol[0].get (this, c0);
750	xcol[1].get (this, c1);
751
752	xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
753		829
754	/* topShadowColor */	830	/* topShadowColor */
755	if (!xcol[1].set (this,	831	if (!pix_colors[Color_topShadow].set (this,
756	rxvt_rgba (	832	rgba (
757	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	833	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	834	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	835	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760	c1.a) // pa1 vs. pa0: arbitrary	836	cscroll.a)
761	));	837	))
762	xcol[1] = pix_colors[Color_White];	838	alias_color (Color_topShadow, Color_White);
763
764	pix_colors[Color_topShadow] = xcol[1];
765	}	839	}
766	#endif /* KEEP_SCROLLCOLOR */	840	#endif /* KEEP_SCROLLCOLOR */
		841
		842	#ifdef OFF_FOCUS_FADING
		843	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		844	update_fade_color (i);
		845	#endif
767	}	846	}
768		847
769	/----------------------------------------------------------------------/	848	/----------------------------------------------------------------------/
770	/* color aliases, fg/bg bright-bold */	849	/* color aliases, fg/bg bright-bold */
771	void	850	void
…		…
810		889
811	if (rsmod	890	if (rsmod
812	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	891	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813	requestedmeta = rsmod[3] - '0';	892	requestedmeta = rsmod[3] - '0';
814		893
815	map = XGetModifierMapping (xdisp);	894	map = XGetModifierMapping (dpy);
816	kc = map->modifiermap;	895	kc = map->modifiermap;
817		896
818	for (i = 1; i < 6; i++)	897	for (i = 1; i < 6; i++)
819	{	898	{
820	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	899	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
822	for (j = map->max_keypermod; j--; k++)	901	for (j = map->max_keypermod; j--; k++)
823	{	902	{
824	if (kc[k] == 0)	903	if (kc[k] == 0)
825	break;	904	break;
826		905
827	switch (XKeycodeToKeysym (xdisp, kc[k], 0))	906	switch (XKeycodeToKeysym (dpy, kc[k], 0))
828	{	907	{
829	case XK_Num_Lock:	908	case XK_Num_Lock:
830	ModNumLockMask = modmasks[i - 1];	909	ModNumLockMask = modmasks[i - 1];
831	continue;	910	continue;
832		911
…		…
882	rxvt_term::create_windows (int argc, const char const argv)	961	rxvt_term::create_windows (int argc, const char const argv)
883	{	962	{
884	XClassHint classHint;	963	XClassHint classHint;
885	XWMHints wmHint;	964	XWMHints wmHint;
886	#if ENABLE_FRILLS	965	#if ENABLE_FRILLS
887	MWMHints mwmhints;	966	MWMHints mwmhints = { };
888	#endif	967	#endif
889	XGCValues gcvalue;	968	XGCValues gcvalue;
890	XSetWindowAttributes attributes;	969	XSetWindowAttributes attributes;
891	Window top, parent;	970	Window top, parent;
892		971
893	dLocal (Display *, xdisp);	972	dLocal (Display *, dpy);
894		973
895	/* grab colors before netscape does */	974	/* grab colors before netscape does */
896	Get_Colours ();	975	Get_Colours ();
897		976
898	if (!set_fonts ())	977	if (!set_fonts ())
899	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	978	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
900		979
901	parent = display->root;	980	parent = display->root;
902		981
903	attributes.override_redirect = !!OPTION (Opt_override_redirect);	982	attributes.override_redirect = !!option (Opt_override_redirect);
904		983
905	#if ENABLE_FRILLS	984	#if ENABLE_FRILLS
906	if (OPTION (Opt_borderLess))	985	if (option (Opt_borderLess))
907	{	986	{
908	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)	987	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909	{	988	{
910	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	989	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911	attributes.override_redirect = true;	990	attributes.override_redirect = true;
912	mwmhints.flags = 0;
913	}	991	}
914	else	992	else
915	{	993	{
916	mwmhints.flags = MWM_HINTS_DECORATIONS;	994	mwmhints.flags = MWM_HINTS_DECORATIONS;
917	mwmhints.decorations = 0;
918	}	995	}
919	}	996	}
920	else
921	mwmhints.flags = 0;
922	#endif	997	#endif
923		998
924	#if ENABLE_XEMBED	999	#if ENABLE_XEMBED
925	if (rs[Rs_embed])	1000	if (rs[Rs_embed])
926	{	1001	{
927	XWindowAttributes wattr;	1002	XWindowAttributes wattr;
928		1003
929	parent = strtol (rs[Rs_embed], 0, 0);	1004	parent = strtol (rs[Rs_embed], 0, 0);
930		1005
931	if (!XGetWindowAttributes (xdisp, parent, &wattr))	1006	if (!XGetWindowAttributes (dpy, parent, &wattr))
932	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	1007	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933		1008
934	window_calc (wattr.width, wattr.height);	1009	window_calc (wattr.width, wattr.height);
935	}	1010	}
936	#endif	1011	#endif
…		…
940	/* sub-window placement & size in rxvt_resize_subwindows () */	1015	/* sub-window placement & size in rxvt_resize_subwindows () */
941	attributes.background_pixel = pix_colors_focused [Color_border];	1016	attributes.background_pixel = pix_colors_focused [Color_border];
942	attributes.border_pixel = pix_colors_focused [Color_border];	1017	attributes.border_pixel = pix_colors_focused [Color_border];
943	attributes.colormap = cmap;	1018	attributes.colormap = cmap;
944		1019
945	top = XCreateWindow (xdisp, parent,	1020	top = XCreateWindow (dpy, parent,
946	szHint.x, szHint.y,	1021	szHint.x, szHint.y,
947	szHint.width, szHint.height,	1022	szHint.width, szHint.height,
948	ext_bwidth,	1023	ext_bwidth,
949	depth, InputOutput, visual,	1024	depth, InputOutput, visual,
950	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1025	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
…		…
961	classHint.res_name = (char *)rs[Rs_name];	1036	classHint.res_name = (char *)rs[Rs_name];
962	classHint.res_class = (char *)RESCLASS;	1037	classHint.res_class = (char *)RESCLASS;
963		1038
964	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1039	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
965	wmHint.input = True;	1040	wmHint.input = True;
966	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1041	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967	wmHint.window_group = top;	1042	wmHint.window_group = top;
968		1043
969	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,	1044	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970	&szHint, &wmHint, &classHint);	1045	&szHint, &wmHint, &classHint);
971		1046
972	#if ENABLE_FRILLS	1047	#if ENABLE_FRILLS
973	if (mwmhints.flags)	1048	if (mwmhints.flags)
974	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1049	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1050	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976	#endif	1051	#endif
977		1052
978	Atom protocols[] = {	1053	Atom protocols[] = {
979	xa[XA_WM_DELETE_WINDOW],	1054	xa[XA_WM_DELETE_WINDOW],
980	#if ENABLE_EWMH	1055	#if ENABLE_EWMH
981	xa[XA_NET_WM_PING],	1056	xa[XA_NET_WM_PING],
982	#endif	1057	#endif
983	};	1058	};
984		1059
985	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1060	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986		1061
987	#if ENABLE_FRILLS	1062	#if ENABLE_FRILLS
988	if (rs[Rs_transient_for])	1063	if (rs[Rs_transient_for])
989	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1064	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990	#endif	1065	#endif
991		1066
992	#if ENABLE_EWMH	1067	#if ENABLE_EWMH
993	long pid = getpid ();	1068	long pid = getpid ();
994		1069
995	XChangeProperty (xdisp, top,	1070	XChangeProperty (dpy, top,
996	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1071	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997	PropModeReplace, (unsigned char *)&pid, 1);	1072	PropModeReplace, (unsigned char *)&pid, 1);
998		1073
999	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1074	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000	#endif	1075	#endif
1001		1076
1002	XSelectInput (xdisp, top,	1077	XSelectInput (dpy, top,
1003	KeyPressMask	1078	KeyPressMask
1004	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1079	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1005	\| KeyReleaseMask	1080	\| KeyReleaseMask
1006	#endif	1081	#endif
1007	\| FocusChangeMask \| VisibilityChangeMask	1082	\| FocusChangeMask \| VisibilityChangeMask
1008	\| ExposureMask \| StructureNotifyMask);	1083	\| ExposureMask \| StructureNotifyMask);
1009		1084
1010	termwin_ev.start (display, top);	1085	termwin_ev.start (display, top);
1011		1086
1012	/* vt cursor: Black-on-White is standard, but this is more popular */	1087	/* vt cursor: Black-on-White is standard, but this is more popular */
1013	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);	1088	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014		1089
1015	#ifdef HAVE_SCROLLBARS	1090	#ifdef HAVE_SCROLLBARS
1016	/* cursor scrollBar: Black-on-White */	1091	/* cursor scrollBar: Black-on-White */
1017	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);	1092	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018	#endif	1093	#endif
1019		1094
1020	/* the vt window */	1095	/* the vt window */
1021	vt = XCreateSimpleWindow (xdisp, top,	1096	vt = XCreateSimpleWindow (dpy, top,
1022	window_vt_x, window_vt_y,	1097	window_vt_x, window_vt_y,
1023	width, height,	1098	width, height,
1024	0,	1099	0,
1025	pix_colors_focused[Color_fg],	1100	pix_colors_focused[Color_fg],
1026	pix_colors_focused[Color_bg]);	1101	pix_colors_focused[Color_bg]);
1027		1102
1028	attributes.bit_gravity = NorthWestGravity;	1103	attributes.bit_gravity = NorthWestGravity;
1029	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);	1104	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030		1105
1031	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1106	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1032		1107
1033	if (OPTION (Opt_pointerBlank))	1108	if (option (Opt_pointerBlank))
1034	vt_emask \|= PointerMotionMask;	1109	vt_emask \|= PointerMotionMask;
1035	else	1110	else
1036	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1111	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1037		1112
1038	vt_select_input ();	1113	vt_select_input ();
1039		1114
1040	vt_ev.start (display, vt);	1115	vt_ev.start (display, vt);
1041		1116
1042	#ifdef XPM_BACKGROUND
1043	if (rs[Rs_backgroundPixmap] != NULL
1044	&& !OPTION (Opt_transparent))
1045	{
1046	const char *p = rs[Rs_backgroundPixmap];
1047
1048	if ((p = strchr (p, ';')) != NULL)
1049	{
1050	p++;
1051	scale_pixmap (p);
1052	}
1053
1054	set_bgPixmap (rs[Rs_backgroundPixmap]);
1055	scr_touch (true);
1056	}
1057	#endif
1058
1059	/* graphics context for the vt window */	1117	/* graphics context for the vt window */
1060	gcvalue.foreground = pix_colors[Color_fg];	1118	gcvalue.foreground = pix_colors[Color_fg];
1061	gcvalue.background = pix_colors[Color_bg];	1119	gcvalue.background = pix_colors[Color_bg];
1062	gcvalue.graphics_exposures = 1;	1120	gcvalue.graphics_exposures = 0;
1063		1121
1064	gc = XCreateGC (xdisp, vt,	1122	gc = XCreateGC (dpy, vt,
1065	GCForeground \| GCBackground \| GCGraphicsExposures,	1123	GCForeground \| GCBackground \| GCGraphicsExposures,
1066	&gcvalue);	1124	&gcvalue);
1067		1125
1068	drawable = new rxvt_drawable (this, vt);	1126	drawable = new rxvt_drawable (this, vt);
1069		1127
1070	#ifdef RXVT_SCROLLBAR	1128	#ifdef RXVT_SCROLLBAR
1071	gcvalue.foreground = pix_colors[Color_topShadow];	1129	gcvalue.foreground = pix_colors[Color_topShadow];
1072	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1130	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073	gcvalue.foreground = pix_colors[Color_bottomShadow];	1131	gcvalue.foreground = pix_colors[Color_bottomShadow];
1074	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1132	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];	1133	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1134	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077	#endif	1135	#endif
1078		1136
1079	#ifdef OFF_FOCUS_FADING	1137	#ifdef OFF_FOCUS_FADING
1080	// initially we are in unfocused state	1138	// initially we are in unfocused state
1081	if (rs[Rs_fade])	1139	if (rs[Rs_fade])
…		…
1090	* GET TTY CURRENT STATE *	1148	* GET TTY CURRENT STATE *
1091	* ------------------------------------------------------------------------- */	1149	* ------------------------------------------------------------------------- */
1092	void	1150	void
1093	rxvt_get_ttymode (ttymode_t *tio, int erase)	1151	rxvt_get_ttymode (ttymode_t *tio, int erase)
1094	{	1152	{
1095	#ifdef HAVE_TERMIOS_H
1096	/*	1153	/*
1097	* standard System V termios interface	1154	* standard System V termios interface
1098	*/	1155	*/
1099	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1156	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100	{	1157	{
…		…
1167	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1224	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1168	# if defined (ECHOCTL) && defined (ECHOKE)	1225	# if defined (ECHOCTL) && defined (ECHOKE)
1169	\| ECHOCTL \| ECHOKE	1226	\| ECHOCTL \| ECHOKE
1170	# endif	1227	# endif
1171	\| ECHOE \| ECHOK);	1228	\| ECHOE \| ECHOK);
1172	# else /* HAVE_TERMIOS_H */
1173
1174	/*
1175	* sgtty interface
1176	*/
1177
1178	/* get parameters -- gtty */
1179	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1180	{
1181	tio->sg.sg_erase = CERASE; /* ^H */
1182	tio->sg.sg_kill = CKILL; /* ^U */
1183	}
1184
1185	if (erase != -1)
1186	tio->sg.sg_erase = (char)erase;
1187
1188	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1189
1190	/* get special characters */
1191	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1192	{
1193	tio->tc.t_intrc = CINTR; /* ^C */
1194	tio->tc.t_quitc = CQUIT; /* ^\ */
1195	tio->tc.t_startc = CSTART; /* ^Q */
1196	tio->tc.t_stopc = CSTOP; /* ^S */
1197	tio->tc.t_eofc = CEOF; /* ^D */
1198	tio->tc.t_brkc = -1;
1199	}
1200
1201	/* get local special chars */
1202	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1203	{
1204	tio->lc.t_suspc = CSUSP; /* ^Z */
1205	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1206	tio->lc.t_rprntc = CRPRNT; /* ^R */
1207	tio->lc.t_flushc = CFLUSH; /* ^O */
1208	tio->lc.t_werasc = CWERASE; /* ^W */
1209	tio->lc.t_lnextc = CLNEXT; /* ^V */
1210	}
1211	/* get line discipline */
1212	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1213	# ifdef NTTYDISC
1214	tio->line = NTTYDISC;
1215	# endif /* NTTYDISC */
1216
1217	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1218	#endif /* HAVE_TERMIOS_H */
1219		1229
1220	/*	1230	/*
1221	* Debugging	1231	* Debugging
1222	*/	1232	*/
1223	#ifdef DEBUG_TTYMODE	1233	#ifdef DEBUG_TTYMODE
…		…
1324	else	1334	else
1325	#endif	1335	#endif
1326	if (!pty->get ())	1336	if (!pty->get ())
1327	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1337	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1328		1338
		1339	int er;
		1340
		1341	#ifndef NO_BACKSPACE_KEY
		1342	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
		1343	er = rs[Rs_backspace_key][0];
		1344	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
		1345	er = '\177'; /* the initial state anyway */
		1346	else
		1347	#endif
		1348	er = -1;
		1349
		1350	rxvt_get_ttymode (&tio, er);
		1351	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1329	pty->set_utf8_mode (enc_utf8);	1352	pty->set_utf8_mode (enc_utf8);
1330		1353
1331	/* set initial window size */	1354	/* set initial window size */
1332	tt_winch ();	1355	tt_winch ();
1333
1334	int er;
1335
1336	#ifndef NO_BACKSPACE_KEY
1337	if (key_backspace[0] && !key_backspace[1])
1338	er = key_backspace[0];
1339	else if (strcmp (key_backspace, "DEC") == 0)
1340	er = '\177'; /* the initial state anyway */
1341	else
1342	#endif
1343	er = -1;
1344
1345	rxvt_get_ttymode (&tio, er);
1346		1356
1347	#if ENABLE_FRILLS	1357	#if ENABLE_FRILLS
1348	if (rs[Rs_pty_fd])	1358	if (rs[Rs_pty_fd])
1349	return;	1359	return;
1350	#endif	1360	#endif
…		…
1381	}	1391	}
1382		1392
1383	_exit (EXIT_FAILURE);	1393	_exit (EXIT_FAILURE);
1384		1394
1385	default:	1395	default:
1386	if (!OPTION (Opt_utmpInhibit))	1396	if (!option (Opt_utmpInhibit))
1387	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1397	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1388		1398
1389	pty->close_tty ();	1399	pty->close_tty ();
1390		1400
1391	child_ev.start (cmd_pid);	1401	child_ev.start (cmd_pid);
1392		1402
…		…
1405	int	1415	int
1406	rxvt_term::run_child (const char const argv)	1416	rxvt_term::run_child (const char const argv)
1407	{	1417	{
1408	char *login;	1418	char *login;
1409		1419
1410	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1411
1412	if (OPTION (Opt_console))	1420	if (option (Opt_console))
1413	{ /* be virtual console, fail silently */	1421	{ /* be virtual console, fail silently */
1414	#ifdef TIOCCONS	1422	#ifdef TIOCCONS
1415	unsigned int on = 1;	1423	unsigned int on = 1;
1416		1424
1417	ioctl (STDIN_FILENO, TIOCCONS, &on);	1425	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1445	sigset_t ss;	1453	sigset_t ss;
1446	sigemptyset (&ss);	1454	sigemptyset (&ss);
1447	sigprocmask (SIG_SETMASK, &ss, 0);	1455	sigprocmask (SIG_SETMASK, &ss, 0);
1448		1456
1449	/* command interpreter path */	1457	/* command interpreter path */
1450	if (argv != NULL)	1458	if (argv)
1451	{	1459	{
1452	# ifdef DEBUG_CMD	1460	# ifdef DEBUG_CMD
1453	int i;	1461	int i;
1454		1462
1455	for (i = 0; argv[i]; i++)	1463	for (i = 0; argv[i]; i++)
…		…
1464	const char argv0, shell;	1472	const char argv0, shell;
1465		1473
1466	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1474	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1467	shell = "/bin/sh";	1475	shell = "/bin/sh";
1468		1476
1469	argv0 = (const char *)rxvt_r_basename (shell);	1477	argv0 = (const char *)rxvt_basename (shell);
1470		1478
1471	if (OPTION (Opt_loginShell))	1479	if (option (Opt_loginShell))
1472	{	1480	{
1473	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1481	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1474		1482
1475	login[0] = '-';	1483	login[0] = '-';
1476	strcpy (&login[1], argv0);	1484	strcpy (&login[1], argv0);
1477	argv0 = login;	1485	argv0 = login;
1478	}	1486	}
1479		1487
1480	execlp (shell, argv0, NULL);	1488	execlp (shell, argv0, (char *)0);
1481	/* no error message: STDERR is closed! */	1489	/* no error message: STDERR is closed! */
1482	}	1490	}
1483		1491
1484	return -1;	1492	return -1;
1485	}	1493	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.163 by root, Tue Jan 31 16:57:35 2006 UTC vs. Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.163 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC