[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.245 by ayin, Sun Jan 27 16:52:13 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	272	#ifdef HAVE_SCROLLBARS
168	COLOR_SCROLLBAR,	273	COLOR_SCROLLBAR,
		274	#endif
		275	#ifdef RXVT_SCROLLBAR
169	COLOR_SCROLLTROUGH,	276	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	277	#endif
171	#if TINTING	278	#if ENABLE_TRANSPARENCY
172	NULL,	279	NULL,
173	#endif	280	#endif
174	#if OFF_FOCUS_FADING	281	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	282	"rgb:00/00/00",
176	#endif	283	#endif
177	};	284	};
178		285
179	bool	286	void
180	rxvt_term::init_vars ()	287	rxvt_term::init_vars ()
181	{	288	{
182	pix_colors = //	289	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		290
192	MEvent.time = CurrentTime;	291	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	292	MEvent.button = AnyButton;
194	want_refresh = 1;	293	want_refresh = 1;
195	priv_modes = SavedModes = PrivMode_Default;	294	priv_modes = SavedModes = PrivMode_Default;
…		…
197	nrow = 24;	296	nrow = 24;
198	int_bwidth = INTERNALBORDERWIDTH;	297	int_bwidth = INTERNALBORDERWIDTH;
199	ext_bwidth = EXTERNALBORDERWIDTH;	298	ext_bwidth = EXTERNALBORDERWIDTH;
200	lineSpace = LINESPACE;	299	lineSpace = LINESPACE;
201	saveLines = SAVELINES;	300	saveLines = SAVELINES;
202	numpix_colors = TOTAL_COLORS;
203		301
204	refresh_limit = 1;
205	refresh_type = SLOW_REFRESH;	302	refresh_type = SLOW_REFRESH;
206		303
207	oldcursor.row = oldcursor.col = -1;	304	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		305
216	set_option (Opt_scrollBar);	306	set_option (Opt_scrollBar);
217	set_option (Opt_scrollTtyOutput);	307	set_option (Opt_scrollTtyOutput);
218	set_option (Opt_jumpScroll);	308	set_option (Opt_jumpScroll);
		309	set_option (Opt_skipScroll);
219	set_option (Opt_secondaryScreen);	310	set_option (Opt_secondaryScreen);
220	set_option (Opt_secondaryScroll);	311	set_option (Opt_secondaryScroll);
221	set_option (Opt_pastableTabs);	312	set_option (Opt_pastableTabs);
222	set_option (Opt_intensityStyles);	313	set_option (Opt_intensityStyles);
223		314	set_option (Opt_iso14755_52);
224	return true;	315	set_option (Opt_buffered);
225	}	316	}
226		317
227	void	318	static void
228	rxvt_term::init_secondary ()	319	init_secondary ()
229	{	320	{
230	int i;	321	int i;
231		322
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)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
237	{	324	{
238	/* TODO: BOO HISS */
239	dup2 (STDERR_FILENO, STDIN_FILENO);	325	dup2 (STDERR_FILENO, STDIN_FILENO);
240	}	326	}
241	else if (i > STDIN_FILENO)	327	else if (i != STDIN_FILENO)
242	{	328	{
243	dup2 (i, STDIN_FILENO);	329	dup2 (i, STDIN_FILENO);
244	close (i);	330	close (i);
245	}	331	}
246		332
247	dup2 (STDERR_FILENO, STDOUT_FILENO);	333	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	}	334	}
260		335
261	/----------------------------------------------------------------------/	336	/----------------------------------------------------------------------/
262	const char **	337	const char **
263	rxvt_term::init_resources (int argc, const char const argv)	338	rxvt_term::init_resources (int argc, const char const argv)
264	{	339	{
265	int i, r_argc;	340	int i, r_argc;
266	char *val;
267	const char cmd_argv, r_argv;	341	const char cmd_argv, r_argv;
268		342
269	/*	343	/*
270	* Look for -e option. Find => split and make cmd_argv[] of command args	344	* Look for -e option. Find => split and make cmd_argv[] of command args
271	*/	345	*/
272	for (r_argc = 0; r_argc < argc; r_argc++)	346	for (r_argc = 0; r_argc < argc; r_argc++)
273	if (!strcmp (argv[r_argc], "-e"))	347	if (!strcmp (argv[r_argc], "-e"))
274	break;	348	break;
275		349
		350	if (r_argc == argc)
		351	cmd_argv = NULL;
		352	else if (!argv[r_argc + 1])
		353	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		354	else
		355	{
		356	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		357
		358	for (i = 0; i < argc - r_argc - 1; i++)
		359	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		360
		361	cmd_argv[i] = NULL;
		362	}
		363
276	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	364	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
277		365
278	for (i = 0; i < r_argc; i++)	366	for (i = 0; i < r_argc; i++)
279	r_argv[i] = (const char *)argv[i];	367	r_argv[i] = (const char *)argv[i];
280		368
281	r_argv[i] = NULL;	369	r_argv[i] = NULL;
282		370
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]);	371	rs[Rs_name] = rxvt_basename (argv[0]);
296		372
297	/*	373	/*
298	* Open display, get options/resources and create the window	374	* Open display, get options/resources and create the window
299	*/	375	*/
300		376
…		…
302	rs[Rs_display_name] = ":0";	378	rs[Rs_display_name] = ":0";
303		379
304	get_options (r_argc, r_argv);	380	get_options (r_argc, r_argv);
305		381
306	if (!(display = displays.get (rs[Rs_display_name])))	382	if (!(display = displays.get (rs[Rs_display_name])))
		383	{
		384	free (r_argv);
307	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	385	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		386	}
308		387
309	// using a local pointer decreases code size a lot	388	// using a local pointer decreases code size a lot
310	xa = display->xa;	389	xa = display->xa;
311		390
312	set (display);	391	set (display);
…		…
315	#if XFT	394	#if XFT
316	if (rs[Rs_depth])	395	if (rs[Rs_depth])
317	select_visual (strtol (rs[Rs_depth], 0, 0));	396	select_visual (strtol (rs[Rs_depth], 0, 0));
318	#endif	397	#endif
319		398
		399	#ifdef HAVE_AFTERIMAGE
		400	set_application_name ((char*)rs[Rs_name]);
		401	set_output_threshold (OUTPUT_LEVEL_WARNING);
		402	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		403	#endif
320	free (r_argv);	404	free (r_argv);
321		405
322	for (int i = NUM_RESOURCES; i--; )	406	for (int i = NUM_RESOURCES; i--; )
323	if (rs [i] == resval_undef)	407	if (rs [i] == resval_undef)
324	rs [i] = 0;	408	rs [i] = 0;
…		…
340	* set any defaults not already set	424	* set any defaults not already set
341	*/	425	*/
342	if (cmd_argv && cmd_argv[0])	426	if (cmd_argv && cmd_argv[0])
343	{	427	{
344	if (!rs[Rs_title])	428	if (!rs[Rs_title])
345	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	429	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346	if (!rs[Rs_iconName])	430	if (!rs[Rs_iconName])
347	rs[Rs_iconName] = rs[Rs_title];	431	rs[Rs_iconName] = rs[Rs_title];
348	}	432	}
349	else	433	else
350	{	434	{
…		…
388	rs[Rs_cutchars] = CUTCHARS;	472	rs[Rs_cutchars] = CUTCHARS;
389		473
390	#ifndef NO_BACKSPACE_KEY	474	#ifndef NO_BACKSPACE_KEY
391	if (!rs[Rs_backspace_key])	475	if (!rs[Rs_backspace_key])
392	# ifdef DEFAULT_BACKSPACE	476	# ifdef DEFAULT_BACKSPACE
393	key_backspace = DEFAULT_BACKSPACE;	477	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394	# else	478	# else
395	key_backspace = "DEC"; /* can toggle between \010 or \177 */	479	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396	# endif	480	# 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	481	#endif
405		482
406	#ifndef NO_DELETE_KEY	483	#ifndef NO_DELETE_KEY
407	if (!rs[Rs_delete_key])	484	if (!rs[Rs_delete_key])
408	# ifdef DEFAULT_DELETE	485	# ifdef DEFAULT_DELETE
409	key_delete = DEFAULT_DELETE;	486	rs[Rs_delete_key] = DEFAULT_DELETE;
410	# else	487	# else
411	key_delete = "\033[3~";	488	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	489	# endif
421	if (rs[Rs_answerbackstring])	490	#endif
422	{
423	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425	}
426		491
427	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
428	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	493	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429	#endif	494	#endif
430		495
…		…
454	color_aliases (Color_fg);	519	color_aliases (Color_fg);
455	color_aliases (Color_bg);	520	color_aliases (Color_bg);
456	#ifndef NO_CURSORCOLOR	521	#ifndef NO_CURSORCOLOR
457	color_aliases (Color_cursor);	522	color_aliases (Color_cursor);
458	color_aliases (Color_cursor2);	523	color_aliases (Color_cursor2);
459	#endif /* NO_CURSORCOLOR */	524	#endif /* NO_CURSORCOLOR */
460	color_aliases (Color_pointer_fg);	525	color_aliases (Color_pointer_fg);
461	color_aliases (Color_pointer_bg);	526	color_aliases (Color_pointer_bg);
462	color_aliases (Color_border);	527	color_aliases (Color_border);
463	#ifndef NO_BOLD_UNDERLINE_REVERSE	528	#ifndef NO_BOLD_UNDERLINE_REVERSE
464	color_aliases (Color_BD);	529	color_aliases (Color_BD);
465	color_aliases (Color_UL);	530	color_aliases (Color_UL);
466	color_aliases (Color_RV);	531	color_aliases (Color_RV);
467	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	532	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468		533
469	if (!rs[Rs_color + Color_border])	534	if (!rs[Rs_color + Color_border])
470	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	535	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471		536
472	return cmd_argv;	537	return cmd_argv;
		538	}
		539
		540	/----------------------------------------------------------------------/
		541	void
		542	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		543	{
		544	this->envv = envv;
		545
		546	SET_R (this);
		547	set_locale ("");
		548	set_environ (envv); // few things in X do not call setlocale :(
		549
		550	init_vars ();
		551
		552	init_secondary ();
		553
		554	const char **cmd_argv = init_resources (argc, argv);
		555
		556	#ifdef KEYSYM_RESOURCE
		557	keyboard->register_done ();
		558	#endif
		559
		560	#ifdef HAVE_SCROLLBARS
		561	if (option (Opt_scrollBar))
		562	scrollBar.setIdle (); /* set existence for size calculations */
		563	#endif
		564
		565	pty = ptytty::create ();
		566
		567	create_windows (argc, argv);
		568
		569	init_xlocale ();
		570
		571	scr_reset (); // initialize screen
		572
		573	#if 0
		574	XSynchronize (dpy, True);
		575	#endif
		576
		577	#ifdef HAVE_SCROLLBARS
		578	if (option (Opt_scrollBar))
		579	resize_scrollbar (); /* create and map scrollbar */
		580	#endif
		581	#ifdef HAVE_BG_PIXMAP
		582	{
		583	bgPixmap.set_target (this);
		584	bgPixmap.invalidate ();
		585
		586	#ifdef ENABLE_TRANSPARENCY
		587	if (option (Opt_transparent))
		588	{
		589	bgPixmap.set_transparent ();
		590
		591	#ifdef HAVE_AFTERIMAGE
		592	if (rs [Rs_blurradius])
		593	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		594	#endif
		595	if (ISSET_PIXCOLOR (Color_tint))
		596	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		597
		598	if (rs [Rs_shade])
		599	bgPixmap.set_shade (rs [Rs_shade]);
		600
		601	bgPixmap.set_root_pixmap ();
		602	XSelectInput (dpy, display->root, PropertyChangeMask);
		603	rootwin_ev.start (display, display->root);
		604	}
		605	#endif
		606
		607	#ifdef BG_IMAGE_FROM_FILE
		608	if (rs[Rs_backgroundPixmap])
		609	{
		610	const char *p = rs[Rs_backgroundPixmap];
		611
		612	if ((p = strchr (p, ';')) != 0)
		613	{
		614	p++;
		615	bgPixmap.set_geometry (p);
		616	}
		617	else
		618	bgPixmap.set_defaultGeometry ();
		619
		620	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		621	if (!bgPixmap.window_position_sensitive ())
		622	update_background ();
		623	}
		624	#endif
		625	}
		626	#endif
		627
		628	#if ENABLE_PERL
		629	rootwin_ev.start (display, display->root);
		630	#endif
		631
		632	set_colorfgbg ();
		633
		634	init_command (cmd_argv);
		635
		636	free (cmd_argv);
		637
		638	if (pty->pty >= 0)
		639	pty_ev.start (pty->pty, ev::READ);
		640
		641	HOOK_INVOKE ((this, HOOK_START, DT_END));
		642
		643	#if ENABLE_XEMBED
		644	if (rs[Rs_embed])
		645	{
		646	long info[2] = { 0, XEMBED_MAPPED };
		647
		648	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		649	32, PropModeReplace, (unsigned char *)&info, 2);
		650	}
		651	#endif
		652
		653	XMapWindow (dpy, vt);
		654	XMapWindow (dpy, parent[0]);
		655
		656	refresh_check ();
473	}	657	}
474		658
475	/----------------------------------------------------------------------/	659	/----------------------------------------------------------------------/
476	void	660	void
477	rxvt_term::init_env ()	661	rxvt_term::init_env ()
478	{	662	{
479	int i;	663	int i;
480	unsigned int u;
481	char *val;	664	char *val;
482		665
483	#ifdef DISPLAY_IS_IP	666	#ifdef DISPLAY_IS_IP
484	/* Fixup display_name for export over pty to any interested terminal	667	/* 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	668	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
493	*/	676	*/
494	val = rxvt_network_display (rs[Rs_display_name]);	677	val = rxvt_network_display (rs[Rs_display_name]);
495	rs[Rs_display_name] = (const char *)val;	678	rs[Rs_display_name] = (const char *)val;
496		679
497	if (val == NULL)	680	if (val == NULL)
498	#endif /* DISPLAY_IS_IP */	681	#endif /* DISPLAY_IS_IP */
499	val = XDisplayString (dpy);	682	val = XDisplayString (dpy);
500		683
501	if (rs[Rs_display_name] == NULL)	684	if (rs[Rs_display_name] == NULL)
502	rs[Rs_display_name] = val; /* use broken `:0' value */	685	rs[Rs_display_name] = val; /* use broken `:0' value */
503		686
504	i = strlen (val);	687	i = strlen (val);
505	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	688	env_display = (char *)rxvt_malloc (i + 9);
506		689
507	sprintf (env_display, "DISPLAY=%s", val);	690	sprintf (env_display, "DISPLAY=%s", val);
508		691
509	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	692	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510		693
…		…
531	else	714	else
532	putenv ("COLORTERM=" COLORTERMENVFULL);	715	putenv ("COLORTERM=" COLORTERMENVFULL);
533		716
534	if (rs[Rs_term_name] != NULL)	717	if (rs[Rs_term_name] != NULL)
535	{	718	{
536	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	719	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	720	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538	putenv (env_term);	721	putenv (env_term);
539	}	722	}
540	else	723	else
541	putenv ("TERM=" TERMENV);	724	putenv ("TERM=" TERMENV);
…		…
543	#ifdef HAVE_UNSETENV	726	#ifdef HAVE_UNSETENV
544	/* avoid passing old settings and confusing term size */	727	/* avoid passing old settings and confusing term size */
545	unsetenv ("LINES");	728	unsetenv ("LINES");
546	unsetenv ("COLUMNS");	729	unsetenv ("COLUMNS");
547	unsetenv ("TERMCAP"); /* terminfo should be okay */	730	unsetenv ("TERMCAP"); /* terminfo should be okay */
548	#endif /* HAVE_UNSETENV */	731	#endif /* HAVE_UNSETENV */
549	}	732	}
550		733
551	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
552	/*	735	/*
553	* This is more or less stolen straight from XFree86 xterm.	736	* This is more or less stolen straight from XFree86 xterm.
…		…
574		757
575	this->locale = "C";	758	this->locale = "C";
576	}	759	}
577		760
578		761
579	this->locale = rxvt_strdup (this->locale);	762	this->locale = strdup (this->locale);
580	SET_LOCALE (this->locale);	763	SET_LOCALE (this->locale);
581	mbstate.reset ();	764	mbstate.reset ();
582	#endif	765	#endif
583		766
584	#if HAVE_NL_LANGINFO	767	#if HAVE_NL_LANGINFO
…		…
641	priv_modes \|= PrivMode_Keypress;	824	priv_modes \|= PrivMode_Keypress;
642	if (!option (Opt_jumpScroll))	825	if (!option (Opt_jumpScroll))
643	priv_modes \|= PrivMode_smoothScroll;	826	priv_modes \|= PrivMode_smoothScroll;
644		827
645	#ifndef NO_BACKSPACE_KEY	828	#ifndef NO_BACKSPACE_KEY
646	if (strcmp (key_backspace, "DEC") == 0)	829	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647	priv_modes \|= PrivMode_HaveBackSpace;	830	priv_modes \|= PrivMode_HaveBackSpace;
648	#endif	831	#endif
649		832
650	/* add value for scrollBar */	833	/* add value for scrollBar */
651	if (scrollBar.state)	834	if (scrollBar.state)
…		…
664	int i;	847	int i;
665		848
666	#ifdef OFF_FOCUS_FADING	849	#ifdef OFF_FOCUS_FADING
667	pix_colors = pix_colors_focused;	850	pix_colors = pix_colors_focused;
668	#endif	851	#endif
669		852
670	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	853	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671	{	854	{
672	const char *name = rs[Rs_color + i];	855	const char *name = rs[Rs_color + i];
673		856
674	if (!name)	857	if (!name)
…		…
727	* get scrollBar shadow colors	910	* get scrollBar shadow colors
728	*	911	*
729	* The calculations of topShadow/bottomShadow values are adapted	912	* The calculations of topShadow/bottomShadow values are adapted
730	* from the fvwm window manager.	913	* from the fvwm window manager.
731	*/	914	*/
732	#ifdef KEEP_SCROLLCOLOR	915	#ifdef RXVT_SCROLLBAR
733	if (depth <= 2)	916	if (depth <= 2)
734	{	917	{
735	/* Monochrome */	918	/* Monochrome */
736	alias_color (Color_scroll, Color_fg);	919	alias_color (Color_scroll, Color_fg);
737	alias_color (Color_topShadow, Color_bg);	920	alias_color (Color_topShadow, Color_bg);
…		…
752	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	935	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753	cscroll.a)	936	cscroll.a)
754	))	937	))
755	alias_color (Color_topShadow, Color_White);	938	alias_color (Color_topShadow, Color_White);
756	}	939	}
757	#endif /* KEEP_SCROLLCOLOR */	940	#endif
758		941
759	#ifdef OFF_FOCUS_FADING	942	#ifdef OFF_FOCUS_FADING
760	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	943	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761	update_fade_color (i);	944	update_fade_color (i);
762	#endif	945	#endif
…		…
770	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	953	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771	{	954	{
772	int i = atoi (rs[Rs_color + idx]);	955	int i = atoi (rs[Rs_color + idx]);
773		956
774	if (i >= 8 && i <= 15)	957	if (i >= 8 && i <= 15)
775	{ /* bright colors */	958	/* bright colors */
776	i -= 8;
777	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	959	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778	return;	960	else if (i >= 0 && i <= 7)
779	}	961	/* normal colors */
780
781	if (i >= 0 && i <= 7) /* normal colors */
782	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	962	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783	}	963	}
784	}	964	}
785		965
786	/----------------------------------------------------------------------/	966	/----------------------------------------------------------------------/
…		…
878	rxvt_term::create_windows (int argc, const char const argv)	1058	rxvt_term::create_windows (int argc, const char const argv)
879	{	1059	{
880	XClassHint classHint;	1060	XClassHint classHint;
881	XWMHints wmHint;	1061	XWMHints wmHint;
882	#if ENABLE_FRILLS	1062	#if ENABLE_FRILLS
883	MWMHints mwmhints;	1063	MWMHints mwmhints = { };
884	#endif	1064	#endif
885	XGCValues gcvalue;	1065	XGCValues gcvalue;
886	XSetWindowAttributes attributes;	1066	XSetWindowAttributes attributes;
887	Window top, parent;	1067	Window top, parent;
888		1068
…		…
901	#if ENABLE_FRILLS	1081	#if ENABLE_FRILLS
902	if (option (Opt_borderLess))	1082	if (option (Opt_borderLess))
903	{	1083	{
904	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1084	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905	{	1085	{
906	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1086	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907	attributes.override_redirect = true;	1087	attributes.override_redirect = true;
908	mwmhints.flags = 0;
909	}	1088	}
910	else	1089	else
911	{	1090	{
912	mwmhints.flags = MWM_HINTS_DECORATIONS;	1091	mwmhints.flags = MWM_HINTS_DECORATIONS;
913	mwmhints.decorations = 0;
914	}	1092	}
915	}	1093	}
916	else
917	mwmhints.flags = 0;
918	#endif	1094	#endif
919		1095
920	#if ENABLE_XEMBED	1096	#if ENABLE_XEMBED
921	if (rs[Rs_embed])	1097	if (rs[Rs_embed])
922	{	1098	{
…		…
1006	termwin_ev.start (display, top);	1182	termwin_ev.start (display, top);
1007		1183
1008	/* vt cursor: Black-on-White is standard, but this is more popular */	1184	/* vt cursor: Black-on-White is standard, but this is more popular */
1009	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1185	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010		1186
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 */	1187	/* the vt window */
1017	vt = XCreateSimpleWindow (dpy, top,	1188	vt = XCreateSimpleWindow (dpy, top,
1018	window_vt_x, window_vt_y,	1189	window_vt_x, window_vt_y,
1019	width, height,	1190	width, height,
1020	0,	1191	0,
…		…
1033		1204
1034	vt_select_input ();	1205	vt_select_input ();
1035		1206
1036	vt_ev.start (display, vt);	1207	vt_ev.start (display, vt);
1037		1208
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 */	1209	/* graphics context for the vt window */
1059	gcvalue.foreground = pix_colors[Color_fg];	1210	gcvalue.foreground = pix_colors[Color_fg];
1060	gcvalue.background = pix_colors[Color_bg];	1211	gcvalue.background = pix_colors[Color_bg];
1061	gcvalue.graphics_exposures = 0;	1212	gcvalue.graphics_exposures = 0;
1062		1213
…		…
1064	GCForeground \| GCBackground \| GCGraphicsExposures,	1215	GCForeground \| GCBackground \| GCGraphicsExposures,
1065	&gcvalue);	1216	&gcvalue);
1066		1217
1067	drawable = new rxvt_drawable (this, vt);	1218	drawable = new rxvt_drawable (this, vt);
1068		1219
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	1220	#ifdef OFF_FOCUS_FADING
1079	// initially we are in unfocused state	1221	// initially we are in unfocused state
1080	if (rs[Rs_fade])	1222	if (rs[Rs_fade])
1081	pix_colors = pix_colors_unfocused;	1223	pix_colors = pix_colors_unfocused;
1082	#endif	1224	#endif
…		…
1087		1229
1088	/* ------------------------------------------------------------------------- *	1230	/* ------------------------------------------------------------------------- *
1089	* GET TTY CURRENT STATE *	1231	* GET TTY CURRENT STATE *
1090	* ------------------------------------------------------------------------- */	1232	* ------------------------------------------------------------------------- */
1091	void	1233	void
1092	rxvt_get_ttymode (ttymode_t *tio, int erase)	1234	rxvt_get_ttymode (struct termios *tio, int erase)
1093	{	1235	{
1094	/*	1236	/*
1095	* standard System V termios interface	1237	* standard System V termios interface
1096	*/	1238	*/
1097	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1239	if (tcgetattr (STDIN_FILENO, tio) < 0)
1098	{	1240	{
1099	// return error - use system defaults,	1241	// return error - use system defaults,
1100	// where possible, and zero elsewhere	1242	// where possible, and zero elsewhere
1101	memset (tio, 0, sizeof (ttymode_t));	1243	memset (tio, 0, sizeof (struct termios));
1102		1244
1103	tio->c_cc[VINTR] = CINTR;	1245	tio->c_cc[VINTR] = CINTR;
1104	tio->c_cc[VQUIT] = CQUIT;	1246	tio->c_cc[VQUIT] = CQUIT;
1105	tio->c_cc[VERASE] = CERASE;	1247	tio->c_cc[VERASE] = CERASE;
1106	#ifdef VERASE2	1248	#ifdef VERASE2
…		…
1170		1312
1171	/*	1313	/*
1172	* Debugging	1314	* Debugging
1173	*/	1315	*/
1174	#ifdef DEBUG_TTYMODE	1316	#ifdef DEBUG_TTYMODE
1175	#ifdef HAVE_TERMIOS_H
1176	/* c_iflag bits */	1317	/* c_iflag bits */
1177	fprintf (stderr, "Input flags\n");	1318	fprintf (stderr, "Input flags\n");
1178		1319
1179	/* cpp token stringize doesn't work on all machines <sigh> */	1320	/* cpp token stringize doesn't work on all machines <sigh> */
1180	# define FOO(flag,name) \	1321	# define FOO(flag,name) \
…		…
1243	FOO (VLNEXT, "VLNEXT");	1384	FOO (VLNEXT, "VLNEXT");
1244	# endif	1385	# endif
1245		1386
1246	fprintf (stderr, "\n");	1387	fprintf (stderr, "\n");
1247	# undef FOO	1388	# undef FOO
1248	# endif /* HAVE_TERMIOS_H */	1389	#endif /* DEBUG_TTYMODE */
1249	#endif /* DEBUG_TTYMODE */
1250	}	1390	}
1251		1391
1252	/----------------------------------------------------------------------/	1392	/----------------------------------------------------------------------/
1253	/*	1393	/*
1254	* Run the command in a subprocess and return a file descriptor for the	1394	* Run the command in a subprocess and return a file descriptor for the
…		…
1278	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1418	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279		1419
1280	int er;	1420	int er;
1281		1421
1282	#ifndef NO_BACKSPACE_KEY	1422	#ifndef NO_BACKSPACE_KEY
1283	if (key_backspace[0] && !key_backspace[1])	1423	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284	er = key_backspace[0];	1424	er = rs[Rs_backspace_key][0];
1285	else if (strcmp (key_backspace, "DEC") == 0)	1425	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286	er = '\177'; /* the initial state anyway */	1426	er = '\177'; /* the initial state anyway */
1287	else	1427	else
1288	#endif	1428	#endif
1289	er = -1;	1429	er = -1;
1290		1430
1291	rxvt_get_ttymode (&tio, er);	1431	rxvt_get_ttymode (&tio, er);
1292	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1432	/* init terminal attributes */
		1433	cfsetospeed (&tio, BAUDRATE);
		1434	cfsetispeed (&tio, BAUDRATE);
		1435	tcsetattr (pty->tty, TCSANOW, &tio);
1293	pty->set_utf8_mode (enc_utf8);	1436	pty->set_utf8_mode (enc_utf8);
1294		1437
1295	/* set initial window size */	1438	/* set initial window size */
1296	tt_winch ();	1439	tt_winch ();
1297		1440
…		…
1357	rxvt_term::run_child (const char const argv)	1500	rxvt_term::run_child (const char const argv)
1358	{	1501	{
1359	char *login;	1502	char *login;
1360		1503
1361	if (option (Opt_console))	1504	if (option (Opt_console))
		1505	{
1362	{ /* be virtual console, fail silently */	1506	/* be virtual console, fail silently */
1363	#ifdef TIOCCONS	1507	#ifdef TIOCCONS
1364	unsigned int on = 1;	1508	unsigned int on = 1;
1365		1509
1366	ioctl (STDIN_FILENO, TIOCCONS, &on);	1510	ioctl (STDIN_FILENO, TIOCCONS, &on);
1367	#elif defined (SRIOCSREDIR)	1511	#elif defined (SRIOCSREDIR)
…		…
1369		1513
1370	fd = open (CONSOLE, O_WRONLY, 0);	1514	fd = open (CONSOLE, O_WRONLY, 0);
1371	if (fd >= 0)	1515	if (fd >= 0)
1372	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1516	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373	close (fd);	1517	close (fd);
1374	#endif /* SRIOCSREDIR */	1518	#endif /* SRIOCSREDIR */
1375	}	1519	}
1376		1520
1377	/* reset signals and spin off the command interpreter */	1521	/* reset signals and spin off the command interpreter */
1378	signal (SIGINT, SIG_DFL);	1522	signal (SIGINT, SIG_DFL);
1379	signal (SIGQUIT, SIG_DFL);	1523	signal (SIGQUIT, SIG_DFL);
…		…
1386	*/	1530	*/
1387	#ifdef SIGTSTP	1531	#ifdef SIGTSTP
1388	signal (SIGTSTP, SIG_IGN);	1532	signal (SIGTSTP, SIG_IGN);
1389	signal (SIGTTIN, SIG_IGN);	1533	signal (SIGTTIN, SIG_IGN);
1390	signal (SIGTTOU, SIG_IGN);	1534	signal (SIGTTOU, SIG_IGN);
1391	#endif /* SIGTSTP */	1535	#endif /* SIGTSTP */
1392		1536
1393	// unblock signals (signals are blocked by iom.C	1537	// unblock signals (signals are blocked by iom.C
1394	sigset_t ss;	1538	sigset_t ss;
1395	sigemptyset (&ss);	1539	sigemptyset (&ss);
1396	sigprocmask (SIG_SETMASK, &ss, 0);	1540	sigprocmask (SIG_SETMASK, &ss, 0);
1397		1541
1398	/* command interpreter path */	1542	/* command interpreter path */
1399	if (argv != NULL)	1543	if (argv)
1400	{	1544	{
1401	# ifdef DEBUG_CMD	1545	# ifdef DEBUG_CMD
1402	int i;	1546	int i;
1403		1547
1404	for (i = 0; argv[i]; i++)	1548	for (i = 0; argv[i]; i++)
…		…
1413	const char argv0, shell;	1557	const char argv0, shell;
1414		1558
1415	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1559	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1416	shell = "/bin/sh";	1560	shell = "/bin/sh";
1417		1561
1418	argv0 = (const char *)rxvt_r_basename (shell);	1562	argv0 = (const char *)rxvt_basename (shell);
1419		1563
1420	if (option (Opt_loginShell))	1564	if (option (Opt_loginShell))
1421	{	1565	{
1422	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1566	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423		1567
1424	login[0] = '-';	1568	login[0] = '-';
1425	strcpy (&login[1], argv0);	1569	strcpy (&login[1], argv0);
1426	argv0 = login;	1570	argv0 = login;
1427	}	1571	}
1428		1572
1429	execlp (shell, argv0, NULL);	1573	execlp (shell, argv0, (char *)0);
1430	/* no error message: STDERR is closed! */	1574	/* no error message: STDERR is closed! */
1431	}	1575	}
1432		1576
1433	return -1;	1577	return -1;
1434	}	1578	}

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.245 by ayin, Sun Jan 27 16:52:13 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.245 by ayin, Sun Jan 27 16:52:13 2008 UTC