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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.185 by ayin, Sat Jun 9 08:12:38 2007 UTC vs.
Revision 1.241 by root, Sat Jan 19 14:23:33 2008 UTC

…		…
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
		10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
		11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
		12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	14	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support
14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15	*	16	*
16	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	20	* (at your option) any later version.
…		…
33		34
34	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	37	#include "rxvtutil.h"
37	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
38		40
39	#include <limits>	41	#include <limits>
40		42
41	#include <csignal>	43	#include <csignal>
		44
		45	#include <fcntl.h>
		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
		56	#ifdef HAVE_NL_LANGINFO
		57	# include <langinfo.h>
		58	#endif
		59
		60	#ifdef DISPLAY_IS_IP
		61	/* On Solaris link with -lsocket and -lnsl */
		62	#include <sys/types.h>
		63	#include <sys/socket.h>
		64
		65	/* these next two are probably only on Sun (not Solaris) */
		66	#ifdef HAVE_SYS_SOCKIO_H
		67	#include <sys/sockio.h>
		68	#endif
		69	#ifdef HAVE_SYS_BYTEORDER_H
		70	#include <sys/byteorder.h>
		71	#endif
		72
		73	#include <netinet/in.h>
		74	#include <arpa/inet.h>
		75	#include <net/if.h>
		76	#include <net/if_arp.h>
		77
		78	static char *
		79	rxvt_network_display (const char *display)
		80	{
		81	char buffer[1024], *rval = NULL;
		82	struct ifconf ifc;
		83	struct ifreq *ifr;
		84	int i, skfd;
		85
		86	if (display[0] != ':' && strncmp (display, "unix:", 5))
		87	return (char ) display; / nothing to do */
		88
		89	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		90	ifc.ifc_buf = buffer;
		91
		92	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		93	{
		94	perror ("socket");
		95	return NULL;
		96	}
		97
		98	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		99	{
		100	perror ("SIOCGIFCONF");
		101	close (skfd);
		102	return NULL;
		103	}
		104
		105	for (i = 0, ifr = ifc.ifc_req;
		106	i < (ifc.ifc_len / sizeof (struct ifreq));
		107	i++, ifr++)
		108	{
		109	struct ifreq ifr2;
		110
		111	strcpy (ifr2.ifr_name, ifr->ifr_name);
		112
		113	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		114	{
		115	unsigned long addr;
		116	struct sockaddr_in *p_addr;
		117
		118	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		119	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		120
		121	/*
		122	* not "0.0.0.0" or "127.0.0.1" - so format the address
		123	*/
		124	if (addr && addr != 0x7F000001)
		125	{
		126	char *colon = strchr (display, ':');
		127
		128	if (colon == NULL)
		129	colon = ":0.0";
		130
		131	rval = rxvt_malloc (strlen (colon) + 16);
		132	sprintf (rval, "%d.%d.%d.%d%s",
		133	(int) ((addr >> 030) & 0xFF),
		134	(int) ((addr >> 020) & 0xFF),
		135	(int) ((addr >> 010) & 0xFF),
		136	(int) (addr & 0xFF), colon);
		137	break;
		138	}
		139	}
		140	}
		141
		142	close (skfd);
		143
		144	return rval;
		145	}
		146	#endif
42		147
43	const char *const def_colorName[] =	148	const char *const def_colorName[] =
44	{	149	{
45	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
…		…
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 KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	273	COLOR_SCROLLBAR,
169	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	275	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	276	#if ENABLE_TRANSPARENCY
172	NULL,	277	NULL,
173	#endif	278	#endif
174	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	280	"rgb:00/00/00",
176	#endif	281	#endif
177	};	282	};
178		283
179	bool	284	void
180	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
181	{	286	{
182	pix_colors = //	287	pix_colors = pix_colors_focused;
183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184	#ifdef OFF_FOCUS_FADING
185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186	#endif
187
188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
189	pixmap = None;
190	#endif
191		288
192	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
194	want_refresh = 1;	291	want_refresh = 1;
195	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
…		…
197	nrow = 24;	294	nrow = 24;
198	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
199	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
200	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
201	saveLines = SAVELINES;	298	saveLines = SAVELINES;
202	numpix_colors = TOTAL_COLORS;
203		299
204	refresh_limit = 1;
205	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
206		301
207	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
208	#ifdef XPM_BACKGROUND
209	/* bgPixmap.w = bgPixmap.h = 0; */
210	bgPixmap.x = bgPixmap.y = 0;
211	bgPixmap.pixmap = None;
212	#endif
213
214	last_bot = last_state = -1;
215		303
216	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
217	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
218	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
		307	set_option (Opt_skipScroll);
219	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
220	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
221	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
222	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
223		312	set_option (Opt_iso14755_52);
224	return true;
225	}	313	}
226		314
227	void	315	static void
228	rxvt_term::init_secondary ()	316	init_secondary ()
229	{	317	{
230	int i;	318	int i;
231		319
232	/*	320	/*
233	* Close all unused file descriptors	321	* Close all unused file descriptors
…		…
236	if ((i = open ("/dev/null", O_RDONLY)) < 0)	324	if ((i = open ("/dev/null", O_RDONLY)) < 0)
237	{	325	{
238	/* TODO: BOO HISS */	326	/* TODO: BOO HISS */
239	dup2 (STDERR_FILENO, STDIN_FILENO);	327	dup2 (STDERR_FILENO, STDIN_FILENO);
240	}	328	}
241	else if (i > STDIN_FILENO)	329	else if (i != STDIN_FILENO)
242	{	330	{
243	dup2 (i, STDIN_FILENO);	331	dup2 (i, STDIN_FILENO);
244	close (i);	332	close (i);
245	}	333	}
246		334
247	dup2 (STDERR_FILENO, STDOUT_FILENO);	335	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	}	336	}
260		337
261	/----------------------------------------------------------------------/	338	/----------------------------------------------------------------------/
262	const char **	339	const char **
263	rxvt_term::init_resources (int argc, const char const argv)	340	rxvt_term::init_resources (int argc, const char const argv)
264	{	341	{
265	int i, r_argc;	342	int i, r_argc;
266	char *val;
267	const char cmd_argv, r_argv;	343	const char cmd_argv, r_argv;
268		344
269	/*	345	/*
270	* Look for -e option. Find => split and make cmd_argv[] of command args	346	* Look for -e option. Find => split and make cmd_argv[] of command args
271	*/	347	*/
272	for (r_argc = 0; r_argc < argc; r_argc++)	348	for (r_argc = 0; r_argc < argc; r_argc++)
273	if (!strcmp (argv[r_argc], "-e"))	349	if (!strcmp (argv[r_argc], "-e"))
274	break;	350	break;
275		351
		352	if (r_argc == argc)
		353	cmd_argv = NULL;
		354	else if (!argv[r_argc + 1])
		355	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		356	else
		357	{
		358	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		359
		360	for (i = 0; i < argc - r_argc - 1; i++)
		361	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		362
		363	cmd_argv[i] = NULL;
		364	}
		365
276	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	366	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
277		367
278	for (i = 0; i < r_argc; i++)	368	for (i = 0; i < r_argc; i++)
279	r_argv[i] = (const char *)argv[i];	369	r_argv[i] = (const char *)argv[i];
280		370
281	r_argv[i] = NULL;	371	r_argv[i] = NULL;
282		372
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]);	373	rs[Rs_name] = rxvt_basename (argv[0]);
296		374
297	/*	375	/*
298	* Open display, get options/resources and create the window	376	* Open display, get options/resources and create the window
299	*/	377	*/
300		378
…		…
302	rs[Rs_display_name] = ":0";	380	rs[Rs_display_name] = ":0";
303		381
304	get_options (r_argc, r_argv);	382	get_options (r_argc, r_argv);
305		383
306	if (!(display = displays.get (rs[Rs_display_name])))	384	if (!(display = displays.get (rs[Rs_display_name])))
		385	{
		386	free (r_argv);
307	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	387	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		388	}
308		389
309	// using a local pointer decreases code size a lot	390	// using a local pointer decreases code size a lot
310	xa = display->xa;	391	xa = display->xa;
311		392
312	set (display);	393	set (display);
…		…
315	#if XFT	396	#if XFT
316	if (rs[Rs_depth])	397	if (rs[Rs_depth])
317	select_visual (strtol (rs[Rs_depth], 0, 0));	398	select_visual (strtol (rs[Rs_depth], 0, 0));
318	#endif	399	#endif
319		400
		401	#ifdef HAVE_AFTERIMAGE
		402	set_application_name ((char*)rs[Rs_name]);
		403	set_output_threshold (OUTPUT_LEVEL_WARNING);
		404	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		405	#endif
320	free (r_argv);	406	free (r_argv);
321		407
322	for (int i = NUM_RESOURCES; i--; )	408	for (int i = NUM_RESOURCES; i--; )
323	if (rs [i] == resval_undef)	409	if (rs [i] == resval_undef)
324	rs [i] = 0;	410	rs [i] = 0;
…		…
340	* set any defaults not already set	426	* set any defaults not already set
341	*/	427	*/
342	if (cmd_argv && cmd_argv[0])	428	if (cmd_argv && cmd_argv[0])
343	{	429	{
344	if (!rs[Rs_title])	430	if (!rs[Rs_title])
345	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	431	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346	if (!rs[Rs_iconName])	432	if (!rs[Rs_iconName])
347	rs[Rs_iconName] = rs[Rs_title];	433	rs[Rs_iconName] = rs[Rs_title];
348	}	434	}
349	else	435	else
350	{	436	{
…		…
388	rs[Rs_cutchars] = CUTCHARS;	474	rs[Rs_cutchars] = CUTCHARS;
389		475
390	#ifndef NO_BACKSPACE_KEY	476	#ifndef NO_BACKSPACE_KEY
391	if (!rs[Rs_backspace_key])	477	if (!rs[Rs_backspace_key])
392	# ifdef DEFAULT_BACKSPACE	478	# ifdef DEFAULT_BACKSPACE
393	key_backspace = DEFAULT_BACKSPACE;	479	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394	# else	480	# else
395	key_backspace = "DEC"; /* can toggle between \010 or \177 */	481	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396	# endif	482	# 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	483	#endif
405		484
406	#ifndef NO_DELETE_KEY	485	#ifndef NO_DELETE_KEY
407	if (!rs[Rs_delete_key])	486	if (!rs[Rs_delete_key])
408	# ifdef DEFAULT_DELETE	487	# ifdef DEFAULT_DELETE
409	key_delete = DEFAULT_DELETE;	488	rs[Rs_delete_key] = DEFAULT_DELETE;
410	# else	489	# else
411	key_delete = "\033[3~";	490	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	491	# endif
421	if (rs[Rs_answerbackstring])	492	#endif
422	{
423	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425	}
426		493
427	#ifdef HAVE_SCROLLBARS	494	#ifdef HAVE_SCROLLBARS
428	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	495	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429	#endif	496	#endif
430		497
…		…
454	color_aliases (Color_fg);	521	color_aliases (Color_fg);
455	color_aliases (Color_bg);	522	color_aliases (Color_bg);
456	#ifndef NO_CURSORCOLOR	523	#ifndef NO_CURSORCOLOR
457	color_aliases (Color_cursor);	524	color_aliases (Color_cursor);
458	color_aliases (Color_cursor2);	525	color_aliases (Color_cursor2);
459	#endif /* NO_CURSORCOLOR */	526	#endif /* NO_CURSORCOLOR */
460	color_aliases (Color_pointer_fg);	527	color_aliases (Color_pointer_fg);
461	color_aliases (Color_pointer_bg);	528	color_aliases (Color_pointer_bg);
462	color_aliases (Color_border);	529	color_aliases (Color_border);
463	#ifndef NO_BOLD_UNDERLINE_REVERSE	530	#ifndef NO_BOLD_UNDERLINE_REVERSE
464	color_aliases (Color_BD);	531	color_aliases (Color_BD);
465	color_aliases (Color_UL);	532	color_aliases (Color_UL);
466	color_aliases (Color_RV);	533	color_aliases (Color_RV);
467	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	534	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468		535
469	if (!rs[Rs_color + Color_border])	536	if (!rs[Rs_color + Color_border])
470	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	537	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471		538
472	return cmd_argv;	539	return cmd_argv;
		540	}
		541
		542	/----------------------------------------------------------------------/
		543	void
		544	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		545	{
		546	this->envv = envv;
		547
		548	SET_R (this);
		549	set_locale ("");
		550	set_environ (envv); // few things in X do not call setlocale :(
		551
		552	init_vars ();
		553
		554	init_secondary ();
		555
		556	const char **cmd_argv = init_resources (argc, argv);
		557
		558	#ifdef KEYSYM_RESOURCE
		559	keyboard->register_done ();
		560	#endif
		561
		562	#ifdef HAVE_SCROLLBARS
		563	if (option (Opt_scrollBar))
		564	scrollBar.setIdle (); /* set existence for size calculations */
		565	#endif
		566
		567	pty = ptytty::create ();
		568
		569	create_windows (argc, argv);
		570
		571	init_xlocale ();
		572
		573	scr_reset (); // initialize screen
		574
		575	#if 0
		576	XSynchronize (dpy, True);
		577	#endif
		578
		579	#ifdef HAVE_SCROLLBARS
		580	if (option (Opt_scrollBar))
		581	resize_scrollbar (); /* create and map scrollbar */
		582	#endif
		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 ();
473	}	659	}
474		660
475	/----------------------------------------------------------------------/	661	/----------------------------------------------------------------------/
476	void	662	void
477	rxvt_term::init_env ()	663	rxvt_term::init_env ()
478	{	664	{
479	int i;	665	int i;
480	unsigned int u;
481	char *val;	666	char *val;
482		667
483	#ifdef DISPLAY_IS_IP	668	#ifdef DISPLAY_IS_IP
484	/* Fixup display_name for export over pty to any interested terminal	669	/* 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	670	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
493	*/	678	*/
494	val = rxvt_network_display (rs[Rs_display_name]);	679	val = rxvt_network_display (rs[Rs_display_name]);
495	rs[Rs_display_name] = (const char *)val;	680	rs[Rs_display_name] = (const char *)val;
496		681
497	if (val == NULL)	682	if (val == NULL)
498	#endif /* DISPLAY_IS_IP */	683	#endif /* DISPLAY_IS_IP */
499	val = XDisplayString (dpy);	684	val = XDisplayString (dpy);
500		685
501	if (rs[Rs_display_name] == NULL)	686	if (rs[Rs_display_name] == NULL)
502	rs[Rs_display_name] = val; /* use broken `:0' value */	687	rs[Rs_display_name] = val; /* use broken `:0' value */
503		688
504	i = strlen (val);	689	i = strlen (val);
505	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	690	env_display = (char *)rxvt_malloc (i + 9);
506		691
507	sprintf (env_display, "DISPLAY=%s", val);	692	sprintf (env_display, "DISPLAY=%s", val);
508		693
509	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	694	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510		695
…		…
531	else	716	else
532	putenv ("COLORTERM=" COLORTERMENVFULL);	717	putenv ("COLORTERM=" COLORTERMENVFULL);
533		718
534	if (rs[Rs_term_name] != NULL)	719	if (rs[Rs_term_name] != NULL)
535	{	720	{
536	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);
537	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	722	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538	putenv (env_term);	723	putenv (env_term);
539	}	724	}
540	else	725	else
541	putenv ("TERM=" TERMENV);	726	putenv ("TERM=" TERMENV);
…		…
543	#ifdef HAVE_UNSETENV	728	#ifdef HAVE_UNSETENV
544	/* avoid passing old settings and confusing term size */	729	/* avoid passing old settings and confusing term size */
545	unsetenv ("LINES");	730	unsetenv ("LINES");
546	unsetenv ("COLUMNS");	731	unsetenv ("COLUMNS");
547	unsetenv ("TERMCAP"); /* terminfo should be okay */	732	unsetenv ("TERMCAP"); /* terminfo should be okay */
548	#endif /* HAVE_UNSETENV */	733	#endif /* HAVE_UNSETENV */
549	}	734	}
550		735
551	/----------------------------------------------------------------------/	736	/----------------------------------------------------------------------/
552	/*	737	/*
553	* This is more or less stolen straight from XFree86 xterm.	738	* This is more or less stolen straight from XFree86 xterm.
…		…
574		759
575	this->locale = "C";	760	this->locale = "C";
576	}	761	}
577		762
578		763
579	this->locale = rxvt_strdup (this->locale);	764	this->locale = strdup (this->locale);
580	SET_LOCALE (this->locale);	765	SET_LOCALE (this->locale);
581	mbstate.reset ();	766	mbstate.reset ();
582	#endif	767	#endif
583		768
584	#if HAVE_NL_LANGINFO	769	#if HAVE_NL_LANGINFO
…		…
641	priv_modes \|= PrivMode_Keypress;	826	priv_modes \|= PrivMode_Keypress;
642	if (!option (Opt_jumpScroll))	827	if (!option (Opt_jumpScroll))
643	priv_modes \|= PrivMode_smoothScroll;	828	priv_modes \|= PrivMode_smoothScroll;
644		829
645	#ifndef NO_BACKSPACE_KEY	830	#ifndef NO_BACKSPACE_KEY
646	if (strcmp (key_backspace, "DEC") == 0)	831	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647	priv_modes \|= PrivMode_HaveBackSpace;	832	priv_modes \|= PrivMode_HaveBackSpace;
648	#endif	833	#endif
649		834
650	/* add value for scrollBar */	835	/* add value for scrollBar */
651	if (scrollBar.state)	836	if (scrollBar.state)
…		…
664	int i;	849	int i;
665		850
666	#ifdef OFF_FOCUS_FADING	851	#ifdef OFF_FOCUS_FADING
667	pix_colors = pix_colors_focused;	852	pix_colors = pix_colors_focused;
668	#endif	853	#endif
669		854
670	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	855	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671	{	856	{
672	const char *name = rs[Rs_color + i];	857	const char *name = rs[Rs_color + i];
673		858
674	if (!name)	859	if (!name)
…		…
752	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),
753	cscroll.a)	938	cscroll.a)
754	))	939	))
755	alias_color (Color_topShadow, Color_White);	940	alias_color (Color_topShadow, Color_White);
756	}	941	}
757	#endif /* KEEP_SCROLLCOLOR */	942	#endif /* KEEP_SCROLLCOLOR */
758		943
759	#ifdef OFF_FOCUS_FADING	944	#ifdef OFF_FOCUS_FADING
760	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	945	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761	update_fade_color (i);	946	update_fade_color (i);
762	#endif	947	#endif
…		…
770	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	955	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771	{	956	{
772	int i = atoi (rs[Rs_color + idx]);	957	int i = atoi (rs[Rs_color + idx]);
773		958
774	if (i >= 8 && i <= 15)	959	if (i >= 8 && i <= 15)
775	{ /* bright colors */	960	/* bright colors */
776	i -= 8;
777	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	961	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778	return;	962	else if (i >= 0 && i <= 7)
779	}	963	/* normal colors */
780
781	if (i >= 0 && i <= 7) /* normal colors */
782	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	964	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783	}	965	}
784	}	966	}
785		967
786	/----------------------------------------------------------------------/	968	/----------------------------------------------------------------------/
…		…
878	rxvt_term::create_windows (int argc, const char const argv)	1060	rxvt_term::create_windows (int argc, const char const argv)
879	{	1061	{
880	XClassHint classHint;	1062	XClassHint classHint;
881	XWMHints wmHint;	1063	XWMHints wmHint;
882	#if ENABLE_FRILLS	1064	#if ENABLE_FRILLS
883	MWMHints mwmhints;	1065	MWMHints mwmhints = { };
884	#endif	1066	#endif
885	XGCValues gcvalue;	1067	XGCValues gcvalue;
886	XSetWindowAttributes attributes;	1068	XSetWindowAttributes attributes;
887	Window top, parent;	1069	Window top, parent;
888		1070
…		…
901	#if ENABLE_FRILLS	1083	#if ENABLE_FRILLS
902	if (option (Opt_borderLess))	1084	if (option (Opt_borderLess))
903	{	1085	{
904	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1086	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905	{	1087	{
906	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1088	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907	attributes.override_redirect = true;	1089	attributes.override_redirect = true;
908	mwmhints.flags = 0;
909	}	1090	}
910	else	1091	else
911	{	1092	{
912	mwmhints.flags = MWM_HINTS_DECORATIONS;	1093	mwmhints.flags = MWM_HINTS_DECORATIONS;
913	mwmhints.decorations = 0;
914	}	1094	}
915	}	1095	}
916	else
917	mwmhints.flags = 0;
918	#endif	1096	#endif
919		1097
920	#if ENABLE_XEMBED	1098	#if ENABLE_XEMBED
921	if (rs[Rs_embed])	1099	if (rs[Rs_embed])
922	{	1100	{
…		…
1006	termwin_ev.start (display, top);	1184	termwin_ev.start (display, top);
1007		1185
1008	/* 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 */
1009	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1187	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010		1188
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 */	1189	/* the vt window */
1017	vt = XCreateSimpleWindow (dpy, top,	1190	vt = XCreateSimpleWindow (dpy, top,
1018	window_vt_x, window_vt_y,	1191	window_vt_x, window_vt_y,
1019	width, height,	1192	width, height,
1020	0,	1193	0,
…		…
1033		1206
1034	vt_select_input ();	1207	vt_select_input ();
1035		1208
1036	vt_ev.start (display, vt);	1209	vt_ev.start (display, vt);
1037		1210
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 */	1211	/* graphics context for the vt window */
1059	gcvalue.foreground = pix_colors[Color_fg];	1212	gcvalue.foreground = pix_colors[Color_fg];
1060	gcvalue.background = pix_colors[Color_bg];	1213	gcvalue.background = pix_colors[Color_bg];
1061	gcvalue.graphics_exposures = 0;	1214	gcvalue.graphics_exposures = 0;
1062		1215
…		…
1064	GCForeground \| GCBackground \| GCGraphicsExposures,	1217	GCForeground \| GCBackground \| GCGraphicsExposures,
1065	&gcvalue);	1218	&gcvalue);
1066		1219
1067	drawable = new rxvt_drawable (this, vt);	1220	drawable = new rxvt_drawable (this, vt);
1068		1221
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	1222	#ifdef OFF_FOCUS_FADING
1079	// initially we are in unfocused state	1223	// initially we are in unfocused state
1080	if (rs[Rs_fade])	1224	if (rs[Rs_fade])
1081	pix_colors = pix_colors_unfocused;	1225	pix_colors = pix_colors_unfocused;
1082	#endif	1226	#endif
…		…
1087		1231
1088	/* ------------------------------------------------------------------------- *	1232	/* ------------------------------------------------------------------------- *
1089	* GET TTY CURRENT STATE *	1233	* GET TTY CURRENT STATE *
1090	* ------------------------------------------------------------------------- */	1234	* ------------------------------------------------------------------------- */
1091	void	1235	void
1092	rxvt_get_ttymode (ttymode_t *tio, int erase)	1236	rxvt_get_ttymode (struct termios *tio, int erase)
1093	{	1237	{
1094	/*	1238	/*
1095	* standard System V termios interface	1239	* standard System V termios interface
1096	*/	1240	*/
1097	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1241	if (tcgetattr (STDIN_FILENO, tio) < 0)
1098	{	1242	{
1099	// return error - use system defaults,	1243	// return error - use system defaults,
1100	// where possible, and zero elsewhere	1244	// where possible, and zero elsewhere
1101	memset (tio, 0, sizeof (ttymode_t));	1245	memset (tio, 0, sizeof (struct termios));
1102		1246
1103	tio->c_cc[VINTR] = CINTR;	1247	tio->c_cc[VINTR] = CINTR;
1104	tio->c_cc[VQUIT] = CQUIT;	1248	tio->c_cc[VQUIT] = CQUIT;
1105	tio->c_cc[VERASE] = CERASE;	1249	tio->c_cc[VERASE] = CERASE;
1106	#ifdef VERASE2	1250	#ifdef VERASE2
…		…
1170		1314
1171	/*	1315	/*
1172	* Debugging	1316	* Debugging
1173	*/	1317	*/
1174	#ifdef DEBUG_TTYMODE	1318	#ifdef DEBUG_TTYMODE
1175	#ifdef HAVE_TERMIOS_H
1176	/* c_iflag bits */	1319	/* c_iflag bits */
1177	fprintf (stderr, "Input flags\n");	1320	fprintf (stderr, "Input flags\n");
1178		1321
1179	/* cpp token stringize doesn't work on all machines <sigh> */	1322	/* cpp token stringize doesn't work on all machines <sigh> */
1180	# define FOO(flag,name) \	1323	# define FOO(flag,name) \
…		…
1243	FOO (VLNEXT, "VLNEXT");	1386	FOO (VLNEXT, "VLNEXT");
1244	# endif	1387	# endif
1245		1388
1246	fprintf (stderr, "\n");	1389	fprintf (stderr, "\n");
1247	# undef FOO	1390	# undef FOO
1248	# endif /* HAVE_TERMIOS_H */	1391	#endif /* DEBUG_TTYMODE */
1249	#endif /* DEBUG_TTYMODE */
1250	}	1392	}
1251		1393
1252	/----------------------------------------------------------------------/	1394	/----------------------------------------------------------------------/
1253	/*	1395	/*
1254	* 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
…		…
1278	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1420	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279		1421
1280	int er;	1422	int er;
1281		1423
1282	#ifndef NO_BACKSPACE_KEY	1424	#ifndef NO_BACKSPACE_KEY
1283	if (key_backspace[0] && !key_backspace[1])	1425	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284	er = key_backspace[0];	1426	er = rs[Rs_backspace_key][0];
1285	else if (strcmp (key_backspace, "DEC") == 0)	1427	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286	er = '\177'; /* the initial state anyway */	1428	er = '\177'; /* the initial state anyway */
1287	else	1429	else
1288	#endif	1430	#endif
1289	er = -1;	1431	er = -1;
1290		1432
1291	rxvt_get_ttymode (&tio, er);	1433	rxvt_get_ttymode (&tio, er);
1292	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);
1293	pty->set_utf8_mode (enc_utf8);	1438	pty->set_utf8_mode (enc_utf8);
1294		1439
1295	/* set initial window size */	1440	/* set initial window size */
1296	tt_winch ();	1441	tt_winch ();
1297		1442
…		…
1357	rxvt_term::run_child (const char const argv)	1502	rxvt_term::run_child (const char const argv)
1358	{	1503	{
1359	char *login;	1504	char *login;
1360		1505
1361	if (option (Opt_console))	1506	if (option (Opt_console))
		1507	{
1362	{ /* be virtual console, fail silently */	1508	/* be virtual console, fail silently */
1363	#ifdef TIOCCONS	1509	#ifdef TIOCCONS
1364	unsigned int on = 1;	1510	unsigned int on = 1;
1365		1511
1366	ioctl (STDIN_FILENO, TIOCCONS, &on);	1512	ioctl (STDIN_FILENO, TIOCCONS, &on);
1367	#elif defined (SRIOCSREDIR)	1513	#elif defined (SRIOCSREDIR)
…		…
1369		1515
1370	fd = open (CONSOLE, O_WRONLY, 0);	1516	fd = open (CONSOLE, O_WRONLY, 0);
1371	if (fd >= 0)	1517	if (fd >= 0)
1372	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1518	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373	close (fd);	1519	close (fd);
1374	#endif /* SRIOCSREDIR */	1520	#endif /* SRIOCSREDIR */
1375	}	1521	}
1376		1522
1377	/* reset signals and spin off the command interpreter */	1523	/* reset signals and spin off the command interpreter */
1378	signal (SIGINT, SIG_DFL);	1524	signal (SIGINT, SIG_DFL);
1379	signal (SIGQUIT, SIG_DFL);	1525	signal (SIGQUIT, SIG_DFL);
…		…
1386	*/	1532	*/
1387	#ifdef SIGTSTP	1533	#ifdef SIGTSTP
1388	signal (SIGTSTP, SIG_IGN);	1534	signal (SIGTSTP, SIG_IGN);
1389	signal (SIGTTIN, SIG_IGN);	1535	signal (SIGTTIN, SIG_IGN);
1390	signal (SIGTTOU, SIG_IGN);	1536	signal (SIGTTOU, SIG_IGN);
1391	#endif /* SIGTSTP */	1537	#endif /* SIGTSTP */
1392		1538
1393	// unblock signals (signals are blocked by iom.C	1539	// unblock signals (signals are blocked by iom.C
1394	sigset_t ss;	1540	sigset_t ss;
1395	sigemptyset (&ss);	1541	sigemptyset (&ss);
1396	sigprocmask (SIG_SETMASK, &ss, 0);	1542	sigprocmask (SIG_SETMASK, &ss, 0);
1397		1543
1398	/* command interpreter path */	1544	/* command interpreter path */
1399	if (argv != NULL)	1545	if (argv)
1400	{	1546	{
1401	# ifdef DEBUG_CMD	1547	# ifdef DEBUG_CMD
1402	int i;	1548	int i;
1403		1549
1404	for (i = 0; argv[i]; i++)	1550	for (i = 0; argv[i]; i++)
…		…
1413	const char argv0, shell;	1559	const char argv0, shell;
1414		1560
1415	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1561	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1416	shell = "/bin/sh";	1562	shell = "/bin/sh";
1417		1563
1418	argv0 = (const char *)rxvt_r_basename (shell);	1564	argv0 = (const char *)rxvt_basename (shell);
1419		1565
1420	if (option (Opt_loginShell))	1566	if (option (Opt_loginShell))
1421	{	1567	{
1422	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1568	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423		1569
1424	login[0] = '-';	1570	login[0] = '-';
1425	strcpy (&login[1], argv0);	1571	strcpy (&login[1], argv0);
1426	argv0 = login;	1572	argv0 = login;
1427	}	1573	}
1428		1574
1429	execlp (shell, argv0, NULL);	1575	execlp (shell, argv0, (char *)0);
1430	/* no error message: STDERR is closed! */	1576	/* no error message: STDERR is closed! */
1431	}	1577	}
1432		1578
1433	return -1;	1579	return -1;
1434	}	1580	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.185 by ayin, Sat Jun 9 08:12:38 2007 UTC vs. Revision 1.241 by root, Sat Jan 19 14:23:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.185 by ayin, Sat Jun 9 08:12:38 2007 UTC vs.
Revision 1.241 by root, Sat Jan 19 14:23:33 2008 UTC