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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC vs. Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC