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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 UTC

…		…
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>
13	* - QNX support
14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
15	*	16	*
16	* 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
17	* 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
18	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	20	* (at your option) any later version.
…		…
33		34
34	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	37	#include "rxvtutil.h"
37	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
38		40
39	#include <limits>	41	#include <limits>
40		42
41	#include <csignal>	43	#include <csignal>
		44
		45	#include <fcntl.h>
		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
		56	#ifdef HAVE_NL_LANGINFO
		57	# include <langinfo.h>
		58	#endif
		59
		60	#ifdef DISPLAY_IS_IP
		61	/* On Solaris link with -lsocket and -lnsl */
		62	#include <sys/types.h>
		63	#include <sys/socket.h>
		64
		65	/* these next two are probably only on Sun (not Solaris) */
		66	#ifdef HAVE_SYS_SOCKIO_H
		67	#include <sys/sockio.h>
		68	#endif
		69	#ifdef HAVE_SYS_BYTEORDER_H
		70	#include <sys/byteorder.h>
		71	#endif
		72
		73	#include <netinet/in.h>
		74	#include <arpa/inet.h>
		75	#include <net/if.h>
		76	#include <net/if_arp.h>
		77
		78	static char *
		79	rxvt_network_display (const char *display)
		80	{
		81	char buffer[1024], *rval = NULL;
		82	struct ifconf ifc;
		83	struct ifreq *ifr;
		84	int i, skfd;
		85
		86	if (display[0] != ':' && strncmp (display, "unix:", 5))
		87	return (char ) display; / nothing to do */
		88
		89	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		90	ifc.ifc_buf = buffer;
		91
		92	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		93	{
		94	perror ("socket");
		95	return NULL;
		96	}
		97
		98	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		99	{
		100	perror ("SIOCGIFCONF");
		101	close (skfd);
		102	return NULL;
		103	}
		104
		105	for (i = 0, ifr = ifc.ifc_req;
		106	i < (ifc.ifc_len / sizeof (struct ifreq));
		107	i++, ifr++)
		108	{
		109	struct ifreq ifr2;
		110
		111	strcpy (ifr2.ifr_name, ifr->ifr_name);
		112
		113	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		114	{
		115	unsigned long addr;
		116	struct sockaddr_in *p_addr;
		117
		118	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		119	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		120
		121	/*
		122	* not "0.0.0.0" or "127.0.0.1" - so format the address
		123	*/
		124	if (addr && addr != 0x7F000001)
		125	{
		126	char *colon = strchr (display, ':');
		127
		128	if (colon == NULL)
		129	colon = ":0.0";
		130
		131	rval = rxvt_malloc (strlen (colon) + 16);
		132	sprintf (rval, "%d.%d.%d.%d%s",
		133	(int) ((addr >> 030) & 0xFF),
		134	(int) ((addr >> 020) & 0xFF),
		135	(int) ((addr >> 010) & 0xFF),
		136	(int) (addr & 0xFF), colon);
		137	break;
		138	}
		139	}
		140	}
		141
		142	close (skfd);
		143
		144	return rval;
		145	}
		146	#endif
42		147
43	const char *const def_colorName[] =	148	const char *const def_colorName[] =
44	{	149	{
45	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
…		…
50	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
53	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
56	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	162	# else
58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59	# endif	164	# endif
60	/* high-intensity colors */	165	/* high-intensity colors */
61	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
62	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
146	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
147		252
148	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
149	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
150	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
151	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
152	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
153	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
154	NULL, /* Color_border */	259	NULL, /* Color_border */
155	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
156	NULL, /* Color_BD */	261	NULL, /* Color_BD */
157	NULL, /* Color_IT */	262	NULL, /* Color_IT */
158	NULL, /* Color_UL */	263	NULL, /* Color_UL */
159	NULL, /* Color_RV */	264	NULL, /* Color_RV */
160	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
162	NULL, // Color_underline	267	NULL, // Color_underline
163	#endif	268	#endif
164	#ifdef OPTION_HC	269	#ifdef OPTION_HC
165	NULL,	270	NULL,
166	#endif	271	#endif
167	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
169	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	275	#endif
171	#if TINTING	276	#if ENABLE_TRANSPARENCY
172	NULL,	277	NULL,
173	#endif	278	#endif
174	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	280	"rgb:00/00/00",
176	#endif	281	#endif
177	};	282	};
178		283
179	bool	284	void
180	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
181	{	286	{
182	pix_colors = //	287	pix_colors = pix_colors_focused;
183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184	#ifdef OFF_FOCUS_FADING
185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186	#endif
187
188		288
189	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
190	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
191	want_refresh = 1;	291	want_refresh = 1;
192	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
193	ncol = 80;	293	ncol = 80;
194	nrow = 24;	294	nrow = 24;
195	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
196	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
197	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
		298	letterSpace = LETTERSPACE;
198	saveLines = SAVELINES;	299	saveLines = SAVELINES;
199	numpix_colors = TOTAL_COLORS;
200		300
201	refresh_type = SLOW_REFRESH;	301	refresh_type = SLOW_REFRESH;
202		302
203	oldcursor.row = oldcursor.col = -1;	303	oldcursor.row = oldcursor.col = -1;
204	#ifdef HAVE_BG_PIXMAP
205	#ifdef HAVE_AFTERIMAGE
206	bgPixmap.original_asim = NULL;
207	#endif
208	/* bgPixmap.w = bgPixmap.h = 0; */
209	bgPixmap.h_scale = bgPixmap.v_scale = 0;
210	bgPixmap.h_align = bgPixmap.v_align = 0;
211	bgPixmap.flags = 0;
212	bgPixmap.pixmap = None;
213	#endif
214
215	last_bot = last_state = -1;
216		304
217	set_option (Opt_scrollBar);	305	set_option (Opt_scrollBar);
218	set_option (Opt_scrollTtyOutput);	306	set_option (Opt_scrollTtyOutput);
219	set_option (Opt_jumpScroll);	307	set_option (Opt_jumpScroll);
220	set_option (Opt_skipScroll);	308	set_option (Opt_skipScroll);
221	set_option (Opt_secondaryScreen);	309	set_option (Opt_secondaryScreen);
222	set_option (Opt_secondaryScroll);	310	set_option (Opt_secondaryScroll);
223	set_option (Opt_pastableTabs);	311	set_option (Opt_pastableTabs);
224	set_option (Opt_intensityStyles);	312	set_option (Opt_intensityStyles);
		313	set_option (Opt_iso14755);
225	set_option (Opt_iso14755_52);	314	set_option (Opt_iso14755_52);
226		315	set_option (Opt_buffered);
227	return true;
228	}	316	}
229		317
230	void	318	static void
231	rxvt_term::init_secondary ()	319	init_secondary ()
232	{	320	{
233	int i;	321	int i;
234		322
235	/*
236	* Close all unused file descriptors
237	* We don't want them, we don't need them.
238	*/
239	if ((i = open ("/dev/null", O_RDONLY)) < 0)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
240	{	324	{
241	/* TODO: BOO HISS */
242	dup2 (STDERR_FILENO, STDIN_FILENO);	325	dup2 (STDERR_FILENO, STDIN_FILENO);
243	}	326	}
244	else if (i > STDIN_FILENO)	327	else if (i != STDIN_FILENO)
245	{	328	{
246	dup2 (i, STDIN_FILENO);	329	dup2 (i, STDIN_FILENO);
247	close (i);	330	close (i);
248	}	331	}
249		332
250	dup2 (STDERR_FILENO, STDOUT_FILENO);	333	dup2 (STDERR_FILENO, STDOUT_FILENO);
251
252	#if 0 // schmorp sayz closing filies is murder
253	for (i = STDERR_FILENO + 1; i < num_fds; i++)
254	{
255	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
256	if (i == 4 \|\| i == 7)
257	continue;
258	#endif
259	close (i);
260	}
261	#endif
262	}	334	}
263		335
264	/----------------------------------------------------------------------/	336	/----------------------------------------------------------------------/
265	const char **	337	const char **
266	rxvt_term::init_resources (int argc, const char const argv)	338	rxvt_term::init_resources (int argc, const char const argv)
267	{	339	{
268	int i, r_argc;	340	int i, r_argc;
269	char *val;
270	const char cmd_argv, r_argv;	341	const char cmd_argv, r_argv;
271		342
272	/*	343	/*
273	* Look for -e option. Find => split and make cmd_argv[] of command args	344	* Look for -e option. Find => split and make cmd_argv[] of command args
274	*/	345	*/
275	for (r_argc = 0; r_argc < argc; r_argc++)	346	for (r_argc = 0; r_argc < argc; r_argc++)
276	if (!strcmp (argv[r_argc], "-e"))	347	if (!strcmp (argv[r_argc], "-e"))
277	break;	348	break;
278		349
		350	if (r_argc == argc)
		351	cmd_argv = NULL;
		352	else if (!argv[r_argc + 1])
		353	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		354	else
		355	{
		356	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		357
		358	for (i = 0; i < argc - r_argc - 1; i++)
		359	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		360
		361	cmd_argv[i] = NULL;
		362	}
		363
279	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	364	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
280		365
281	for (i = 0; i < r_argc; i++)	366	for (i = 0; i < r_argc; i++)
282	r_argv[i] = (const char *)argv[i];	367	r_argv[i] = (const char *)argv[i];
283		368
284	r_argv[i] = NULL;	369	r_argv[i] = NULL;
285		370
286	if (r_argc == argc)
287	cmd_argv = NULL;
288	else
289	{
290	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
291
292	for (i = 0; i < argc - r_argc - 1; i++)
293	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294
295	cmd_argv[i] = NULL;
296	}
297
298	rs[Rs_name] = rxvt_r_basename (argv[0]);	371	rs[Rs_name] = rxvt_basename (argv[0]);
299		372
300	/*	373	/*
301	* Open display, get options/resources and create the window	374	* Open display, get options/resources and create the window
302	*/	375	*/
303		376
…		…
305	rs[Rs_display_name] = ":0";	378	rs[Rs_display_name] = ":0";
306		379
307	get_options (r_argc, r_argv);	380	get_options (r_argc, r_argv);
308		381
309	if (!(display = displays.get (rs[Rs_display_name])))	382	if (!(display = displays.get (rs[Rs_display_name])))
		383	{
		384	free (r_argv);
310	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	385	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		386	}
311		387
312	// using a local pointer decreases code size a lot	388	// using a local pointer decreases code size a lot
313	xa = display->xa;	389	xa = display->xa;
314		390
315	set (display);	391	set (display);
…		…
318	#if XFT	394	#if XFT
319	if (rs[Rs_depth])	395	if (rs[Rs_depth])
320	select_visual (strtol (rs[Rs_depth], 0, 0));	396	select_visual (strtol (rs[Rs_depth], 0, 0));
321	#endif	397	#endif
322		398
323	#ifdef HAVE_AFTERIMAGE
324	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325	#endif
326	free (r_argv);	399	free (r_argv);
327		400
328	for (int i = NUM_RESOURCES; i--; )	401	for (int i = NUM_RESOURCES; i--; )
329	if (rs [i] == resval_undef)	402	if (rs [i] == resval_undef)
330	rs [i] = 0;	403	rs [i] = 0;
		404
		405	#ifdef HAVE_AFTERIMAGE
		406	set_application_name ((char *)rs[Rs_name]);
		407	set_output_threshold (OUTPUT_LEVEL_WARNING);
		408	#endif
331		409
332	#if ENABLE_PERL	410	#if ENABLE_PERL
333	if (!rs[Rs_perl_ext_1])	411	if (!rs[Rs_perl_ext_1])
334	rs[Rs_perl_ext_1] = "default";	412	rs[Rs_perl_ext_1] = "default";
335		413
…		…
346	* set any defaults not already set	424	* set any defaults not already set
347	*/	425	*/
348	if (cmd_argv && cmd_argv[0])	426	if (cmd_argv && cmd_argv[0])
349	{	427	{
350	if (!rs[Rs_title])	428	if (!rs[Rs_title])
351	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	429	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
		430
352	if (!rs[Rs_iconName])	431	if (!rs[Rs_iconName])
353	rs[Rs_iconName] = rs[Rs_title];	432	rs[Rs_iconName] = rs[Rs_title];
354	}	433	}
355	else	434	else
356	{	435	{
357	if (!rs[Rs_title])	436	if (!rs[Rs_title])
358	rs[Rs_title] = rs[Rs_name];	437	rs[Rs_title] = rs[Rs_name];
		438
359	if (!rs[Rs_iconName])	439	if (!rs[Rs_iconName])
360	rs[Rs_iconName] = rs[Rs_name];	440	rs[Rs_iconName] = rs[Rs_name];
361	}	441	}
362		442
363	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	443	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
…		…
370	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	450	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());	451	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372		452
373	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	453	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374	lineSpace = min (i, std::numeric_limits<int16_t>::max ());	454	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
		455
		456	if (rs[Rs_letterSpace])
		457	letterSpace = atoi (rs[Rs_letterSpace]);
375	#endif	458	#endif
376		459
377	#ifdef POINTER_BLANK	460	#ifdef POINTER_BLANK
378	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	461	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
379	pointerBlankDelay = i;	462	pointerBlankDelay = i;
…		…
383		466
384	/* no point having a scrollbar without having any scrollback! */	467	/* no point having a scrollbar without having any scrollback! */
385	if (!saveLines)	468	if (!saveLines)
386	set_option (Opt_scrollBar, 0);	469	set_option (Opt_scrollBar, 0);
387		470
388	#ifdef PRINTPIPE
389	if (!rs[Rs_print_pipe])
390	rs[Rs_print_pipe] = PRINTPIPE;
391	#endif
392
393	if (!rs[Rs_cutchars])	471	if (!rs[Rs_cutchars])
394	rs[Rs_cutchars] = CUTCHARS;	472	rs[Rs_cutchars] = CUTCHARS;
395		473
396	#ifndef NO_BACKSPACE_KEY	474	#ifndef NO_BACKSPACE_KEY
397	if (!rs[Rs_backspace_key])	475	if (!rs[Rs_backspace_key])
398	# ifdef DEFAULT_BACKSPACE	476	# ifdef DEFAULT_BACKSPACE
399	key_backspace = DEFAULT_BACKSPACE;	477	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400	# else	478	# else
401	key_backspace = "DEC"; /* can toggle between \010 or \177 */	479	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402	# endif	480	# endif
403	else
404	{
405	val = strdup (rs[Rs_backspace_key]);
406	rxvt_Str_trim (val);
407	rxvt_Str_escaped (val);
408	key_backspace = val;
409	}
410	#endif	481	#endif
411		482
412	#ifndef NO_DELETE_KEY	483	#ifndef NO_DELETE_KEY
413	if (!rs[Rs_delete_key])	484	if (!rs[Rs_delete_key])
414	# ifdef DEFAULT_DELETE	485	# ifdef DEFAULT_DELETE
415	key_delete = DEFAULT_DELETE;	486	rs[Rs_delete_key] = DEFAULT_DELETE;
416	# else	487	# else
417	key_delete = "\033[3~";	488	rs[Rs_delete_key] = "\033[3~";
418	# endif
419	else
420	{
421	val = strdup (rs[Rs_delete_key]);
422	rxvt_Str_trim (val);
423	rxvt_Str_escaped (val);
424	key_delete = val;
425	}
426	#endif	489	# endif
427	if (rs[Rs_answerbackstring])
428	{
429	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431	}
432
433	#ifdef HAVE_SCROLLBARS
434	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435	#endif	490	#endif
		491
		492	scrollBar.setup (this);
436		493
437	#ifdef XTERM_REVERSE_VIDEO	494	#ifdef XTERM_REVERSE_VIDEO
438	/* this is how xterm implements reverseVideo */	495	/* this is how xterm implements reverseVideo */
439	if (option (Opt_reverseVideo))	496	if (option (Opt_reverseVideo))
440	{	497	{
…		…
460	color_aliases (Color_fg);	517	color_aliases (Color_fg);
461	color_aliases (Color_bg);	518	color_aliases (Color_bg);
462	#ifndef NO_CURSORCOLOR	519	#ifndef NO_CURSORCOLOR
463	color_aliases (Color_cursor);	520	color_aliases (Color_cursor);
464	color_aliases (Color_cursor2);	521	color_aliases (Color_cursor2);
465	#endif /* NO_CURSORCOLOR */	522	#endif /* NO_CURSORCOLOR */
466	color_aliases (Color_pointer_fg);	523	color_aliases (Color_pointer_fg);
467	color_aliases (Color_pointer_bg);	524	color_aliases (Color_pointer_bg);
468	color_aliases (Color_border);	525	color_aliases (Color_border);
469	#ifndef NO_BOLD_UNDERLINE_REVERSE	526	#ifndef NO_BOLD_UNDERLINE_REVERSE
470	color_aliases (Color_BD);	527	color_aliases (Color_BD);
471	color_aliases (Color_UL);	528	color_aliases (Color_UL);
472	color_aliases (Color_RV);	529	color_aliases (Color_RV);
473	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	530	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
474		531
475	if (!rs[Rs_color + Color_border])	532	if (!rs[Rs_color + Color_border])
476	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	533	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
477		534
478	return cmd_argv;	535	return cmd_argv;
		536	}
		537
		538	/----------------------------------------------------------------------/
		539	void
		540	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		541	{
		542	this->envv = envv;
		543
		544	SET_R (this);
		545	set_locale ("");
		546	set_environ (envv); // a few things in X do not call setlocale :(
		547
		548	init_vars ();
		549
		550	init_secondary ();
		551
		552	const char **cmd_argv = init_resources (argc, argv);
		553
		554	#ifdef KEYSYM_RESOURCE
		555	keyboard->register_done ();
		556	#endif
		557
		558	if (const char *path = rs[Rs_chdir])
		559	if (*path) // ignored if empty
		560	{
		561	if (*path != '/')
		562	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		563
		564	if (chdir (path))
		565	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		566	}
		567
		568	if (option (Opt_scrollBar))
		569	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		570
		571	pty = ptytty::create ();
		572
		573	create_windows (argc, argv);
		574
		575	init_xlocale ();
		576
		577	scr_poweron (); // initialize screen
		578
		579	#if 0
		580	XSynchronize (dpy, True);
		581	#endif
		582
		583	if (option (Opt_scrollBar))
		584	scrollBar.resize (); /* create and map scrollbar */
		585	#ifdef HAVE_BG_PIXMAP
		586	{
		587	bgPixmap.set_target (this);
		588	bgPixmap.invalidate ();
		589
		590	#ifdef ENABLE_TRANSPARENCY
		591	if (option (Opt_transparent))
		592	{
		593	bgPixmap.set_transparent ();
		594
		595	#ifdef HAVE_AFTERIMAGE
		596	if (rs [Rs_blurradius])
		597	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		598	#endif
		599	if (ISSET_PIXCOLOR (Color_tint))
		600	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		601
		602	if (rs [Rs_shade])
		603	bgPixmap.set_shade (rs [Rs_shade]);
		604
		605	bgPixmap.set_root_pixmap ();
		606	XSelectInput (dpy, display->root, PropertyChangeMask);
		607	rootwin_ev.start (display, display->root);
		608	}
		609	#endif
		610
		611	#ifdef BG_IMAGE_FROM_FILE
		612	if (rs[Rs_backgroundPixmap])
		613	{
		614	const char *p = rs[Rs_backgroundPixmap];
		615
		616	if ((p = strchr (p, ';')) != 0)
		617	{
		618	p++;
		619	bgPixmap.set_geometry (p);
		620	}
		621	else
		622	bgPixmap.set_defaultGeometry ();
		623
		624	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		625	if (!bgPixmap.window_position_sensitive ())
		626	update_background ();
		627	}
		628	#endif
		629	}
		630	#endif
		631
		632	#if ENABLE_PERL
		633	rootwin_ev.start (display, display->root);
		634	#endif
		635
		636	set_colorfgbg ();
		637
		638	init_command (cmd_argv);
		639
		640	free (cmd_argv);
		641
		642	if (pty->pty >= 0)
		643	pty_ev.start (pty->pty, ev::READ);
		644
		645	HOOK_INVOKE ((this, HOOK_START, DT_END));
		646
		647	#if ENABLE_XEMBED
		648	if (rs[Rs_embed])
		649	{
		650	long info[2] = { 0, XEMBED_MAPPED };
		651
		652	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		653	32, PropModeReplace, (unsigned char *)&info, 2);
		654	}
		655	#endif
		656
		657	XMapWindow (dpy, vt);
		658	XMapWindow (dpy, parent[0]);
		659
		660	refresh_check ();
479	}	661	}
480		662
481	/----------------------------------------------------------------------/	663	/----------------------------------------------------------------------/
482	void	664	void
483	rxvt_term::init_env ()	665	rxvt_term::init_env ()
484	{	666	{
485	int i;	667	int i;
486	unsigned int u;
487	char *val;	668	char *val;
488		669
489	#ifdef DISPLAY_IS_IP	670	#ifdef DISPLAY_IS_IP
490	/* Fixup display_name for export over pty to any interested terminal	671	/* Fixup display_name for export over pty to any interested terminal
491	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	672	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
499	*/	680	*/
500	val = rxvt_network_display (rs[Rs_display_name]);	681	val = rxvt_network_display (rs[Rs_display_name]);
501	rs[Rs_display_name] = (const char *)val;	682	rs[Rs_display_name] = (const char *)val;
502		683
503	if (val == NULL)	684	if (val == NULL)
504	#endif /* DISPLAY_IS_IP */	685	#endif /* DISPLAY_IS_IP */
505	val = XDisplayString (dpy);	686	val = XDisplayString (dpy);
506		687
507	if (rs[Rs_display_name] == NULL)	688	if (rs[Rs_display_name] == NULL)
508	rs[Rs_display_name] = val; /* use broken `:0' value */	689	rs[Rs_display_name] = val; /* use broken `:0' value */
509		690
510	i = strlen (val);	691	i = strlen (val);
511	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	692	env_display = (char *)rxvt_malloc (i + 9);
512		693
513	sprintf (env_display, "DISPLAY=%s", val);	694	sprintf (env_display, "DISPLAY=%s", val);
514		695
515	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	696	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516		697
…		…
537	else	718	else
538	putenv ("COLORTERM=" COLORTERMENVFULL);	719	putenv ("COLORTERM=" COLORTERMENVFULL);
539		720
540	if (rs[Rs_term_name] != NULL)	721	if (rs[Rs_term_name] != NULL)
541	{	722	{
542	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	723	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
543	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	724	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544	putenv (env_term);	725	putenv (env_term);
545	}	726	}
546	else	727	else
547	putenv ("TERM=" TERMENV);	728	putenv ("TERM=" TERMENV);
…		…
549	#ifdef HAVE_UNSETENV	730	#ifdef HAVE_UNSETENV
550	/* avoid passing old settings and confusing term size */	731	/* avoid passing old settings and confusing term size */
551	unsetenv ("LINES");	732	unsetenv ("LINES");
552	unsetenv ("COLUMNS");	733	unsetenv ("COLUMNS");
553	unsetenv ("TERMCAP"); /* terminfo should be okay */	734	unsetenv ("TERMCAP"); /* terminfo should be okay */
554	#endif /* HAVE_UNSETENV */	735	#endif /* HAVE_UNSETENV */
555	}	736	}
556		737
557	/----------------------------------------------------------------------/	738	/----------------------------------------------------------------------/
558	/*	739	/*
559	* This is more or less stolen straight from XFree86 xterm.	740	* This is more or less stolen straight from XFree86 xterm.
…		…
580		761
581	this->locale = "C";	762	this->locale = "C";
582	}	763	}
583		764
584		765
585	this->locale = rxvt_strdup (this->locale);	766	this->locale = strdup (this->locale);
586	SET_LOCALE (this->locale);	767	SET_LOCALE (this->locale);
587	mbstate.reset ();	768	mbstate.reset ();
588	#endif	769	#endif
589		770
590	#if HAVE_NL_LANGINFO	771	#if HAVE_NL_LANGINFO
…		…
647	priv_modes \|= PrivMode_Keypress;	828	priv_modes \|= PrivMode_Keypress;
648	if (!option (Opt_jumpScroll))	829	if (!option (Opt_jumpScroll))
649	priv_modes \|= PrivMode_smoothScroll;	830	priv_modes \|= PrivMode_smoothScroll;
650		831
651	#ifndef NO_BACKSPACE_KEY	832	#ifndef NO_BACKSPACE_KEY
652	if (strcmp (key_backspace, "DEC") == 0)	833	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653	priv_modes \|= PrivMode_HaveBackSpace;	834	priv_modes \|= PrivMode_HaveBackSpace;
654	#endif	835	#endif
655		836
656	/* add value for scrollBar */	837	/* add value for scrollBar */
657	if (scrollBar.state)	838	if (scrollBar.state)
…		…
663	run_command (argv);	844	run_command (argv);
664	}	845	}
665		846
666	/----------------------------------------------------------------------/	847	/----------------------------------------------------------------------/
667	void	848	void
668	rxvt_term::Get_Colours ()	849	rxvt_term::get_colours ()
669	{	850	{
670	int i;	851	int i;
671		852
672	#ifdef OFF_FOCUS_FADING	853	#ifdef OFF_FOCUS_FADING
673	pix_colors = pix_colors_focused;	854	pix_colors = pix_colors_focused;
674	#endif	855	#endif
675		856
676	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	857	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
677	{	858	{
678	const char *name = rs[Rs_color + i];	859	const char *name = rs[Rs_color + i];
679		860
680	if (!name)	861	if (!name)
…		…
733	* get scrollBar shadow colors	914	* get scrollBar shadow colors
734	*	915	*
735	* The calculations of topShadow/bottomShadow values are adapted	916	* The calculations of topShadow/bottomShadow values are adapted
736	* from the fvwm window manager.	917	* from the fvwm window manager.
737	*/	918	*/
738	#ifdef KEEP_SCROLLCOLOR	919	#ifdef RXVT_SCROLLBAR
739	if (depth <= 2)	920	if (depth <= 2)
740	{	921	{
741	/* Monochrome */	922	/* Monochrome */
742	alias_color (Color_scroll, Color_fg);	923	alias_color (Color_scroll, Color_fg);
743	alias_color (Color_topShadow, Color_bg);	924	alias_color (Color_topShadow, Color_bg);
…		…
758	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	939	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
759	cscroll.a)	940	cscroll.a)
760	))	941	))
761	alias_color (Color_topShadow, Color_White);	942	alias_color (Color_topShadow, Color_White);
762	}	943	}
763	#endif /* KEEP_SCROLLCOLOR */	944	#endif
764		945
765	#ifdef OFF_FOCUS_FADING	946	#ifdef OFF_FOCUS_FADING
766	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	947	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767	update_fade_color (i);	948	update_fade_color (i);
768	#endif	949	#endif
…		…
776	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	957	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777	{	958	{
778	int i = atoi (rs[Rs_color + idx]);	959	int i = atoi (rs[Rs_color + idx]);
779		960
780	if (i >= 8 && i <= 15)	961	if (i >= 8 && i <= 15)
781	{ /* bright colors */	962	/* bright colors */
782	i -= 8;
783	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	963	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784	return;	964	else if (i >= 0 && i <= 7)
785	}	965	/* normal colors */
786
787	if (i >= 0 && i <= 7) /* normal colors */
788	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	966	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789	}	967	}
790	}	968	}
791		969
792	/----------------------------------------------------------------------/	970	/----------------------------------------------------------------------/
…		…
893	Window top, parent;	1071	Window top, parent;
894		1072
895	dLocal (Display *, dpy);	1073	dLocal (Display *, dpy);
896		1074
897	/* grab colors before netscape does */	1075	/* grab colors before netscape does */
898	Get_Colours ();	1076	get_colours ();
899		1077
900	if (!set_fonts ())	1078	if (!set_fonts ())
901	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1079	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902		1080
903	parent = display->root;	1081	parent = display->root;
…		…
907	#if ENABLE_FRILLS	1085	#if ENABLE_FRILLS
908	if (option (Opt_borderLess))	1086	if (option (Opt_borderLess))
909	{	1087	{
910	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1088	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911	{	1089	{
912	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1090	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913	attributes.override_redirect = true;	1091	attributes.override_redirect = true;
914	mwmhints.flags = 0;
915	}	1092	}
916	else	1093	else
917	{	1094	{
918	mwmhints.flags = MWM_HINTS_DECORATIONS;	1095	mwmhints.flags = MWM_HINTS_DECORATIONS;
919	mwmhints.decorations = 0;
920	}	1096	}
921	}	1097	}
922	else
923	mwmhints.flags = 0;
924	#endif	1098	#endif
925		1099
926	#if ENABLE_XEMBED	1100	#if ENABLE_XEMBED
927	if (rs[Rs_embed])	1101	if (rs[Rs_embed])
928	{	1102	{
…		…
955	this->parent[0] = top;	1129	this->parent[0] = top;
956		1130
957	old_width = szHint.width;	1131	old_width = szHint.width;
958	old_height = szHint.height;	1132	old_height = szHint.height;
959		1133
960	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1134	set_title (rs [Rs_title]);
961	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1135	set_icon_name (rs [Rs_iconName]);
962		1136
963	classHint.res_name = (char *)rs[Rs_name];	1137	classHint.res_name = (char *)rs[Rs_name];
964	classHint.res_class = (char *)RESCLASS;	1138	classHint.res_class = (char *)RESCLASS;
965		1139
966	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1140	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
…		…
968	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1142	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
969	wmHint.window_group = top;	1143	wmHint.window_group = top;
970		1144
971	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1145	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972	&szHint, &wmHint, &classHint);	1146	&szHint, &wmHint, &classHint);
		1147	#if ENABLE_EWMH
		1148	# ifdef HAVE_AFTERIMAGE
		1149	/*
		1150	* set up icon hint
		1151	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources
		1152	*/
		1153
		1154	if (rs [Rs_iconfile])
		1155	{
		1156	init_asv ();
		1157
		1158	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1159	if (asv && im)
		1160	{
		1161	int w = im->width;
		1162	int h = im->height;
		1163	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1164	ASImage *result = scale_asimage (asv, im,
		1165	w, h, ASA_ARGB32,
		1166	100, ASIMAGE_QUALITY_DEFAULT);
		1167	destroy_asimage (&im);
		1168
		1169	if (buffer && result)
		1170	{
		1171	ARGB32 *asbuf = result->alt.argb32;
		1172	buffer [0] = w;
		1173	buffer [1] = h;
		1174
		1175	for (unsigned int i = 0; i < w * h; ++i)
		1176	buffer [i + 2] = asbuf [i];
		1177
		1178	destroy_asimage (&result);
		1179	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1180	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1181	free (buffer);
		1182	}
		1183	else
		1184	{
		1185	if (!buffer)
		1186	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1187
		1188	if (!result)
		1189	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1190	}
		1191	}
		1192	else
		1193	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1194	}
		1195	# endif
		1196	#endif
973		1197
974	#if ENABLE_FRILLS	1198	#if ENABLE_FRILLS
975	if (mwmhints.flags)	1199	if (mwmhints.flags)
976	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1200	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1201	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
1011		1235
1012	termwin_ev.start (display, top);	1236	termwin_ev.start (display, top);
1013		1237
1014	/* vt cursor: Black-on-White is standard, but this is more popular */	1238	/* vt cursor: Black-on-White is standard, but this is more popular */
1015	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1239	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016
1017	#ifdef HAVE_SCROLLBARS
1018	/* cursor scrollBar: Black-on-White */
1019	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020	#endif
1021		1240
1022	/* the vt window */	1241	/* the vt window */
1023	vt = XCreateSimpleWindow (dpy, top,	1242	vt = XCreateSimpleWindow (dpy, top,
1024	window_vt_x, window_vt_y,	1243	window_vt_x, window_vt_y,
1025	width, height,	1244	width, height,
…		…
1039		1258
1040	vt_select_input ();	1259	vt_select_input ();
1041		1260
1042	vt_ev.start (display, vt);	1261	vt_ev.start (display, vt);
1043		1262
1044	#ifdef XPM_BACKGROUND
1045	if (rs[Rs_backgroundPixmap] != NULL)
1046	{
1047	const char *p = rs[Rs_backgroundPixmap];
1048
1049	if ((p = strchr (p, ';')) != NULL)
1050	{
1051	p++;
1052	bgPixmap.handle_geometry (p);
1053	}
1054
1055	set_bgPixmap (rs[Rs_backgroundPixmap]);
1056	scr_touch (true);
1057	}
1058	#endif
1059
1060	/* graphics context for the vt window */	1263	/* graphics context for the vt window */
1061	gcvalue.foreground = pix_colors[Color_fg];	1264	gcvalue.foreground = pix_colors[Color_fg];
1062	gcvalue.background = pix_colors[Color_bg];	1265	gcvalue.background = pix_colors[Color_bg];
1063	gcvalue.graphics_exposures = 0;	1266	gcvalue.graphics_exposures = 0;
1064		1267
…		…
1066	GCForeground \| GCBackground \| GCGraphicsExposures,	1269	GCForeground \| GCBackground \| GCGraphicsExposures,
1067	&gcvalue);	1270	&gcvalue);
1068		1271
1069	drawable = new rxvt_drawable (this, vt);	1272	drawable = new rxvt_drawable (this, vt);
1070		1273
1071	#ifdef RXVT_SCROLLBAR
1072	gcvalue.foreground = pix_colors[Color_topShadow];
1073	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074	gcvalue.foreground = pix_colors[Color_bottomShadow];
1075	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1077	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078	#endif
1079
1080	#ifdef OFF_FOCUS_FADING	1274	#ifdef OFF_FOCUS_FADING
1081	// initially we are in unfocused state	1275	// initially we are in unfocused state
1082	if (rs[Rs_fade])	1276	if (rs[Rs_fade])
1083	pix_colors = pix_colors_unfocused;	1277	pix_colors = pix_colors_unfocused;
1084	#endif	1278	#endif
…		…
1089		1283
1090	/* ------------------------------------------------------------------------- *	1284	/* ------------------------------------------------------------------------- *
1091	* GET TTY CURRENT STATE *	1285	* GET TTY CURRENT STATE *
1092	* ------------------------------------------------------------------------- */	1286	* ------------------------------------------------------------------------- */
1093	void	1287	void
1094	rxvt_get_ttymode (ttymode_t *tio, int erase)	1288	rxvt_get_ttymode (struct termios *tio, int erase)
1095	{	1289	{
1096	/*	1290	/*
1097	* standard System V termios interface	1291	* standard System V termios interface
1098	*/	1292	*/
1099	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1293	if (tcgetattr (STDIN_FILENO, tio) < 0)
1100	{	1294	{
1101	// return error - use system defaults,	1295	// return error - use system defaults,
1102	// where possible, and zero elsewhere	1296	// where possible, and zero elsewhere
1103	memset (tio, 0, sizeof (ttymode_t));	1297	memset (tio, 0, sizeof (struct termios));
1104		1298
1105	tio->c_cc[VINTR] = CINTR;	1299	tio->c_cc[VINTR] = CINTR;
1106	tio->c_cc[VQUIT] = CQUIT;	1300	tio->c_cc[VQUIT] = CQUIT;
1107	tio->c_cc[VERASE] = CERASE;	1301	tio->c_cc[VERASE] = CERASE;
1108	#ifdef VERASE2	1302	#ifdef VERASE2
…		…
1172		1366
1173	/*	1367	/*
1174	* Debugging	1368	* Debugging
1175	*/	1369	*/
1176	#ifdef DEBUG_TTYMODE	1370	#ifdef DEBUG_TTYMODE
1177	#ifdef HAVE_TERMIOS_H
1178	/* c_iflag bits */	1371	/* c_iflag bits */
1179	fprintf (stderr, "Input flags\n");	1372	fprintf (stderr, "Input flags\n");
1180		1373
1181	/* cpp token stringize doesn't work on all machines <sigh> */	1374	/* cpp token stringize doesn't work on all machines <sigh> */
1182	# define FOO(flag,name) \	1375	# define FOO(flag,name) \
…		…
1245	FOO (VLNEXT, "VLNEXT");	1438	FOO (VLNEXT, "VLNEXT");
1246	# endif	1439	# endif
1247		1440
1248	fprintf (stderr, "\n");	1441	fprintf (stderr, "\n");
1249	# undef FOO	1442	# undef FOO
1250	# endif /* HAVE_TERMIOS_H */	1443	#endif /* DEBUG_TTYMODE */
1251	#endif /* DEBUG_TTYMODE */
1252	}	1444	}
1253		1445
1254	/----------------------------------------------------------------------/	1446	/----------------------------------------------------------------------/
1255	/*	1447	/*
1256	* Run the command in a subprocess and return a file descriptor for the	1448	* Run the command in a subprocess and return a file descriptor for the
…		…
1280	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1472	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1281		1473
1282	int er;	1474	int er;
1283		1475
1284	#ifndef NO_BACKSPACE_KEY	1476	#ifndef NO_BACKSPACE_KEY
1285	if (key_backspace[0] && !key_backspace[1])	1477	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1286	er = key_backspace[0];	1478	er = rs[Rs_backspace_key][0];
1287	else if (strcmp (key_backspace, "DEC") == 0)	1479	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1288	er = '\177'; /* the initial state anyway */	1480	er = '\177'; /* the initial state anyway */
1289	else	1481	else
1290	#endif	1482	#endif
1291	er = -1;	1483	er = -1;
1292		1484
1293	rxvt_get_ttymode (&tio, er);	1485	rxvt_get_ttymode (&tio, er);
1294	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1486	/* init terminal attributes */
		1487	cfsetospeed (&tio, BAUDRATE);
		1488	cfsetispeed (&tio, BAUDRATE);
		1489	tcsetattr (pty->tty, TCSANOW, &tio);
1295	pty->set_utf8_mode (enc_utf8);	1490	pty->set_utf8_mode (enc_utf8);
1296		1491
1297	/* set initial window size */	1492	/* set initial window size */
1298	tt_winch ();	1493	tt_winch ();
1299		1494
…		…
1359	rxvt_term::run_child (const char const argv)	1554	rxvt_term::run_child (const char const argv)
1360	{	1555	{
1361	char *login;	1556	char *login;
1362		1557
1363	if (option (Opt_console))	1558	if (option (Opt_console))
		1559	{
1364	{ /* be virtual console, fail silently */	1560	/* be virtual console, fail silently */
1365	#ifdef TIOCCONS	1561	#ifdef TIOCCONS
1366	unsigned int on = 1;	1562	unsigned int on = 1;
1367		1563
1368	ioctl (STDIN_FILENO, TIOCCONS, &on);	1564	ioctl (STDIN_FILENO, TIOCCONS, &on);
1369	#elif defined (SRIOCSREDIR)	1565	#elif defined (SRIOCSREDIR)
…		…
1371		1567
1372	fd = open (CONSOLE, O_WRONLY, 0);	1568	fd = open (CONSOLE, O_WRONLY, 0);
1373	if (fd >= 0)	1569	if (fd >= 0)
1374	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1570	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1375	close (fd);	1571	close (fd);
1376	#endif /* SRIOCSREDIR */	1572	#endif /* SRIOCSREDIR */
1377	}	1573	}
1378		1574
1379	/* reset signals and spin off the command interpreter */	1575	/* reset signals and spin off the command interpreter */
1380	signal (SIGINT, SIG_DFL);	1576	signal (SIGINT, SIG_DFL);
1381	signal (SIGQUIT, SIG_DFL);	1577	signal (SIGQUIT, SIG_DFL);
…		…
1388	*/	1584	*/
1389	#ifdef SIGTSTP	1585	#ifdef SIGTSTP
1390	signal (SIGTSTP, SIG_IGN);	1586	signal (SIGTSTP, SIG_IGN);
1391	signal (SIGTTIN, SIG_IGN);	1587	signal (SIGTTIN, SIG_IGN);
1392	signal (SIGTTOU, SIG_IGN);	1588	signal (SIGTTOU, SIG_IGN);
1393	#endif /* SIGTSTP */	1589	#endif /* SIGTSTP */
1394
1395	// unblock signals (signals are blocked by iom.C
1396	sigset_t ss;
1397	sigemptyset (&ss);
1398	sigprocmask (SIG_SETMASK, &ss, 0);
1399		1590
1400	/* command interpreter path */	1591	/* command interpreter path */
1401	if (argv != NULL)	1592	if (argv)
1402	{	1593	{
1403	# ifdef DEBUG_CMD	1594	# ifdef DEBUG_CMD
1404	int i;	1595	int i;
1405		1596
1406	for (i = 0; argv[i]; i++)	1597	for (i = 0; argv[i]; i++)
…		…
1415	const char argv0, shell;	1606	const char argv0, shell;
1416		1607
1417	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1608	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1418	shell = "/bin/sh";	1609	shell = "/bin/sh";
1419		1610
1420	argv0 = (const char *)rxvt_r_basename (shell);	1611	argv0 = rxvt_basename (shell);
1421		1612
1422	if (option (Opt_loginShell))	1613	if (option (Opt_loginShell))
1423	{	1614	{
1424	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1615	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1425		1616
1426	login[0] = '-';	1617	login[0] = '-';
1427	strcpy (&login[1], argv0);	1618	strcpy (&login[1], argv0);
1428	argv0 = login;	1619	argv0 = login;
1429	}	1620	}
1430		1621
1431	execlp (shell, argv0, NULL);	1622	execlp (shell, argv0, (char *)0);
1432	/* no error message: STDERR is closed! */	1623	/* no error message: STDERR is closed! */
1433	}	1624	}
1434		1625
1435	return -1;	1626	return -1;
1436	}	1627	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC vs. Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 UTC