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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.243 by root, Fri Jan 25 16:04:57 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-2008 Marc Lehmann <pcg@goof.com>
15	*	16	*
16	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	20	* (at your option) any later version.
33		34
34	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	37	#include "rxvtutil.h"
37	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
38		40
39	#include <limits>	41	#include <limits>
40		42
41	#include <csignal>	43	#include <csignal>
		44
		45	#include <fcntl.h>
		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
		56	#ifdef HAVE_NL_LANGINFO
		57	# include <langinfo.h>
		58	#endif
		59
		60	#ifdef DISPLAY_IS_IP
		61	/* On Solaris link with -lsocket and -lnsl */
		62	#include <sys/types.h>
		63	#include <sys/socket.h>
		64
		65	/* these next two are probably only on Sun (not Solaris) */
		66	#ifdef HAVE_SYS_SOCKIO_H
		67	#include <sys/sockio.h>
		68	#endif
		69	#ifdef HAVE_SYS_BYTEORDER_H
		70	#include <sys/byteorder.h>
		71	#endif
		72
		73	#include <netinet/in.h>
		74	#include <arpa/inet.h>
		75	#include <net/if.h>
		76	#include <net/if_arp.h>
		77
		78	static char *
		79	rxvt_network_display (const char *display)
		80	{
		81	char buffer[1024], *rval = NULL;
		82	struct ifconf ifc;
		83	struct ifreq *ifr;
		84	int i, skfd;
		85
		86	if (display[0] != ':' && strncmp (display, "unix:", 5))
		87	return (char ) display; / nothing to do */
		88
		89	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		90	ifc.ifc_buf = buffer;
		91
		92	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		93	{
		94	perror ("socket");
		95	return NULL;
		96	}
		97
		98	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		99	{
		100	perror ("SIOCGIFCONF");
		101	close (skfd);
		102	return NULL;
		103	}
		104
		105	for (i = 0, ifr = ifc.ifc_req;
		106	i < (ifc.ifc_len / sizeof (struct ifreq));
		107	i++, ifr++)
		108	{
		109	struct ifreq ifr2;
		110
		111	strcpy (ifr2.ifr_name, ifr->ifr_name);
		112
		113	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		114	{
		115	unsigned long addr;
		116	struct sockaddr_in *p_addr;
		117
		118	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		119	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		120
		121	/*
		122	* not "0.0.0.0" or "127.0.0.1" - so format the address
		123	*/
		124	if (addr && addr != 0x7F000001)
		125	{
		126	char *colon = strchr (display, ':');
		127
		128	if (colon == NULL)
		129	colon = ":0.0";
		130
		131	rval = rxvt_malloc (strlen (colon) + 16);
		132	sprintf (rval, "%d.%d.%d.%d%s",
		133	(int) ((addr >> 030) & 0xFF),
		134	(int) ((addr >> 020) & 0xFF),
		135	(int) ((addr >> 010) & 0xFF),
		136	(int) (addr & 0xFF), colon);
		137	break;
		138	}
		139	}
		140	}
		141
		142	close (skfd);
		143
		144	return rval;
		145	}
		146	#endif
42		147
43	const char *const def_colorName[] =	148	const char *const def_colorName[] =
44	{	149	{
45	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
47	/* low-intensity colors */	152	/* low-intensity colors */
48	"rgb:00/00/00", // 0: black (Black)	153	"rgb:00/00/00", // 0: black (Black)
49	"rgb:cd/00/00", // 1: red (Red3)	154	"rgb:cd/00/00", // 1: red (Red3)
50	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
53	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
56	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	162	# else
58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59	# endif	164	# endif
60	/* high-intensity colors */	165	/* high-intensity colors */
61	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
62	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
146	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
147		252
148	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
149	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
150	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
151	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
152	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
153	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
154	NULL, /* Color_border */	259	NULL, /* Color_border */
155	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
156	NULL, /* Color_BD */	261	NULL, /* Color_BD */
157	NULL, /* Color_IT */	262	NULL, /* Color_IT */
158	NULL, /* Color_UL */	263	NULL, /* Color_UL */
159	NULL, /* Color_RV */	264	NULL, /* Color_RV */
160	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
162	NULL, // Color_underline	267	NULL, // Color_underline
163	#endif	268	#endif
164	#ifdef OPTION_HC	269	#ifdef OPTION_HC
165	NULL,	270	NULL,
166	#endif	271	#endif
167	#ifdef KEEP_SCROLLCOLOR	272	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	273	COLOR_SCROLLBAR,
169	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	275	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	276	#if ENABLE_TRANSPARENCY
172	NULL,	277	NULL,
173	#endif	278	#endif
174	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	280	"rgb:00/00/00",
176	#endif	281	#endif
177	};	282	};
178		283
179	bool	284	void
180	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
181	{	286	{
182	pix_colors = //	287	pix_colors = pix_colors_focused;
183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184	#ifdef OFF_FOCUS_FADING
185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186	#endif
187
188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
189	pixmap = None;
190	#endif
191		288
192	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
194	options = DEFAULT_OPTIONS;
195	want_refresh = 1;	291	want_refresh = 1;
196	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
197	ncol = 80;	293	ncol = 80;
198	nrow = 24;	294	nrow = 24;
199	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
200	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
201	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
202	saveLines = SAVELINES;	298	saveLines = SAVELINES;
203	numpix_colors = TOTAL_COLORS;
204		299
205	refresh_limit = 1;
206	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
207		301
208	oldcursor.row = oldcursor.col = -1;	302	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		303
215	last_bot = last_state = -1;	304	set_option (Opt_scrollBar);
216		305	set_option (Opt_scrollTtyOutput);
217	return true;	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	static void
221	rxvt_term::init_secondary ()	316	init_secondary ()
222	{	317	{
223	int i;	318	int i;
224		319
225	/*
226	* Close all unused file descriptors
227	* We don't want them, we don't need them.
228	*/
229	if ((i = open ("/dev/null", O_RDONLY)) < 0)	320	if ((i = open ("/dev/null", O_RDONLY)) < 0)
230	{	321	{
231	/* TODO: BOO HISS */
232	dup2 (STDERR_FILENO, STDIN_FILENO);	322	dup2 (STDERR_FILENO, STDIN_FILENO);
233	}	323	}
234	else if (i > STDIN_FILENO)	324	else if (i != STDIN_FILENO)
235	{	325	{
236	dup2 (i, STDIN_FILENO);	326	dup2 (i, STDIN_FILENO);
237	close (i);	327	close (i);
238	}	328	}
239		329
240	dup2 (STDERR_FILENO, STDOUT_FILENO);	330	dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242	#if 0 // schmorp sayz closing filies is murder
243	for (i = STDERR_FILENO + 1; i < num_fds; i++)
244	{
245	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246	if (i == 4 \|\| i == 7)
247	continue;
248	#endif
249	close (i);
250	}
251	#endif
252	}	331	}
253		332
254	/----------------------------------------------------------------------/	333	/----------------------------------------------------------------------/
255	const char **	334	const char **
256	rxvt_term::init_resources (int argc, const char const argv)	335	rxvt_term::init_resources (int argc, const char const argv)
257	{	336	{
258	int i, r_argc;	337	int i, r_argc;
259	char *val;
260	const char cmd_argv, r_argv;	338	const char cmd_argv, r_argv;
261		339
262	/*	340	/*
263	* Look for -exec option. Find => split and make cmd_argv[] of command args	341	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	342	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	343	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	344	if (!strcmp (argv[r_argc], "-e"))
267	break;	345	break;
		346
		347	if (r_argc == argc)
		348	cmd_argv = NULL;
		349	else if (!argv[r_argc + 1])
		350	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		351	else
		352	{
		353	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		354
		355	for (i = 0; i < argc - r_argc - 1; i++)
		356	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		357
		358	cmd_argv[i] = NULL;
		359	}
268		360
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	361	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		362
271	for (i = 0; i < r_argc; i++)	363	for (i = 0; i < r_argc; i++)
272	r_argv[i] = (const char *)argv[i];	364	r_argv[i] = (const char *)argv[i];
273		365
274	r_argv[i] = NULL;	366	r_argv[i] = NULL;
275		367
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]);	368	rs[Rs_name] = rxvt_basename (argv[0]);
289		369
290	/*	370	/*
291	* Open display, get options/resources and create the window	371	* Open display, get options/resources and create the window
292	*/	372	*/
293		373
…		…
295	rs[Rs_display_name] = ":0";	375	rs[Rs_display_name] = ":0";
296		376
297	get_options (r_argc, r_argv);	377	get_options (r_argc, r_argv);
298		378
299	if (!(display = displays.get (rs[Rs_display_name])))	379	if (!(display = displays.get (rs[Rs_display_name])))
		380	{
		381	free (r_argv);
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	382	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		383	}
301		384
		385	// using a local pointer decreases code size a lot
302	xa = display->xa;	386	xa = display->xa;
		387
		388	set (display);
		389	extract_resources ();
303		390
304	#if XFT	391	#if XFT
305	if (rs[Rs_depth])	392	if (rs[Rs_depth])
306	set (display, strtol (rs[Rs_depth], 0, 0));	393	select_visual (strtol (rs[Rs_depth], 0, 0));
307	else
308	#endif	394	#endif
309	set (display);
310		395
311	extract_resources ();	396	#ifdef HAVE_AFTERIMAGE
312		397	set_application_name ((char*)rs[Rs_name]);
		398	set_output_threshold (OUTPUT_LEVEL_WARNING);
		399	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		400	#endif
313	free (r_argv);	401	free (r_argv);
		402
		403	for (int i = NUM_RESOURCES; i--; )
		404	if (rs [i] == resval_undef)
		405	rs [i] = 0;
314		406
315	#if ENABLE_PERL	407	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	408	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	409	rs[Rs_perl_ext_1] = "default";
318		410
…		…
329	* set any defaults not already set	421	* set any defaults not already set
330	*/	422	*/
331	if (cmd_argv && cmd_argv[0])	423	if (cmd_argv && cmd_argv[0])
332	{	424	{
333	if (!rs[Rs_title])	425	if (!rs[Rs_title])
334	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	426	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335	if (!rs[Rs_iconName])	427	if (!rs[Rs_iconName])
336	rs[Rs_iconName] = rs[Rs_title];	428	rs[Rs_iconName] = rs[Rs_title];
337	}	429	}
338	else	430	else
339	{	431	{
…		…
377	rs[Rs_cutchars] = CUTCHARS;	469	rs[Rs_cutchars] = CUTCHARS;
378		470
379	#ifndef NO_BACKSPACE_KEY	471	#ifndef NO_BACKSPACE_KEY
380	if (!rs[Rs_backspace_key])	472	if (!rs[Rs_backspace_key])
381	# ifdef DEFAULT_BACKSPACE	473	# ifdef DEFAULT_BACKSPACE
382	key_backspace = DEFAULT_BACKSPACE;	474	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383	# else	475	# else
384	key_backspace = "DEC"; /* can toggle between \010 or \177 */	476	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385	# endif	477	# 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	478	#endif
394		479
395	#ifndef NO_DELETE_KEY	480	#ifndef NO_DELETE_KEY
396	if (!rs[Rs_delete_key])	481	if (!rs[Rs_delete_key])
397	# ifdef DEFAULT_DELETE	482	# ifdef DEFAULT_DELETE
398	key_delete = DEFAULT_DELETE;	483	rs[Rs_delete_key] = DEFAULT_DELETE;
399	# else	484	# else
400	key_delete = "\033[3~";	485	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	486	# endif
410	if (rs[Rs_answerbackstring])	487	#endif
411	{
412	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414	}
415		488
416	#ifdef HAVE_SCROLLBARS	489	#ifdef HAVE_SCROLLBARS
417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	490	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418	#endif	491	#endif
419		492
420	#ifdef XTERM_REVERSE_VIDEO	493	#ifdef XTERM_REVERSE_VIDEO
421	/* this is how xterm implements reverseVideo */	494	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	495	if (option (Opt_reverseVideo))
423	{	496	{
424	if (!rs[Rs_color + Color_fg])	497	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	498	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
426		499
427	if (!rs[Rs_color + Color_bg])	500	if (!rs[Rs_color + Color_bg])
…		…
433	if (!rs[Rs_color + i])	506	if (!rs[Rs_color + i])
434	rs[Rs_color + i] = def_colorName[i];	507	rs[Rs_color + i] = def_colorName[i];
435		508
436	#ifndef XTERM_REVERSE_VIDEO	509	#ifndef XTERM_REVERSE_VIDEO
437	/* this is how we implement reverseVideo */	510	/* this is how we implement reverseVideo */
438	if (OPTION (Opt_reverseVideo))	511	if (option (Opt_reverseVideo))
439	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	512	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
440	#endif	513	#endif
441		514
442	/* convenient aliases for setting fg/bg to colors */	515	/* convenient aliases for setting fg/bg to colors */
443	color_aliases (Color_fg);	516	color_aliases (Color_fg);
444	color_aliases (Color_bg);	517	color_aliases (Color_bg);
445	#ifndef NO_CURSORCOLOR	518	#ifndef NO_CURSORCOLOR
446	color_aliases (Color_cursor);	519	color_aliases (Color_cursor);
447	color_aliases (Color_cursor2);	520	color_aliases (Color_cursor2);
448	#endif /* NO_CURSORCOLOR */	521	#endif /* NO_CURSORCOLOR */
449	color_aliases (Color_pointer_fg);	522	color_aliases (Color_pointer_fg);
450	color_aliases (Color_pointer_bg);	523	color_aliases (Color_pointer_bg);
451	color_aliases (Color_border);	524	color_aliases (Color_border);
452	#ifndef NO_BOLD_UNDERLINE_REVERSE	525	#ifndef NO_BOLD_UNDERLINE_REVERSE
453	color_aliases (Color_BD);	526	color_aliases (Color_BD);
454	color_aliases (Color_UL);	527	color_aliases (Color_UL);
455	color_aliases (Color_RV);	528	color_aliases (Color_RV);
456	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	529	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
457		530
458	if (!rs[Rs_color + Color_border])	531	if (!rs[Rs_color + Color_border])
459	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	532	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
460		533
461	return cmd_argv;	534	return cmd_argv;
		535	}
		536
		537	/----------------------------------------------------------------------/
		538	void
		539	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		540	{
		541	this->envv = envv;
		542
		543	SET_R (this);
		544	set_locale ("");
		545	set_environ (envv); // few things in X do not call setlocale :(
		546
		547	init_vars ();
		548
		549	init_secondary ();
		550
		551	const char **cmd_argv = init_resources (argc, argv);
		552
		553	#ifdef KEYSYM_RESOURCE
		554	keyboard->register_done ();
		555	#endif
		556
		557	#ifdef HAVE_SCROLLBARS
		558	if (option (Opt_scrollBar))
		559	scrollBar.setIdle (); /* set existence for size calculations */
		560	#endif
		561
		562	pty = ptytty::create ();
		563
		564	create_windows (argc, argv);
		565
		566	init_xlocale ();
		567
		568	scr_reset (); // initialize screen
		569
		570	#if 0
		571	XSynchronize (dpy, True);
		572	#endif
		573
		574	#ifdef HAVE_SCROLLBARS
		575	if (option (Opt_scrollBar))
		576	resize_scrollbar (); /* create and map scrollbar */
		577	#endif
		578	#ifdef HAVE_BG_PIXMAP
		579	{
		580	bgPixmap.set_target (this);
		581	bgPixmap.invalidate ();
		582
		583	#ifdef ENABLE_TRANSPARENCY
		584	if (option (Opt_transparent))
		585	{
		586	bgPixmap.set_transparent ();
		587
		588	#ifdef HAVE_AFTERIMAGE
		589	if (rs [Rs_blurradius])
		590	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		591	#endif
		592	if (ISSET_PIXCOLOR (Color_tint))
		593	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		594
		595	if (rs [Rs_shade])
		596	bgPixmap.set_shade (rs [Rs_shade]);
		597
		598	bgPixmap.set_root_pixmap ();
		599	XSelectInput (dpy, display->root, PropertyChangeMask);
		600	rootwin_ev.start (display, display->root);
		601	}
		602	#endif
		603
		604	#ifdef BG_IMAGE_FROM_FILE
		605	if (rs[Rs_backgroundPixmap])
		606	{
		607	const char *p = rs[Rs_backgroundPixmap];
		608
		609	if ((p = strchr (p, ';')) != 0)
		610	{
		611	p++;
		612	bgPixmap.set_geometry (p);
		613	}
		614	else
		615	bgPixmap.set_defaultGeometry ();
		616
		617	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		618	if (!bgPixmap.window_position_sensitive ())
		619	update_background ();
		620	}
		621	#endif
		622	}
		623	#endif
		624
		625	#if ENABLE_PERL
		626	rootwin_ev.start (display, display->root);
		627	#endif
		628
		629	set_colorfgbg ();
		630
		631	init_command (cmd_argv);
		632
		633	free (cmd_argv);
		634
		635	if (pty->pty >= 0)
		636	pty_ev.start (pty->pty, ev::READ);
		637
		638	HOOK_INVOKE ((this, HOOK_START, DT_END));
		639
		640	#if ENABLE_XEMBED
		641	if (rs[Rs_embed])
		642	{
		643	long info[2] = { 0, XEMBED_MAPPED };
		644
		645	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		646	32, PropModeReplace, (unsigned char *)&info, 2);
		647	}
		648	#endif
		649
		650	XMapWindow (dpy, vt);
		651	XMapWindow (dpy, parent[0]);
		652
		653	refresh_check ();
462	}	654	}
463		655
464	/----------------------------------------------------------------------/	656	/----------------------------------------------------------------------/
465	void	657	void
466	rxvt_term::init_env ()	658	rxvt_term::init_env ()
467	{	659	{
468	int i;	660	int i;
469	unsigned int u;
470	char *val;	661	char *val;
471		662
472	#ifdef DISPLAY_IS_IP	663	#ifdef DISPLAY_IS_IP
473	/* Fixup display_name for export over pty to any interested terminal	664	/* Fixup display_name for export over pty to any interested terminal
474	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	665	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
482	*/	673	*/
483	val = rxvt_network_display (rs[Rs_display_name]);	674	val = rxvt_network_display (rs[Rs_display_name]);
484	rs[Rs_display_name] = (const char *)val;	675	rs[Rs_display_name] = (const char *)val;
485		676
486	if (val == NULL)	677	if (val == NULL)
487	#endif /* DISPLAY_IS_IP */	678	#endif /* DISPLAY_IS_IP */
488	val = XDisplayString (xdisp);	679	val = XDisplayString (dpy);
489		680
490	if (rs[Rs_display_name] == NULL)	681	if (rs[Rs_display_name] == NULL)
491	rs[Rs_display_name] = val; /* use broken `:0' value */	682	rs[Rs_display_name] = val; /* use broken `:0' value */
492		683
493	i = strlen (val);	684	i = strlen (val);
494	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	685	env_display = (char *)rxvt_malloc (i + 9);
495		686
496	sprintf (env_display, "DISPLAY=%s", val);	687	sprintf (env_display, "DISPLAY=%s", val);
497		688
498	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	689	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
499		690
…		…
520	else	711	else
521	putenv ("COLORTERM=" COLORTERMENVFULL);	712	putenv ("COLORTERM=" COLORTERMENVFULL);
522		713
523	if (rs[Rs_term_name] != NULL)	714	if (rs[Rs_term_name] != NULL)
524	{	715	{
525	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	716	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
526	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	717	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
527	putenv (env_term);	718	putenv (env_term);
528	}	719	}
529	else	720	else
530	putenv ("TERM=" TERMENV);	721	putenv ("TERM=" TERMENV);
…		…
532	#ifdef HAVE_UNSETENV	723	#ifdef HAVE_UNSETENV
533	/* avoid passing old settings and confusing term size */	724	/* avoid passing old settings and confusing term size */
534	unsetenv ("LINES");	725	unsetenv ("LINES");
535	unsetenv ("COLUMNS");	726	unsetenv ("COLUMNS");
536	unsetenv ("TERMCAP"); /* terminfo should be okay */	727	unsetenv ("TERMCAP"); /* terminfo should be okay */
537	#endif /* HAVE_UNSETENV */	728	#endif /* HAVE_UNSETENV */
538	}	729	}
539		730
540	/----------------------------------------------------------------------/	731	/----------------------------------------------------------------------/
541	/*	732	/*
542	* This is more or less stolen straight from XFree86 xterm.	733	* This is more or less stolen straight from XFree86 xterm.
…		…
563		754
564	this->locale = "C";	755	this->locale = "C";
565	}	756	}
566		757
567		758
568	this->locale = rxvt_strdup (this->locale);	759	this->locale = strdup (this->locale);
569	SET_LOCALE (this->locale);	760	SET_LOCALE (this->locale);
570	mbstate.reset ();	761	mbstate.reset ();
571	#endif	762	#endif
572		763
573	#if HAVE_NL_LANGINFO	764	#if HAVE_NL_LANGINFO
…		…
617	* Initialize the command connection.	808	* Initialize the command connection.
618	* This should be called after the X server connection is established.	809	* This should be called after the X server connection is established.
619	*/	810	*/
620		811
621	#ifdef META8_OPTION	812	#ifdef META8_OPTION
622	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	813	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
623	#endif	814	#endif
624		815
625	get_ourmods ();	816	get_ourmods ();
626		817
627	if (!OPTION (Opt_scrollTtyOutput))	818	if (!option (Opt_scrollTtyOutput))
628	priv_modes \|= PrivMode_TtyOutputInh;	819	priv_modes \|= PrivMode_TtyOutputInh;
629	if (OPTION (Opt_scrollTtyKeypress))	820	if (option (Opt_scrollTtyKeypress))
630	priv_modes \|= PrivMode_Keypress;	821	priv_modes \|= PrivMode_Keypress;
631	if (!OPTION (Opt_jumpScroll))	822	if (!option (Opt_jumpScroll))
632	priv_modes \|= PrivMode_smoothScroll;	823	priv_modes \|= PrivMode_smoothScroll;
633		824
634	#ifndef NO_BACKSPACE_KEY	825	#ifndef NO_BACKSPACE_KEY
635	if (strcmp (key_backspace, "DEC") == 0)	826	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
636	priv_modes \|= PrivMode_HaveBackSpace;	827	priv_modes \|= PrivMode_HaveBackSpace;
637	#endif	828	#endif
638		829
639	/* add value for scrollBar */	830	/* add value for scrollBar */
640	if (scrollBar.state)	831	if (scrollBar.state)
…		…
653	int i;	844	int i;
654		845
655	#ifdef OFF_FOCUS_FADING	846	#ifdef OFF_FOCUS_FADING
656	pix_colors = pix_colors_focused;	847	pix_colors = pix_colors_focused;
657	#endif	848	#endif
658		849
659	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	850	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
660	{	851	{
661	const char *name = rs[Rs_color + i];	852	const char *name = rs[Rs_color + i];
662		853
663	if (!name)	854	if (!name)
…		…
666	rxvt_color xcol;	857	rxvt_color xcol;
667		858
668	if (!set_color (xcol, name))	859	if (!set_color (xcol, name))
669	{	860	{
670	#ifndef XTERM_REVERSE_VIDEO	861	#ifndef XTERM_REVERSE_VIDEO
671	if (i < 2 && OPTION (Opt_reverseVideo))	862	if (i < 2 && option (Opt_reverseVideo))
672	name = def_colorName [1 - i];	863	name = def_colorName [1 - i];
673	else	864	else
674	#endif	865	#endif
675	name = def_colorName [i];	866	name = def_colorName [i];
676		867
…		…
689	#ifndef NO_CURSORCOLOR	880	#ifndef NO_CURSORCOLOR
690	case Color_cursor2:	881	case Color_cursor2:
691	#endif	882	#endif
692	case Color_pointer_fg:	883	case Color_pointer_fg:
693	name = rs[Rs_color + Color_fg];	884	name = rs[Rs_color + Color_fg];
694	xcol = pix_colors[Color_fg];	885	xcol.set (this, name);
695	break;	886	break;
696	default:	887	default:
697	name = rs[Rs_color + Color_bg];	888	name = rs[Rs_color + Color_bg];
698	xcol = pix_colors[Color_bg];	889	xcol.set (this, name);
699	break;	890	break;
700	}	891	}
701	}	892	}
702	}	893	}
703		894
704	pix_colors[i] = xcol;	895	pix_colors[i] = xcol;
705	rs[Rs_color + i] = name;	896	rs[Rs_color + i] = name;
706	}	897	}
707		898
708	#ifdef OFF_FOCUS_FADING
709	if (rs[Rs_fade])
710	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
711	{
712	rgba c;
713	pix_colors[Color_fade].get (this, c);
714	pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
715	}
716	#endif
717
718	if (depth <= 2)	899	if (depth <= 2)
719	{	900	{
720	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	901	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
721	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	902	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
722	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	903	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
723	}	904	}
724		905
725	/*	906	/*
726	* get scrollBar shadow colors	907	* get scrollBar shadow colors
727	*	908	*
728	* The calculations of topShadow/bottomShadow values are adapted	909	* The calculations of topShadow/bottomShadow values are adapted
729	* from the fvwm window manager.	910	* from the fvwm window manager.
730	*/	911	*/
731	#ifdef KEEP_SCROLLCOLOR	912	#ifdef KEEP_SCROLLCOLOR
732
733	if (depth <= 2)	913	if (depth <= 2)
734	{	914	{
735	/* Monochrome */	915	/* Monochrome */
736	pix_colors[Color_scroll] = pix_colors[Color_fg];	916	alias_color (Color_scroll, Color_fg);
737	pix_colors[Color_topShadow] = pix_colors[Color_bg];	917	alias_color (Color_topShadow, Color_bg);
738	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	918	alias_color (Color_bottomShadow, Color_bg);
739	}	919	}
740	else	920	else
741	{	921	{
742	rxvt_color xcol[2];	922	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
743	/* xcol[0] == white
744	* xcol[1] == top shadow
745	* xcol[2] == bot shadow */
746		923
747	xcol[1] = pix_colors[Color_scroll];
748	xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
749
750	rgba c0, c1;	924	rgba cscroll;
751		925	pix_colors [Color_scroll].get (cscroll);
752	xcol[0].get (this, c0);
753	xcol[1].get (this, c1);
754
755	xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
756		926
757	/* topShadowColor */	927	/* topShadowColor */
758	if (!xcol[1].set (this,	928	if (!pix_colors[Color_topShadow].set (this,
759	rgba (	929	rgba (
760	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	930	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
761	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	931	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
762	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	932	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
763	c1.a) // pa1 vs. pa0: arbitrary	933	cscroll.a)
764	));	934	))
765	xcol[1] = pix_colors[Color_White];	935	alias_color (Color_topShadow, Color_White);
766
767	pix_colors[Color_topShadow] = xcol[1];
768	}	936	}
769	#endif /* KEEP_SCROLLCOLOR */	937	#endif /* KEEP_SCROLLCOLOR */
		938
		939	#ifdef OFF_FOCUS_FADING
		940	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		941	update_fade_color (i);
		942	#endif
770	}	943	}
771		944
772	/----------------------------------------------------------------------/	945	/----------------------------------------------------------------------/
773	/* color aliases, fg/bg bright-bold */	946	/* color aliases, fg/bg bright-bold */
774	void	947	void
…		…
777	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	950	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
778	{	951	{
779	int i = atoi (rs[Rs_color + idx]);	952	int i = atoi (rs[Rs_color + idx]);
780		953
781	if (i >= 8 && i <= 15)	954	if (i >= 8 && i <= 15)
782	{ /* bright colors */	955	/* bright colors */
783	i -= 8;
784	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	956	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
785	return;	957	else if (i >= 0 && i <= 7)
786	}	958	/* normal colors */
787
788	if (i >= 0 && i <= 7) /* normal colors */
789	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	959	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
790	}	960	}
791	}	961	}
792		962
793	/----------------------------------------------------------------------/	963	/----------------------------------------------------------------------/
…		…
813		983
814	if (rsmod	984	if (rsmod
815	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	985	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
816	requestedmeta = rsmod[3] - '0';	986	requestedmeta = rsmod[3] - '0';
817		987
818	map = XGetModifierMapping (xdisp);	988	map = XGetModifierMapping (dpy);
819	kc = map->modifiermap;	989	kc = map->modifiermap;
820		990
821	for (i = 1; i < 6; i++)	991	for (i = 1; i < 6; i++)
822	{	992	{
823	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	993	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
825	for (j = map->max_keypermod; j--; k++)	995	for (j = map->max_keypermod; j--; k++)
826	{	996	{
827	if (kc[k] == 0)	997	if (kc[k] == 0)
828	break;	998	break;
829		999
830	switch (XKeycodeToKeysym (xdisp, kc[k], 0))	1000	switch (XKeycodeToKeysym (dpy, kc[k], 0))
831	{	1001	{
832	case XK_Num_Lock:	1002	case XK_Num_Lock:
833	ModNumLockMask = modmasks[i - 1];	1003	ModNumLockMask = modmasks[i - 1];
834	continue;	1004	continue;
835		1005
…		…
885	rxvt_term::create_windows (int argc, const char const argv)	1055	rxvt_term::create_windows (int argc, const char const argv)
886	{	1056	{
887	XClassHint classHint;	1057	XClassHint classHint;
888	XWMHints wmHint;	1058	XWMHints wmHint;
889	#if ENABLE_FRILLS	1059	#if ENABLE_FRILLS
890	MWMHints mwmhints;	1060	MWMHints mwmhints = { };
891	#endif	1061	#endif
892	XGCValues gcvalue;	1062	XGCValues gcvalue;
893	XSetWindowAttributes attributes;	1063	XSetWindowAttributes attributes;
894	Window top, parent;	1064	Window top, parent;
895		1065
896	dLocal (Display *, xdisp);	1066	dLocal (Display *, dpy);
897		1067
898	/* grab colors before netscape does */	1068	/* grab colors before netscape does */
899	Get_Colours ();	1069	Get_Colours ();
900		1070
901	if (!set_fonts ())	1071	if (!set_fonts ())
902	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1072	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
903		1073
904	parent = display->root;	1074	parent = display->root;
905		1075
906	attributes.override_redirect = !!OPTION (Opt_override_redirect);	1076	attributes.override_redirect = !!option (Opt_override_redirect);
907		1077
908	#if ENABLE_FRILLS	1078	#if ENABLE_FRILLS
909	if (OPTION (Opt_borderLess))	1079	if (option (Opt_borderLess))
910	{	1080	{
911	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)	1081	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
912	{	1082	{
913	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1083	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
914	attributes.override_redirect = true;	1084	attributes.override_redirect = true;
915	mwmhints.flags = 0;
916	}	1085	}
917	else	1086	else
918	{	1087	{
919	mwmhints.flags = MWM_HINTS_DECORATIONS;	1088	mwmhints.flags = MWM_HINTS_DECORATIONS;
920	mwmhints.decorations = 0;
921	}	1089	}
922	}	1090	}
923	else
924	mwmhints.flags = 0;
925	#endif	1091	#endif
926		1092
927	#if ENABLE_XEMBED	1093	#if ENABLE_XEMBED
928	if (rs[Rs_embed])	1094	if (rs[Rs_embed])
929	{	1095	{
930	XWindowAttributes wattr;	1096	XWindowAttributes wattr;
931		1097
932	parent = strtol (rs[Rs_embed], 0, 0);	1098	parent = strtol (rs[Rs_embed], 0, 0);
933		1099
934	if (!XGetWindowAttributes (xdisp, parent, &wattr))	1100	if (!XGetWindowAttributes (dpy, parent, &wattr))
935	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	1101	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
936		1102
937	window_calc (wattr.width, wattr.height);	1103	window_calc (wattr.width, wattr.height);
938	}	1104	}
939	#endif	1105	#endif
…		…
943	/* sub-window placement & size in rxvt_resize_subwindows () */	1109	/* sub-window placement & size in rxvt_resize_subwindows () */
944	attributes.background_pixel = pix_colors_focused [Color_border];	1110	attributes.background_pixel = pix_colors_focused [Color_border];
945	attributes.border_pixel = pix_colors_focused [Color_border];	1111	attributes.border_pixel = pix_colors_focused [Color_border];
946	attributes.colormap = cmap;	1112	attributes.colormap = cmap;
947		1113
948	top = XCreateWindow (xdisp, parent,	1114	top = XCreateWindow (dpy, parent,
949	szHint.x, szHint.y,	1115	szHint.x, szHint.y,
950	szHint.width, szHint.height,	1116	szHint.width, szHint.height,
951	ext_bwidth,	1117	ext_bwidth,
952	depth, InputOutput, visual,	1118	depth, InputOutput, visual,
953	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1119	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
…		…
964	classHint.res_name = (char *)rs[Rs_name];	1130	classHint.res_name = (char *)rs[Rs_name];
965	classHint.res_class = (char *)RESCLASS;	1131	classHint.res_class = (char *)RESCLASS;
966		1132
967	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1133	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
968	wmHint.input = True;	1134	wmHint.input = True;
969	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1135	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
970	wmHint.window_group = top;	1136	wmHint.window_group = top;
971		1137
972	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,	1138	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
973	&szHint, &wmHint, &classHint);	1139	&szHint, &wmHint, &classHint);
974		1140
975	#if ENABLE_FRILLS	1141	#if ENABLE_FRILLS
976	if (mwmhints.flags)	1142	if (mwmhints.flags)
977	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1143	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
978	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1144	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
979	#endif	1145	#endif
980		1146
981	Atom protocols[] = {	1147	Atom protocols[] = {
982	xa[XA_WM_DELETE_WINDOW],	1148	xa[XA_WM_DELETE_WINDOW],
983	#if ENABLE_EWMH	1149	#if ENABLE_EWMH
984	xa[XA_NET_WM_PING],	1150	xa[XA_NET_WM_PING],
985	#endif	1151	#endif
986	};	1152	};
987		1153
988	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1154	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
989		1155
990	#if ENABLE_FRILLS	1156	#if ENABLE_FRILLS
991	if (rs[Rs_transient_for])	1157	if (rs[Rs_transient_for])
992	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1158	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
993	#endif	1159	#endif
994		1160
995	#if ENABLE_EWMH	1161	#if ENABLE_EWMH
996	long pid = getpid ();	1162	long pid = getpid ();
997		1163
998	XChangeProperty (xdisp, top,	1164	XChangeProperty (dpy, top,
999	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1165	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000	PropModeReplace, (unsigned char *)&pid, 1);	1166	PropModeReplace, (unsigned char *)&pid, 1);
1001		1167
1002	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1168	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1003	#endif	1169	#endif
1004		1170
1005	XSelectInput (xdisp, top,	1171	XSelectInput (dpy, top,
1006	KeyPressMask	1172	KeyPressMask
1007	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1173	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1008	\| KeyReleaseMask	1174	\| KeyReleaseMask
1009	#endif	1175	#endif
1010	\| FocusChangeMask \| VisibilityChangeMask	1176	\| FocusChangeMask \| VisibilityChangeMask
1011	\| ExposureMask \| StructureNotifyMask);	1177	\| ExposureMask \| StructureNotifyMask);
1012		1178
1013	termwin_ev.start (display, top);	1179	termwin_ev.start (display, top);
1014		1180
1015	/* vt cursor: Black-on-White is standard, but this is more popular */	1181	/* vt cursor: Black-on-White is standard, but this is more popular */
1016	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);	1182	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1017
1018	#ifdef HAVE_SCROLLBARS
1019	/* cursor scrollBar: Black-on-White */
1020	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1021	#endif
1022		1183
1023	/* the vt window */	1184	/* the vt window */
1024	vt = XCreateSimpleWindow (xdisp, top,	1185	vt = XCreateSimpleWindow (dpy, top,
1025	window_vt_x, window_vt_y,	1186	window_vt_x, window_vt_y,
1026	width, height,	1187	width, height,
1027	0,	1188	0,
1028	pix_colors_focused[Color_fg],	1189	pix_colors_focused[Color_fg],
1029	pix_colors_focused[Color_bg]);	1190	pix_colors_focused[Color_bg]);
1030		1191
1031	attributes.bit_gravity = NorthWestGravity;	1192	attributes.bit_gravity = NorthWestGravity;
1032	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);	1193	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1033		1194
1034	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1195	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1035		1196
1036	if (OPTION (Opt_pointerBlank))	1197	if (option (Opt_pointerBlank))
1037	vt_emask \|= PointerMotionMask;	1198	vt_emask \|= PointerMotionMask;
1038	else	1199	else
1039	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1200	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1040		1201
1041	vt_select_input ();	1202	vt_select_input ();
1042		1203
1043	vt_ev.start (display, vt);	1204	vt_ev.start (display, vt);
1044		1205
1045	#ifdef XPM_BACKGROUND
1046	if (rs[Rs_backgroundPixmap] != NULL
1047	&& !OPTION (Opt_transparent))
1048	{
1049	const char *p = rs[Rs_backgroundPixmap];
1050
1051	if ((p = strchr (p, ';')) != NULL)
1052	{
1053	p++;
1054	scale_pixmap (p);
1055	}
1056
1057	set_bgPixmap (rs[Rs_backgroundPixmap]);
1058	scr_touch (true);
1059	}
1060	#endif
1061
1062	/* graphics context for the vt window */	1206	/* graphics context for the vt window */
1063	gcvalue.foreground = pix_colors[Color_fg];	1207	gcvalue.foreground = pix_colors[Color_fg];
1064	gcvalue.background = pix_colors[Color_bg];	1208	gcvalue.background = pix_colors[Color_bg];
1065	gcvalue.graphics_exposures = 1;	1209	gcvalue.graphics_exposures = 0;
1066		1210
1067	gc = XCreateGC (xdisp, vt,	1211	gc = XCreateGC (dpy, vt,
1068	GCForeground \| GCBackground \| GCGraphicsExposures,	1212	GCForeground \| GCBackground \| GCGraphicsExposures,
1069	&gcvalue);	1213	&gcvalue);
1070		1214
1071	drawable = new rxvt_drawable (this, vt);	1215	drawable = new rxvt_drawable (this, vt);
1072
1073	#ifdef RXVT_SCROLLBAR
1074	gcvalue.foreground = pix_colors[Color_topShadow];
1075	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1076	gcvalue.foreground = pix_colors[Color_bottomShadow];
1077	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1078	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1079	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1080	#endif
1081		1216
1082	#ifdef OFF_FOCUS_FADING	1217	#ifdef OFF_FOCUS_FADING
1083	// initially we are in unfocused state	1218	// initially we are in unfocused state
1084	if (rs[Rs_fade])	1219	if (rs[Rs_fade])
1085	pix_colors = pix_colors_unfocused;	1220	pix_colors = pix_colors_unfocused;
…		…
1091		1226
1092	/* ------------------------------------------------------------------------- *	1227	/* ------------------------------------------------------------------------- *
1093	* GET TTY CURRENT STATE *	1228	* GET TTY CURRENT STATE *
1094	* ------------------------------------------------------------------------- */	1229	* ------------------------------------------------------------------------- */
1095	void	1230	void
1096	rxvt_get_ttymode (ttymode_t *tio, int erase)	1231	rxvt_get_ttymode (struct termios *tio, int erase)
1097	{	1232	{
1098	#ifdef HAVE_TERMIOS_H
1099	/*	1233	/*
1100	* standard System V termios interface	1234	* standard System V termios interface
1101	*/	1235	*/
1102	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1236	if (tcgetattr (STDIN_FILENO, tio) < 0)
1103	{	1237	{
1104	// return error - use system defaults,	1238	// return error - use system defaults,
1105	// where possible, and zero elsewhere	1239	// where possible, and zero elsewhere
1106	memset (tio, 0, sizeof (ttymode_t));	1240	memset (tio, 0, sizeof (struct termios));
1107		1241
1108	tio->c_cc[VINTR] = CINTR;	1242	tio->c_cc[VINTR] = CINTR;
1109	tio->c_cc[VQUIT] = CQUIT;	1243	tio->c_cc[VQUIT] = CQUIT;
1110	tio->c_cc[VERASE] = CERASE;	1244	tio->c_cc[VERASE] = CERASE;
1111	#ifdef VERASE2	1245	#ifdef VERASE2
…		…
1170	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1304	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1171	# if defined (ECHOCTL) && defined (ECHOKE)	1305	# if defined (ECHOCTL) && defined (ECHOKE)
1172	\| ECHOCTL \| ECHOKE	1306	\| ECHOCTL \| ECHOKE
1173	# endif	1307	# endif
1174	\| ECHOE \| ECHOK);	1308	\| ECHOE \| ECHOK);
1175	# else /* HAVE_TERMIOS_H */
1176
1177	/*
1178	* sgtty interface
1179	*/
1180
1181	/* get parameters -- gtty */
1182	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1183	{
1184	tio->sg.sg_erase = CERASE; /* ^H */
1185	tio->sg.sg_kill = CKILL; /* ^U */
1186	}
1187
1188	if (erase != -1)
1189	tio->sg.sg_erase = (char)erase;
1190
1191	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1192
1193	/* get special characters */
1194	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1195	{
1196	tio->tc.t_intrc = CINTR; /* ^C */
1197	tio->tc.t_quitc = CQUIT; /* ^\ */
1198	tio->tc.t_startc = CSTART; /* ^Q */
1199	tio->tc.t_stopc = CSTOP; /* ^S */
1200	tio->tc.t_eofc = CEOF; /* ^D */
1201	tio->tc.t_brkc = -1;
1202	}
1203
1204	/* get local special chars */
1205	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1206	{
1207	tio->lc.t_suspc = CSUSP; /* ^Z */
1208	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1209	tio->lc.t_rprntc = CRPRNT; /* ^R */
1210	tio->lc.t_flushc = CFLUSH; /* ^O */
1211	tio->lc.t_werasc = CWERASE; /* ^W */
1212	tio->lc.t_lnextc = CLNEXT; /* ^V */
1213	}
1214	/* get line discipline */
1215	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1216	# ifdef NTTYDISC
1217	tio->line = NTTYDISC;
1218	# endif /* NTTYDISC */
1219
1220	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1221	#endif /* HAVE_TERMIOS_H */
1222		1309
1223	/*	1310	/*
1224	* Debugging	1311	* Debugging
1225	*/	1312	*/
1226	#ifdef DEBUG_TTYMODE	1313	#ifdef DEBUG_TTYMODE
1227	#ifdef HAVE_TERMIOS_H
1228	/* c_iflag bits */	1314	/* c_iflag bits */
1229	fprintf (stderr, "Input flags\n");	1315	fprintf (stderr, "Input flags\n");
1230		1316
1231	/* cpp token stringize doesn't work on all machines <sigh> */	1317	/* cpp token stringize doesn't work on all machines <sigh> */
1232	# define FOO(flag,name) \	1318	# define FOO(flag,name) \
…		…
1295	FOO (VLNEXT, "VLNEXT");	1381	FOO (VLNEXT, "VLNEXT");
1296	# endif	1382	# endif
1297		1383
1298	fprintf (stderr, "\n");	1384	fprintf (stderr, "\n");
1299	# undef FOO	1385	# undef FOO
1300	# endif /* HAVE_TERMIOS_H */	1386	#endif /* DEBUG_TTYMODE */
1301	#endif /* DEBUG_TTYMODE */
1302	}	1387	}
1303		1388
1304	/----------------------------------------------------------------------/	1389	/----------------------------------------------------------------------/
1305	/*	1390	/*
1306	* Run the command in a subprocess and return a file descriptor for the	1391	* Run the command in a subprocess and return a file descriptor for the
…		…
1327	else	1412	else
1328	#endif	1413	#endif
1329	if (!pty->get ())	1414	if (!pty->get ())
1330	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1415	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1331		1416
		1417	int er;
		1418
		1419	#ifndef NO_BACKSPACE_KEY
		1420	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
		1421	er = rs[Rs_backspace_key][0];
		1422	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
		1423	er = '\177'; /* the initial state anyway */
		1424	else
		1425	#endif
		1426	er = -1;
		1427
		1428	rxvt_get_ttymode (&tio, er);
		1429	/* init terminal attributes */
		1430	cfsetospeed (&tio, BAUDRATE);
		1431	cfsetispeed (&tio, BAUDRATE);
		1432	tcsetattr (pty->tty, TCSANOW, &tio);
1332	pty->set_utf8_mode (enc_utf8);	1433	pty->set_utf8_mode (enc_utf8);
1333		1434
1334	/* set initial window size */	1435	/* set initial window size */
1335	tt_winch ();	1436	tt_winch ();
1336
1337	int er;
1338
1339	#ifndef NO_BACKSPACE_KEY
1340	if (key_backspace[0] && !key_backspace[1])
1341	er = key_backspace[0];
1342	else if (strcmp (key_backspace, "DEC") == 0)
1343	er = '\177'; /* the initial state anyway */
1344	else
1345	#endif
1346	er = -1;
1347
1348	rxvt_get_ttymode (&tio, er);
1349		1437
1350	#if ENABLE_FRILLS	1438	#if ENABLE_FRILLS
1351	if (rs[Rs_pty_fd])	1439	if (rs[Rs_pty_fd])
1352	return;	1440	return;
1353	#endif	1441	#endif
…		…
1384	}	1472	}
1385		1473
1386	_exit (EXIT_FAILURE);	1474	_exit (EXIT_FAILURE);
1387		1475
1388	default:	1476	default:
1389	if (!OPTION (Opt_utmpInhibit))	1477	if (!option (Opt_utmpInhibit))
1390	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1478	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1391		1479
1392	pty->close_tty ();	1480	pty->close_tty ();
1393		1481
1394	child_ev.start (cmd_pid);	1482	child_ev.start (cmd_pid);
1395		1483
…		…
1408	int	1496	int
1409	rxvt_term::run_child (const char const argv)	1497	rxvt_term::run_child (const char const argv)
1410	{	1498	{
1411	char *login;	1499	char *login;
1412		1500
1413	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1414
1415	if (OPTION (Opt_console))	1501	if (option (Opt_console))
		1502	{
1416	{ /* be virtual console, fail silently */	1503	/* be virtual console, fail silently */
1417	#ifdef TIOCCONS	1504	#ifdef TIOCCONS
1418	unsigned int on = 1;	1505	unsigned int on = 1;
1419		1506
1420	ioctl (STDIN_FILENO, TIOCCONS, &on);	1507	ioctl (STDIN_FILENO, TIOCCONS, &on);
1421	#elif defined (SRIOCSREDIR)	1508	#elif defined (SRIOCSREDIR)
…		…
1423		1510
1424	fd = open (CONSOLE, O_WRONLY, 0);	1511	fd = open (CONSOLE, O_WRONLY, 0);
1425	if (fd >= 0)	1512	if (fd >= 0)
1426	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1513	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1427	close (fd);	1514	close (fd);
1428	#endif /* SRIOCSREDIR */	1515	#endif /* SRIOCSREDIR */
1429	}	1516	}
1430		1517
1431	/* reset signals and spin off the command interpreter */	1518	/* reset signals and spin off the command interpreter */
1432	signal (SIGINT, SIG_DFL);	1519	signal (SIGINT, SIG_DFL);
1433	signal (SIGQUIT, SIG_DFL);	1520	signal (SIGQUIT, SIG_DFL);
…		…
1440	*/	1527	*/
1441	#ifdef SIGTSTP	1528	#ifdef SIGTSTP
1442	signal (SIGTSTP, SIG_IGN);	1529	signal (SIGTSTP, SIG_IGN);
1443	signal (SIGTTIN, SIG_IGN);	1530	signal (SIGTTIN, SIG_IGN);
1444	signal (SIGTTOU, SIG_IGN);	1531	signal (SIGTTOU, SIG_IGN);
1445	#endif /* SIGTSTP */	1532	#endif /* SIGTSTP */
1446		1533
1447	// unblock signals (signals are blocked by iom.C	1534	// unblock signals (signals are blocked by iom.C
1448	sigset_t ss;	1535	sigset_t ss;
1449	sigemptyset (&ss);	1536	sigemptyset (&ss);
1450	sigprocmask (SIG_SETMASK, &ss, 0);	1537	sigprocmask (SIG_SETMASK, &ss, 0);
1451		1538
1452	/* command interpreter path */	1539	/* command interpreter path */
1453	if (argv != NULL)	1540	if (argv)
1454	{	1541	{
1455	# ifdef DEBUG_CMD	1542	# ifdef DEBUG_CMD
1456	int i;	1543	int i;
1457		1544
1458	for (i = 0; argv[i]; i++)	1545	for (i = 0; argv[i]; i++)
…		…
1467	const char argv0, shell;	1554	const char argv0, shell;
1468		1555
1469	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1556	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1470	shell = "/bin/sh";	1557	shell = "/bin/sh";
1471		1558
1472	argv0 = (const char *)rxvt_r_basename (shell);	1559	argv0 = (const char *)rxvt_basename (shell);
1473		1560
1474	if (OPTION (Opt_loginShell))	1561	if (option (Opt_loginShell))
1475	{	1562	{
1476	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1563	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1477		1564
1478	login[0] = '-';	1565	login[0] = '-';
1479	strcpy (&login[1], argv0);	1566	strcpy (&login[1], argv0);
1480	argv0 = login;	1567	argv0 = login;
1481	}	1568	}
1482		1569
1483	execlp (shell, argv0, NULL);	1570	execlp (shell, argv0, (char *)0);
1484	/* no error message: STDERR is closed! */	1571	/* no error message: STDERR is closed! */
1485	}	1572	}
1486		1573
1487	return -1;	1574	return -1;
1488	}	1575	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC vs. Revision 1.243 by root, Fri Jan 25 16:04:57 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.243 by root, Fri Jan 25 16:04:57 2008 UTC