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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.240 by ayin, Sat Jan 19 13:05:55 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
		10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
		11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
		12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	14	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support
14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15	*	16	*
16	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	20	* (at your option) any later version.
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	/*	320	/*
226	* Close all unused file descriptors	321	* Close all unused file descriptors
…		…
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
302	xa = display->xa;	402	xa = display->xa;
		403
		404	set (display);
		405	extract_resources ();
303		406
304	#if XFT	407	#if XFT
305	if (rs[Rs_depth])	408	if (rs[Rs_depth])
306	set (display, strtol (rs[Rs_depth], 0, 0));	409	select_visual (strtol (rs[Rs_depth], 0, 0));
307	else
308	#endif	410	#endif
309	set (display);
310		411
311	extract_resources ();	412	#ifdef HAVE_AFTERIMAGE
312		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
313	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;
314		422
315	#if ENABLE_PERL	423	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	424	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	425	rs[Rs_perl_ext_1] = "default";
318		426
…		…
329	* set any defaults not already set	437	* set any defaults not already set
330	*/	438	*/
331	if (cmd_argv && cmd_argv[0])	439	if (cmd_argv && cmd_argv[0])
332	{	440	{
333	if (!rs[Rs_title])	441	if (!rs[Rs_title])
334	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	442	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335	if (!rs[Rs_iconName])	443	if (!rs[Rs_iconName])
336	rs[Rs_iconName] = rs[Rs_title];	444	rs[Rs_iconName] = rs[Rs_title];
337	}	445	}
338	else	446	else
339	{	447	{
…		…
377	rs[Rs_cutchars] = CUTCHARS;	485	rs[Rs_cutchars] = CUTCHARS;
378		486
379	#ifndef NO_BACKSPACE_KEY	487	#ifndef NO_BACKSPACE_KEY
380	if (!rs[Rs_backspace_key])	488	if (!rs[Rs_backspace_key])
381	# ifdef DEFAULT_BACKSPACE	489	# ifdef DEFAULT_BACKSPACE
382	key_backspace = DEFAULT_BACKSPACE;	490	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383	# else	491	# else
384	key_backspace = "DEC"; /* can toggle between \010 or \177 */	492	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385	# endif	493	# 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	494	#endif
394		495
395	#ifndef NO_DELETE_KEY	496	#ifndef NO_DELETE_KEY
396	if (!rs[Rs_delete_key])	497	if (!rs[Rs_delete_key])
397	# ifdef DEFAULT_DELETE	498	# ifdef DEFAULT_DELETE
398	key_delete = DEFAULT_DELETE;	499	rs[Rs_delete_key] = DEFAULT_DELETE;
399	# else	500	# else
400	key_delete = "\033[3~";	501	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	502	# endif
410	if (rs[Rs_answerbackstring])	503	#endif
411	{
412	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414	}
415		504
416	#ifdef HAVE_SCROLLBARS	505	#ifdef HAVE_SCROLLBARS
417	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]);
418	#endif	507	#endif
419		508
420	#ifdef XTERM_REVERSE_VIDEO	509	#ifdef XTERM_REVERSE_VIDEO
421	/* this is how xterm implements reverseVideo */	510	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	511	if (option (Opt_reverseVideo))
423	{	512	{
424	if (!rs[Rs_color + Color_fg])	513	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	514	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		515
426	if (!rs[Rs_color + Color_bg])	516	if (!rs[Rs_color + Color_bg])
427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	517	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428	}	518	}
429	#endif	519	#endif
430		520
…		…
432	if (!rs[Rs_color + i])	522	if (!rs[Rs_color + i])
433	rs[Rs_color + i] = def_colorName[i];	523	rs[Rs_color + i] = def_colorName[i];
434		524
435	#ifndef XTERM_REVERSE_VIDEO	525	#ifndef XTERM_REVERSE_VIDEO
436	/* this is how we implement reverseVideo */	526	/* this is how we implement reverseVideo */
437	if (OPTION (Opt_reverseVideo))	527	if (option (Opt_reverseVideo))
438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	528	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439	#endif	529	#endif
440		530
441	/* convenient aliases for setting fg/bg to colors */	531	/* convenient aliases for setting fg/bg to colors */
442	color_aliases (Color_fg);	532	color_aliases (Color_fg);
443	color_aliases (Color_bg);	533	color_aliases (Color_bg);
444	#ifndef NO_CURSORCOLOR	534	#ifndef NO_CURSORCOLOR
445	color_aliases (Color_cursor);	535	color_aliases (Color_cursor);
446	color_aliases (Color_cursor2);	536	color_aliases (Color_cursor2);
447	#endif /* NO_CURSORCOLOR */	537	#endif /* NO_CURSORCOLOR */
448	color_aliases (Color_pointer_fg);	538	color_aliases (Color_pointer_fg);
449	color_aliases (Color_pointer_bg);	539	color_aliases (Color_pointer_bg);
450	color_aliases (Color_border);	540	color_aliases (Color_border);
451	#ifndef NO_BOLD_UNDERLINE_REVERSE	541	#ifndef NO_BOLD_UNDERLINE_REVERSE
452	color_aliases (Color_BD);	542	color_aliases (Color_BD);
453	color_aliases (Color_UL);	543	color_aliases (Color_UL);
454	color_aliases (Color_RV);	544	color_aliases (Color_RV);
455	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	545	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456		546
457	if (!rs[Rs_color + Color_border])	547	if (!rs[Rs_color + Color_border])
458	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	548	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459		549
460	return cmd_argv;	550	return cmd_argv;
		551	}
		552
		553	/----------------------------------------------------------------------/
		554	void
		555	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		556	{
		557	this->envv = envv;
		558
		559	SET_R (this);
		560	set_locale ("");
		561	set_environ (envv); // few things in X do not call setlocale :(
		562
		563	init_vars ();
		564
		565	init_secondary ();
		566
		567	const char **cmd_argv = init_resources (argc, argv);
		568
		569	#ifdef KEYSYM_RESOURCE
		570	keyboard->register_done ();
		571	#endif
		572
		573	#ifdef HAVE_SCROLLBARS
		574	if (option (Opt_scrollBar))
		575	scrollBar.setIdle (); /* set existence for size calculations */
		576	#endif
		577
		578	pty = ptytty::create ();
		579
		580	create_windows (argc, argv);
		581
		582	init_xlocale ();
		583
		584	scr_reset (); // initialize screen
		585
		586	#if 0
		587	XSynchronize (dpy, True);
		588	#endif
		589
		590	#ifdef HAVE_SCROLLBARS
		591	if (option (Opt_scrollBar))
		592	resize_scrollbar (); /* create and map scrollbar */
		593	#endif
		594	#ifdef HAVE_BG_PIXMAP
		595	{
		596	bgPixmap.set_target (this);
		597	bgPixmap.invalidate ();
		598
		599	#ifdef ENABLE_TRANSPARENCY
		600	if (option (Opt_transparent))
		601	{
		602	bgPixmap.set_transparent ();
		603
		604	#ifdef HAVE_AFTERIMAGE
		605	if (rs [Rs_blurradius])
		606	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		607	#endif
		608	if (ISSET_PIXCOLOR (Color_tint))
		609	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		610
		611	if (rs [Rs_shade])
		612	bgPixmap.set_shade (rs [Rs_shade]);
		613
		614	bgPixmap.set_root_pixmap ();
		615	XSelectInput (dpy, display->root, PropertyChangeMask);
		616	rootwin_ev.start (display, display->root);
		617	}
		618	#endif
		619
		620	#ifdef BG_IMAGE_FROM_FILE
		621	if (rs[Rs_backgroundPixmap])
		622	{
		623	const char *p = rs[Rs_backgroundPixmap];
		624
		625	if ((p = strchr (p, ';')) != 0)
		626	{
		627	p++;
		628	bgPixmap.set_geometry (p);
		629	}
		630	else
		631	bgPixmap.set_defaultGeometry ();
		632
		633	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		634	if (!bgPixmap.window_position_sensitive ())
		635	update_background ();
		636	}
		637	#endif
		638	}
		639	#endif
		640
		641	#if ENABLE_PERL
		642	rootwin_ev.start (display, display->root);
		643	#endif
		644
		645	set_colorfgbg ();
		646
		647	init_command (cmd_argv);
		648
		649	free (cmd_argv);
		650
		651	if (pty->pty >= 0)
		652	pty_ev.start (pty->pty, ev::READ);
		653
		654	HOOK_INVOKE ((this, HOOK_START, DT_END));
		655
		656	#if ENABLE_XEMBED
		657	if (rs[Rs_embed])
		658	{
		659	long info[2] = { 0, XEMBED_MAPPED };
		660
		661	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		662	32, PropModeReplace, (unsigned char *)&info, 2);
		663	}
		664	#endif
		665
		666	XMapWindow (dpy, vt);
		667	XMapWindow (dpy, parent[0]);
		668
		669	refresh_check ();
461	}	670	}
462		671
463	/----------------------------------------------------------------------/	672	/----------------------------------------------------------------------/
464	void	673	void
465	rxvt_term::init_env ()	674	rxvt_term::init_env ()
466	{	675	{
467	int i;	676	int i;
468	unsigned int u;
469	char *val;	677	char *val;
470		678
471	#ifdef DISPLAY_IS_IP	679	#ifdef DISPLAY_IS_IP
472	/* Fixup display_name for export over pty to any interested terminal	680	/* Fixup display_name for export over pty to any interested terminal
473	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	681	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
481	*/	689	*/
482	val = rxvt_network_display (rs[Rs_display_name]);	690	val = rxvt_network_display (rs[Rs_display_name]);
483	rs[Rs_display_name] = (const char *)val;	691	rs[Rs_display_name] = (const char *)val;
484		692
485	if (val == NULL)	693	if (val == NULL)
486	#endif /* DISPLAY_IS_IP */	694	#endif /* DISPLAY_IS_IP */
487	val = XDisplayString (xdisp);	695	val = XDisplayString (dpy);
488		696
489	if (rs[Rs_display_name] == NULL)	697	if (rs[Rs_display_name] == NULL)
490	rs[Rs_display_name] = val; /* use broken `:0' value */	698	rs[Rs_display_name] = val; /* use broken `:0' value */
491		699
492	i = strlen (val);	700	i = strlen (val);
493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	701	env_display = (char *)rxvt_malloc (i + 9);
494		702
495	sprintf (env_display, "DISPLAY=%s", val);	703	sprintf (env_display, "DISPLAY=%s", val);
496		704
497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	705	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498		706
…		…
519	else	727	else
520	putenv ("COLORTERM=" COLORTERMENVFULL);	728	putenv ("COLORTERM=" COLORTERMENVFULL);
521		729
522	if (rs[Rs_term_name] != NULL)	730	if (rs[Rs_term_name] != NULL)
523	{	731	{
524	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	732	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	733	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526	putenv (env_term);	734	putenv (env_term);
527	}	735	}
528	else	736	else
529	putenv ("TERM=" TERMENV);	737	putenv ("TERM=" TERMENV);
…		…
531	#ifdef HAVE_UNSETENV	739	#ifdef HAVE_UNSETENV
532	/* avoid passing old settings and confusing term size */	740	/* avoid passing old settings and confusing term size */
533	unsetenv ("LINES");	741	unsetenv ("LINES");
534	unsetenv ("COLUMNS");	742	unsetenv ("COLUMNS");
535	unsetenv ("TERMCAP"); /* terminfo should be okay */	743	unsetenv ("TERMCAP"); /* terminfo should be okay */
536	#endif /* HAVE_UNSETENV */	744	#endif /* HAVE_UNSETENV */
537	}	745	}
538		746
539	/----------------------------------------------------------------------/	747	/----------------------------------------------------------------------/
540	/*	748	/*
541	* This is more or less stolen straight from XFree86 xterm.	749	* This is more or less stolen straight from XFree86 xterm.
…		…
562		770
563	this->locale = "C";	771	this->locale = "C";
564	}	772	}
565		773
566		774
567	this->locale = rxvt_strdup (this->locale);	775	this->locale = strdup (this->locale);
568	SET_LOCALE (this->locale);	776	SET_LOCALE (this->locale);
569	mbstate.reset ();	777	mbstate.reset ();
570	#endif	778	#endif
571		779
572	#if HAVE_NL_LANGINFO	780	#if HAVE_NL_LANGINFO
…		…
616	* Initialize the command connection.	824	* Initialize the command connection.
617	* This should be called after the X server connection is established.	825	* This should be called after the X server connection is established.
618	*/	826	*/
619		827
620	#ifdef META8_OPTION	828	#ifdef META8_OPTION
621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	829	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622	#endif	830	#endif
623		831
624	get_ourmods ();	832	get_ourmods ();
625		833
626	if (!OPTION (Opt_scrollTtyOutput))	834	if (!option (Opt_scrollTtyOutput))
627	priv_modes \|= PrivMode_TtyOutputInh;	835	priv_modes \|= PrivMode_TtyOutputInh;
628	if (OPTION (Opt_scrollTtyKeypress))	836	if (option (Opt_scrollTtyKeypress))
629	priv_modes \|= PrivMode_Keypress;	837	priv_modes \|= PrivMode_Keypress;
630	if (!OPTION (Opt_jumpScroll))	838	if (!option (Opt_jumpScroll))
631	priv_modes \|= PrivMode_smoothScroll;	839	priv_modes \|= PrivMode_smoothScroll;
632		840
633	#ifndef NO_BACKSPACE_KEY	841	#ifndef NO_BACKSPACE_KEY
634	if (strcmp (key_backspace, "DEC") == 0)	842	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635	priv_modes \|= PrivMode_HaveBackSpace;	843	priv_modes \|= PrivMode_HaveBackSpace;
636	#endif	844	#endif
637		845
638	/* add value for scrollBar */	846	/* add value for scrollBar */
639	if (scrollBar.state)	847	if (scrollBar.state)
…		…
652	int i;	860	int i;
653		861
654	#ifdef OFF_FOCUS_FADING	862	#ifdef OFF_FOCUS_FADING
655	pix_colors = pix_colors_focused;	863	pix_colors = pix_colors_focused;
656	#endif	864	#endif
657		865
658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	866	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659	{	867	{
660	const char *name = rs[Rs_color + i];	868	const char *name = rs[Rs_color + i];
661		869
662	if (!name)	870	if (!name)
…		…
665	rxvt_color xcol;	873	rxvt_color xcol;
666		874
667	if (!set_color (xcol, name))	875	if (!set_color (xcol, name))
668	{	876	{
669	#ifndef XTERM_REVERSE_VIDEO	877	#ifndef XTERM_REVERSE_VIDEO
670	if (i < 2 && OPTION (Opt_reverseVideo))	878	if (i < 2 && option (Opt_reverseVideo))
671	name = def_colorName [1 - i];	879	name = def_colorName [1 - i];
672	else	880	else
673	#endif	881	#endif
674	name = def_colorName [i];	882	name = def_colorName [i];
675		883
…		…
688	#ifndef NO_CURSORCOLOR	896	#ifndef NO_CURSORCOLOR
689	case Color_cursor2:	897	case Color_cursor2:
690	#endif	898	#endif
691	case Color_pointer_fg:	899	case Color_pointer_fg:
692	name = rs[Rs_color + Color_fg];	900	name = rs[Rs_color + Color_fg];
693	xcol = pix_colors[Color_fg];	901	xcol.set (this, name);
694	break;	902	break;
695	default:	903	default:
696	name = rs[Rs_color + Color_bg];	904	name = rs[Rs_color + Color_bg];
697	xcol = pix_colors[Color_bg];	905	xcol.set (this, name);
698	break;	906	break;
699	}	907	}
700	}	908	}
701	}	909	}
702		910
703	pix_colors[i] = xcol;	911	pix_colors[i] = xcol;
704	rs[Rs_color + i] = name;	912	rs[Rs_color + i] = name;
705	}	913	}
706		914
707	#ifdef OFF_FOCUS_FADING
708	if (rs[Rs_fade])
709	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
710	{
711	rgba c;
712	pix_colors[Color_fade].get (this, c);
713	pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
714	}
715	#endif
716
717	if (depth <= 2)	915	if (depth <= 2)
718	{	916	{
719	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	917	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
720	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	918	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
721	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	919	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
722	}	920	}
723		921
724	/*	922	/*
725	* get scrollBar shadow colors	923	* get scrollBar shadow colors
726	*	924	*
727	* The calculations of topShadow/bottomShadow values are adapted	925	* The calculations of topShadow/bottomShadow values are adapted
728	* from the fvwm window manager.	926	* from the fvwm window manager.
729	*/	927	*/
730	#ifdef KEEP_SCROLLCOLOR	928	#ifdef KEEP_SCROLLCOLOR
731
732	if (depth <= 2)	929	if (depth <= 2)
733	{	930	{
734	/* Monochrome */	931	/* Monochrome */
735	pix_colors[Color_scroll] = pix_colors[Color_fg];	932	alias_color (Color_scroll, Color_fg);
736	pix_colors[Color_topShadow] = pix_colors[Color_bg];	933	alias_color (Color_topShadow, Color_bg);
737	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	934	alias_color (Color_bottomShadow, Color_bg);
738	}	935	}
739	else	936	else
740	{	937	{
741	rxvt_color xcol[2];	938	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
742	/* xcol[0] == white
743	* xcol[1] == top shadow
744	* xcol[2] == bot shadow */
745		939
746	xcol[1] = pix_colors[Color_scroll];
747	xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
748
749	rgba c0, c1;	940	rgba cscroll;
750		941	pix_colors [Color_scroll].get (cscroll);
751	xcol[0].get (this, c0);
752	xcol[1].get (this, c1);
753
754	xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
755		942
756	/* topShadowColor */	943	/* topShadowColor */
757	if (!xcol[1].set (this,	944	if (!pix_colors[Color_topShadow].set (this,
758	rgba (	945	rgba (
759	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	946	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
760	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	947	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
761	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	948	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762	c1.a) // pa1 vs. pa0: arbitrary	949	cscroll.a)
763	));	950	))
764	xcol[1] = pix_colors[Color_White];	951	alias_color (Color_topShadow, Color_White);
765
766	pix_colors[Color_topShadow] = xcol[1];
767	}	952	}
768	#endif /* KEEP_SCROLLCOLOR */	953	#endif /* KEEP_SCROLLCOLOR */
		954
		955	#ifdef OFF_FOCUS_FADING
		956	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		957	update_fade_color (i);
		958	#endif
769	}	959	}
770		960
771	/----------------------------------------------------------------------/	961	/----------------------------------------------------------------------/
772	/* color aliases, fg/bg bright-bold */	962	/* color aliases, fg/bg bright-bold */
773	void	963	void
…		…
776	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	966	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777	{	967	{
778	int i = atoi (rs[Rs_color + idx]);	968	int i = atoi (rs[Rs_color + idx]);
779		969
780	if (i >= 8 && i <= 15)	970	if (i >= 8 && i <= 15)
781	{ /* bright colors */	971	/* bright colors */
782	i -= 8;
783	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	972	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784	return;	973	else if (i >= 0 && i <= 7)
785	}	974	/* normal colors */
786
787	if (i >= 0 && i <= 7) /* normal colors */
788	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	975	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789	}	976	}
790	}	977	}
791		978
792	/----------------------------------------------------------------------/	979	/----------------------------------------------------------------------/
…		…
812		999
813	if (rsmod	1000	if (rsmod
814	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	1001	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
815	requestedmeta = rsmod[3] - '0';	1002	requestedmeta = rsmod[3] - '0';
816		1003
817	map = XGetModifierMapping (xdisp);	1004	map = XGetModifierMapping (dpy);
818	kc = map->modifiermap;	1005	kc = map->modifiermap;
819		1006
820	for (i = 1; i < 6; i++)	1007	for (i = 1; i < 6; i++)
821	{	1008	{
822	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	1009	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
824	for (j = map->max_keypermod; j--; k++)	1011	for (j = map->max_keypermod; j--; k++)
825	{	1012	{
826	if (kc[k] == 0)	1013	if (kc[k] == 0)
827	break;	1014	break;
828		1015
829	switch (XKeycodeToKeysym (xdisp, kc[k], 0))	1016	switch (XKeycodeToKeysym (dpy, kc[k], 0))
830	{	1017	{
831	case XK_Num_Lock:	1018	case XK_Num_Lock:
832	ModNumLockMask = modmasks[i - 1];	1019	ModNumLockMask = modmasks[i - 1];
833	continue;	1020	continue;
834		1021
…		…
884	rxvt_term::create_windows (int argc, const char const argv)	1071	rxvt_term::create_windows (int argc, const char const argv)
885	{	1072	{
886	XClassHint classHint;	1073	XClassHint classHint;
887	XWMHints wmHint;	1074	XWMHints wmHint;
888	#if ENABLE_FRILLS	1075	#if ENABLE_FRILLS
889	MWMHints mwmhints;	1076	MWMHints mwmhints = { };
890	#endif	1077	#endif
891	XGCValues gcvalue;	1078	XGCValues gcvalue;
892	XSetWindowAttributes attributes;	1079	XSetWindowAttributes attributes;
893	Window top, parent;	1080	Window top, parent;
894		1081
895	dLocal (Display *, xdisp);	1082	dLocal (Display *, dpy);
896		1083
897	/* grab colors before netscape does */	1084	/* grab colors before netscape does */
898	Get_Colours ();	1085	Get_Colours ();
899		1086
900	if (!set_fonts ())	1087	if (!set_fonts ())
901	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1088	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902		1089
903	parent = display->root;	1090	parent = display->root;
904		1091
905	attributes.override_redirect = !!OPTION (Opt_override_redirect);	1092	attributes.override_redirect = !!option (Opt_override_redirect);
906		1093
907	#if ENABLE_FRILLS	1094	#if ENABLE_FRILLS
908	if (OPTION (Opt_borderLess))	1095	if (option (Opt_borderLess))
909	{	1096	{
910	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)	1097	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911	{	1098	{
912	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1099	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913	attributes.override_redirect = true;	1100	attributes.override_redirect = true;
914	mwmhints.flags = 0;
915	}	1101	}
916	else	1102	else
917	{	1103	{
918	mwmhints.flags = MWM_HINTS_DECORATIONS;	1104	mwmhints.flags = MWM_HINTS_DECORATIONS;
919	mwmhints.decorations = 0;
920	}	1105	}
921	}	1106	}
922	else
923	mwmhints.flags = 0;
924	#endif	1107	#endif
925		1108
926	#if ENABLE_XEMBED	1109	#if ENABLE_XEMBED
927	if (rs[Rs_embed])	1110	if (rs[Rs_embed])
928	{	1111	{
929	XWindowAttributes wattr;	1112	XWindowAttributes wattr;
930		1113
931	parent = strtol (rs[Rs_embed], 0, 0);	1114	parent = strtol (rs[Rs_embed], 0, 0);
932		1115
933	if (!XGetWindowAttributes (xdisp, parent, &wattr))	1116	if (!XGetWindowAttributes (dpy, parent, &wattr))
934	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	1117	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
935		1118
936	window_calc (wattr.width, wattr.height);	1119	window_calc (wattr.width, wattr.height);
937	}	1120	}
938	#endif	1121	#endif
…		…
942	/* sub-window placement & size in rxvt_resize_subwindows () */	1125	/* sub-window placement & size in rxvt_resize_subwindows () */
943	attributes.background_pixel = pix_colors_focused [Color_border];	1126	attributes.background_pixel = pix_colors_focused [Color_border];
944	attributes.border_pixel = pix_colors_focused [Color_border];	1127	attributes.border_pixel = pix_colors_focused [Color_border];
945	attributes.colormap = cmap;	1128	attributes.colormap = cmap;
946		1129
947	top = XCreateWindow (xdisp, parent,	1130	top = XCreateWindow (dpy, parent,
948	szHint.x, szHint.y,	1131	szHint.x, szHint.y,
949	szHint.width, szHint.height,	1132	szHint.width, szHint.height,
950	ext_bwidth,	1133	ext_bwidth,
951	depth, InputOutput, visual,	1134	depth, InputOutput, visual,
952	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1135	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
…		…
963	classHint.res_name = (char *)rs[Rs_name];	1146	classHint.res_name = (char *)rs[Rs_name];
964	classHint.res_class = (char *)RESCLASS;	1147	classHint.res_class = (char *)RESCLASS;
965		1148
966	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1149	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
967	wmHint.input = True;	1150	wmHint.input = True;
968	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1151	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
969	wmHint.window_group = top;	1152	wmHint.window_group = top;
970		1153
971	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,	1154	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972	&szHint, &wmHint, &classHint);	1155	&szHint, &wmHint, &classHint);
973		1156
974	#if ENABLE_FRILLS	1157	#if ENABLE_FRILLS
975	if (mwmhints.flags)	1158	if (mwmhints.flags)
976	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1159	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1160	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
978	#endif	1161	#endif
979		1162
980	Atom protocols[] = {	1163	Atom protocols[] = {
981	xa[XA_WM_DELETE_WINDOW],	1164	xa[XA_WM_DELETE_WINDOW],
982	#if ENABLE_EWMH	1165	#if ENABLE_EWMH
983	xa[XA_NET_WM_PING],	1166	xa[XA_NET_WM_PING],
984	#endif	1167	#endif
985	};	1168	};
986		1169
987	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1170	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
988		1171
989	#if ENABLE_FRILLS	1172	#if ENABLE_FRILLS
990	if (rs[Rs_transient_for])	1173	if (rs[Rs_transient_for])
991	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1174	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992	#endif	1175	#endif
993		1176
994	#if ENABLE_EWMH	1177	#if ENABLE_EWMH
995	long pid = getpid ();	1178	long pid = getpid ();
996		1179
997	XChangeProperty (xdisp, top,	1180	XChangeProperty (dpy, top,
998	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1181	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
999	PropModeReplace, (unsigned char *)&pid, 1);	1182	PropModeReplace, (unsigned char *)&pid, 1);
1000		1183
1001	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1184	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1002	#endif	1185	#endif
1003		1186
1004	XSelectInput (xdisp, top,	1187	XSelectInput (dpy, top,
1005	KeyPressMask	1188	KeyPressMask
1006	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1189	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1007	\| KeyReleaseMask	1190	\| KeyReleaseMask
1008	#endif	1191	#endif
1009	\| FocusChangeMask \| VisibilityChangeMask	1192	\| FocusChangeMask \| VisibilityChangeMask
1010	\| ExposureMask \| StructureNotifyMask);	1193	\| ExposureMask \| StructureNotifyMask);
1011		1194
1012	termwin_ev.start (display, top);	1195	termwin_ev.start (display, top);
1013		1196
1014	/* vt cursor: Black-on-White is standard, but this is more popular */	1197	/* vt cursor: Black-on-White is standard, but this is more popular */
1015	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);	1198	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016
1017	#ifdef HAVE_SCROLLBARS
1018	/* cursor scrollBar: Black-on-White */
1019	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1020	#endif
1021		1199
1022	/* the vt window */	1200	/* the vt window */
1023	vt = XCreateSimpleWindow (xdisp, top,	1201	vt = XCreateSimpleWindow (dpy, top,
1024	window_vt_x, window_vt_y,	1202	window_vt_x, window_vt_y,
1025	width, height,	1203	width, height,
1026	0,	1204	0,
1027	pix_colors_focused[Color_fg],	1205	pix_colors_focused[Color_fg],
1028	pix_colors_focused[Color_bg]);	1206	pix_colors_focused[Color_bg]);
1029		1207
1030	attributes.bit_gravity = NorthWestGravity;	1208	attributes.bit_gravity = NorthWestGravity;
1031	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);	1209	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1032		1210
1033	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1211	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1034		1212
1035	if (OPTION (Opt_pointerBlank))	1213	if (option (Opt_pointerBlank))
1036	vt_emask \|= PointerMotionMask;	1214	vt_emask \|= PointerMotionMask;
1037	else	1215	else
1038	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1216	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1039		1217
1040	vt_select_input ();	1218	vt_select_input ();
1041		1219
1042	vt_ev.start (display, vt);	1220	vt_ev.start (display, vt);
1043		1221
1044	#ifdef XPM_BACKGROUND
1045	if (rs[Rs_backgroundPixmap] != NULL
1046	&& !OPTION (Opt_transparent))
1047	{
1048	const char *p = rs[Rs_backgroundPixmap];
1049
1050	if ((p = strchr (p, ';')) != NULL)
1051	{
1052	p++;
1053	scale_pixmap (p);
1054	}
1055
1056	set_bgPixmap (rs[Rs_backgroundPixmap]);
1057	scr_touch (true);
1058	}
1059	#endif
1060
1061	/* graphics context for the vt window */	1222	/* graphics context for the vt window */
1062	gcvalue.foreground = pix_colors[Color_fg];	1223	gcvalue.foreground = pix_colors[Color_fg];
1063	gcvalue.background = pix_colors[Color_bg];	1224	gcvalue.background = pix_colors[Color_bg];
1064	gcvalue.graphics_exposures = 1;	1225	gcvalue.graphics_exposures = 0;
1065		1226
1066	gc = XCreateGC (xdisp, vt,	1227	gc = XCreateGC (dpy, vt,
1067	GCForeground \| GCBackground \| GCGraphicsExposures,	1228	GCForeground \| GCBackground \| GCGraphicsExposures,
1068	&gcvalue);	1229	&gcvalue);
1069		1230
1070	drawable = new rxvt_drawable (this, vt);	1231	drawable = new rxvt_drawable (this, vt);
1071
1072	#ifdef RXVT_SCROLLBAR
1073	gcvalue.foreground = pix_colors[Color_topShadow];
1074	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1075	gcvalue.foreground = pix_colors[Color_bottomShadow];
1076	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1077	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1078	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1079	#endif
1080		1232
1081	#ifdef OFF_FOCUS_FADING	1233	#ifdef OFF_FOCUS_FADING
1082	// initially we are in unfocused state	1234	// initially we are in unfocused state
1083	if (rs[Rs_fade])	1235	if (rs[Rs_fade])
1084	pix_colors = pix_colors_unfocused;	1236	pix_colors = pix_colors_unfocused;
…		…
1090		1242
1091	/* ------------------------------------------------------------------------- *	1243	/* ------------------------------------------------------------------------- *
1092	* GET TTY CURRENT STATE *	1244	* GET TTY CURRENT STATE *
1093	* ------------------------------------------------------------------------- */	1245	* ------------------------------------------------------------------------- */
1094	void	1246	void
1095	rxvt_get_ttymode (ttymode_t *tio, int erase)	1247	rxvt_get_ttymode (struct termios *tio, int erase)
1096	{	1248	{
1097	#ifdef HAVE_TERMIOS_H
1098	/*	1249	/*
1099	* standard System V termios interface	1250	* standard System V termios interface
1100	*/	1251	*/
1101	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1252	if (tcgetattr (STDIN_FILENO, tio) < 0)
1102	{	1253	{
1103	// return error - use system defaults,	1254	// return error - use system defaults,
1104	// where possible, and zero elsewhere	1255	// where possible, and zero elsewhere
1105	memset (tio, 0, sizeof (ttymode_t));	1256	memset (tio, 0, sizeof (struct termios));
1106		1257
1107	tio->c_cc[VINTR] = CINTR;	1258	tio->c_cc[VINTR] = CINTR;
1108	tio->c_cc[VQUIT] = CQUIT;	1259	tio->c_cc[VQUIT] = CQUIT;
1109	tio->c_cc[VERASE] = CERASE;	1260	tio->c_cc[VERASE] = CERASE;
1110	#ifdef VERASE2	1261	#ifdef VERASE2
…		…
1169	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1320	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1170	# if defined (ECHOCTL) && defined (ECHOKE)	1321	# if defined (ECHOCTL) && defined (ECHOKE)
1171	\| ECHOCTL \| ECHOKE	1322	\| ECHOCTL \| ECHOKE
1172	# endif	1323	# endif
1173	\| ECHOE \| ECHOK);	1324	\| ECHOE \| ECHOK);
1174	# else /* HAVE_TERMIOS_H */
1175
1176	/*
1177	* sgtty interface
1178	*/
1179
1180	/* get parameters -- gtty */
1181	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1182	{
1183	tio->sg.sg_erase = CERASE; /* ^H */
1184	tio->sg.sg_kill = CKILL; /* ^U */
1185	}
1186
1187	if (erase != -1)
1188	tio->sg.sg_erase = (char)erase;
1189
1190	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1191
1192	/* get special characters */
1193	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1194	{
1195	tio->tc.t_intrc = CINTR; /* ^C */
1196	tio->tc.t_quitc = CQUIT; /* ^\ */
1197	tio->tc.t_startc = CSTART; /* ^Q */
1198	tio->tc.t_stopc = CSTOP; /* ^S */
1199	tio->tc.t_eofc = CEOF; /* ^D */
1200	tio->tc.t_brkc = -1;
1201	}
1202
1203	/* get local special chars */
1204	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1205	{
1206	tio->lc.t_suspc = CSUSP; /* ^Z */
1207	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1208	tio->lc.t_rprntc = CRPRNT; /* ^R */
1209	tio->lc.t_flushc = CFLUSH; /* ^O */
1210	tio->lc.t_werasc = CWERASE; /* ^W */
1211	tio->lc.t_lnextc = CLNEXT; /* ^V */
1212	}
1213	/* get line discipline */
1214	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1215	# ifdef NTTYDISC
1216	tio->line = NTTYDISC;
1217	# endif /* NTTYDISC */
1218
1219	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1220	#endif /* HAVE_TERMIOS_H */
1221		1325
1222	/*	1326	/*
1223	* Debugging	1327	* Debugging
1224	*/	1328	*/
1225	#ifdef DEBUG_TTYMODE	1329	#ifdef DEBUG_TTYMODE
1226	#ifdef HAVE_TERMIOS_H
1227	/* c_iflag bits */	1330	/* c_iflag bits */
1228	fprintf (stderr, "Input flags\n");	1331	fprintf (stderr, "Input flags\n");
1229		1332
1230	/* cpp token stringize doesn't work on all machines <sigh> */	1333	/* cpp token stringize doesn't work on all machines <sigh> */
1231	# define FOO(flag,name) \	1334	# define FOO(flag,name) \
…		…
1294	FOO (VLNEXT, "VLNEXT");	1397	FOO (VLNEXT, "VLNEXT");
1295	# endif	1398	# endif
1296		1399
1297	fprintf (stderr, "\n");	1400	fprintf (stderr, "\n");
1298	# undef FOO	1401	# undef FOO
1299	# endif /* HAVE_TERMIOS_H */	1402	#endif /* DEBUG_TTYMODE */
1300	#endif /* DEBUG_TTYMODE */
1301	}	1403	}
1302		1404
1303	/----------------------------------------------------------------------/	1405	/----------------------------------------------------------------------/
1304	/*	1406	/*
1305	* Run the command in a subprocess and return a file descriptor for the	1407	* Run the command in a subprocess and return a file descriptor for the
…		…
1326	else	1428	else
1327	#endif	1429	#endif
1328	if (!pty->get ())	1430	if (!pty->get ())
1329	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1431	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1330		1432
		1433	int er;
		1434
		1435	#ifndef NO_BACKSPACE_KEY
		1436	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
		1437	er = rs[Rs_backspace_key][0];
		1438	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
		1439	er = '\177'; /* the initial state anyway */
		1440	else
		1441	#endif
		1442	er = -1;
		1443
		1444	rxvt_get_ttymode (&tio, er);
		1445	/* init terminal attributes */
		1446	cfsetospeed (&tio, BAUDRATE);
		1447	cfsetispeed (&tio, BAUDRATE);
		1448	tcsetattr (pty->tty, TCSANOW, &tio);
1331	pty->set_utf8_mode (enc_utf8);	1449	pty->set_utf8_mode (enc_utf8);
1332		1450
1333	/* set initial window size */	1451	/* set initial window size */
1334	tt_winch ();	1452	tt_winch ();
1335
1336	int er;
1337
1338	#ifndef NO_BACKSPACE_KEY
1339	if (key_backspace[0] && !key_backspace[1])
1340	er = key_backspace[0];
1341	else if (strcmp (key_backspace, "DEC") == 0)
1342	er = '\177'; /* the initial state anyway */
1343	else
1344	#endif
1345	er = -1;
1346
1347	rxvt_get_ttymode (&tio, er);
1348		1453
1349	#if ENABLE_FRILLS	1454	#if ENABLE_FRILLS
1350	if (rs[Rs_pty_fd])	1455	if (rs[Rs_pty_fd])
1351	return;	1456	return;
1352	#endif	1457	#endif
…		…
1383	}	1488	}
1384		1489
1385	_exit (EXIT_FAILURE);	1490	_exit (EXIT_FAILURE);
1386		1491
1387	default:	1492	default:
1388	if (!OPTION (Opt_utmpInhibit))	1493	if (!option (Opt_utmpInhibit))
1389	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1494	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1390		1495
1391	pty->close_tty ();	1496	pty->close_tty ();
1392		1497
1393	child_ev.start (cmd_pid);	1498	child_ev.start (cmd_pid);
1394		1499
…		…
1407	int	1512	int
1408	rxvt_term::run_child (const char const argv)	1513	rxvt_term::run_child (const char const argv)
1409	{	1514	{
1410	char *login;	1515	char *login;
1411		1516
1412	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1413
1414	if (OPTION (Opt_console))	1517	if (option (Opt_console))
		1518	{
1415	{ /* be virtual console, fail silently */	1519	/* be virtual console, fail silently */
1416	#ifdef TIOCCONS	1520	#ifdef TIOCCONS
1417	unsigned int on = 1;	1521	unsigned int on = 1;
1418		1522
1419	ioctl (STDIN_FILENO, TIOCCONS, &on);	1523	ioctl (STDIN_FILENO, TIOCCONS, &on);
1420	#elif defined (SRIOCSREDIR)	1524	#elif defined (SRIOCSREDIR)
…		…
1422		1526
1423	fd = open (CONSOLE, O_WRONLY, 0);	1527	fd = open (CONSOLE, O_WRONLY, 0);
1424	if (fd >= 0)	1528	if (fd >= 0)
1425	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1529	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1426	close (fd);	1530	close (fd);
1427	#endif /* SRIOCSREDIR */	1531	#endif /* SRIOCSREDIR */
1428	}	1532	}
1429		1533
1430	/* reset signals and spin off the command interpreter */	1534	/* reset signals and spin off the command interpreter */
1431	signal (SIGINT, SIG_DFL);	1535	signal (SIGINT, SIG_DFL);
1432	signal (SIGQUIT, SIG_DFL);	1536	signal (SIGQUIT, SIG_DFL);
…		…
1439	*/	1543	*/
1440	#ifdef SIGTSTP	1544	#ifdef SIGTSTP
1441	signal (SIGTSTP, SIG_IGN);	1545	signal (SIGTSTP, SIG_IGN);
1442	signal (SIGTTIN, SIG_IGN);	1546	signal (SIGTTIN, SIG_IGN);
1443	signal (SIGTTOU, SIG_IGN);	1547	signal (SIGTTOU, SIG_IGN);
1444	#endif /* SIGTSTP */	1548	#endif /* SIGTSTP */
1445		1549
1446	// unblock signals (signals are blocked by iom.C	1550	// unblock signals (signals are blocked by iom.C
1447	sigset_t ss;	1551	sigset_t ss;
1448	sigemptyset (&ss);	1552	sigemptyset (&ss);
1449	sigprocmask (SIG_SETMASK, &ss, 0);	1553	sigprocmask (SIG_SETMASK, &ss, 0);
1450		1554
1451	/* command interpreter path */	1555	/* command interpreter path */
1452	if (argv != NULL)	1556	if (argv)
1453	{	1557	{
1454	# ifdef DEBUG_CMD	1558	# ifdef DEBUG_CMD
1455	int i;	1559	int i;
1456		1560
1457	for (i = 0; argv[i]; i++)	1561	for (i = 0; argv[i]; i++)
…		…
1466	const char argv0, shell;	1570	const char argv0, shell;
1467		1571
1468	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1572	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1469	shell = "/bin/sh";	1573	shell = "/bin/sh";
1470		1574
1471	argv0 = (const char *)rxvt_r_basename (shell);	1575	argv0 = (const char *)rxvt_basename (shell);
1472		1576
1473	if (OPTION (Opt_loginShell))	1577	if (option (Opt_loginShell))
1474	{	1578	{
1475	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1579	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1476		1580
1477	login[0] = '-';	1581	login[0] = '-';
1478	strcpy (&login[1], argv0);	1582	strcpy (&login[1], argv0);
1479	argv0 = login;	1583	argv0 = login;
1480	}	1584	}
1481		1585
1482	execlp (shell, argv0, NULL);	1586	execlp (shell, argv0, (char *)0);
1483	/* no error message: STDERR is closed! */	1587	/* no error message: STDERR is closed! */
1484	}	1588	}
1485		1589
1486	return -1;	1590	return -1;
1487	}	1591	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs. Revision 1.240 by ayin, Sat Jan 19 13:05:55 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.240 by ayin, Sat Jan 19 13:05:55 2008 UTC