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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.181 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.230 by root, Fri Dec 14 05:25:24 2007 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-2007 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.
…		…
38		39
39	#include <limits>	40	#include <limits>
40		41
41	#include <csignal>	42	#include <csignal>
42		43
		44	#include <fcntl.h>
		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)
57	# else	161	# else
58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	162	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59	# endif	163	# endif
60	/* high-intensity colors */	164	/* high-intensity colors */
61	# ifdef XTERM_COLORS	165	# ifdef XTERM_COLORS
62	"rgb:4d/4d/4d", // 8: bright black (Grey30)	166	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
146	"rgb:e7/e7/e7",	250	"rgb:e7/e7/e7",
147		251
148	#ifndef NO_CURSORCOLOR	252	#ifndef NO_CURSORCOLOR
149	COLOR_CURSOR_BACKGROUND,	253	COLOR_CURSOR_BACKGROUND,
150	COLOR_CURSOR_FOREGROUND,	254	COLOR_CURSOR_FOREGROUND,
151	#endif /* ! NO_CURSORCOLOR */	255	#endif /* ! NO_CURSORCOLOR */
152	NULL, /* Color_pointer_fg */	256	NULL, /* Color_pointer_fg */
153	NULL, /* Color_pointer_bg */	257	NULL, /* Color_pointer_bg */
154	NULL, /* Color_border */	258	NULL, /* Color_border */
155	#ifndef NO_BOLD_UNDERLINE_REVERSE	259	#ifndef NO_BOLD_UNDERLINE_REVERSE
156	NULL, /* Color_BD */	260	NULL, /* Color_BD */
157	NULL, /* Color_IT */	261	NULL, /* Color_IT */
158	NULL, /* Color_UL */	262	NULL, /* Color_UL */
159	NULL, /* Color_RV */	263	NULL, /* Color_RV */
160	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	264	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161	#if ENABLE_FRILLS	265	#if ENABLE_FRILLS
162	NULL, // Color_underline	266	NULL, // Color_underline
163	#endif	267	#endif
164	#ifdef OPTION_HC	268	#ifdef OPTION_HC
165	NULL,	269	NULL,
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
177	};	281	};
178		282
179	bool	283	void
180	rxvt_term::init_vars ()	284	rxvt_term::init_vars ()
181	{	285	{
182	pix_colors = //	286	pix_colors = //
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
187
188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
189	pixmap = None;
190	#endif	290	#endif
191		291
192	MEvent.time = CurrentTime;	292	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	293	MEvent.button = AnyButton;
194	want_refresh = 1;	294	want_refresh = 1;
…		…
199	ext_bwidth = EXTERNALBORDERWIDTH;	299	ext_bwidth = EXTERNALBORDERWIDTH;
200	lineSpace = LINESPACE;	300	lineSpace = LINESPACE;
201	saveLines = SAVELINES;	301	saveLines = SAVELINES;
202	numpix_colors = TOTAL_COLORS;	302	numpix_colors = TOTAL_COLORS;
203		303
204	refresh_limit = 1;
205	refresh_type = SLOW_REFRESH;	304	refresh_type = SLOW_REFRESH;
206		305
207	oldcursor.row = oldcursor.col = -1;	306	oldcursor.row = oldcursor.col = -1;
208	#ifdef XPM_BACKGROUND
209	/* bgPixmap.w = bgPixmap.h = 0; */
210	bgPixmap.x = bgPixmap.y = 0;
211	bgPixmap.pixmap = None;
212	#endif
213
214	last_bot = last_state = -1;	307	last_bot = last_state = -1;
215		308
216	set_option (Opt_scrollBar, 1);	309	set_option (Opt_scrollBar);
217	set_option (Opt_scrollTtyOutput, 1);	310	set_option (Opt_scrollTtyOutput);
218	set_option (Opt_jumpScroll, 1);	311	set_option (Opt_jumpScroll);
		312	set_option (Opt_skipScroll);
219	set_option (Opt_secondaryScreen, 1);	313	set_option (Opt_secondaryScreen);
220	set_option (Opt_secondaryScroll, 1);	314	set_option (Opt_secondaryScroll);
221	set_option (Opt_pastableTabs, 1);	315	set_option (Opt_pastableTabs);
222	set_option (Opt_intensityStyles, 1);	316	set_option (Opt_intensityStyles);
223		317	set_option (Opt_iso14755_52);
224	return true;
225	}	318	}
226		319
227	void	320	void
228	rxvt_term::init_secondary ()	321	rxvt_term::init_secondary ()
229	{	322	{
…		…
236	if ((i = open ("/dev/null", O_RDONLY)) < 0)	329	if ((i = open ("/dev/null", O_RDONLY)) < 0)
237	{	330	{
238	/* TODO: BOO HISS */	331	/* TODO: BOO HISS */
239	dup2 (STDERR_FILENO, STDIN_FILENO);	332	dup2 (STDERR_FILENO, STDIN_FILENO);
240	}	333	}
241	else if (i > STDIN_FILENO)	334	else if (i != STDIN_FILENO)
242	{	335	{
243	dup2 (i, STDIN_FILENO);	336	dup2 (i, STDIN_FILENO);
244	close (i);	337	close (i);
245	}	338	}
246		339
…		…
261	/----------------------------------------------------------------------/	354	/----------------------------------------------------------------------/
262	const char **	355	const char **
263	rxvt_term::init_resources (int argc, const char const argv)	356	rxvt_term::init_resources (int argc, const char const argv)
264	{	357	{
265	int i, r_argc;	358	int i, r_argc;
266	char *val;
267	const char cmd_argv, r_argv;	359	const char cmd_argv, r_argv;
268		360
269	/*	361	/*
270	* Look for -e option. Find => split and make cmd_argv[] of command args	362	* Look for -e option. Find => split and make cmd_argv[] of command args
271	*/	363	*/
272	for (r_argc = 0; r_argc < argc; r_argc++)	364	for (r_argc = 0; r_argc < argc; r_argc++)
273	if (!strcmp (argv[r_argc], "-e"))	365	if (!strcmp (argv[r_argc], "-e"))
274	break;	366	break;
275		367
		368	if (r_argc == argc)
		369	cmd_argv = NULL;
		370	else if (!argv[r_argc + 1])
		371	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		372	else
		373	{
		374	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		375
		376	for (i = 0; i < argc - r_argc - 1; i++)
		377	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		378
		379	cmd_argv[i] = NULL;
		380	}
		381
276	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	382	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
277		383
278	for (i = 0; i < r_argc; i++)	384	for (i = 0; i < r_argc; i++)
279	r_argv[i] = (const char *)argv[i];	385	r_argv[i] = (const char *)argv[i];
280		386
281	r_argv[i] = NULL;	387	r_argv[i] = NULL;
282		388
283	if (r_argc == argc)
284	cmd_argv = NULL;
285	else
286	{
287	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
288
289	for (i = 0; i < argc - r_argc - 1; i++)
290	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292	cmd_argv[i] = NULL;
293	}
294
295	rs[Rs_name] = rxvt_r_basename (argv[0]);	389	rs[Rs_name] = rxvt_basename (argv[0]);
296		390
297	/*	391	/*
298	* Open display, get options/resources and create the window	392	* Open display, get options/resources and create the window
299	*/	393	*/
300		394
…		…
302	rs[Rs_display_name] = ":0";	396	rs[Rs_display_name] = ":0";
303		397
304	get_options (r_argc, r_argv);	398	get_options (r_argc, r_argv);
305		399
306	if (!(display = displays.get (rs[Rs_display_name])))	400	if (!(display = displays.get (rs[Rs_display_name])))
		401	{
		402	free (r_argv);
307	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	403	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		404	}
308		405
309	// using a local pointer decreases code size a lot	406	// using a local pointer decreases code size a lot
310	xa = display->xa;	407	xa = display->xa;
311		408
312	set (display);	409	set (display);
…		…
315	#if XFT	412	#if XFT
316	if (rs[Rs_depth])	413	if (rs[Rs_depth])
317	select_visual (strtol (rs[Rs_depth], 0, 0));	414	select_visual (strtol (rs[Rs_depth], 0, 0));
318	#endif	415	#endif
319		416
		417	#ifdef HAVE_AFTERIMAGE
		418	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		419	#endif
320	free (r_argv);	420	free (r_argv);
321		421
322	for (int i = NUM_RESOURCES; i--; )	422	for (int i = NUM_RESOURCES; i--; )
323	if (rs [i] == resval_undef)	423	if (rs [i] == resval_undef)
324	rs [i] = 0;	424	rs [i] = 0;
…		…
340	* set any defaults not already set	440	* set any defaults not already set
341	*/	441	*/
342	if (cmd_argv && cmd_argv[0])	442	if (cmd_argv && cmd_argv[0])
343	{	443	{
344	if (!rs[Rs_title])	444	if (!rs[Rs_title])
345	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	445	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346	if (!rs[Rs_iconName])	446	if (!rs[Rs_iconName])
347	rs[Rs_iconName] = rs[Rs_title];	447	rs[Rs_iconName] = rs[Rs_title];
348	}	448	}
349	else	449	else
350	{	450	{
…		…
388	rs[Rs_cutchars] = CUTCHARS;	488	rs[Rs_cutchars] = CUTCHARS;
389		489
390	#ifndef NO_BACKSPACE_KEY	490	#ifndef NO_BACKSPACE_KEY
391	if (!rs[Rs_backspace_key])	491	if (!rs[Rs_backspace_key])
392	# ifdef DEFAULT_BACKSPACE	492	# ifdef DEFAULT_BACKSPACE
393	key_backspace = DEFAULT_BACKSPACE;	493	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394	# else	494	# else
395	key_backspace = "DEC"; /* can toggle between \010 or \177 */	495	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396	# endif	496	# endif
397	else
398	{
399	val = strdup (rs[Rs_backspace_key]);
400	rxvt_Str_trim (val);
401	rxvt_Str_escaped (val);
402	key_backspace = val;
403	}
404	#endif	497	#endif
405		498
406	#ifndef NO_DELETE_KEY	499	#ifndef NO_DELETE_KEY
407	if (!rs[Rs_delete_key])	500	if (!rs[Rs_delete_key])
408	# ifdef DEFAULT_DELETE	501	# ifdef DEFAULT_DELETE
409	key_delete = DEFAULT_DELETE;	502	rs[Rs_delete_key] = DEFAULT_DELETE;
410	# else	503	# else
411	key_delete = "\033[3~";	504	rs[Rs_delete_key] = "\033[3~";
412	# endif
413	else
414	{
415	val = strdup (rs[Rs_delete_key]);
416	rxvt_Str_trim (val);
417	rxvt_Str_escaped (val);
418	key_delete = val;
419	}
420	#endif	505	# endif
421	if (rs[Rs_answerbackstring])	506	#endif
422	{
423	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425	}
426		507
427	#ifdef HAVE_SCROLLBARS	508	#ifdef HAVE_SCROLLBARS
428	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	509	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429	#endif	510	#endif
430		511
431	#ifdef XTERM_REVERSE_VIDEO	512	#ifdef XTERM_REVERSE_VIDEO
432	/* this is how xterm implements reverseVideo */	513	/* this is how xterm implements reverseVideo */
433	if (OPTION (Opt_reverseVideo))	514	if (option (Opt_reverseVideo))
434	{	515	{
435	if (!rs[Rs_color + Color_fg])	516	if (!rs[Rs_color + Color_fg])
436	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	517	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437		518
438	if (!rs[Rs_color + Color_bg])	519	if (!rs[Rs_color + Color_bg])
…		…
444	if (!rs[Rs_color + i])	525	if (!rs[Rs_color + i])
445	rs[Rs_color + i] = def_colorName[i];	526	rs[Rs_color + i] = def_colorName[i];
446		527
447	#ifndef XTERM_REVERSE_VIDEO	528	#ifndef XTERM_REVERSE_VIDEO
448	/* this is how we implement reverseVideo */	529	/* this is how we implement reverseVideo */
449	if (OPTION (Opt_reverseVideo))	530	if (option (Opt_reverseVideo))
450	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	531	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451	#endif	532	#endif
452		533
453	/* convenient aliases for setting fg/bg to colors */	534	/* convenient aliases for setting fg/bg to colors */
454	color_aliases (Color_fg);	535	color_aliases (Color_fg);
455	color_aliases (Color_bg);	536	color_aliases (Color_bg);
456	#ifndef NO_CURSORCOLOR	537	#ifndef NO_CURSORCOLOR
457	color_aliases (Color_cursor);	538	color_aliases (Color_cursor);
458	color_aliases (Color_cursor2);	539	color_aliases (Color_cursor2);
459	#endif /* NO_CURSORCOLOR */	540	#endif /* NO_CURSORCOLOR */
460	color_aliases (Color_pointer_fg);	541	color_aliases (Color_pointer_fg);
461	color_aliases (Color_pointer_bg);	542	color_aliases (Color_pointer_bg);
462	color_aliases (Color_border);	543	color_aliases (Color_border);
463	#ifndef NO_BOLD_UNDERLINE_REVERSE	544	#ifndef NO_BOLD_UNDERLINE_REVERSE
464	color_aliases (Color_BD);	545	color_aliases (Color_BD);
465	color_aliases (Color_UL);	546	color_aliases (Color_UL);
466	color_aliases (Color_RV);	547	color_aliases (Color_RV);
467	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	548	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468		549
469	if (!rs[Rs_color + Color_border])	550	if (!rs[Rs_color + Color_border])
470	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	551	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471		552
472	return cmd_argv;	553	return cmd_argv;
…		…
475	/----------------------------------------------------------------------/	556	/----------------------------------------------------------------------/
476	void	557	void
477	rxvt_term::init_env ()	558	rxvt_term::init_env ()
478	{	559	{
479	int i;	560	int i;
480	unsigned int u;
481	char *val;	561	char *val;
482		562
483	#ifdef DISPLAY_IS_IP	563	#ifdef DISPLAY_IS_IP
484	/* Fixup display_name for export over pty to any interested terminal	564	/* Fixup display_name for export over pty to any interested terminal
485	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	565	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
493	*/	573	*/
494	val = rxvt_network_display (rs[Rs_display_name]);	574	val = rxvt_network_display (rs[Rs_display_name]);
495	rs[Rs_display_name] = (const char *)val;	575	rs[Rs_display_name] = (const char *)val;
496		576
497	if (val == NULL)	577	if (val == NULL)
498	#endif /* DISPLAY_IS_IP */	578	#endif /* DISPLAY_IS_IP */
499	val = XDisplayString (dpy);	579	val = XDisplayString (dpy);
500		580
501	if (rs[Rs_display_name] == NULL)	581	if (rs[Rs_display_name] == NULL)
502	rs[Rs_display_name] = val; /* use broken `:0' value */	582	rs[Rs_display_name] = val; /* use broken `:0' value */
503		583
504	i = strlen (val);	584	i = strlen (val);
505	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	585	env_display = (char *)rxvt_malloc (i + 9);
506		586
507	sprintf (env_display, "DISPLAY=%s", val);	587	sprintf (env_display, "DISPLAY=%s", val);
508		588
509	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	589	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510		590
…		…
531	else	611	else
532	putenv ("COLORTERM=" COLORTERMENVFULL);	612	putenv ("COLORTERM=" COLORTERMENVFULL);
533		613
534	if (rs[Rs_term_name] != NULL)	614	if (rs[Rs_term_name] != NULL)
535	{	615	{
536	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	616	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	617	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538	putenv (env_term);	618	putenv (env_term);
539	}	619	}
540	else	620	else
541	putenv ("TERM=" TERMENV);	621	putenv ("TERM=" TERMENV);
…		…
543	#ifdef HAVE_UNSETENV	623	#ifdef HAVE_UNSETENV
544	/* avoid passing old settings and confusing term size */	624	/* avoid passing old settings and confusing term size */
545	unsetenv ("LINES");	625	unsetenv ("LINES");
546	unsetenv ("COLUMNS");	626	unsetenv ("COLUMNS");
547	unsetenv ("TERMCAP"); /* terminfo should be okay */	627	unsetenv ("TERMCAP"); /* terminfo should be okay */
548	#endif /* HAVE_UNSETENV */	628	#endif /* HAVE_UNSETENV */
549	}	629	}
550		630
551	/----------------------------------------------------------------------/	631	/----------------------------------------------------------------------/
552	/*	632	/*
553	* This is more or less stolen straight from XFree86 xterm.	633	* This is more or less stolen straight from XFree86 xterm.
…		…
574		654
575	this->locale = "C";	655	this->locale = "C";
576	}	656	}
577		657
578		658
579	this->locale = rxvt_strdup (this->locale);	659	this->locale = strdup (this->locale);
580	SET_LOCALE (this->locale);	660	SET_LOCALE (this->locale);
581	mbstate.reset ();	661	mbstate.reset ();
582	#endif	662	#endif
583		663
584	#if HAVE_NL_LANGINFO	664	#if HAVE_NL_LANGINFO
…		…
628	* Initialize the command connection.	708	* Initialize the command connection.
629	* This should be called after the X server connection is established.	709	* This should be called after the X server connection is established.
630	*/	710	*/
631		711
632	#ifdef META8_OPTION	712	#ifdef META8_OPTION
633	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	713	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634	#endif	714	#endif
635		715
636	get_ourmods ();	716	get_ourmods ();
637		717
638	if (!OPTION (Opt_scrollTtyOutput))	718	if (!option (Opt_scrollTtyOutput))
639	priv_modes \|= PrivMode_TtyOutputInh;	719	priv_modes \|= PrivMode_TtyOutputInh;
640	if (OPTION (Opt_scrollTtyKeypress))	720	if (option (Opt_scrollTtyKeypress))
641	priv_modes \|= PrivMode_Keypress;	721	priv_modes \|= PrivMode_Keypress;
642	if (!OPTION (Opt_jumpScroll))	722	if (!option (Opt_jumpScroll))
643	priv_modes \|= PrivMode_smoothScroll;	723	priv_modes \|= PrivMode_smoothScroll;
644		724
645	#ifndef NO_BACKSPACE_KEY	725	#ifndef NO_BACKSPACE_KEY
646	if (strcmp (key_backspace, "DEC") == 0)	726	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647	priv_modes \|= PrivMode_HaveBackSpace;	727	priv_modes \|= PrivMode_HaveBackSpace;
648	#endif	728	#endif
649		729
650	/* add value for scrollBar */	730	/* add value for scrollBar */
651	if (scrollBar.state)	731	if (scrollBar.state)
…		…
664	int i;	744	int i;
665		745
666	#ifdef OFF_FOCUS_FADING	746	#ifdef OFF_FOCUS_FADING
667	pix_colors = pix_colors_focused;	747	pix_colors = pix_colors_focused;
668	#endif	748	#endif
669		749
670	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	750	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671	{	751	{
672	const char *name = rs[Rs_color + i];	752	const char *name = rs[Rs_color + i];
673		753
674	if (!name)	754	if (!name)
…		…
677	rxvt_color xcol;	757	rxvt_color xcol;
678		758
679	if (!set_color (xcol, name))	759	if (!set_color (xcol, name))
680	{	760	{
681	#ifndef XTERM_REVERSE_VIDEO	761	#ifndef XTERM_REVERSE_VIDEO
682	if (i < 2 && OPTION (Opt_reverseVideo))	762	if (i < 2 && option (Opt_reverseVideo))
683	name = def_colorName [1 - i];	763	name = def_colorName [1 - i];
684	else	764	else
685	#endif	765	#endif
686	name = def_colorName [i];	766	name = def_colorName [i];
687		767
…		…
752	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	832	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753	cscroll.a)	833	cscroll.a)
754	))	834	))
755	alias_color (Color_topShadow, Color_White);	835	alias_color (Color_topShadow, Color_White);
756	}	836	}
757	#endif /* KEEP_SCROLLCOLOR */	837	#endif /* KEEP_SCROLLCOLOR */
758		838
759	#ifdef OFF_FOCUS_FADING	839	#ifdef OFF_FOCUS_FADING
760	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	840	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761	update_fade_color (i);	841	update_fade_color (i);
762	#endif	842	#endif
…		…
770	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	850	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771	{	851	{
772	int i = atoi (rs[Rs_color + idx]);	852	int i = atoi (rs[Rs_color + idx]);
773		853
774	if (i >= 8 && i <= 15)	854	if (i >= 8 && i <= 15)
775	{ /* bright colors */	855	/* bright colors */
776	i -= 8;
777	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	856	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778	return;	857	else if (i >= 0 && i <= 7)
779	}	858	/* normal colors */
780
781	if (i >= 0 && i <= 7) /* normal colors */
782	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	859	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783	}	860	}
784	}	861	}
785		862
786	/----------------------------------------------------------------------/	863	/----------------------------------------------------------------------/
…		…
878	rxvt_term::create_windows (int argc, const char const argv)	955	rxvt_term::create_windows (int argc, const char const argv)
879	{	956	{
880	XClassHint classHint;	957	XClassHint classHint;
881	XWMHints wmHint;	958	XWMHints wmHint;
882	#if ENABLE_FRILLS	959	#if ENABLE_FRILLS
883	MWMHints mwmhints;	960	MWMHints mwmhints = { };
884	#endif	961	#endif
885	XGCValues gcvalue;	962	XGCValues gcvalue;
886	XSetWindowAttributes attributes;	963	XSetWindowAttributes attributes;
887	Window top, parent;	964	Window top, parent;
888		965
…		…
894	if (!set_fonts ())	971	if (!set_fonts ())
895	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	972	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896		973
897	parent = display->root;	974	parent = display->root;
898		975
899	attributes.override_redirect = !!OPTION (Opt_override_redirect);	976	attributes.override_redirect = !!option (Opt_override_redirect);
900		977
901	#if ENABLE_FRILLS	978	#if ENABLE_FRILLS
902	if (OPTION (Opt_borderLess))	979	if (option (Opt_borderLess))
903	{	980	{
904	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	981	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905	{	982	{
906	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	983	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907	attributes.override_redirect = true;	984	attributes.override_redirect = true;
908	mwmhints.flags = 0;
909	}	985	}
910	else	986	else
911	{	987	{
912	mwmhints.flags = MWM_HINTS_DECORATIONS;	988	mwmhints.flags = MWM_HINTS_DECORATIONS;
913	mwmhints.decorations = 0;
914	}	989	}
915	}	990	}
916	else
917	mwmhints.flags = 0;
918	#endif	991	#endif
919		992
920	#if ENABLE_XEMBED	993	#if ENABLE_XEMBED
921	if (rs[Rs_embed])	994	if (rs[Rs_embed])
922	{	995	{
…		…
957	classHint.res_name = (char *)rs[Rs_name];	1030	classHint.res_name = (char *)rs[Rs_name];
958	classHint.res_class = (char *)RESCLASS;	1031	classHint.res_class = (char *)RESCLASS;
959		1032
960	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1033	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
961	wmHint.input = True;	1034	wmHint.input = True;
962	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1035	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963	wmHint.window_group = top;	1036	wmHint.window_group = top;
964		1037
965	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1038	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966	&szHint, &wmHint, &classHint);	1039	&szHint, &wmHint, &classHint);
967		1040
…		…
1024	attributes.bit_gravity = NorthWestGravity;	1097	attributes.bit_gravity = NorthWestGravity;
1025	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);	1098	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026		1099
1027	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1100	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1028		1101
1029	if (OPTION (Opt_pointerBlank))	1102	if (option (Opt_pointerBlank))
1030	vt_emask \|= PointerMotionMask;	1103	vt_emask \|= PointerMotionMask;
1031	else	1104	else
1032	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1105	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1033		1106
1034	vt_select_input ();	1107	vt_select_input ();
1035		1108
1036	vt_ev.start (display, vt);	1109	vt_ev.start (display, vt);
1037
1038	#ifdef XPM_BACKGROUND
1039	if (rs[Rs_backgroundPixmap] != NULL
1040	&& !OPTION (Opt_transparent))
1041	{
1042	const char *p = rs[Rs_backgroundPixmap];
1043
1044	if ((p = strchr (p, ';')) != NULL)
1045	{
1046	p++;
1047	scale_pixmap (p);
1048	}
1049
1050	set_bgPixmap (rs[Rs_backgroundPixmap]);
1051	scr_touch (true);
1052	}
1053	#endif
1054		1110
1055	/* graphics context for the vt window */	1111	/* graphics context for the vt window */
1056	gcvalue.foreground = pix_colors[Color_fg];	1112	gcvalue.foreground = pix_colors[Color_fg];
1057	gcvalue.background = pix_colors[Color_bg];	1113	gcvalue.background = pix_colors[Color_bg];
1058	gcvalue.graphics_exposures = 0;	1114	gcvalue.graphics_exposures = 0;
…		…
1167		1223
1168	/*	1224	/*
1169	* Debugging	1225	* Debugging
1170	*/	1226	*/
1171	#ifdef DEBUG_TTYMODE	1227	#ifdef DEBUG_TTYMODE
1172	#ifdef HAVE_TERMIOS_H
1173	/* c_iflag bits */	1228	/* c_iflag bits */
1174	fprintf (stderr, "Input flags\n");	1229	fprintf (stderr, "Input flags\n");
1175		1230
1176	/* cpp token stringize doesn't work on all machines <sigh> */	1231	/* cpp token stringize doesn't work on all machines <sigh> */
1177	# define FOO(flag,name) \	1232	# define FOO(flag,name) \
…		…
1240	FOO (VLNEXT, "VLNEXT");	1295	FOO (VLNEXT, "VLNEXT");
1241	# endif	1296	# endif
1242		1297
1243	fprintf (stderr, "\n");	1298	fprintf (stderr, "\n");
1244	# undef FOO	1299	# undef FOO
1245	# endif /* HAVE_TERMIOS_H */	1300	#endif /* DEBUG_TTYMODE */
1246	#endif /* DEBUG_TTYMODE */
1247	}	1301	}
1248		1302
1249	/----------------------------------------------------------------------/	1303	/----------------------------------------------------------------------/
1250	/*	1304	/*
1251	* Run the command in a subprocess and return a file descriptor for the	1305	* Run the command in a subprocess and return a file descriptor for the
…		…
1275	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1329	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276		1330
1277	int er;	1331	int er;
1278		1332
1279	#ifndef NO_BACKSPACE_KEY	1333	#ifndef NO_BACKSPACE_KEY
1280	if (key_backspace[0] && !key_backspace[1])	1334	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281	er = key_backspace[0];	1335	er = rs[Rs_backspace_key][0];
1282	else if (strcmp (key_backspace, "DEC") == 0)	1336	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283	er = '\177'; /* the initial state anyway */	1337	er = '\177'; /* the initial state anyway */
1284	else	1338	else
1285	#endif	1339	#endif
1286	er = -1;	1340	er = -1;
1287		1341
…		…
1329	}	1383	}
1330		1384
1331	_exit (EXIT_FAILURE);	1385	_exit (EXIT_FAILURE);
1332		1386
1333	default:	1387	default:
1334	if (!OPTION (Opt_utmpInhibit))	1388	if (!option (Opt_utmpInhibit))
1335	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1389	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336		1390
1337	pty->close_tty ();	1391	pty->close_tty ();
1338		1392
1339	child_ev.start (cmd_pid);	1393	child_ev.start (cmd_pid);
1340		1394
…		…
1353	int	1407	int
1354	rxvt_term::run_child (const char const argv)	1408	rxvt_term::run_child (const char const argv)
1355	{	1409	{
1356	char *login;	1410	char *login;
1357		1411
1358	if (OPTION (Opt_console))	1412	if (option (Opt_console))
		1413	{
1359	{ /* be virtual console, fail silently */	1414	/* be virtual console, fail silently */
1360	#ifdef TIOCCONS	1415	#ifdef TIOCCONS
1361	unsigned int on = 1;	1416	unsigned int on = 1;
1362		1417
1363	ioctl (STDIN_FILENO, TIOCCONS, &on);	1418	ioctl (STDIN_FILENO, TIOCCONS, &on);
1364	#elif defined (SRIOCSREDIR)	1419	#elif defined (SRIOCSREDIR)
…		…
1366		1421
1367	fd = open (CONSOLE, O_WRONLY, 0);	1422	fd = open (CONSOLE, O_WRONLY, 0);
1368	if (fd >= 0)	1423	if (fd >= 0)
1369	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1424	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1370	close (fd);	1425	close (fd);
1371	#endif /* SRIOCSREDIR */	1426	#endif /* SRIOCSREDIR */
1372	}	1427	}
1373		1428
1374	/* reset signals and spin off the command interpreter */	1429	/* reset signals and spin off the command interpreter */
1375	signal (SIGINT, SIG_DFL);	1430	signal (SIGINT, SIG_DFL);
1376	signal (SIGQUIT, SIG_DFL);	1431	signal (SIGQUIT, SIG_DFL);
…		…
1383	*/	1438	*/
1384	#ifdef SIGTSTP	1439	#ifdef SIGTSTP
1385	signal (SIGTSTP, SIG_IGN);	1440	signal (SIGTSTP, SIG_IGN);
1386	signal (SIGTTIN, SIG_IGN);	1441	signal (SIGTTIN, SIG_IGN);
1387	signal (SIGTTOU, SIG_IGN);	1442	signal (SIGTTOU, SIG_IGN);
1388	#endif /* SIGTSTP */	1443	#endif /* SIGTSTP */
1389		1444
1390	// unblock signals (signals are blocked by iom.C	1445	// unblock signals (signals are blocked by iom.C
1391	sigset_t ss;	1446	sigset_t ss;
1392	sigemptyset (&ss);	1447	sigemptyset (&ss);
1393	sigprocmask (SIG_SETMASK, &ss, 0);	1448	sigprocmask (SIG_SETMASK, &ss, 0);
1394		1449
1395	/* command interpreter path */	1450	/* command interpreter path */
1396	if (argv != NULL)	1451	if (argv)
1397	{	1452	{
1398	# ifdef DEBUG_CMD	1453	# ifdef DEBUG_CMD
1399	int i;	1454	int i;
1400		1455
1401	for (i = 0; argv[i]; i++)	1456	for (i = 0; argv[i]; i++)
…		…
1410	const char argv0, shell;	1465	const char argv0, shell;
1411		1466
1412	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1467	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1413	shell = "/bin/sh";	1468	shell = "/bin/sh";
1414		1469
1415	argv0 = (const char *)rxvt_r_basename (shell);	1470	argv0 = (const char *)rxvt_basename (shell);
1416		1471
1417	if (OPTION (Opt_loginShell))	1472	if (option (Opt_loginShell))
1418	{	1473	{
1419	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1474	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420		1475
1421	login[0] = '-';	1476	login[0] = '-';
1422	strcpy (&login[1], argv0);	1477	strcpy (&login[1], argv0);
1423	argv0 = login;	1478	argv0 = login;
1424	}	1479	}
1425		1480
1426	execlp (shell, argv0, NULL);	1481	execlp (shell, argv0, (char *)0);
1427	/* no error message: STDERR is closed! */	1482	/* no error message: STDERR is closed! */
1428	}	1483	}
1429		1484
1430	return -1;	1485	return -1;
1431	}	1486	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.181 by ayin, Tue May 1 21:10:04 2007 UTC vs. Revision 1.230 by root, Fri Dec 14 05:25:24 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.181 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.230 by root, Fri Dec 14 05:25:24 2007 UTC