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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.238 by ayin, Fri Jan 4 17:57:28 2008 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>
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	"Black", /* 0: black (#000000) */	152	"rgb:00/00/00", // 0: black (Black)
49	"Red3", /* 1: red (#CD0000) */	153	"rgb:cd/00/00", // 1: red (Red3)
50	"Green3", /* 2: green (#00CD00) */	154	"rgb:00/cd/00", // 2: green (Green3)
51	"Yellow3", /* 3: yellow (#CDCD00) */	155	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"Blue3", /* 4: blue (#0000CD) */	156	"rgb:00/00/cd", // 4: blue (Blue3)
53	"Magenta3", /* 5: magenta (#CD00CD) */	157	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"Cyan3", /* 6: cyan (#00CDCD) */	158	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	159	# ifdef XTERM_COLORS
56	"Grey90", /* 7: white (#E5E5E5) */	160	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	161	# else
58	"AntiqueWhite", /* 7: white (#FAEBD7) */	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	"Grey30", /* 8: bright black (#4D4D4D) */	166	"rgb:4d/4d/4d", // 8: bright black (Grey30)
63	# else	167	# else
64	"Grey25", /* 8: bright black (#404040) */	168	"rgb:40/40/40", // 8: bright black (Grey25)
65	# endif	169	# endif
66	"Red", /* 1/9: bright red (#FF0000) */	170	"rgb:ff/00/00", // 1/9: bright red (Reed)
67	"Green", /* 2/10: bright green (#00FF00) */	171	"rgb:00/ff/00", // 2/10: bright green (Green)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	172	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69	"Blue", /* 4/12: bright blue (#0000FF) */	173	"rgb:00/00/ff", // 4/12: bright blue (Blue)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	174	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	175	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72	"White", /* 7/15: bright white (#FFFFFF) */	176	"rgb:ff/ff/ff", // 7/15: bright white (White)
73		177
74	// 88 xterm colours	178	// 88 xterm colours
75	"rgb:00/00/00",	179	"rgb:00/00/00",
76	"rgb:00/00/8b",	180	"rgb:00/00/8b",
77	"rgb:00/00/cd",	181	"rgb:00/00/cd",
…		…
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	"black",	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 = 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	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
189	pixmap = None;
190	#endif
191		287
192	MEvent.time = CurrentTime;	288	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	289	MEvent.button = AnyButton;
194	options = DEFAULT_OPTIONS;
195	want_refresh = 1;	290	want_refresh = 1;
196	priv_modes = SavedModes = PrivMode_Default;	291	priv_modes = SavedModes = PrivMode_Default;
197	ncol = 80;	292	ncol = 80;
198	nrow = 24;	293	nrow = 24;
199	int_bwidth = INTERNALBORDERWIDTH;	294	int_bwidth = INTERNALBORDERWIDTH;
200	ext_bwidth = EXTERNALBORDERWIDTH;	295	ext_bwidth = EXTERNALBORDERWIDTH;
201	lineSpace = LINESPACE;	296	lineSpace = LINESPACE;
202	saveLines = SAVELINES;	297	saveLines = SAVELINES;
203	numpix_colors = TOTAL_COLORS;
204		298
205	refresh_limit = 1;
206	refresh_type = SLOW_REFRESH;	299	refresh_type = SLOW_REFRESH;
207		300
208	oldcursor.row = oldcursor.col = -1;	301	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		302
215	last_bot = last_state = -1;	303	set_option (Opt_scrollBar);
216		304	set_option (Opt_scrollTtyOutput);
217	return true;	305	set_option (Opt_jumpScroll);
		306	set_option (Opt_skipScroll);
		307	set_option (Opt_secondaryScreen);
		308	set_option (Opt_secondaryScroll);
		309	set_option (Opt_pastableTabs);
		310	set_option (Opt_intensityStyles);
		311	set_option (Opt_iso14755_52);
218	}	312	}
219		313
220	void	314	void
221	rxvt_term::init_secondary ()	315	rxvt_term::init_secondary ()
222	{	316	{
…		…
229	if ((i = open ("/dev/null", O_RDONLY)) < 0)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
230	{	324	{
231	/* TODO: BOO HISS */	325	/* TODO: BOO HISS */
232	dup2 (STDERR_FILENO, STDIN_FILENO);	326	dup2 (STDERR_FILENO, STDIN_FILENO);
233	}	327	}
234	else if (i > STDIN_FILENO)	328	else if (i != STDIN_FILENO)
235	{	329	{
236	dup2 (i, STDIN_FILENO);	330	dup2 (i, STDIN_FILENO);
237	close (i);	331	close (i);
238	}	332	}
239		333
…		…
254	/----------------------------------------------------------------------/	348	/----------------------------------------------------------------------/
255	const char **	349	const char **
256	rxvt_term::init_resources (int argc, const char const argv)	350	rxvt_term::init_resources (int argc, const char const argv)
257	{	351	{
258	int i, r_argc;	352	int i, r_argc;
259	char *val;
260	const char cmd_argv, r_argv;	353	const char cmd_argv, r_argv;
261		354
262	/*	355	/*
263	* Look for -exec option. Find => split and make cmd_argv[] of command args	356	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	357	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	358	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	359	if (!strcmp (argv[r_argc], "-e"))
267	break;	360	break;
		361
		362	if (r_argc == argc)
		363	cmd_argv = NULL;
		364	else if (!argv[r_argc + 1])
		365	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		366	else
		367	{
		368	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		369
		370	for (i = 0; i < argc - r_argc - 1; i++)
		371	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		372
		373	cmd_argv[i] = NULL;
		374	}
268		375
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	376	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		377
271	for (i = 0; i < r_argc; i++)	378	for (i = 0; i < r_argc; i++)
272	r_argv[i] = (const char *)argv[i];	379	r_argv[i] = (const char *)argv[i];
273		380
274	r_argv[i] = NULL;	381	r_argv[i] = NULL;
275		382
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]);	383	rs[Rs_name] = rxvt_basename (argv[0]);
289		384
290	/*	385	/*
291	* Open display, get options/resources and create the window	386	* Open display, get options/resources and create the window
292	*/	387	*/
293		388
…		…
295	rs[Rs_display_name] = ":0";	390	rs[Rs_display_name] = ":0";
296		391
297	get_options (r_argc, r_argv);	392	get_options (r_argc, r_argv);
298		393
299	if (!(display = displays.get (rs[Rs_display_name])))	394	if (!(display = displays.get (rs[Rs_display_name])))
		395	{
		396	free (r_argv);
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	397	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		398	}
301		399
		400	// using a local pointer decreases code size a lot
302	xa = display->xa;	401	xa = display->xa;
303		402
304	#if ENABLE_FRILLS	403	set (display);
		404	extract_resources ();
		405
		406	#if XFT
305	if (rs[Rs_depth])	407	if (rs[Rs_depth])
306	set (display, strtol (rs[Rs_depth], 0, 0));	408	select_visual (strtol (rs[Rs_depth], 0, 0));
307	else
308	#endif	409	#endif
309	set (display);
310		410
311	extract_resources ();	411	#ifdef HAVE_AFTERIMAGE
312		412	set_application_name ((char*)rs[Rs_name]);
		413	set_output_threshold (OUTPUT_LEVEL_WARNING);
		414	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		415	#endif
313	free (r_argv);	416	free (r_argv);
		417
		418	for (int i = NUM_RESOURCES; i--; )
		419	if (rs [i] == resval_undef)
		420	rs [i] = 0;
314		421
315	#if ENABLE_PERL	422	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	423	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	424	rs[Rs_perl_ext_1] = "default";
318		425
…		…
329	* set any defaults not already set	436	* set any defaults not already set
330	*/	437	*/
331	if (cmd_argv && cmd_argv[0])	438	if (cmd_argv && cmd_argv[0])
332	{	439	{
333	if (!rs[Rs_title])	440	if (!rs[Rs_title])
334	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	441	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335	if (!rs[Rs_iconName])	442	if (!rs[Rs_iconName])
336	rs[Rs_iconName] = rs[Rs_title];	443	rs[Rs_iconName] = rs[Rs_title];
337	}	444	}
338	else	445	else
339	{	446	{
…		…
377	rs[Rs_cutchars] = CUTCHARS;	484	rs[Rs_cutchars] = CUTCHARS;
378		485
379	#ifndef NO_BACKSPACE_KEY	486	#ifndef NO_BACKSPACE_KEY
380	if (!rs[Rs_backspace_key])	487	if (!rs[Rs_backspace_key])
381	# ifdef DEFAULT_BACKSPACE	488	# ifdef DEFAULT_BACKSPACE
382	key_backspace = DEFAULT_BACKSPACE;	489	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383	# else	490	# else
384	key_backspace = "DEC"; /* can toggle between \010 or \177 */	491	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385	# endif	492	# 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	493	#endif
394		494
395	#ifndef NO_DELETE_KEY	495	#ifndef NO_DELETE_KEY
396	if (!rs[Rs_delete_key])	496	if (!rs[Rs_delete_key])
397	# ifdef DEFAULT_DELETE	497	# ifdef DEFAULT_DELETE
398	key_delete = DEFAULT_DELETE;	498	rs[Rs_delete_key] = DEFAULT_DELETE;
399	# else	499	# else
400	key_delete = "\033[3~";	500	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	501	# endif
410	if (rs[Rs_answerbackstring])	502	#endif
411	{
412	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414	}
415		503
416	#ifdef HAVE_SCROLLBARS	504	#ifdef HAVE_SCROLLBARS
417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	505	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418	#endif	506	#endif
419		507
420	#ifdef XTERM_REVERSE_VIDEO	508	#ifdef XTERM_REVERSE_VIDEO
421	/* this is how xterm implements reverseVideo */	509	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	510	if (option (Opt_reverseVideo))
423	{	511	{
424	if (!rs[Rs_color + Color_fg])	512	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	513	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		514
426	if (!rs[Rs_color + Color_bg])	515	if (!rs[Rs_color + Color_bg])
427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	516	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428	}	517	}
429	#endif	518	#endif
430		519
…		…
432	if (!rs[Rs_color + i])	521	if (!rs[Rs_color + i])
433	rs[Rs_color + i] = def_colorName[i];	522	rs[Rs_color + i] = def_colorName[i];
434		523
435	#ifndef XTERM_REVERSE_VIDEO	524	#ifndef XTERM_REVERSE_VIDEO
436	/* this is how we implement reverseVideo */	525	/* this is how we implement reverseVideo */
437	if (OPTION (Opt_reverseVideo))	526	if (option (Opt_reverseVideo))
438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	527	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439	#endif	528	#endif
440		529
441	/* convenient aliases for setting fg/bg to colors */	530	/* convenient aliases for setting fg/bg to colors */
442	color_aliases (Color_fg);	531	color_aliases (Color_fg);
443	color_aliases (Color_bg);	532	color_aliases (Color_bg);
444	#ifndef NO_CURSORCOLOR	533	#ifndef NO_CURSORCOLOR
445	color_aliases (Color_cursor);	534	color_aliases (Color_cursor);
446	color_aliases (Color_cursor2);	535	color_aliases (Color_cursor2);
447	#endif /* NO_CURSORCOLOR */	536	#endif /* NO_CURSORCOLOR */
448	color_aliases (Color_pointer_fg);	537	color_aliases (Color_pointer_fg);
449	color_aliases (Color_pointer_bg);	538	color_aliases (Color_pointer_bg);
450	color_aliases (Color_border);	539	color_aliases (Color_border);
451	#ifndef NO_BOLD_UNDERLINE_REVERSE	540	#ifndef NO_BOLD_UNDERLINE_REVERSE
452	color_aliases (Color_BD);	541	color_aliases (Color_BD);
453	color_aliases (Color_UL);	542	color_aliases (Color_UL);
454	color_aliases (Color_RV);	543	color_aliases (Color_RV);
455	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	544	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456		545
457	if (!rs[Rs_color + Color_border])	546	if (!rs[Rs_color + Color_border])
458	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	547	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459		548
460	return cmd_argv;	549	return cmd_argv;
…		…
463	/----------------------------------------------------------------------/	552	/----------------------------------------------------------------------/
464	void	553	void
465	rxvt_term::init_env ()	554	rxvt_term::init_env ()
466	{	555	{
467	int i;	556	int i;
468	unsigned int u;
469	char *val;	557	char *val;
470		558
471	#ifdef DISPLAY_IS_IP	559	#ifdef DISPLAY_IS_IP
472	/* Fixup display_name for export over pty to any interested terminal	560	/* 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	561	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
481	*/	569	*/
482	val = rxvt_network_display (rs[Rs_display_name]);	570	val = rxvt_network_display (rs[Rs_display_name]);
483	rs[Rs_display_name] = (const char *)val;	571	rs[Rs_display_name] = (const char *)val;
484		572
485	if (val == NULL)	573	if (val == NULL)
486	#endif /* DISPLAY_IS_IP */	574	#endif /* DISPLAY_IS_IP */
487	val = XDisplayString (xdisp);	575	val = XDisplayString (dpy);
488		576
489	if (rs[Rs_display_name] == NULL)	577	if (rs[Rs_display_name] == NULL)
490	rs[Rs_display_name] = val; /* use broken `:0' value */	578	rs[Rs_display_name] = val; /* use broken `:0' value */
491		579
492	i = strlen (val);	580	i = strlen (val);
493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	581	env_display = (char *)rxvt_malloc (i + 9);
494		582
495	sprintf (env_display, "DISPLAY=%s", val);	583	sprintf (env_display, "DISPLAY=%s", val);
496		584
497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	585	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498		586
…		…
519	else	607	else
520	putenv ("COLORTERM=" COLORTERMENVFULL);	608	putenv ("COLORTERM=" COLORTERMENVFULL);
521		609
522	if (rs[Rs_term_name] != NULL)	610	if (rs[Rs_term_name] != NULL)
523	{	611	{
524	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	612	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	613	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526	putenv (env_term);	614	putenv (env_term);
527	}	615	}
528	else	616	else
529	putenv ("TERM=" TERMENV);	617	putenv ("TERM=" TERMENV);
…		…
531	#ifdef HAVE_UNSETENV	619	#ifdef HAVE_UNSETENV
532	/* avoid passing old settings and confusing term size */	620	/* avoid passing old settings and confusing term size */
533	unsetenv ("LINES");	621	unsetenv ("LINES");
534	unsetenv ("COLUMNS");	622	unsetenv ("COLUMNS");
535	unsetenv ("TERMCAP"); /* terminfo should be okay */	623	unsetenv ("TERMCAP"); /* terminfo should be okay */
536	#endif /* HAVE_UNSETENV */	624	#endif /* HAVE_UNSETENV */
537	}	625	}
538		626
539	/----------------------------------------------------------------------/	627	/----------------------------------------------------------------------/
540	/*	628	/*
541	* This is more or less stolen straight from XFree86 xterm.	629	* This is more or less stolen straight from XFree86 xterm.
…		…
562		650
563	this->locale = "C";	651	this->locale = "C";
564	}	652	}
565		653
566		654
567	this->locale = rxvt_strdup (this->locale);	655	this->locale = strdup (this->locale);
568	SET_LOCALE (this->locale);	656	SET_LOCALE (this->locale);
569	mbstate.reset ();	657	mbstate.reset ();
570	#endif	658	#endif
571		659
572	#if HAVE_NL_LANGINFO	660	#if HAVE_NL_LANGINFO
…		…
616	* Initialize the command connection.	704	* Initialize the command connection.
617	* This should be called after the X server connection is established.	705	* This should be called after the X server connection is established.
618	*/	706	*/
619		707
620	#ifdef META8_OPTION	708	#ifdef META8_OPTION
621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	709	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622	#endif	710	#endif
623		711
624	get_ourmods ();	712	get_ourmods ();
625		713
626	if (!OPTION (Opt_scrollTtyOutput))	714	if (!option (Opt_scrollTtyOutput))
627	priv_modes \|= PrivMode_TtyOutputInh;	715	priv_modes \|= PrivMode_TtyOutputInh;
628	if (OPTION (Opt_scrollTtyKeypress))	716	if (option (Opt_scrollTtyKeypress))
629	priv_modes \|= PrivMode_Keypress;	717	priv_modes \|= PrivMode_Keypress;
630	if (!OPTION (Opt_jumpScroll))	718	if (!option (Opt_jumpScroll))
631	priv_modes \|= PrivMode_smoothScroll;	719	priv_modes \|= PrivMode_smoothScroll;
632		720
633	#ifndef NO_BACKSPACE_KEY	721	#ifndef NO_BACKSPACE_KEY
634	if (strcmp (key_backspace, "DEC") == 0)	722	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635	priv_modes \|= PrivMode_HaveBackSpace;	723	priv_modes \|= PrivMode_HaveBackSpace;
636	#endif	724	#endif
637		725
638	/* add value for scrollBar */	726	/* add value for scrollBar */
639	if (scrollBar.state)	727	if (scrollBar.state)
…		…
652	int i;	740	int i;
653		741
654	#ifdef OFF_FOCUS_FADING	742	#ifdef OFF_FOCUS_FADING
655	pix_colors = pix_colors_focused;	743	pix_colors = pix_colors_focused;
656	#endif	744	#endif
657		745
658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	746	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659	{	747	{
		748	const char *name = rs[Rs_color + i];
		749
		750	if (!name)
		751	continue;
		752
660	rxvt_color xcol;	753	rxvt_color xcol;
661		754
662	if (!rs[Rs_color + i])	755	if (!set_color (xcol, name))
663	continue;
664
665	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666	{	756	{
667	#ifndef XTERM_REVERSE_VIDEO	757	#ifndef XTERM_REVERSE_VIDEO
668	if (i < 2 && OPTION (Opt_reverseVideo))	758	if (i < 2 && option (Opt_reverseVideo))
669	rs[Rs_color + i] = def_colorName[!i];	759	name = def_colorName [1 - i];
670	else	760	else
671	#endif	761	#endif
672	rs[Rs_color + i] = def_colorName[i];	762	name = def_colorName [i];
673		763
674	if (!rs[Rs_color + i])	764	if (!name)
675	continue;	765	continue;
676		766
677	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	767	if (!set_color (xcol, name))
678	{	768	{
679	switch (i)	769	switch (i)
680	{	770	{
681	case Color_fg:	771	case Color_fg:
682	case Color_bg:	772	case Color_bg:
683	/* fatal: need bg/fg color */
684	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	773	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685	/* NOTREACHED */	774	name = "";
686	break;	775	break;
687	#ifndef NO_CURSORCOLOR	776	#ifndef NO_CURSORCOLOR
688	case Color_cursor2:	777	case Color_cursor2:
689	xcol = pix_colors[Color_fg];	778	#endif
690	break;
691	#endif /* ! NO_CURSORCOLOR */
692	case Color_pointer_fg:	779	case Color_pointer_fg:
693	xcol = pix_colors[Color_fg];	780	name = rs[Rs_color + Color_fg];
		781	xcol.set (this, name);
694	break;	782	break;
695	default:	783	default:
696	xcol = pix_colors[Color_bg]; /* None */	784	name = rs[Rs_color + Color_bg];
		785	xcol.set (this, name);
697	break;	786	break;
698	}	787	}
699	}	788	}
700	}	789	}
701		790
702	pix_colors[i] = xcol;	791	pix_colors[i] = xcol;
703	SET_PIXCOLOR (i);	792	rs[Rs_color + i] = name;
704	}	793	}
705
706	#ifdef OFF_FOCUS_FADING
707	if (rs[Rs_fade])
708	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709	pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710	#endif
711		794
712	if (depth <= 2)	795	if (depth <= 2)
713	{	796	{
714	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	797	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	798	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	799	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717	}	800	}
718		801
719	/*	802	/*
720	* get scrollBar shadow colors	803	* get scrollBar shadow colors
721	*	804	*
722	* The calculations of topShadow/bottomShadow values are adapted	805	* The calculations of topShadow/bottomShadow values are adapted
723	* from the fvwm window manager.	806	* from the fvwm window manager.
724	*/	807	*/
725	#ifdef KEEP_SCROLLCOLOR	808	#ifdef KEEP_SCROLLCOLOR
726
727	if (depth <= 2)	809	if (depth <= 2)
728	{	810	{
729	/* Monochrome */	811	/* Monochrome */
730	pix_colors[Color_scroll] = pix_colors[Color_fg];	812	alias_color (Color_scroll, Color_fg);
731	pix_colors[Color_topShadow] = pix_colors[Color_bg];	813	alias_color (Color_topShadow, Color_bg);
732	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	814	alias_color (Color_bottomShadow, Color_bg);
733	}	815	}
734	else	816	else
735	{	817	{
736	rxvt_color xcol[2];	818	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737	/* xcol[0] == white
738	* xcol[1] == top shadow
739	* xcol[2] == bot shadow */
740		819
741	xcol[1] = pix_colors[Color_scroll];	820	rgba cscroll;
742	xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));	821	pix_colors [Color_scroll].get (cscroll);
743
744	rxvt_rgba c0, c1;
745
746	xcol[0].get (this, c0);
747	xcol[1].get (this, c1);
748
749	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750		822
751	/* topShadowColor */	823	/* topShadowColor */
752	if (!xcol[1].set (this,	824	if (!pix_colors[Color_topShadow].set (this,
753	rxvt_rgba (	825	rgba (
754	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	826	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	827	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	828	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757	c1.a) // pa1 vs. pa0: arbitrary	829	cscroll.a)
758	));	830	))
759	xcol[1] = pix_colors[Color_White];	831	alias_color (Color_topShadow, Color_White);
760
761	pix_colors[Color_topShadow] = xcol[1];
762	}	832	}
763	#endif /* KEEP_SCROLLCOLOR */	833	#endif /* KEEP_SCROLLCOLOR */
		834
		835	#ifdef OFF_FOCUS_FADING
		836	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		837	update_fade_color (i);
		838	#endif
764	}	839	}
765		840
766	/----------------------------------------------------------------------/	841	/----------------------------------------------------------------------/
767	/* color aliases, fg/bg bright-bold */	842	/* color aliases, fg/bg bright-bold */
768	void	843	void
…		…
771	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	846	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772	{	847	{
773	int i = atoi (rs[Rs_color + idx]);	848	int i = atoi (rs[Rs_color + idx]);
774		849
775	if (i >= 8 && i <= 15)	850	if (i >= 8 && i <= 15)
776	{ /* bright colors */	851	/* bright colors */
777	i -= 8;
778	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	852	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779	return;	853	else if (i >= 0 && i <= 7)
780	}	854	/* normal colors */
781
782	if (i >= 0 && i <= 7) /* normal colors */
783	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	855	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784	}	856	}
785	}	857	}
786		858
787	/----------------------------------------------------------------------/	859	/----------------------------------------------------------------------/
…		…
807		879
808	if (rsmod	880	if (rsmod
809	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	881	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810	requestedmeta = rsmod[3] - '0';	882	requestedmeta = rsmod[3] - '0';
811		883
812	map = XGetModifierMapping (xdisp);	884	map = XGetModifierMapping (dpy);
813	kc = map->modifiermap;	885	kc = map->modifiermap;
814		886
815	for (i = 1; i < 6; i++)	887	for (i = 1; i < 6; i++)
816	{	888	{
817	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	889	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
819	for (j = map->max_keypermod; j--; k++)	891	for (j = map->max_keypermod; j--; k++)
820	{	892	{
821	if (kc[k] == 0)	893	if (kc[k] == 0)
822	break;	894	break;
823		895
824	switch (XKeycodeToKeysym (xdisp, kc[k], 0))	896	switch (XKeycodeToKeysym (dpy, kc[k], 0))
825	{	897	{
826	case XK_Num_Lock:	898	case XK_Num_Lock:
827	ModNumLockMask = modmasks[i - 1];	899	ModNumLockMask = modmasks[i - 1];
828	continue;	900	continue;
829		901
…		…
879	rxvt_term::create_windows (int argc, const char const argv)	951	rxvt_term::create_windows (int argc, const char const argv)
880	{	952	{
881	XClassHint classHint;	953	XClassHint classHint;
882	XWMHints wmHint;	954	XWMHints wmHint;
883	#if ENABLE_FRILLS	955	#if ENABLE_FRILLS
884	MWMHints mwmhints;	956	MWMHints mwmhints = { };
885	#endif	957	#endif
886	XGCValues gcvalue;	958	XGCValues gcvalue;
887	XSetWindowAttributes attributes;	959	XSetWindowAttributes attributes;
888	Window top, parent;	960	Window top, parent;
889		961
890	dLocal (Display *, xdisp);	962	dLocal (Display *, dpy);
891		963
892	/* grab colors before netscape does */	964	/* grab colors before netscape does */
893	Get_Colours ();	965	Get_Colours ();
894		966
895	if (!set_fonts ())	967	if (!set_fonts ())
896	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	968	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897		969
898	parent = display->root;	970	parent = display->root;
899		971
900	attributes.override_redirect = !!OPTION (Opt_override_redirect);	972	attributes.override_redirect = !!option (Opt_override_redirect);
901		973
902	#if ENABLE_FRILLS	974	#if ENABLE_FRILLS
903	if (OPTION (Opt_borderLess))	975	if (option (Opt_borderLess))
904	{	976	{
905	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)	977	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906	{	978	{
907	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	979	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908	attributes.override_redirect = true;	980	attributes.override_redirect = true;
909	mwmhints.flags = 0;
910	}	981	}
911	else	982	else
912	{	983	{
913	mwmhints.flags = MWM_HINTS_DECORATIONS;	984	mwmhints.flags = MWM_HINTS_DECORATIONS;
914	mwmhints.decorations = 0;
915	}	985	}
916	}	986	}
917	else
918	mwmhints.flags = 0;
919	#endif	987	#endif
920		988
921	#if ENABLE_XEMBED	989	#if ENABLE_XEMBED
922	if (rs[Rs_embed])	990	if (rs[Rs_embed])
923	{	991	{
924	XWindowAttributes wattr;	992	XWindowAttributes wattr;
925		993
926	parent = strtol (rs[Rs_embed], 0, 0);	994	parent = strtol (rs[Rs_embed], 0, 0);
927		995
928	if (!XGetWindowAttributes (xdisp, parent, &wattr))	996	if (!XGetWindowAttributes (dpy, parent, &wattr))
929	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	997	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930		998
931	window_calc (wattr.width, wattr.height);	999	window_calc (wattr.width, wattr.height);
932	}	1000	}
933	#endif	1001	#endif
…		…
937	/* sub-window placement & size in rxvt_resize_subwindows () */	1005	/* sub-window placement & size in rxvt_resize_subwindows () */
938	attributes.background_pixel = pix_colors_focused [Color_border];	1006	attributes.background_pixel = pix_colors_focused [Color_border];
939	attributes.border_pixel = pix_colors_focused [Color_border];	1007	attributes.border_pixel = pix_colors_focused [Color_border];
940	attributes.colormap = cmap;	1008	attributes.colormap = cmap;
941		1009
942	top = XCreateWindow (xdisp, parent,	1010	top = XCreateWindow (dpy, parent,
943	szHint.x, szHint.y,	1011	szHint.x, szHint.y,
944	szHint.width, szHint.height,	1012	szHint.width, szHint.height,
945	ext_bwidth,	1013	ext_bwidth,
946	depth, InputOutput, visual,	1014	depth, InputOutput, visual,
947	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1015	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
…		…
958	classHint.res_name = (char *)rs[Rs_name];	1026	classHint.res_name = (char *)rs[Rs_name];
959	classHint.res_class = (char *)RESCLASS;	1027	classHint.res_class = (char *)RESCLASS;
960		1028
961	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1029	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
962	wmHint.input = True;	1030	wmHint.input = True;
963	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1031	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964	wmHint.window_group = top;	1032	wmHint.window_group = top;
965		1033
966	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,	1034	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967	&szHint, &wmHint, &classHint);	1035	&szHint, &wmHint, &classHint);
968		1036
969	#if ENABLE_FRILLS	1037	#if ENABLE_FRILLS
970	if (mwmhints.flags)	1038	if (mwmhints.flags)
971	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1039	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1040	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973	#endif	1041	#endif
974		1042
975	Atom protocols[] = {	1043	Atom protocols[] = {
976	xa[XA_WM_DELETE_WINDOW],	1044	xa[XA_WM_DELETE_WINDOW],
977	#if ENABLE_EWMH	1045	#if ENABLE_EWMH
978	xa[XA_NET_WM_PING],	1046	xa[XA_NET_WM_PING],
979	#endif	1047	#endif
980	};	1048	};
981		1049
982	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1050	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983		1051
984	#if ENABLE_FRILLS	1052	#if ENABLE_FRILLS
985	if (rs[Rs_transient_for])	1053	if (rs[Rs_transient_for])
986	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1054	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987	#endif	1055	#endif
988		1056
989	#if ENABLE_EWMH	1057	#if ENABLE_EWMH
990	long pid = getpid ();	1058	long pid = getpid ();
991		1059
992	XChangeProperty (xdisp, top,	1060	XChangeProperty (dpy, top,
993	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1061	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994	PropModeReplace, (unsigned char *)&pid, 1);	1062	PropModeReplace, (unsigned char *)&pid, 1);
995		1063
996	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1064	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997	#endif	1065	#endif
998		1066
999	XSelectInput (xdisp, top,	1067	XSelectInput (dpy, top,
1000	KeyPressMask	1068	KeyPressMask
1001	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1069	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1002	\| KeyReleaseMask	1070	\| KeyReleaseMask
1003	#endif	1071	#endif
1004	\| FocusChangeMask \| VisibilityChangeMask	1072	\| FocusChangeMask \| VisibilityChangeMask
1005	\| ExposureMask \| StructureNotifyMask);	1073	\| ExposureMask \| StructureNotifyMask);
1006		1074
1007	termwin_ev.start (display, top);	1075	termwin_ev.start (display, top);
1008		1076
1009	/* vt cursor: Black-on-White is standard, but this is more popular */	1077	/* vt cursor: Black-on-White is standard, but this is more popular */
1010	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);	1078	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011
1012	#ifdef HAVE_SCROLLBARS
1013	/* cursor scrollBar: Black-on-White */
1014	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1015	#endif
1016		1079
1017	/* the vt window */	1080	/* the vt window */
1018	vt = XCreateSimpleWindow (xdisp, top,	1081	vt = XCreateSimpleWindow (dpy, top,
1019	window_vt_x, window_vt_y,	1082	window_vt_x, window_vt_y,
1020	width, height,	1083	width, height,
1021	0,	1084	0,
1022	pix_colors_focused[Color_fg],	1085	pix_colors_focused[Color_fg],
1023	pix_colors_focused[Color_bg]);	1086	pix_colors_focused[Color_bg]);
1024		1087
1025	attributes.bit_gravity = NorthWestGravity;	1088	attributes.bit_gravity = NorthWestGravity;
1026	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);	1089	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027		1090
1028	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1091	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1029		1092
1030	if (OPTION (Opt_pointerBlank))	1093	if (option (Opt_pointerBlank))
1031	vt_emask \|= PointerMotionMask;	1094	vt_emask \|= PointerMotionMask;
1032	else	1095	else
1033	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1096	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1034		1097
1035	vt_select_input ();	1098	vt_select_input ();
1036		1099
1037	vt_ev.start (display, vt);	1100	vt_ev.start (display, vt);
1038		1101
1039	#ifdef XPM_BACKGROUND
1040	if (rs[Rs_backgroundPixmap] != NULL
1041	&& !OPTION (Opt_transparent))
1042	{
1043	const char *p = rs[Rs_backgroundPixmap];
1044
1045	if ((p = strchr (p, ';')) != NULL)
1046	{
1047	p++;
1048	scale_pixmap (p);
1049	}
1050
1051	set_bgPixmap (rs[Rs_backgroundPixmap]);
1052	scr_touch (true);
1053	}
1054	#endif
1055
1056	/* graphics context for the vt window */	1102	/* graphics context for the vt window */
1057	gcvalue.foreground = pix_colors[Color_fg];	1103	gcvalue.foreground = pix_colors[Color_fg];
1058	gcvalue.background = pix_colors[Color_bg];	1104	gcvalue.background = pix_colors[Color_bg];
1059	gcvalue.graphics_exposures = 1;	1105	gcvalue.graphics_exposures = 0;
1060		1106
1061	gc = XCreateGC (xdisp, vt,	1107	gc = XCreateGC (dpy, vt,
1062	GCForeground \| GCBackground \| GCGraphicsExposures,	1108	GCForeground \| GCBackground \| GCGraphicsExposures,
1063	&gcvalue);	1109	&gcvalue);
1064		1110
1065	drawable = new rxvt_drawable (this, vt);	1111	drawable = new rxvt_drawable (this, vt);
1066
1067	#ifdef RXVT_SCROLLBAR
1068	gcvalue.foreground = pix_colors[Color_topShadow];
1069	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1070	gcvalue.foreground = pix_colors[Color_bottomShadow];
1071	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1072	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1074	#endif
1075		1112
1076	#ifdef OFF_FOCUS_FADING	1113	#ifdef OFF_FOCUS_FADING
1077	// initially we are in unfocused state	1114	// initially we are in unfocused state
1078	if (rs[Rs_fade])	1115	if (rs[Rs_fade])
1079	pix_colors = pix_colors_unfocused;	1116	pix_colors = pix_colors_unfocused;
…		…
1085		1122
1086	/* ------------------------------------------------------------------------- *	1123	/* ------------------------------------------------------------------------- *
1087	* GET TTY CURRENT STATE *	1124	* GET TTY CURRENT STATE *
1088	* ------------------------------------------------------------------------- */	1125	* ------------------------------------------------------------------------- */
1089	void	1126	void
1090	rxvt_get_ttymode (ttymode_t *tio, int erase)	1127	rxvt_get_ttymode (struct termios *tio, int erase)
1091	{	1128	{
1092	#ifdef HAVE_TERMIOS_H
1093	/*	1129	/*
1094	* standard System V termios interface	1130	* standard System V termios interface
1095	*/	1131	*/
1096	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1132	if (tcgetattr (STDIN_FILENO, tio) < 0)
1097	{	1133	{
1098	// return error - use system defaults,	1134	// return error - use system defaults,
1099	// where possible, and zero elsewhere	1135	// where possible, and zero elsewhere
1100	memset (tio, 0, sizeof (ttymode_t));	1136	memset (tio, 0, sizeof (struct termios));
1101		1137
1102	tio->c_cc[VINTR] = CINTR;	1138	tio->c_cc[VINTR] = CINTR;
1103	tio->c_cc[VQUIT] = CQUIT;	1139	tio->c_cc[VQUIT] = CQUIT;
1104	tio->c_cc[VERASE] = CERASE;	1140	tio->c_cc[VERASE] = CERASE;
1105	#ifdef VERASE2	1141	#ifdef VERASE2
…		…
1164	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1200	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1165	# if defined (ECHOCTL) && defined (ECHOKE)	1201	# if defined (ECHOCTL) && defined (ECHOKE)
1166	\| ECHOCTL \| ECHOKE	1202	\| ECHOCTL \| ECHOKE
1167	# endif	1203	# endif
1168	\| ECHOE \| ECHOK);	1204	\| ECHOE \| ECHOK);
1169	# else /* HAVE_TERMIOS_H */
1170
1171	/*
1172	* sgtty interface
1173	*/
1174
1175	/* get parameters -- gtty */
1176	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177	{
1178	tio->sg.sg_erase = CERASE; /* ^H */
1179	tio->sg.sg_kill = CKILL; /* ^U */
1180	}
1181
1182	if (erase != -1)
1183	tio->sg.sg_erase = (char)erase;
1184
1185	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1186
1187	/* get special characters */
1188	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189	{
1190	tio->tc.t_intrc = CINTR; /* ^C */
1191	tio->tc.t_quitc = CQUIT; /* ^\ */
1192	tio->tc.t_startc = CSTART; /* ^Q */
1193	tio->tc.t_stopc = CSTOP; /* ^S */
1194	tio->tc.t_eofc = CEOF; /* ^D */
1195	tio->tc.t_brkc = -1;
1196	}
1197
1198	/* get local special chars */
1199	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200	{
1201	tio->lc.t_suspc = CSUSP; /* ^Z */
1202	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203	tio->lc.t_rprntc = CRPRNT; /* ^R */
1204	tio->lc.t_flushc = CFLUSH; /* ^O */
1205	tio->lc.t_werasc = CWERASE; /* ^W */
1206	tio->lc.t_lnextc = CLNEXT; /* ^V */
1207	}
1208	/* get line discipline */
1209	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210	# ifdef NTTYDISC
1211	tio->line = NTTYDISC;
1212	# endif /* NTTYDISC */
1213
1214	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1215	#endif /* HAVE_TERMIOS_H */
1216		1205
1217	/*	1206	/*
1218	* Debugging	1207	* Debugging
1219	*/	1208	*/
1220	#ifdef DEBUG_TTYMODE	1209	#ifdef DEBUG_TTYMODE
1221	#ifdef HAVE_TERMIOS_H
1222	/* c_iflag bits */	1210	/* c_iflag bits */
1223	fprintf (stderr, "Input flags\n");	1211	fprintf (stderr, "Input flags\n");
1224		1212
1225	/* cpp token stringize doesn't work on all machines <sigh> */	1213	/* cpp token stringize doesn't work on all machines <sigh> */
1226	# define FOO(flag,name) \	1214	# define FOO(flag,name) \
…		…
1289	FOO (VLNEXT, "VLNEXT");	1277	FOO (VLNEXT, "VLNEXT");
1290	# endif	1278	# endif
1291		1279
1292	fprintf (stderr, "\n");	1280	fprintf (stderr, "\n");
1293	# undef FOO	1281	# undef FOO
1294	# endif /* HAVE_TERMIOS_H */	1282	#endif /* DEBUG_TTYMODE */
1295	#endif /* DEBUG_TTYMODE */
1296	}	1283	}
1297		1284
1298	/----------------------------------------------------------------------/	1285	/----------------------------------------------------------------------/
1299	/*	1286	/*
1300	* Run the command in a subprocess and return a file descriptor for the	1287	* Run the command in a subprocess and return a file descriptor for the
…		…
1321	else	1308	else
1322	#endif	1309	#endif
1323	if (!pty->get ())	1310	if (!pty->get ())
1324	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1311	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325		1312
		1313	int er;
		1314
		1315	#ifndef NO_BACKSPACE_KEY
		1316	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
		1317	er = rs[Rs_backspace_key][0];
		1318	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
		1319	er = '\177'; /* the initial state anyway */
		1320	else
		1321	#endif
		1322	er = -1;
		1323
		1324	rxvt_get_ttymode (&tio, er);
		1325	/* init terminal attributes */
		1326	cfsetospeed (&tio, BAUDRATE);
		1327	cfsetispeed (&tio, BAUDRATE);
		1328	tcsetattr (pty->tty, TCSANOW, &tio);
1326	pty->set_utf8_mode (enc_utf8);	1329	pty->set_utf8_mode (enc_utf8);
1327		1330
1328	/* set initial window size */	1331	/* set initial window size */
1329	tt_winch ();	1332	tt_winch ();
1330
1331	int er;
1332
1333	#ifndef NO_BACKSPACE_KEY
1334	if (key_backspace[0] && !key_backspace[1])
1335	er = key_backspace[0];
1336	else if (strcmp (key_backspace, "DEC") == 0)
1337	er = '\177'; /* the initial state anyway */
1338	else
1339	#endif
1340	er = -1;
1341
1342	rxvt_get_ttymode (&tio, er);
1343		1333
1344	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1345	if (rs[Rs_pty_fd])	1335	if (rs[Rs_pty_fd])
1346	return;	1336	return;
1347	#endif	1337	#endif
…		…
1378	}	1368	}
1379		1369
1380	_exit (EXIT_FAILURE);	1370	_exit (EXIT_FAILURE);
1381		1371
1382	default:	1372	default:
1383	if (!OPTION (Opt_utmpInhibit))	1373	if (!option (Opt_utmpInhibit))
1384	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1374	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385		1375
1386	pty->close_tty ();	1376	pty->close_tty ();
1387		1377
1388	child_ev.start (cmd_pid);	1378	child_ev.start (cmd_pid);
1389		1379
…		…
1402	int	1392	int
1403	rxvt_term::run_child (const char const argv)	1393	rxvt_term::run_child (const char const argv)
1404	{	1394	{
1405	char *login;	1395	char *login;
1406		1396
1407	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409	if (OPTION (Opt_console))	1397	if (option (Opt_console))
		1398	{
1410	{ /* be virtual console, fail silently */	1399	/* be virtual console, fail silently */
1411	#ifdef TIOCCONS	1400	#ifdef TIOCCONS
1412	unsigned int on = 1;	1401	unsigned int on = 1;
1413		1402
1414	ioctl (STDIN_FILENO, TIOCCONS, &on);	1403	ioctl (STDIN_FILENO, TIOCCONS, &on);
1415	#elif defined (SRIOCSREDIR)	1404	#elif defined (SRIOCSREDIR)
…		…
1417		1406
1418	fd = open (CONSOLE, O_WRONLY, 0);	1407	fd = open (CONSOLE, O_WRONLY, 0);
1419	if (fd >= 0)	1408	if (fd >= 0)
1420	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1409	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1421	close (fd);	1410	close (fd);
1422	#endif /* SRIOCSREDIR */	1411	#endif /* SRIOCSREDIR */
1423	}	1412	}
1424		1413
1425	/* reset signals and spin off the command interpreter */	1414	/* reset signals and spin off the command interpreter */
1426	signal (SIGINT, SIG_DFL);	1415	signal (SIGINT, SIG_DFL);
1427	signal (SIGQUIT, SIG_DFL);	1416	signal (SIGQUIT, SIG_DFL);
…		…
1434	*/	1423	*/
1435	#ifdef SIGTSTP	1424	#ifdef SIGTSTP
1436	signal (SIGTSTP, SIG_IGN);	1425	signal (SIGTSTP, SIG_IGN);
1437	signal (SIGTTIN, SIG_IGN);	1426	signal (SIGTTIN, SIG_IGN);
1438	signal (SIGTTOU, SIG_IGN);	1427	signal (SIGTTOU, SIG_IGN);
1439	#endif /* SIGTSTP */	1428	#endif /* SIGTSTP */
1440		1429
1441	// unblock signals (signals are blocked by iom.C	1430	// unblock signals (signals are blocked by iom.C
1442	sigset_t ss;	1431	sigset_t ss;
1443	sigemptyset (&ss);	1432	sigemptyset (&ss);
1444	sigprocmask (SIG_SETMASK, &ss, 0);	1433	sigprocmask (SIG_SETMASK, &ss, 0);
1445		1434
1446	/* command interpreter path */	1435	/* command interpreter path */
1447	if (argv != NULL)	1436	if (argv)
1448	{	1437	{
1449	# ifdef DEBUG_CMD	1438	# ifdef DEBUG_CMD
1450	int i;	1439	int i;
1451		1440
1452	for (i = 0; argv[i]; i++)	1441	for (i = 0; argv[i]; i++)
…		…
1461	const char argv0, shell;	1450	const char argv0, shell;
1462		1451
1463	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1452	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1464	shell = "/bin/sh";	1453	shell = "/bin/sh";
1465		1454
1466	argv0 = (const char *)rxvt_r_basename (shell);	1455	argv0 = (const char *)rxvt_basename (shell);
1467		1456
1468	if (OPTION (Opt_loginShell))	1457	if (option (Opt_loginShell))
1469	{	1458	{
1470	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1459	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1471		1460
1472	login[0] = '-';	1461	login[0] = '-';
1473	strcpy (&login[1], argv0);	1462	strcpy (&login[1], argv0);
1474	argv0 = login;	1463	argv0 = login;
1475	}	1464	}
1476		1465
1477	execlp (shell, argv0, NULL);	1466	execlp (shell, argv0, (char *)0);
1478	/* no error message: STDERR is closed! */	1467	/* no error message: STDERR is closed! */
1479	}	1468	}
1480		1469
1481	return -1;	1470	return -1;
1482	}	1471	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC vs. Revision 1.238 by ayin, Fri Jan 4 17:57:28 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.238 by ayin, Fri Jan 4 17:57:28 2008 UTC