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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.184 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.246 by ayin, Sun Jan 27 22:48:33 2008 UTC

…		…
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
		10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
		11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
		12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	14	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support
14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-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,
…		…
50	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: yellow (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
168	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
169	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	275	#endif
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	want_refresh = 1;	291	want_refresh = 1;
195	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
…		…
197	nrow = 24;	294	nrow = 24;
198	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
199	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
200	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
201	saveLines = SAVELINES;	298	saveLines = SAVELINES;
202	numpix_colors = TOTAL_COLORS;
203		299
204	refresh_limit = 1;
205	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
206		301
207	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
208	#ifdef XPM_BACKGROUND
209	/* bgPixmap.w = bgPixmap.h = 0; */
210	bgPixmap.x = bgPixmap.y = 0;
211	bgPixmap.pixmap = None;
212	#endif
213
214	last_bot = last_state = -1;
215		303
216	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
217	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
218	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
		307	set_option (Opt_skipScroll);
219	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
220	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
221	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
222	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
223		312	set_option (Opt_iso14755_52);
224	return true;	313	set_option (Opt_buffered);
225	}	314	}
226		315
227	void	316	static void
228	rxvt_term::init_secondary ()	317	init_secondary ()
229	{	318	{
230	int i;	319	int i;
231		320
232	/*
233	* Close all unused file descriptors
234	* We don't want them, we don't need them.
235	*/
236	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
237	{	322	{
238	/* TODO: BOO HISS */
239	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
240	}	324	}
241	else if (i > STDIN_FILENO)	325	else if (i != STDIN_FILENO)
242	{	326	{
243	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
244	close (i);	328	close (i);
245	}	329	}
246		330
247	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
248
249	#if 0 // schmorp sayz closing filies is murder
250	for (i = STDERR_FILENO + 1; i < num_fds; i++)
251	{
252	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
253	if (i == 4 \|\| i == 7)
254	continue;
255	#endif
256	close (i);
257	}
258	#endif
259	}	332	}
260		333
261	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
262	const char **	335	const char **
263	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
264	{	337	{
265	int i, r_argc;	338	int i, r_argc;
266	char *val;
267	const char cmd_argv, r_argv;	339	const char cmd_argv, r_argv;
268		340
269	/*	341	/*
270	* Look for -e option. Find => split and make cmd_argv[] of command args	342	* Look for -e option. Find => split and make cmd_argv[] of command args
271	*/	343	*/
272	for (r_argc = 0; r_argc < argc; r_argc++)	344	for (r_argc = 0; r_argc < argc; r_argc++)
273	if (!strcmp (argv[r_argc], "-e"))	345	if (!strcmp (argv[r_argc], "-e"))
274	break;	346	break;
275		347
		348	if (r_argc == argc)
		349	cmd_argv = NULL;
		350	else if (!argv[r_argc + 1])
		351	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		352	else
		353	{
		354	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		355
		356	for (i = 0; i < argc - r_argc - 1; i++)
		357	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		358
		359	cmd_argv[i] = NULL;
		360	}
		361
276	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	362	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
277		363
278	for (i = 0; i < r_argc; i++)	364	for (i = 0; i < r_argc; i++)
279	r_argv[i] = (const char *)argv[i];	365	r_argv[i] = (const char *)argv[i];
280		366
281	r_argv[i] = NULL;	367	r_argv[i] = NULL;
282		368
283	if (r_argc == argc)
284	cmd_argv = NULL;
285	else
286	{
287	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
288
289	for (i = 0; i < argc - r_argc - 1; i++)
290	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292	cmd_argv[i] = NULL;
293	}
294
295	rs[Rs_name] = rxvt_r_basename (argv[0]);	369	rs[Rs_name] = rxvt_basename (argv[0]);
296		370
297	/*	371	/*
298	* Open display, get options/resources and create the window	372	* Open display, get options/resources and create the window
299	*/	373	*/
300		374
…		…
302	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
303		377
304	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
305		379
306	if (!(display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
307	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	383	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		384	}
308		385
309	// using a local pointer decreases code size a lot	386	// using a local pointer decreases code size a lot
310	xa = display->xa;	387	xa = display->xa;
311		388
312	set (display);	389	set (display);
…		…
315	#if XFT	392	#if XFT
316	if (rs[Rs_depth])	393	if (rs[Rs_depth])
317	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
318	#endif	395	#endif
319		396
		397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
		400	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		401	#endif
320	free (r_argv);	402	free (r_argv);
321		403
322	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
323	if (rs [i] == resval_undef)	405	if (rs [i] == resval_undef)
324	rs [i] = 0;	406	rs [i] = 0;
…		…
340	* set any defaults not already set	422	* set any defaults not already set
341	*/	423	*/
342	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
343	{	425	{
344	if (!rs[Rs_title])	426	if (!rs[Rs_title])
345	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346	if (!rs[Rs_iconName])	428	if (!rs[Rs_iconName])
347	rs[Rs_iconName] = rs[Rs_title];	429	rs[Rs_iconName] = rs[Rs_title];
348	}	430	}
349	else	431	else
350	{	432	{
…		…
388	rs[Rs_cutchars] = CUTCHARS;	470	rs[Rs_cutchars] = CUTCHARS;
389		471
390	#ifndef NO_BACKSPACE_KEY	472	#ifndef NO_BACKSPACE_KEY
391	if (!rs[Rs_backspace_key])	473	if (!rs[Rs_backspace_key])
392	# ifdef DEFAULT_BACKSPACE	474	# ifdef DEFAULT_BACKSPACE
393	key_backspace = DEFAULT_BACKSPACE;	475	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394	# else	476	# else
395	key_backspace = "DEC"; /* can toggle between \010 or \177 */	477	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396	# endif	478	# endif
397	else
398	{
399	val = strdup (rs[Rs_backspace_key]);
400	rxvt_Str_trim (val);
401	rxvt_Str_escaped (val);
402	key_backspace = val;
403	}
404	#endif	479	#endif
405		480
406	#ifndef NO_DELETE_KEY	481	#ifndef NO_DELETE_KEY
407	if (!rs[Rs_delete_key])	482	if (!rs[Rs_delete_key])
408	# ifdef DEFAULT_DELETE	483	# ifdef DEFAULT_DELETE
409	key_delete = DEFAULT_DELETE;	484	rs[Rs_delete_key] = DEFAULT_DELETE;
410	# else	485	# else
411	key_delete = "\033[3~";	486	rs[Rs_delete_key] = "\033[3~";
412	# endif
413	else
414	{
415	val = strdup (rs[Rs_delete_key]);
416	rxvt_Str_trim (val);
417	rxvt_Str_escaped (val);
418	key_delete = val;
419	}
420	#endif	487	# endif
421	if (rs[Rs_answerbackstring])	488	#endif
422	{
423	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425	}
426		489
427	#ifdef HAVE_SCROLLBARS
428	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]);
429	#endif
430		491
431	#ifdef XTERM_REVERSE_VIDEO	492	#ifdef XTERM_REVERSE_VIDEO
432	/* this is how xterm implements reverseVideo */	493	/* this is how xterm implements reverseVideo */
433	if (option (Opt_reverseVideo))	494	if (option (Opt_reverseVideo))
434	{	495	{
…		…
454	color_aliases (Color_fg);	515	color_aliases (Color_fg);
455	color_aliases (Color_bg);	516	color_aliases (Color_bg);
456	#ifndef NO_CURSORCOLOR	517	#ifndef NO_CURSORCOLOR
457	color_aliases (Color_cursor);	518	color_aliases (Color_cursor);
458	color_aliases (Color_cursor2);	519	color_aliases (Color_cursor2);
459	#endif /* NO_CURSORCOLOR */	520	#endif /* NO_CURSORCOLOR */
460	color_aliases (Color_pointer_fg);	521	color_aliases (Color_pointer_fg);
461	color_aliases (Color_pointer_bg);	522	color_aliases (Color_pointer_bg);
462	color_aliases (Color_border);	523	color_aliases (Color_border);
463	#ifndef NO_BOLD_UNDERLINE_REVERSE	524	#ifndef NO_BOLD_UNDERLINE_REVERSE
464	color_aliases (Color_BD);	525	color_aliases (Color_BD);
465	color_aliases (Color_UL);	526	color_aliases (Color_UL);
466	color_aliases (Color_RV);	527	color_aliases (Color_RV);
467	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	528	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468		529
469	if (!rs[Rs_color + Color_border])	530	if (!rs[Rs_color + Color_border])
470	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	531	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471		532
472	return cmd_argv;	533	return cmd_argv;
		534	}
		535
		536	/----------------------------------------------------------------------/
		537	void
		538	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		539	{
		540	this->envv = envv;
		541
		542	SET_R (this);
		543	set_locale ("");
		544	set_environ (envv); // few things in X do not call setlocale :(
		545
		546	init_vars ();
		547
		548	init_secondary ();
		549
		550	const char **cmd_argv = init_resources (argc, argv);
		551
		552	#ifdef KEYSYM_RESOURCE
		553	keyboard->register_done ();
		554	#endif
		555
		556	if (option (Opt_scrollBar))
		557	scrollBar.setIdle (); /* set existence for size calculations */
		558
		559	pty = ptytty::create ();
		560
		561	create_windows (argc, argv);
		562
		563	init_xlocale ();
		564
		565	scr_reset (); // initialize screen
		566
		567	#if 0
		568	XSynchronize (dpy, True);
		569	#endif
		570
		571	if (option (Opt_scrollBar))
		572	resize_scrollbar (); /* create and map scrollbar */
		573	#ifdef HAVE_BG_PIXMAP
		574	{
		575	bgPixmap.set_target (this);
		576	bgPixmap.invalidate ();
		577
		578	#ifdef ENABLE_TRANSPARENCY
		579	if (option (Opt_transparent))
		580	{
		581	bgPixmap.set_transparent ();
		582
		583	#ifdef HAVE_AFTERIMAGE
		584	if (rs [Rs_blurradius])
		585	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		586	#endif
		587	if (ISSET_PIXCOLOR (Color_tint))
		588	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		589
		590	if (rs [Rs_shade])
		591	bgPixmap.set_shade (rs [Rs_shade]);
		592
		593	bgPixmap.set_root_pixmap ();
		594	XSelectInput (dpy, display->root, PropertyChangeMask);
		595	rootwin_ev.start (display, display->root);
		596	}
		597	#endif
		598
		599	#ifdef BG_IMAGE_FROM_FILE
		600	if (rs[Rs_backgroundPixmap])
		601	{
		602	const char *p = rs[Rs_backgroundPixmap];
		603
		604	if ((p = strchr (p, ';')) != 0)
		605	{
		606	p++;
		607	bgPixmap.set_geometry (p);
		608	}
		609	else
		610	bgPixmap.set_defaultGeometry ();
		611
		612	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		613	if (!bgPixmap.window_position_sensitive ())
		614	update_background ();
		615	}
		616	#endif
		617	}
		618	#endif
		619
		620	#if ENABLE_PERL
		621	rootwin_ev.start (display, display->root);
		622	#endif
		623
		624	set_colorfgbg ();
		625
		626	init_command (cmd_argv);
		627
		628	free (cmd_argv);
		629
		630	if (pty->pty >= 0)
		631	pty_ev.start (pty->pty, ev::READ);
		632
		633	HOOK_INVOKE ((this, HOOK_START, DT_END));
		634
		635	#if ENABLE_XEMBED
		636	if (rs[Rs_embed])
		637	{
		638	long info[2] = { 0, XEMBED_MAPPED };
		639
		640	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		641	32, PropModeReplace, (unsigned char *)&info, 2);
		642	}
		643	#endif
		644
		645	XMapWindow (dpy, vt);
		646	XMapWindow (dpy, parent[0]);
		647
		648	refresh_check ();
473	}	649	}
474		650
475	/----------------------------------------------------------------------/	651	/----------------------------------------------------------------------/
476	void	652	void
477	rxvt_term::init_env ()	653	rxvt_term::init_env ()
478	{	654	{
479	int i;	655	int i;
480	unsigned int u;
481	char *val;	656	char *val;
482		657
483	#ifdef DISPLAY_IS_IP	658	#ifdef DISPLAY_IS_IP
484	/* Fixup display_name for export over pty to any interested terminal	659	/* Fixup display_name for export over pty to any interested terminal
485	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	660	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
493	*/	668	*/
494	val = rxvt_network_display (rs[Rs_display_name]);	669	val = rxvt_network_display (rs[Rs_display_name]);
495	rs[Rs_display_name] = (const char *)val;	670	rs[Rs_display_name] = (const char *)val;
496		671
497	if (val == NULL)	672	if (val == NULL)
498	#endif /* DISPLAY_IS_IP */	673	#endif /* DISPLAY_IS_IP */
499	val = XDisplayString (dpy);	674	val = XDisplayString (dpy);
500		675
501	if (rs[Rs_display_name] == NULL)	676	if (rs[Rs_display_name] == NULL)
502	rs[Rs_display_name] = val; /* use broken `:0' value */	677	rs[Rs_display_name] = val; /* use broken `:0' value */
503		678
504	i = strlen (val);	679	i = strlen (val);
505	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	680	env_display = (char *)rxvt_malloc (i + 9);
506		681
507	sprintf (env_display, "DISPLAY=%s", val);	682	sprintf (env_display, "DISPLAY=%s", val);
508		683
509	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	684	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510		685
…		…
531	else	706	else
532	putenv ("COLORTERM=" COLORTERMENVFULL);	707	putenv ("COLORTERM=" COLORTERMENVFULL);
533		708
534	if (rs[Rs_term_name] != NULL)	709	if (rs[Rs_term_name] != NULL)
535	{	710	{
536	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	711	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	712	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538	putenv (env_term);	713	putenv (env_term);
539	}	714	}
540	else	715	else
541	putenv ("TERM=" TERMENV);	716	putenv ("TERM=" TERMENV);
…		…
543	#ifdef HAVE_UNSETENV	718	#ifdef HAVE_UNSETENV
544	/* avoid passing old settings and confusing term size */	719	/* avoid passing old settings and confusing term size */
545	unsetenv ("LINES");	720	unsetenv ("LINES");
546	unsetenv ("COLUMNS");	721	unsetenv ("COLUMNS");
547	unsetenv ("TERMCAP"); /* terminfo should be okay */	722	unsetenv ("TERMCAP"); /* terminfo should be okay */
548	#endif /* HAVE_UNSETENV */	723	#endif /* HAVE_UNSETENV */
549	}	724	}
550		725
551	/----------------------------------------------------------------------/	726	/----------------------------------------------------------------------/
552	/*	727	/*
553	* This is more or less stolen straight from XFree86 xterm.	728	* This is more or less stolen straight from XFree86 xterm.
…		…
574		749
575	this->locale = "C";	750	this->locale = "C";
576	}	751	}
577		752
578		753
579	this->locale = rxvt_strdup (this->locale);	754	this->locale = strdup (this->locale);
580	SET_LOCALE (this->locale);	755	SET_LOCALE (this->locale);
581	mbstate.reset ();	756	mbstate.reset ();
582	#endif	757	#endif
583		758
584	#if HAVE_NL_LANGINFO	759	#if HAVE_NL_LANGINFO
…		…
641	priv_modes \|= PrivMode_Keypress;	816	priv_modes \|= PrivMode_Keypress;
642	if (!option (Opt_jumpScroll))	817	if (!option (Opt_jumpScroll))
643	priv_modes \|= PrivMode_smoothScroll;	818	priv_modes \|= PrivMode_smoothScroll;
644		819
645	#ifndef NO_BACKSPACE_KEY	820	#ifndef NO_BACKSPACE_KEY
646	if (strcmp (key_backspace, "DEC") == 0)	821	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647	priv_modes \|= PrivMode_HaveBackSpace;	822	priv_modes \|= PrivMode_HaveBackSpace;
648	#endif	823	#endif
649		824
650	/* add value for scrollBar */	825	/* add value for scrollBar */
651	if (scrollBar.state)	826	if (scrollBar.state)
…		…
664	int i;	839	int i;
665		840
666	#ifdef OFF_FOCUS_FADING	841	#ifdef OFF_FOCUS_FADING
667	pix_colors = pix_colors_focused;	842	pix_colors = pix_colors_focused;
668	#endif	843	#endif
669		844
670	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	845	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671	{	846	{
672	const char *name = rs[Rs_color + i];	847	const char *name = rs[Rs_color + i];
673		848
674	if (!name)	849	if (!name)
…		…
727	* get scrollBar shadow colors	902	* get scrollBar shadow colors
728	*	903	*
729	* The calculations of topShadow/bottomShadow values are adapted	904	* The calculations of topShadow/bottomShadow values are adapted
730	* from the fvwm window manager.	905	* from the fvwm window manager.
731	*/	906	*/
732	#ifdef KEEP_SCROLLCOLOR	907	#ifdef RXVT_SCROLLBAR
733	if (depth <= 2)	908	if (depth <= 2)
734	{	909	{
735	/* Monochrome */	910	/* Monochrome */
736	alias_color (Color_scroll, Color_fg);	911	alias_color (Color_scroll, Color_fg);
737	alias_color (Color_topShadow, Color_bg);	912	alias_color (Color_topShadow, Color_bg);
…		…
752	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	927	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753	cscroll.a)	928	cscroll.a)
754	))	929	))
755	alias_color (Color_topShadow, Color_White);	930	alias_color (Color_topShadow, Color_White);
756	}	931	}
757	#endif /* KEEP_SCROLLCOLOR */	932	#endif
758		933
759	#ifdef OFF_FOCUS_FADING	934	#ifdef OFF_FOCUS_FADING
760	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	935	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761	update_fade_color (i);	936	update_fade_color (i);
762	#endif	937	#endif
…		…
770	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	945	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771	{	946	{
772	int i = atoi (rs[Rs_color + idx]);	947	int i = atoi (rs[Rs_color + idx]);
773		948
774	if (i >= 8 && i <= 15)	949	if (i >= 8 && i <= 15)
775	{ /* bright colors */	950	/* bright colors */
776	i -= 8;
777	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	951	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778	return;	952	else if (i >= 0 && i <= 7)
779	}	953	/* normal colors */
780
781	if (i >= 0 && i <= 7) /* normal colors */
782	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	954	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783	}	955	}
784	}	956	}
785		957
786	/----------------------------------------------------------------------/	958	/----------------------------------------------------------------------/
…		…
878	rxvt_term::create_windows (int argc, const char const argv)	1050	rxvt_term::create_windows (int argc, const char const argv)
879	{	1051	{
880	XClassHint classHint;	1052	XClassHint classHint;
881	XWMHints wmHint;	1053	XWMHints wmHint;
882	#if ENABLE_FRILLS	1054	#if ENABLE_FRILLS
883	MWMHints mwmhints;	1055	MWMHints mwmhints = { };
884	#endif	1056	#endif
885	XGCValues gcvalue;	1057	XGCValues gcvalue;
886	XSetWindowAttributes attributes;	1058	XSetWindowAttributes attributes;
887	Window top, parent;	1059	Window top, parent;
888		1060
…		…
901	#if ENABLE_FRILLS	1073	#if ENABLE_FRILLS
902	if (option (Opt_borderLess))	1074	if (option (Opt_borderLess))
903	{	1075	{
904	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1076	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905	{	1077	{
906	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1078	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907	attributes.override_redirect = true;	1079	attributes.override_redirect = true;
908	mwmhints.flags = 0;
909	}	1080	}
910	else	1081	else
911	{	1082	{
912	mwmhints.flags = MWM_HINTS_DECORATIONS;	1083	mwmhints.flags = MWM_HINTS_DECORATIONS;
913	mwmhints.decorations = 0;
914	}	1084	}
915	}	1085	}
916	else
917	mwmhints.flags = 0;
918	#endif	1086	#endif
919		1087
920	#if ENABLE_XEMBED	1088	#if ENABLE_XEMBED
921	if (rs[Rs_embed])	1089	if (rs[Rs_embed])
922	{	1090	{
…		…
1006	termwin_ev.start (display, top);	1174	termwin_ev.start (display, top);
1007		1175
1008	/* vt cursor: Black-on-White is standard, but this is more popular */	1176	/* vt cursor: Black-on-White is standard, but this is more popular */
1009	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1177	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010		1178
1011	#ifdef HAVE_SCROLLBARS
1012	/* cursor scrollBar: Black-on-White */
1013	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014	#endif
1015
1016	/* the vt window */	1179	/* the vt window */
1017	vt = XCreateSimpleWindow (dpy, top,	1180	vt = XCreateSimpleWindow (dpy, top,
1018	window_vt_x, window_vt_y,	1181	window_vt_x, window_vt_y,
1019	width, height,	1182	width, height,
1020	0,	1183	0,
…		…
1033		1196
1034	vt_select_input ();	1197	vt_select_input ();
1035		1198
1036	vt_ev.start (display, vt);	1199	vt_ev.start (display, vt);
1037		1200
1038	#ifdef XPM_BACKGROUND
1039	if (rs[Rs_backgroundPixmap] != NULL
1040	#ifndef HAVE_AFTERIMAGE
1041	&& !OPTION (Opt_transparent)
1042	#endif
1043	)
1044	{
1045	const char *p = rs[Rs_backgroundPixmap];
1046
1047	if ((p = strchr (p, ';')) != NULL)
1048	{
1049	p++;
1050	scale_pixmap (p);
1051	}
1052
1053	set_bgPixmap (rs[Rs_backgroundPixmap]);
1054	scr_touch (true);
1055	}
1056	#endif
1057
1058	/* graphics context for the vt window */	1201	/* graphics context for the vt window */
1059	gcvalue.foreground = pix_colors[Color_fg];	1202	gcvalue.foreground = pix_colors[Color_fg];
1060	gcvalue.background = pix_colors[Color_bg];	1203	gcvalue.background = pix_colors[Color_bg];
1061	gcvalue.graphics_exposures = 0;	1204	gcvalue.graphics_exposures = 0;
1062		1205
…		…
1064	GCForeground \| GCBackground \| GCGraphicsExposures,	1207	GCForeground \| GCBackground \| GCGraphicsExposures,
1065	&gcvalue);	1208	&gcvalue);
1066		1209
1067	drawable = new rxvt_drawable (this, vt);	1210	drawable = new rxvt_drawable (this, vt);
1068		1211
1069	#ifdef RXVT_SCROLLBAR
1070	gcvalue.foreground = pix_colors[Color_topShadow];
1071	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072	gcvalue.foreground = pix_colors[Color_bottomShadow];
1073	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076	#endif
1077
1078	#ifdef OFF_FOCUS_FADING	1212	#ifdef OFF_FOCUS_FADING
1079	// initially we are in unfocused state	1213	// initially we are in unfocused state
1080	if (rs[Rs_fade])	1214	if (rs[Rs_fade])
1081	pix_colors = pix_colors_unfocused;	1215	pix_colors = pix_colors_unfocused;
1082	#endif	1216	#endif
…		…
1087		1221
1088	/* ------------------------------------------------------------------------- *	1222	/* ------------------------------------------------------------------------- *
1089	* GET TTY CURRENT STATE *	1223	* GET TTY CURRENT STATE *
1090	* ------------------------------------------------------------------------- */	1224	* ------------------------------------------------------------------------- */
1091	void	1225	void
1092	rxvt_get_ttymode (ttymode_t *tio, int erase)	1226	rxvt_get_ttymode (struct termios *tio, int erase)
1093	{	1227	{
1094	/*	1228	/*
1095	* standard System V termios interface	1229	* standard System V termios interface
1096	*/	1230	*/
1097	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1231	if (tcgetattr (STDIN_FILENO, tio) < 0)
1098	{	1232	{
1099	// return error - use system defaults,	1233	// return error - use system defaults,
1100	// where possible, and zero elsewhere	1234	// where possible, and zero elsewhere
1101	memset (tio, 0, sizeof (ttymode_t));	1235	memset (tio, 0, sizeof (struct termios));
1102		1236
1103	tio->c_cc[VINTR] = CINTR;	1237	tio->c_cc[VINTR] = CINTR;
1104	tio->c_cc[VQUIT] = CQUIT;	1238	tio->c_cc[VQUIT] = CQUIT;
1105	tio->c_cc[VERASE] = CERASE;	1239	tio->c_cc[VERASE] = CERASE;
1106	#ifdef VERASE2	1240	#ifdef VERASE2
…		…
1170		1304
1171	/*	1305	/*
1172	* Debugging	1306	* Debugging
1173	*/	1307	*/
1174	#ifdef DEBUG_TTYMODE	1308	#ifdef DEBUG_TTYMODE
1175	#ifdef HAVE_TERMIOS_H
1176	/* c_iflag bits */	1309	/* c_iflag bits */
1177	fprintf (stderr, "Input flags\n");	1310	fprintf (stderr, "Input flags\n");
1178		1311
1179	/* cpp token stringize doesn't work on all machines <sigh> */	1312	/* cpp token stringize doesn't work on all machines <sigh> */
1180	# define FOO(flag,name) \	1313	# define FOO(flag,name) \
…		…
1243	FOO (VLNEXT, "VLNEXT");	1376	FOO (VLNEXT, "VLNEXT");
1244	# endif	1377	# endif
1245		1378
1246	fprintf (stderr, "\n");	1379	fprintf (stderr, "\n");
1247	# undef FOO	1380	# undef FOO
1248	# endif /* HAVE_TERMIOS_H */	1381	#endif /* DEBUG_TTYMODE */
1249	#endif /* DEBUG_TTYMODE */
1250	}	1382	}
1251		1383
1252	/----------------------------------------------------------------------/	1384	/----------------------------------------------------------------------/
1253	/*	1385	/*
1254	* Run the command in a subprocess and return a file descriptor for the	1386	* Run the command in a subprocess and return a file descriptor for the
…		…
1278	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1410	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279		1411
1280	int er;	1412	int er;
1281		1413
1282	#ifndef NO_BACKSPACE_KEY	1414	#ifndef NO_BACKSPACE_KEY
1283	if (key_backspace[0] && !key_backspace[1])	1415	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284	er = key_backspace[0];	1416	er = rs[Rs_backspace_key][0];
1285	else if (strcmp (key_backspace, "DEC") == 0)	1417	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286	er = '\177'; /* the initial state anyway */	1418	er = '\177'; /* the initial state anyway */
1287	else	1419	else
1288	#endif	1420	#endif
1289	er = -1;	1421	er = -1;
1290		1422
1291	rxvt_get_ttymode (&tio, er);	1423	rxvt_get_ttymode (&tio, er);
1292	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1424	/* init terminal attributes */
		1425	cfsetospeed (&tio, BAUDRATE);
		1426	cfsetispeed (&tio, BAUDRATE);
		1427	tcsetattr (pty->tty, TCSANOW, &tio);
1293	pty->set_utf8_mode (enc_utf8);	1428	pty->set_utf8_mode (enc_utf8);
1294		1429
1295	/* set initial window size */	1430	/* set initial window size */
1296	tt_winch ();	1431	tt_winch ();
1297		1432
…		…
1357	rxvt_term::run_child (const char const argv)	1492	rxvt_term::run_child (const char const argv)
1358	{	1493	{
1359	char *login;	1494	char *login;
1360		1495
1361	if (option (Opt_console))	1496	if (option (Opt_console))
		1497	{
1362	{ /* be virtual console, fail silently */	1498	/* be virtual console, fail silently */
1363	#ifdef TIOCCONS	1499	#ifdef TIOCCONS
1364	unsigned int on = 1;	1500	unsigned int on = 1;
1365		1501
1366	ioctl (STDIN_FILENO, TIOCCONS, &on);	1502	ioctl (STDIN_FILENO, TIOCCONS, &on);
1367	#elif defined (SRIOCSREDIR)	1503	#elif defined (SRIOCSREDIR)
…		…
1369		1505
1370	fd = open (CONSOLE, O_WRONLY, 0);	1506	fd = open (CONSOLE, O_WRONLY, 0);
1371	if (fd >= 0)	1507	if (fd >= 0)
1372	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1508	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373	close (fd);	1509	close (fd);
1374	#endif /* SRIOCSREDIR */	1510	#endif /* SRIOCSREDIR */
1375	}	1511	}
1376		1512
1377	/* reset signals and spin off the command interpreter */	1513	/* reset signals and spin off the command interpreter */
1378	signal (SIGINT, SIG_DFL);	1514	signal (SIGINT, SIG_DFL);
1379	signal (SIGQUIT, SIG_DFL);	1515	signal (SIGQUIT, SIG_DFL);
…		…
1386	*/	1522	*/
1387	#ifdef SIGTSTP	1523	#ifdef SIGTSTP
1388	signal (SIGTSTP, SIG_IGN);	1524	signal (SIGTSTP, SIG_IGN);
1389	signal (SIGTTIN, SIG_IGN);	1525	signal (SIGTTIN, SIG_IGN);
1390	signal (SIGTTOU, SIG_IGN);	1526	signal (SIGTTOU, SIG_IGN);
1391	#endif /* SIGTSTP */	1527	#endif /* SIGTSTP */
1392		1528
1393	// unblock signals (signals are blocked by iom.C	1529	// unblock signals (signals are blocked by iom.C
1394	sigset_t ss;	1530	sigset_t ss;
1395	sigemptyset (&ss);	1531	sigemptyset (&ss);
1396	sigprocmask (SIG_SETMASK, &ss, 0);	1532	sigprocmask (SIG_SETMASK, &ss, 0);
1397		1533
1398	/* command interpreter path */	1534	/* command interpreter path */
1399	if (argv != NULL)	1535	if (argv)
1400	{	1536	{
1401	# ifdef DEBUG_CMD	1537	# ifdef DEBUG_CMD
1402	int i;	1538	int i;
1403		1539
1404	for (i = 0; argv[i]; i++)	1540	for (i = 0; argv[i]; i++)
…		…
1413	const char argv0, shell;	1549	const char argv0, shell;
1414		1550
1415	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1551	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1416	shell = "/bin/sh";	1552	shell = "/bin/sh";
1417		1553
1418	argv0 = (const char *)rxvt_r_basename (shell);	1554	argv0 = (const char *)rxvt_basename (shell);
1419		1555
1420	if (option (Opt_loginShell))	1556	if (option (Opt_loginShell))
1421	{	1557	{
1422	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1558	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423		1559
1424	login[0] = '-';	1560	login[0] = '-';
1425	strcpy (&login[1], argv0);	1561	strcpy (&login[1], argv0);
1426	argv0 = login;	1562	argv0 = login;
1427	}	1563	}
1428		1564
1429	execlp (shell, argv0, NULL);	1565	execlp (shell, argv0, (char *)0);
1430	/* no error message: STDERR is closed! */	1566	/* no error message: STDERR is closed! */
1431	}	1567	}
1432		1568
1433	return -1;	1569	return -1;
1434	}	1570	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.184 by sasha, Fri Jun 8 20:04:12 2007 UTC vs. Revision 1.246 by ayin, Sun Jan 27 22:48:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.184 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.246 by ayin, Sun Jan 27 22:48:33 2008 UTC