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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.206 by ayin, Mon Aug 13 07:17:48 2007 UTC vs.
Revision 1.252 by root, Sun Jun 15 13:54:15 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 ENABLE_TRANSPARENCY	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		288
189	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
190	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
191	want_refresh = 1;	291	want_refresh = 1;
192	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
…		…
194	nrow = 24;	294	nrow = 24;
195	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
196	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
197	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
198	saveLines = SAVELINES;	298	saveLines = SAVELINES;
199	numpix_colors = TOTAL_COLORS;
200		299
201	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
202		301
203	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
204	#ifdef HAVE_BG_PIXMAP
205	#ifdef HAVE_AFTERIMAGE
206	bgPixmap.original_asim = NULL;
207	#endif
208	/* bgPixmap.w = bgPixmap.h = 0; */
209	#ifdef XPM_BACKGROUND
210	bgPixmap.h_scale = bgPixmap.v_scale = 0;
211	bgPixmap.h_align = bgPixmap.v_align = 0;
212	#endif
213	bgPixmap.flags = 0;
214	bgPixmap.pixmap = None;
215	#endif
216	last_bot = last_state = -1;
217		303
218	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
219	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
220	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
221	set_option (Opt_skipScroll);	307	set_option (Opt_skipScroll);
222	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
223	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
224	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
225	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
226	set_option (Opt_iso14755_52);	312	set_option (Opt_iso14755_52);
227		313	set_option (Opt_buffered);
228	return true;
229	}	314	}
230		315
231	void	316	static void
232	rxvt_term::init_secondary ()	317	init_secondary ()
233	{	318	{
234	int i;	319	int i;
235		320
236	/*
237	* Close all unused file descriptors
238	* We don't want them, we don't need them.
239	*/
240	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
241	{	322	{
242	/* TODO: BOO HISS */
243	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
244	}	324	}
245	else if (i > STDIN_FILENO)	325	else if (i != STDIN_FILENO)
246	{	326	{
247	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
248	close (i);	328	close (i);
249	}	329	}
250		330
251	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
252
253	#if 0 // schmorp sayz closing filies is murder
254	for (i = STDERR_FILENO + 1; i < num_fds; i++)
255	{
256	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
257	if (i == 4 \|\| i == 7)
258	continue;
259	#endif
260	close (i);
261	}
262	#endif
263	}	332	}
264		333
265	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
266	const char **	335	const char **
267	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
268	{	337	{
269	int i, r_argc;	338	int i, r_argc;
270	char *val;
271	const char cmd_argv, r_argv;	339	const char cmd_argv, r_argv;
272		340
273	/*	341	/*
274	* 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
275	*/	343	*/
276	for (r_argc = 0; r_argc < argc; r_argc++)	344	for (r_argc = 0; r_argc < argc; r_argc++)
277	if (!strcmp (argv[r_argc], "-e"))	345	if (!strcmp (argv[r_argc], "-e"))
278	break;	346	break;
279		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
280	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	362	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
281		363
282	for (i = 0; i < r_argc; i++)	364	for (i = 0; i < r_argc; i++)
283	r_argv[i] = (const char *)argv[i];	365	r_argv[i] = (const char *)argv[i];
284		366
285	r_argv[i] = NULL;	367	r_argv[i] = NULL;
286		368
287	if (r_argc == argc)
288	cmd_argv = NULL;
289	else
290	{
291	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
292
293	for (i = 0; i < argc - r_argc - 1; i++)
294	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296	cmd_argv[i] = NULL;
297	}
298
299	rs[Rs_name] = rxvt_r_basename (argv[0]);	369	rs[Rs_name] = rxvt_basename (argv[0]);
300		370
301	/*	371	/*
302	* Open display, get options/resources and create the window	372	* Open display, get options/resources and create the window
303	*/	373	*/
304		374
…		…
306	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
307		377
308	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
309		379
310	if (!(display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
311	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	}
312		385
313	// using a local pointer decreases code size a lot	386	// using a local pointer decreases code size a lot
314	xa = display->xa;	387	xa = display->xa;
315		388
316	set (display);	389	set (display);
…		…
320	if (rs[Rs_depth])	393	if (rs[Rs_depth])
321	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
322	#endif	395	#endif
323		396
324	#ifdef HAVE_AFTERIMAGE	397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
325	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);	400	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326	#endif	401	#endif
327	free (r_argv);	402	free (r_argv);
328		403
329	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
…		…
347	* set any defaults not already set	422	* set any defaults not already set
348	*/	423	*/
349	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
350	{	425	{
351	if (!rs[Rs_title])	426	if (!rs[Rs_title])
352	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353	if (!rs[Rs_iconName])	428	if (!rs[Rs_iconName])
354	rs[Rs_iconName] = rs[Rs_title];	429	rs[Rs_iconName] = rs[Rs_title];
355	}	430	}
356	else	431	else
357	{	432	{
…		…
395	rs[Rs_cutchars] = CUTCHARS;	470	rs[Rs_cutchars] = CUTCHARS;
396		471
397	#ifndef NO_BACKSPACE_KEY	472	#ifndef NO_BACKSPACE_KEY
398	if (!rs[Rs_backspace_key])	473	if (!rs[Rs_backspace_key])
399	# ifdef DEFAULT_BACKSPACE	474	# ifdef DEFAULT_BACKSPACE
400	key_backspace = DEFAULT_BACKSPACE;	475	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401	# else	476	# else
402	key_backspace = "DEC"; /* can toggle between \010 or \177 */	477	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403	# endif	478	# endif
404	else
405	{
406	val = strdup (rs[Rs_backspace_key]);
407	rxvt_Str_trim (val);
408	rxvt_Str_escaped (val);
409	key_backspace = val;
410	}
411	#endif	479	#endif
412		480
413	#ifndef NO_DELETE_KEY	481	#ifndef NO_DELETE_KEY
414	if (!rs[Rs_delete_key])	482	if (!rs[Rs_delete_key])
415	# ifdef DEFAULT_DELETE	483	# ifdef DEFAULT_DELETE
416	key_delete = DEFAULT_DELETE;	484	rs[Rs_delete_key] = DEFAULT_DELETE;
417	# else	485	# else
418	key_delete = "\033[3~";	486	rs[Rs_delete_key] = "\033[3~";
419	# endif
420	else
421	{
422	val = strdup (rs[Rs_delete_key]);
423	rxvt_Str_trim (val);
424	rxvt_Str_escaped (val);
425	key_delete = val;
426	}
427	#endif	487	# endif
428	if (rs[Rs_answerbackstring])
429	{
430	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
431	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
432	}
433
434	#ifdef HAVE_SCROLLBARS
435	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
436	#endif	488	#endif
		489
		490	scrollBar.setup (this);
437		491
438	#ifdef XTERM_REVERSE_VIDEO	492	#ifdef XTERM_REVERSE_VIDEO
439	/* this is how xterm implements reverseVideo */	493	/* this is how xterm implements reverseVideo */
440	if (option (Opt_reverseVideo))	494	if (option (Opt_reverseVideo))
441	{	495	{
…		…
461	color_aliases (Color_fg);	515	color_aliases (Color_fg);
462	color_aliases (Color_bg);	516	color_aliases (Color_bg);
463	#ifndef NO_CURSORCOLOR	517	#ifndef NO_CURSORCOLOR
464	color_aliases (Color_cursor);	518	color_aliases (Color_cursor);
465	color_aliases (Color_cursor2);	519	color_aliases (Color_cursor2);
466	#endif /* NO_CURSORCOLOR */	520	#endif /* NO_CURSORCOLOR */
467	color_aliases (Color_pointer_fg);	521	color_aliases (Color_pointer_fg);
468	color_aliases (Color_pointer_bg);	522	color_aliases (Color_pointer_bg);
469	color_aliases (Color_border);	523	color_aliases (Color_border);
470	#ifndef NO_BOLD_UNDERLINE_REVERSE	524	#ifndef NO_BOLD_UNDERLINE_REVERSE
471	color_aliases (Color_BD);	525	color_aliases (Color_BD);
472	color_aliases (Color_UL);	526	color_aliases (Color_UL);
473	color_aliases (Color_RV);	527	color_aliases (Color_RV);
474	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	528	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
475		529
476	if (!rs[Rs_color + Color_border])	530	if (!rs[Rs_color + Color_border])
477	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	531	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
478		532
479	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); // a 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 (const char *path = rs[Rs_chdir])
		557	if (*path) // ignored if empty
		558	{
		559	if (*path != '/')
		560	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		561
		562	if (chdir (path))
		563	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		564	}
		565
		566	if (option (Opt_scrollBar))
		567	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		568
		569	pty = ptytty::create ();
		570
		571	create_windows (argc, argv);
		572
		573	init_xlocale ();
		574
		575	scr_reset (); // initialize screen
		576
		577	#if 0
		578	XSynchronize (dpy, True);
		579	#endif
		580
		581	if (option (Opt_scrollBar))
		582	scrollBar.resize (); /* create and map scrollbar */
		583	#ifdef HAVE_BG_PIXMAP
		584	{
		585	bgPixmap.set_target (this);
		586	bgPixmap.invalidate ();
		587
		588	#ifdef ENABLE_TRANSPARENCY
		589	if (option (Opt_transparent))
		590	{
		591	bgPixmap.set_transparent ();
		592
		593	#ifdef HAVE_AFTERIMAGE
		594	if (rs [Rs_blurradius])
		595	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		596	#endif
		597	if (ISSET_PIXCOLOR (Color_tint))
		598	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		599
		600	if (rs [Rs_shade])
		601	bgPixmap.set_shade (rs [Rs_shade]);
		602
		603	bgPixmap.set_root_pixmap ();
		604	XSelectInput (dpy, display->root, PropertyChangeMask);
		605	rootwin_ev.start (display, display->root);
		606	}
		607	#endif
		608
		609	#ifdef BG_IMAGE_FROM_FILE
		610	if (rs[Rs_backgroundPixmap])
		611	{
		612	const char *p = rs[Rs_backgroundPixmap];
		613
		614	if ((p = strchr (p, ';')) != 0)
		615	{
		616	p++;
		617	bgPixmap.set_geometry (p);
		618	}
		619	else
		620	bgPixmap.set_defaultGeometry ();
		621
		622	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		623	if (!bgPixmap.window_position_sensitive ())
		624	update_background ();
		625	}
		626	#endif
		627	}
		628	#endif
		629
		630	#if ENABLE_PERL
		631	rootwin_ev.start (display, display->root);
		632	#endif
		633
		634	set_colorfgbg ();
		635
		636	init_command (cmd_argv);
		637
		638	free (cmd_argv);
		639
		640	if (pty->pty >= 0)
		641	pty_ev.start (pty->pty, ev::READ);
		642
		643	HOOK_INVOKE ((this, HOOK_START, DT_END));
		644
		645	#if ENABLE_XEMBED
		646	if (rs[Rs_embed])
		647	{
		648	long info[2] = { 0, XEMBED_MAPPED };
		649
		650	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		651	32, PropModeReplace, (unsigned char *)&info, 2);
		652	}
		653	#endif
		654
		655	XMapWindow (dpy, vt);
		656	XMapWindow (dpy, parent[0]);
		657
		658	refresh_check ();
480	}	659	}
481		660
482	/----------------------------------------------------------------------/	661	/----------------------------------------------------------------------/
483	void	662	void
484	rxvt_term::init_env ()	663	rxvt_term::init_env ()
485	{	664	{
486	int i;	665	int i;
487	unsigned int u;
488	char *val;	666	char *val;
489		667
490	#ifdef DISPLAY_IS_IP	668	#ifdef DISPLAY_IS_IP
491	/* Fixup display_name for export over pty to any interested terminal	669	/* Fixup display_name for export over pty to any interested terminal
492	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	670	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
500	*/	678	*/
501	val = rxvt_network_display (rs[Rs_display_name]);	679	val = rxvt_network_display (rs[Rs_display_name]);
502	rs[Rs_display_name] = (const char *)val;	680	rs[Rs_display_name] = (const char *)val;
503		681
504	if (val == NULL)	682	if (val == NULL)
505	#endif /* DISPLAY_IS_IP */	683	#endif /* DISPLAY_IS_IP */
506	val = XDisplayString (dpy);	684	val = XDisplayString (dpy);
507		685
508	if (rs[Rs_display_name] == NULL)	686	if (rs[Rs_display_name] == NULL)
509	rs[Rs_display_name] = val; /* use broken `:0' value */	687	rs[Rs_display_name] = val; /* use broken `:0' value */
510		688
511	i = strlen (val);	689	i = strlen (val);
512	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	690	env_display = (char *)rxvt_malloc (i + 9);
513		691
514	sprintf (env_display, "DISPLAY=%s", val);	692	sprintf (env_display, "DISPLAY=%s", val);
515		693
516	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	694	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
517		695
…		…
538	else	716	else
539	putenv ("COLORTERM=" COLORTERMENVFULL);	717	putenv ("COLORTERM=" COLORTERMENVFULL);
540		718
541	if (rs[Rs_term_name] != NULL)	719	if (rs[Rs_term_name] != NULL)
542	{	720	{
543	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	721	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
544	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	722	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
545	putenv (env_term);	723	putenv (env_term);
546	}	724	}
547	else	725	else
548	putenv ("TERM=" TERMENV);	726	putenv ("TERM=" TERMENV);
…		…
550	#ifdef HAVE_UNSETENV	728	#ifdef HAVE_UNSETENV
551	/* avoid passing old settings and confusing term size */	729	/* avoid passing old settings and confusing term size */
552	unsetenv ("LINES");	730	unsetenv ("LINES");
553	unsetenv ("COLUMNS");	731	unsetenv ("COLUMNS");
554	unsetenv ("TERMCAP"); /* terminfo should be okay */	732	unsetenv ("TERMCAP"); /* terminfo should be okay */
555	#endif /* HAVE_UNSETENV */	733	#endif /* HAVE_UNSETENV */
556	}	734	}
557		735
558	/----------------------------------------------------------------------/	736	/----------------------------------------------------------------------/
559	/*	737	/*
560	* This is more or less stolen straight from XFree86 xterm.	738	* This is more or less stolen straight from XFree86 xterm.
…		…
581		759
582	this->locale = "C";	760	this->locale = "C";
583	}	761	}
584		762
585		763
586	this->locale = rxvt_strdup (this->locale);	764	this->locale = strdup (this->locale);
587	SET_LOCALE (this->locale);	765	SET_LOCALE (this->locale);
588	mbstate.reset ();	766	mbstate.reset ();
589	#endif	767	#endif
590		768
591	#if HAVE_NL_LANGINFO	769	#if HAVE_NL_LANGINFO
…		…
648	priv_modes \|= PrivMode_Keypress;	826	priv_modes \|= PrivMode_Keypress;
649	if (!option (Opt_jumpScroll))	827	if (!option (Opt_jumpScroll))
650	priv_modes \|= PrivMode_smoothScroll;	828	priv_modes \|= PrivMode_smoothScroll;
651		829
652	#ifndef NO_BACKSPACE_KEY	830	#ifndef NO_BACKSPACE_KEY
653	if (strcmp (key_backspace, "DEC") == 0)	831	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
654	priv_modes \|= PrivMode_HaveBackSpace;	832	priv_modes \|= PrivMode_HaveBackSpace;
655	#endif	833	#endif
656		834
657	/* add value for scrollBar */	835	/* add value for scrollBar */
658	if (scrollBar.state)	836	if (scrollBar.state)
…		…
664	run_command (argv);	842	run_command (argv);
665	}	843	}
666		844
667	/----------------------------------------------------------------------/	845	/----------------------------------------------------------------------/
668	void	846	void
669	rxvt_term::Get_Colours ()	847	rxvt_term::get_colours ()
670	{	848	{
671	int i;	849	int i;
672		850
673	#ifdef OFF_FOCUS_FADING	851	#ifdef OFF_FOCUS_FADING
674	pix_colors = pix_colors_focused;	852	pix_colors = pix_colors_focused;
675	#endif	853	#endif
676		854
677	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	855	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
678	{	856	{
679	const char *name = rs[Rs_color + i];	857	const char *name = rs[Rs_color + i];
680		858
681	if (!name)	859	if (!name)
…		…
734	* get scrollBar shadow colors	912	* get scrollBar shadow colors
735	*	913	*
736	* The calculations of topShadow/bottomShadow values are adapted	914	* The calculations of topShadow/bottomShadow values are adapted
737	* from the fvwm window manager.	915	* from the fvwm window manager.
738	*/	916	*/
739	#ifdef KEEP_SCROLLCOLOR	917	#ifdef RXVT_SCROLLBAR
740	if (depth <= 2)	918	if (depth <= 2)
741	{	919	{
742	/* Monochrome */	920	/* Monochrome */
743	alias_color (Color_scroll, Color_fg);	921	alias_color (Color_scroll, Color_fg);
744	alias_color (Color_topShadow, Color_bg);	922	alias_color (Color_topShadow, Color_bg);
…		…
759	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	937	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760	cscroll.a)	938	cscroll.a)
761	))	939	))
762	alias_color (Color_topShadow, Color_White);	940	alias_color (Color_topShadow, Color_White);
763	}	941	}
764	#endif /* KEEP_SCROLLCOLOR */	942	#endif
765		943
766	#ifdef OFF_FOCUS_FADING	944	#ifdef OFF_FOCUS_FADING
767	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	945	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
768	update_fade_color (i);	946	update_fade_color (i);
769	#endif	947	#endif
…		…
777	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	955	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
778	{	956	{
779	int i = atoi (rs[Rs_color + idx]);	957	int i = atoi (rs[Rs_color + idx]);
780		958
781	if (i >= 8 && i <= 15)	959	if (i >= 8 && i <= 15)
782	{ /* bright colors */	960	/* bright colors */
783	i -= 8;
784	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	961	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
785	return;	962	else if (i >= 0 && i <= 7)
786	}	963	/* normal colors */
787
788	if (i >= 0 && i <= 7) /* normal colors */
789	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	964	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
790	}	965	}
791	}	966	}
792		967
793	/----------------------------------------------------------------------/	968	/----------------------------------------------------------------------/
…		…
894	Window top, parent;	1069	Window top, parent;
895		1070
896	dLocal (Display *, dpy);	1071	dLocal (Display *, dpy);
897		1072
898	/* grab colors before netscape does */	1073	/* grab colors before netscape does */
899	Get_Colours ();	1074	get_colours ();
900		1075
901	if (!set_fonts ())	1076	if (!set_fonts ())
902	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1077	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
903		1078
904	parent = display->root;	1079	parent = display->root;
…		…
1009	termwin_ev.start (display, top);	1184	termwin_ev.start (display, top);
1010		1185
1011	/* vt cursor: Black-on-White is standard, but this is more popular */	1186	/* vt cursor: Black-on-White is standard, but this is more popular */
1012	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1187	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013		1188
1014	#ifdef HAVE_SCROLLBARS
1015	/* cursor scrollBar: Black-on-White */
1016	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1017	#endif
1018
1019	/* the vt window */	1189	/* the vt window */
1020	vt = XCreateSimpleWindow (dpy, top,	1190	vt = XCreateSimpleWindow (dpy, top,
1021	window_vt_x, window_vt_y,	1191	window_vt_x, window_vt_y,
1022	width, height,	1192	width, height,
1023	0,	1193	0,
…		…
1047	GCForeground \| GCBackground \| GCGraphicsExposures,	1217	GCForeground \| GCBackground \| GCGraphicsExposures,
1048	&gcvalue);	1218	&gcvalue);
1049		1219
1050	drawable = new rxvt_drawable (this, vt);	1220	drawable = new rxvt_drawable (this, vt);
1051		1221
1052	#ifdef RXVT_SCROLLBAR
1053	gcvalue.foreground = pix_colors[Color_topShadow];
1054	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1055	gcvalue.foreground = pix_colors[Color_bottomShadow];
1056	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1057	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1058	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1059	#endif
1060
1061	#ifdef OFF_FOCUS_FADING	1222	#ifdef OFF_FOCUS_FADING
1062	// initially we are in unfocused state	1223	// initially we are in unfocused state
1063	if (rs[Rs_fade])	1224	if (rs[Rs_fade])
1064	pix_colors = pix_colors_unfocused;	1225	pix_colors = pix_colors_unfocused;
1065	#endif	1226	#endif
…		…
1070		1231
1071	/* ------------------------------------------------------------------------- *	1232	/* ------------------------------------------------------------------------- *
1072	* GET TTY CURRENT STATE *	1233	* GET TTY CURRENT STATE *
1073	* ------------------------------------------------------------------------- */	1234	* ------------------------------------------------------------------------- */
1074	void	1235	void
1075	rxvt_get_ttymode (ttymode_t *tio, int erase)	1236	rxvt_get_ttymode (struct termios *tio, int erase)
1076	{	1237	{
1077	/*	1238	/*
1078	* standard System V termios interface	1239	* standard System V termios interface
1079	*/	1240	*/
1080	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1241	if (tcgetattr (STDIN_FILENO, tio) < 0)
1081	{	1242	{
1082	// return error - use system defaults,	1243	// return error - use system defaults,
1083	// where possible, and zero elsewhere	1244	// where possible, and zero elsewhere
1084	memset (tio, 0, sizeof (ttymode_t));	1245	memset (tio, 0, sizeof (struct termios));
1085		1246
1086	tio->c_cc[VINTR] = CINTR;	1247	tio->c_cc[VINTR] = CINTR;
1087	tio->c_cc[VQUIT] = CQUIT;	1248	tio->c_cc[VQUIT] = CQUIT;
1088	tio->c_cc[VERASE] = CERASE;	1249	tio->c_cc[VERASE] = CERASE;
1089	#ifdef VERASE2	1250	#ifdef VERASE2
…		…
1153		1314
1154	/*	1315	/*
1155	* Debugging	1316	* Debugging
1156	*/	1317	*/
1157	#ifdef DEBUG_TTYMODE	1318	#ifdef DEBUG_TTYMODE
1158	#ifdef HAVE_TERMIOS_H
1159	/* c_iflag bits */	1319	/* c_iflag bits */
1160	fprintf (stderr, "Input flags\n");	1320	fprintf (stderr, "Input flags\n");
1161		1321
1162	/* cpp token stringize doesn't work on all machines <sigh> */	1322	/* cpp token stringize doesn't work on all machines <sigh> */
1163	# define FOO(flag,name) \	1323	# define FOO(flag,name) \
…		…
1226	FOO (VLNEXT, "VLNEXT");	1386	FOO (VLNEXT, "VLNEXT");
1227	# endif	1387	# endif
1228		1388
1229	fprintf (stderr, "\n");	1389	fprintf (stderr, "\n");
1230	# undef FOO	1390	# undef FOO
1231	# endif /* HAVE_TERMIOS_H */	1391	#endif /* DEBUG_TTYMODE */
1232	#endif /* DEBUG_TTYMODE */
1233	}	1392	}
1234		1393
1235	/----------------------------------------------------------------------/	1394	/----------------------------------------------------------------------/
1236	/*	1395	/*
1237	* Run the command in a subprocess and return a file descriptor for the	1396	* Run the command in a subprocess and return a file descriptor for the
…		…
1261	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1420	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1262		1421
1263	int er;	1422	int er;
1264		1423
1265	#ifndef NO_BACKSPACE_KEY	1424	#ifndef NO_BACKSPACE_KEY
1266	if (key_backspace[0] && !key_backspace[1])	1425	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1267	er = key_backspace[0];	1426	er = rs[Rs_backspace_key][0];
1268	else if (strcmp (key_backspace, "DEC") == 0)	1427	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1269	er = '\177'; /* the initial state anyway */	1428	er = '\177'; /* the initial state anyway */
1270	else	1429	else
1271	#endif	1430	#endif
1272	er = -1;	1431	er = -1;
1273		1432
1274	rxvt_get_ttymode (&tio, er);	1433	rxvt_get_ttymode (&tio, er);
1275	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1434	/* init terminal attributes */
		1435	cfsetospeed (&tio, BAUDRATE);
		1436	cfsetispeed (&tio, BAUDRATE);
		1437	tcsetattr (pty->tty, TCSANOW, &tio);
1276	pty->set_utf8_mode (enc_utf8);	1438	pty->set_utf8_mode (enc_utf8);
1277		1439
1278	/* set initial window size */	1440	/* set initial window size */
1279	tt_winch ();	1441	tt_winch ();
1280		1442
…		…
1340	rxvt_term::run_child (const char const argv)	1502	rxvt_term::run_child (const char const argv)
1341	{	1503	{
1342	char *login;	1504	char *login;
1343		1505
1344	if (option (Opt_console))	1506	if (option (Opt_console))
		1507	{
1345	{ /* be virtual console, fail silently */	1508	/* be virtual console, fail silently */
1346	#ifdef TIOCCONS	1509	#ifdef TIOCCONS
1347	unsigned int on = 1;	1510	unsigned int on = 1;
1348		1511
1349	ioctl (STDIN_FILENO, TIOCCONS, &on);	1512	ioctl (STDIN_FILENO, TIOCCONS, &on);
1350	#elif defined (SRIOCSREDIR)	1513	#elif defined (SRIOCSREDIR)
…		…
1352		1515
1353	fd = open (CONSOLE, O_WRONLY, 0);	1516	fd = open (CONSOLE, O_WRONLY, 0);
1354	if (fd >= 0)	1517	if (fd >= 0)
1355	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1518	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1356	close (fd);	1519	close (fd);
1357	#endif /* SRIOCSREDIR */	1520	#endif /* SRIOCSREDIR */
1358	}	1521	}
1359		1522
1360	/* reset signals and spin off the command interpreter */	1523	/* reset signals and spin off the command interpreter */
1361	signal (SIGINT, SIG_DFL);	1524	signal (SIGINT, SIG_DFL);
1362	signal (SIGQUIT, SIG_DFL);	1525	signal (SIGQUIT, SIG_DFL);
…		…
1369	*/	1532	*/
1370	#ifdef SIGTSTP	1533	#ifdef SIGTSTP
1371	signal (SIGTSTP, SIG_IGN);	1534	signal (SIGTSTP, SIG_IGN);
1372	signal (SIGTTIN, SIG_IGN);	1535	signal (SIGTTIN, SIG_IGN);
1373	signal (SIGTTOU, SIG_IGN);	1536	signal (SIGTTOU, SIG_IGN);
1374	#endif /* SIGTSTP */	1537	#endif /* SIGTSTP */
1375
1376	// unblock signals (signals are blocked by iom.C
1377	sigset_t ss;
1378	sigemptyset (&ss);
1379	sigprocmask (SIG_SETMASK, &ss, 0);
1380		1538
1381	/* command interpreter path */	1539	/* command interpreter path */
1382	if (argv != NULL)	1540	if (argv)
1383	{	1541	{
1384	# ifdef DEBUG_CMD	1542	# ifdef DEBUG_CMD
1385	int i;	1543	int i;
1386		1544
1387	for (i = 0; argv[i]; i++)	1545	for (i = 0; argv[i]; i++)
…		…
1396	const char argv0, shell;	1554	const char argv0, shell;
1397		1555
1398	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1556	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1399	shell = "/bin/sh";	1557	shell = "/bin/sh";
1400		1558
1401	argv0 = (const char *)rxvt_r_basename (shell);	1559	argv0 = (const char *)rxvt_basename (shell);
1402		1560
1403	if (option (Opt_loginShell))	1561	if (option (Opt_loginShell))
1404	{	1562	{
1405	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1563	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1406		1564
1407	login[0] = '-';	1565	login[0] = '-';
1408	strcpy (&login[1], argv0);	1566	strcpy (&login[1], argv0);
1409	argv0 = login;	1567	argv0 = login;
1410	}	1568	}
1411		1569
1412	execlp (shell, argv0, NULL);	1570	execlp (shell, argv0, (char *)0);
1413	/* no error message: STDERR is closed! */	1571	/* no error message: STDERR is closed! */
1414	}	1572	}
1415		1573
1416	return -1;	1574	return -1;
1417	}	1575	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.206 by ayin, Mon Aug 13 07:17:48 2007 UTC vs. Revision 1.252 by root, Sun Jun 15 13:54:15 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.206 by ayin, Mon Aug 13 07:17:48 2007 UTC vs.
Revision 1.252 by root, Sun Jun 15 13:54:15 2008 UTC