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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs.
Revision 1.250 by root, Tue Feb 19 17:47:01 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	key_backspace = val;
408	}
409	#endif	479	#endif
410		480
411	#ifndef NO_DELETE_KEY	481	#ifndef NO_DELETE_KEY
412	if (!rs[Rs_delete_key])	482	if (!rs[Rs_delete_key])
413	# ifdef DEFAULT_DELETE	483	# ifdef DEFAULT_DELETE
414	key_delete = DEFAULT_DELETE;	484	rs[Rs_delete_key] = DEFAULT_DELETE;
415	# else	485	# else
416	key_delete = "\033[3~";	486	rs[Rs_delete_key] = "\033[3~";
417	# endif
418	else
419	{
420	val = strdup (rs[Rs_delete_key]);
421	key_delete = val;
422	}
423	#endif	487	# endif
424
425	#ifdef HAVE_SCROLLBARS
426	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427	#endif	488	#endif
		489
		490	scrollBar.setup (this);
428		491
429	#ifdef XTERM_REVERSE_VIDEO	492	#ifdef XTERM_REVERSE_VIDEO
430	/* this is how xterm implements reverseVideo */	493	/* this is how xterm implements reverseVideo */
431	if (option (Opt_reverseVideo))	494	if (option (Opt_reverseVideo))
432	{	495	{
…		…
452	color_aliases (Color_fg);	515	color_aliases (Color_fg);
453	color_aliases (Color_bg);	516	color_aliases (Color_bg);
454	#ifndef NO_CURSORCOLOR	517	#ifndef NO_CURSORCOLOR
455	color_aliases (Color_cursor);	518	color_aliases (Color_cursor);
456	color_aliases (Color_cursor2);	519	color_aliases (Color_cursor2);
457	#endif /* NO_CURSORCOLOR */	520	#endif /* NO_CURSORCOLOR */
458	color_aliases (Color_pointer_fg);	521	color_aliases (Color_pointer_fg);
459	color_aliases (Color_pointer_bg);	522	color_aliases (Color_pointer_bg);
460	color_aliases (Color_border);	523	color_aliases (Color_border);
461	#ifndef NO_BOLD_UNDERLINE_REVERSE	524	#ifndef NO_BOLD_UNDERLINE_REVERSE
462	color_aliases (Color_BD);	525	color_aliases (Color_BD);
463	color_aliases (Color_UL);	526	color_aliases (Color_UL);
464	color_aliases (Color_RV);	527	color_aliases (Color_RV);
465	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	528	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
466		529
467	if (!rs[Rs_color + Color_border])	530	if (!rs[Rs_color + Color_border])
468	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	531	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
469		532
470	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.state = STATE_IDLE; /* 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	scrollBar.resize (); /* 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 ();
471	}	649	}
472		650
473	/----------------------------------------------------------------------/	651	/----------------------------------------------------------------------/
474	void	652	void
475	rxvt_term::init_env ()	653	rxvt_term::init_env ()
…		…
490	*/	668	*/
491	val = rxvt_network_display (rs[Rs_display_name]);	669	val = rxvt_network_display (rs[Rs_display_name]);
492	rs[Rs_display_name] = (const char *)val;	670	rs[Rs_display_name] = (const char *)val;
493		671
494	if (val == NULL)	672	if (val == NULL)
495	#endif /* DISPLAY_IS_IP */	673	#endif /* DISPLAY_IS_IP */
496	val = XDisplayString (dpy);	674	val = XDisplayString (dpy);
497		675
498	if (rs[Rs_display_name] == NULL)	676	if (rs[Rs_display_name] == NULL)
499	rs[Rs_display_name] = val; /* use broken `:0' value */	677	rs[Rs_display_name] = val; /* use broken `:0' value */
500		678
…		…
540	#ifdef HAVE_UNSETENV	718	#ifdef HAVE_UNSETENV
541	/* avoid passing old settings and confusing term size */	719	/* avoid passing old settings and confusing term size */
542	unsetenv ("LINES");	720	unsetenv ("LINES");
543	unsetenv ("COLUMNS");	721	unsetenv ("COLUMNS");
544	unsetenv ("TERMCAP"); /* terminfo should be okay */	722	unsetenv ("TERMCAP"); /* terminfo should be okay */
545	#endif /* HAVE_UNSETENV */	723	#endif /* HAVE_UNSETENV */
546	}	724	}
547		725
548	/----------------------------------------------------------------------/	726	/----------------------------------------------------------------------/
549	/*	727	/*
550	* This is more or less stolen straight from XFree86 xterm.	728	* This is more or less stolen straight from XFree86 xterm.
…		…
571		749
572	this->locale = "C";	750	this->locale = "C";
573	}	751	}
574		752
575		753
576	this->locale = rxvt_strdup (this->locale);	754	this->locale = strdup (this->locale);
577	SET_LOCALE (this->locale);	755	SET_LOCALE (this->locale);
578	mbstate.reset ();	756	mbstate.reset ();
579	#endif	757	#endif
580		758
581	#if HAVE_NL_LANGINFO	759	#if HAVE_NL_LANGINFO
…		…
638	priv_modes \|= PrivMode_Keypress;	816	priv_modes \|= PrivMode_Keypress;
639	if (!option (Opt_jumpScroll))	817	if (!option (Opt_jumpScroll))
640	priv_modes \|= PrivMode_smoothScroll;	818	priv_modes \|= PrivMode_smoothScroll;
641		819
642	#ifndef NO_BACKSPACE_KEY	820	#ifndef NO_BACKSPACE_KEY
643	if (strcmp (key_backspace, "DEC") == 0)	821	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644	priv_modes \|= PrivMode_HaveBackSpace;	822	priv_modes \|= PrivMode_HaveBackSpace;
645	#endif	823	#endif
646		824
647	/* add value for scrollBar */	825	/* add value for scrollBar */
648	if (scrollBar.state)	826	if (scrollBar.state)
…		…
661	int i;	839	int i;
662		840
663	#ifdef OFF_FOCUS_FADING	841	#ifdef OFF_FOCUS_FADING
664	pix_colors = pix_colors_focused;	842	pix_colors = pix_colors_focused;
665	#endif	843	#endif
666		844
667	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	845	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
668	{	846	{
669	const char *name = rs[Rs_color + i];	847	const char *name = rs[Rs_color + i];
670		848
671	if (!name)	849	if (!name)
…		…
724	* get scrollBar shadow colors	902	* get scrollBar shadow colors
725	*	903	*
726	* The calculations of topShadow/bottomShadow values are adapted	904	* The calculations of topShadow/bottomShadow values are adapted
727	* from the fvwm window manager.	905	* from the fvwm window manager.
728	*/	906	*/
729	#ifdef KEEP_SCROLLCOLOR	907	#ifdef RXVT_SCROLLBAR
730	if (depth <= 2)	908	if (depth <= 2)
731	{	909	{
732	/* Monochrome */	910	/* Monochrome */
733	alias_color (Color_scroll, Color_fg);	911	alias_color (Color_scroll, Color_fg);
734	alias_color (Color_topShadow, Color_bg);	912	alias_color (Color_topShadow, Color_bg);
…		…
749	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),
750	cscroll.a)	928	cscroll.a)
751	))	929	))
752	alias_color (Color_topShadow, Color_White);	930	alias_color (Color_topShadow, Color_White);
753	}	931	}
754	#endif /* KEEP_SCROLLCOLOR */	932	#endif
755		933
756	#ifdef OFF_FOCUS_FADING	934	#ifdef OFF_FOCUS_FADING
757	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	935	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758	update_fade_color (i);	936	update_fade_color (i);
759	#endif	937	#endif
…		…
767	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	945	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
768	{	946	{
769	int i = atoi (rs[Rs_color + idx]);	947	int i = atoi (rs[Rs_color + idx]);
770		948
771	if (i >= 8 && i <= 15)	949	if (i >= 8 && i <= 15)
772	{ /* bright colors */	950	/* bright colors */
773	i -= 8;
774	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	951	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
775	return;	952	else if (i >= 0 && i <= 7)
776	}	953	/* normal colors */
777
778	if (i >= 0 && i <= 7) /* normal colors */
779	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	954	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
780	}	955	}
781	}	956	}
782		957
783	/----------------------------------------------------------------------/	958	/----------------------------------------------------------------------/
…		…
999	termwin_ev.start (display, top);	1174	termwin_ev.start (display, top);
1000		1175
1001	/* 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 */
1002	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1177	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1003		1178
1004	#ifdef HAVE_SCROLLBARS
1005	/* cursor scrollBar: Black-on-White */
1006	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007	#endif
1008
1009	/* the vt window */	1179	/* the vt window */
1010	vt = XCreateSimpleWindow (dpy, top,	1180	vt = XCreateSimpleWindow (dpy, top,
1011	window_vt_x, window_vt_y,	1181	window_vt_x, window_vt_y,
1012	width, height,	1182	width, height,
1013	0,	1183	0,
…		…
1037	GCForeground \| GCBackground \| GCGraphicsExposures,	1207	GCForeground \| GCBackground \| GCGraphicsExposures,
1038	&gcvalue);	1208	&gcvalue);
1039		1209
1040	drawable = new rxvt_drawable (this, vt);	1210	drawable = new rxvt_drawable (this, vt);
1041		1211
1042	#ifdef RXVT_SCROLLBAR
1043	gcvalue.foreground = pix_colors[Color_topShadow];
1044	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1045	gcvalue.foreground = pix_colors[Color_bottomShadow];
1046	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1047	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1048	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1049	#endif
1050
1051	#ifdef OFF_FOCUS_FADING	1212	#ifdef OFF_FOCUS_FADING
1052	// initially we are in unfocused state	1213	// initially we are in unfocused state
1053	if (rs[Rs_fade])	1214	if (rs[Rs_fade])
1054	pix_colors = pix_colors_unfocused;	1215	pix_colors = pix_colors_unfocused;
1055	#endif	1216	#endif
…		…
1060		1221
1061	/* ------------------------------------------------------------------------- *	1222	/* ------------------------------------------------------------------------- *
1062	* GET TTY CURRENT STATE *	1223	* GET TTY CURRENT STATE *
1063	* ------------------------------------------------------------------------- */	1224	* ------------------------------------------------------------------------- */
1064	void	1225	void
1065	rxvt_get_ttymode (ttymode_t *tio, int erase)	1226	rxvt_get_ttymode (struct termios *tio, int erase)
1066	{	1227	{
1067	/*	1228	/*
1068	* standard System V termios interface	1229	* standard System V termios interface
1069	*/	1230	*/
1070	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1231	if (tcgetattr (STDIN_FILENO, tio) < 0)
1071	{	1232	{
1072	// return error - use system defaults,	1233	// return error - use system defaults,
1073	// where possible, and zero elsewhere	1234	// where possible, and zero elsewhere
1074	memset (tio, 0, sizeof (ttymode_t));	1235	memset (tio, 0, sizeof (struct termios));
1075		1236
1076	tio->c_cc[VINTR] = CINTR;	1237	tio->c_cc[VINTR] = CINTR;
1077	tio->c_cc[VQUIT] = CQUIT;	1238	tio->c_cc[VQUIT] = CQUIT;
1078	tio->c_cc[VERASE] = CERASE;	1239	tio->c_cc[VERASE] = CERASE;
1079	#ifdef VERASE2	1240	#ifdef VERASE2
…		…
1143		1304
1144	/*	1305	/*
1145	* Debugging	1306	* Debugging
1146	*/	1307	*/
1147	#ifdef DEBUG_TTYMODE	1308	#ifdef DEBUG_TTYMODE
1148	#ifdef HAVE_TERMIOS_H
1149	/* c_iflag bits */	1309	/* c_iflag bits */
1150	fprintf (stderr, "Input flags\n");	1310	fprintf (stderr, "Input flags\n");
1151		1311
1152	/* cpp token stringize doesn't work on all machines <sigh> */	1312	/* cpp token stringize doesn't work on all machines <sigh> */
1153	# define FOO(flag,name) \	1313	# define FOO(flag,name) \
…		…
1216	FOO (VLNEXT, "VLNEXT");	1376	FOO (VLNEXT, "VLNEXT");
1217	# endif	1377	# endif
1218		1378
1219	fprintf (stderr, "\n");	1379	fprintf (stderr, "\n");
1220	# undef FOO	1380	# undef FOO
1221	# endif /* HAVE_TERMIOS_H */	1381	#endif /* DEBUG_TTYMODE */
1222	#endif /* DEBUG_TTYMODE */
1223	}	1382	}
1224		1383
1225	/----------------------------------------------------------------------/	1384	/----------------------------------------------------------------------/
1226	/*	1385	/*
1227	* 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
…		…
1251	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1410	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252		1411
1253	int er;	1412	int er;
1254		1413
1255	#ifndef NO_BACKSPACE_KEY	1414	#ifndef NO_BACKSPACE_KEY
1256	if (key_backspace[0] && !key_backspace[1])	1415	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257	er = key_backspace[0];	1416	er = rs[Rs_backspace_key][0];
1258	else if (strcmp (key_backspace, "DEC") == 0)	1417	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259	er = '\177'; /* the initial state anyway */	1418	er = '\177'; /* the initial state anyway */
1260	else	1419	else
1261	#endif	1420	#endif
1262	er = -1;	1421	er = -1;
1263		1422
1264	rxvt_get_ttymode (&tio, er);	1423	rxvt_get_ttymode (&tio, er);
1265	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);
1266	pty->set_utf8_mode (enc_utf8);	1428	pty->set_utf8_mode (enc_utf8);
1267		1429
1268	/* set initial window size */	1430	/* set initial window size */
1269	tt_winch ();	1431	tt_winch ();
1270		1432
…		…
1330	rxvt_term::run_child (const char const argv)	1492	rxvt_term::run_child (const char const argv)
1331	{	1493	{
1332	char *login;	1494	char *login;
1333		1495
1334	if (option (Opt_console))	1496	if (option (Opt_console))
		1497	{
1335	{ /* be virtual console, fail silently */	1498	/* be virtual console, fail silently */
1336	#ifdef TIOCCONS	1499	#ifdef TIOCCONS
1337	unsigned int on = 1;	1500	unsigned int on = 1;
1338		1501
1339	ioctl (STDIN_FILENO, TIOCCONS, &on);	1502	ioctl (STDIN_FILENO, TIOCCONS, &on);
1340	#elif defined (SRIOCSREDIR)	1503	#elif defined (SRIOCSREDIR)
…		…
1342		1505
1343	fd = open (CONSOLE, O_WRONLY, 0);	1506	fd = open (CONSOLE, O_WRONLY, 0);
1344	if (fd >= 0)	1507	if (fd >= 0)
1345	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1508	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1346	close (fd);	1509	close (fd);
1347	#endif /* SRIOCSREDIR */	1510	#endif /* SRIOCSREDIR */
1348	}	1511	}
1349		1512
1350	/* reset signals and spin off the command interpreter */	1513	/* reset signals and spin off the command interpreter */
1351	signal (SIGINT, SIG_DFL);	1514	signal (SIGINT, SIG_DFL);
1352	signal (SIGQUIT, SIG_DFL);	1515	signal (SIGQUIT, SIG_DFL);
…		…
1359	*/	1522	*/
1360	#ifdef SIGTSTP	1523	#ifdef SIGTSTP
1361	signal (SIGTSTP, SIG_IGN);	1524	signal (SIGTSTP, SIG_IGN);
1362	signal (SIGTTIN, SIG_IGN);	1525	signal (SIGTTIN, SIG_IGN);
1363	signal (SIGTTOU, SIG_IGN);	1526	signal (SIGTTOU, SIG_IGN);
1364	#endif /* SIGTSTP */	1527	#endif /* SIGTSTP */
1365
1366	// unblock signals (signals are blocked by iom.C
1367	sigset_t ss;
1368	sigemptyset (&ss);
1369	sigprocmask (SIG_SETMASK, &ss, 0);
1370		1528
1371	/* command interpreter path */	1529	/* command interpreter path */
1372	if (argv != NULL)	1530	if (argv)
1373	{	1531	{
1374	# ifdef DEBUG_CMD	1532	# ifdef DEBUG_CMD
1375	int i;	1533	int i;
1376		1534
1377	for (i = 0; argv[i]; i++)	1535	for (i = 0; argv[i]; i++)
…		…
1386	const char argv0, shell;	1544	const char argv0, shell;
1387		1545
1388	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1546	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1389	shell = "/bin/sh";	1547	shell = "/bin/sh";
1390		1548
1391	argv0 = (const char *)rxvt_r_basename (shell);	1549	argv0 = (const char *)rxvt_basename (shell);
1392		1550
1393	if (option (Opt_loginShell))	1551	if (option (Opt_loginShell))
1394	{	1552	{
1395	login = (char *)rxvt_malloc (strlen (argv0) + 2);	1553	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1396		1554
1397	login[0] = '-';	1555	login[0] = '-';
1398	strcpy (&login[1], argv0);	1556	strcpy (&login[1], argv0);
1399	argv0 = login;	1557	argv0 = login;
1400	}	1558	}
1401		1559
1402	execlp (shell, argv0, NULL);	1560	execlp (shell, argv0, (char *)0);
1403	/* no error message: STDERR is closed! */	1561	/* no error message: STDERR is closed! */
1404	}	1562	}
1405		1563
1406	return -1;	1564	return -1;
1407	}	1565	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs. Revision 1.250 by root, Tue Feb 19 17:47:01 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs.
Revision 1.250 by root, Tue Feb 19 17:47:01 2008 UTC