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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.216 by ayin, Tue Oct 9 13:34:46 2007 UTC vs.
Revision 1.252 by root, Sun Jun 15 13:54:15 2008 UTC

…		…
10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>	10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>	11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14	* - extensive modifications	14	* - extensive modifications
15	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16	* - QNX support
17	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18	*	16	*
19	* 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
20	* 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
21	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
22	* (at your option) any later version.	20	* (at your option) any later version.
…		…
36		34
37	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
38	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
39	#include "rxvtutil.h"	37	#include "rxvtutil.h"
40	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
41		40
42	#include <limits>	41	#include <limits>
43		42
44	#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
45		59
46	#ifdef DISPLAY_IS_IP	60	#ifdef DISPLAY_IS_IP
47	/* On Solaris link with -lsocket and -lnsl */	61	/* On Solaris link with -lsocket and -lnsl */
48	#include <sys/types.h>	62	#include <sys/types.h>
49	#include <sys/socket.h>	63	#include <sys/socket.h>
…		…
141	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
142	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
143	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
144	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
145	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
146	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
147	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
148	# else	162	# else
149	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150	# endif	164	# endif
151	/* high-intensity colors */	165	/* high-intensity colors */
152	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
153	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
237	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
238		252
239	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
240	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
241	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
242	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
243	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
244	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
245	NULL, /* Color_border */	259	NULL, /* Color_border */
246	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
247	NULL, /* Color_BD */	261	NULL, /* Color_BD */
248	NULL, /* Color_IT */	262	NULL, /* Color_IT */
249	NULL, /* Color_UL */	263	NULL, /* Color_UL */
250	NULL, /* Color_RV */	264	NULL, /* Color_RV */
251	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
253	NULL, // Color_underline	267	NULL, // Color_underline
254	#endif	268	#endif
255	#ifdef OPTION_HC	269	#ifdef OPTION_HC
256	NULL,	270	NULL,
257	#endif	271	#endif
258	#ifdef KEEP_SCROLLCOLOR
259	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
260	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
261	#endif /* KEEP_SCROLLCOLOR */	275	#endif
262	#if ENABLE_TRANSPARENCY	276	#if ENABLE_TRANSPARENCY
263	NULL,	277	NULL,
264	#endif	278	#endif
265	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
266	"rgb:00/00/00",	280	"rgb:00/00/00",
267	#endif	281	#endif
268	};	282	};
269		283
270	bool	284	void
271	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
272	{	286	{
273	pix_colors = //	287	pix_colors = pix_colors_focused;
274	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275	#ifdef OFF_FOCUS_FADING
276	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277	#endif
278
279		288
280	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
281	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
282	want_refresh = 1;	291	want_refresh = 1;
283	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
…		…
285	nrow = 24;	294	nrow = 24;
286	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
287	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
288	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
289	saveLines = SAVELINES;	298	saveLines = SAVELINES;
290	numpix_colors = TOTAL_COLORS;
291		299
292	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
293		301
294	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
295	last_bot = last_state = -1;
296		303
297	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
298	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
299	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
300	set_option (Opt_skipScroll);	307	set_option (Opt_skipScroll);
301	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
302	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
303	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
304	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
305	set_option (Opt_iso14755_52);	312	set_option (Opt_iso14755_52);
306		313	set_option (Opt_buffered);
307	return true;
308	}	314	}
309		315
310	void	316	static void
311	rxvt_term::init_secondary ()	317	init_secondary ()
312	{	318	{
313	int i;	319	int i;
314		320
315	/*
316	* Close all unused file descriptors
317	* We don't want them, we don't need them.
318	*/
319	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
320	{	322	{
321	/* TODO: BOO HISS */
322	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
323	}	324	}
324	else if (i != STDIN_FILENO)	325	else if (i != STDIN_FILENO)
325	{	326	{
326	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
327	close (i);	328	close (i);
328	}	329	}
329		330
330	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332	#if 0 // schmorp sayz closing filies is murder
333	for (i = STDERR_FILENO + 1; i < num_fds; i++)
334	{
335	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336	if (i == 4 \|\| i == 7)
337	continue;
338	#endif
339	close (i);
340	}
341	#endif
342	}	332	}
343		333
344	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
345	const char **	335	const char **
346	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
…		…
356	break;	346	break;
357		347
358	if (r_argc == argc)	348	if (r_argc == argc)
359	cmd_argv = NULL;	349	cmd_argv = NULL;
360	else if (!argv[r_argc + 1])	350	else if (!argv[r_argc + 1])
361	rxvt_fatal ("-e requires an argument\n");	351	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
362	else	352	else
363	{	353	{
364	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));	354	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
365		355
366	for (i = 0; i < argc - r_argc - 1; i++)	356	for (i = 0; i < argc - r_argc - 1; i++)
…		…
386	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
387		377
388	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
389		379
390	if (!(display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
391	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	}
392		385
393	// using a local pointer decreases code size a lot	386	// using a local pointer decreases code size a lot
394	xa = display->xa;	387	xa = display->xa;
395		388
396	set (display);	389	set (display);
…		…
400	if (rs[Rs_depth])	393	if (rs[Rs_depth])
401	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
402	#endif	395	#endif
403		396
404	#ifdef HAVE_AFTERIMAGE	397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
405	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);
406	#endif	401	#endif
407	free (r_argv);	402	free (r_argv);
408		403
409	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
…		…
490	# else	485	# else
491	rs[Rs_delete_key] = "\033[3~";	486	rs[Rs_delete_key] = "\033[3~";
492	# endif	487	# endif
493	#endif	488	#endif
494		489
495	#ifdef HAVE_SCROLLBARS	490	scrollBar.setup (this);
496	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
497	#endif
498		491
499	#ifdef XTERM_REVERSE_VIDEO	492	#ifdef XTERM_REVERSE_VIDEO
500	/* this is how xterm implements reverseVideo */	493	/* this is how xterm implements reverseVideo */
501	if (option (Opt_reverseVideo))	494	if (option (Opt_reverseVideo))
502	{	495	{
…		…
522	color_aliases (Color_fg);	515	color_aliases (Color_fg);
523	color_aliases (Color_bg);	516	color_aliases (Color_bg);
524	#ifndef NO_CURSORCOLOR	517	#ifndef NO_CURSORCOLOR
525	color_aliases (Color_cursor);	518	color_aliases (Color_cursor);
526	color_aliases (Color_cursor2);	519	color_aliases (Color_cursor2);
527	#endif /* NO_CURSORCOLOR */	520	#endif /* NO_CURSORCOLOR */
528	color_aliases (Color_pointer_fg);	521	color_aliases (Color_pointer_fg);
529	color_aliases (Color_pointer_bg);	522	color_aliases (Color_pointer_bg);
530	color_aliases (Color_border);	523	color_aliases (Color_border);
531	#ifndef NO_BOLD_UNDERLINE_REVERSE	524	#ifndef NO_BOLD_UNDERLINE_REVERSE
532	color_aliases (Color_BD);	525	color_aliases (Color_BD);
533	color_aliases (Color_UL);	526	color_aliases (Color_UL);
534	color_aliases (Color_RV);	527	color_aliases (Color_RV);
535	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	528	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
536		529
537	if (!rs[Rs_color + Color_border])	530	if (!rs[Rs_color + Color_border])
538	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	531	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
539		532
540	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 ();
541	}	659	}
542		660
543	/----------------------------------------------------------------------/	661	/----------------------------------------------------------------------/
544	void	662	void
545	rxvt_term::init_env ()	663	rxvt_term::init_env ()
…		…
560	*/	678	*/
561	val = rxvt_network_display (rs[Rs_display_name]);	679	val = rxvt_network_display (rs[Rs_display_name]);
562	rs[Rs_display_name] = (const char *)val;	680	rs[Rs_display_name] = (const char *)val;
563		681
564	if (val == NULL)	682	if (val == NULL)
565	#endif /* DISPLAY_IS_IP */	683	#endif /* DISPLAY_IS_IP */
566	val = XDisplayString (dpy);	684	val = XDisplayString (dpy);
567		685
568	if (rs[Rs_display_name] == NULL)	686	if (rs[Rs_display_name] == NULL)
569	rs[Rs_display_name] = val; /* use broken `:0' value */	687	rs[Rs_display_name] = val; /* use broken `:0' value */
570		688
…		…
610	#ifdef HAVE_UNSETENV	728	#ifdef HAVE_UNSETENV
611	/* avoid passing old settings and confusing term size */	729	/* avoid passing old settings and confusing term size */
612	unsetenv ("LINES");	730	unsetenv ("LINES");
613	unsetenv ("COLUMNS");	731	unsetenv ("COLUMNS");
614	unsetenv ("TERMCAP"); /* terminfo should be okay */	732	unsetenv ("TERMCAP"); /* terminfo should be okay */
615	#endif /* HAVE_UNSETENV */	733	#endif /* HAVE_UNSETENV */
616	}	734	}
617		735
618	/----------------------------------------------------------------------/	736	/----------------------------------------------------------------------/
619	/*	737	/*
620	* This is more or less stolen straight from XFree86 xterm.	738	* This is more or less stolen straight from XFree86 xterm.
…		…
641		759
642	this->locale = "C";	760	this->locale = "C";
643	}	761	}
644		762
645		763
646	this->locale = rxvt_strdup (this->locale);	764	this->locale = strdup (this->locale);
647	SET_LOCALE (this->locale);	765	SET_LOCALE (this->locale);
648	mbstate.reset ();	766	mbstate.reset ();
649	#endif	767	#endif
650		768
651	#if HAVE_NL_LANGINFO	769	#if HAVE_NL_LANGINFO
…		…
724	run_command (argv);	842	run_command (argv);
725	}	843	}
726		844
727	/----------------------------------------------------------------------/	845	/----------------------------------------------------------------------/
728	void	846	void
729	rxvt_term::Get_Colours ()	847	rxvt_term::get_colours ()
730	{	848	{
731	int i;	849	int i;
732		850
733	#ifdef OFF_FOCUS_FADING	851	#ifdef OFF_FOCUS_FADING
734	pix_colors = pix_colors_focused;	852	pix_colors = pix_colors_focused;
735	#endif	853	#endif
736		854
737	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	855	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738	{	856	{
739	const char *name = rs[Rs_color + i];	857	const char *name = rs[Rs_color + i];
740		858
741	if (!name)	859	if (!name)
…		…
794	* get scrollBar shadow colors	912	* get scrollBar shadow colors
795	*	913	*
796	* The calculations of topShadow/bottomShadow values are adapted	914	* The calculations of topShadow/bottomShadow values are adapted
797	* from the fvwm window manager.	915	* from the fvwm window manager.
798	*/	916	*/
799	#ifdef KEEP_SCROLLCOLOR	917	#ifdef RXVT_SCROLLBAR
800	if (depth <= 2)	918	if (depth <= 2)
801	{	919	{
802	/* Monochrome */	920	/* Monochrome */
803	alias_color (Color_scroll, Color_fg);	921	alias_color (Color_scroll, Color_fg);
804	alias_color (Color_topShadow, Color_bg);	922	alias_color (Color_topShadow, Color_bg);
…		…
819	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),
820	cscroll.a)	938	cscroll.a)
821	))	939	))
822	alias_color (Color_topShadow, Color_White);	940	alias_color (Color_topShadow, Color_White);
823	}	941	}
824	#endif /* KEEP_SCROLLCOLOR */	942	#endif
825		943
826	#ifdef OFF_FOCUS_FADING	944	#ifdef OFF_FOCUS_FADING
827	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	945	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
828	update_fade_color (i);	946	update_fade_color (i);
829	#endif	947	#endif
…		…
837	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	955	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
838	{	956	{
839	int i = atoi (rs[Rs_color + idx]);	957	int i = atoi (rs[Rs_color + idx]);
840		958
841	if (i >= 8 && i <= 15)	959	if (i >= 8 && i <= 15)
842	{ /* bright colors */	960	/* bright colors */
843	i -= 8;
844	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	961	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
845	return;	962	else if (i >= 0 && i <= 7)
846	}	963	/* normal colors */
847
848	if (i >= 0 && i <= 7) /* normal colors */
849	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	964	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
850	}	965	}
851	}	966	}
852		967
853	/----------------------------------------------------------------------/	968	/----------------------------------------------------------------------/
…		…
954	Window top, parent;	1069	Window top, parent;
955		1070
956	dLocal (Display *, dpy);	1071	dLocal (Display *, dpy);
957		1072
958	/* grab colors before netscape does */	1073	/* grab colors before netscape does */
959	Get_Colours ();	1074	get_colours ();
960		1075
961	if (!set_fonts ())	1076	if (!set_fonts ())
962	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");
963		1078
964	parent = display->root;	1079	parent = display->root;
…		…
1069	termwin_ev.start (display, top);	1184	termwin_ev.start (display, top);
1070		1185
1071	/* 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 */
1072	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1187	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1073		1188
1074	#ifdef HAVE_SCROLLBARS
1075	/* cursor scrollBar: Black-on-White */
1076	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1077	#endif
1078
1079	/* the vt window */	1189	/* the vt window */
1080	vt = XCreateSimpleWindow (dpy, top,	1190	vt = XCreateSimpleWindow (dpy, top,
1081	window_vt_x, window_vt_y,	1191	window_vt_x, window_vt_y,
1082	width, height,	1192	width, height,
1083	0,	1193	0,
…		…
1107	GCForeground \| GCBackground \| GCGraphicsExposures,	1217	GCForeground \| GCBackground \| GCGraphicsExposures,
1108	&gcvalue);	1218	&gcvalue);
1109		1219
1110	drawable = new rxvt_drawable (this, vt);	1220	drawable = new rxvt_drawable (this, vt);
1111		1221
1112	#ifdef RXVT_SCROLLBAR
1113	gcvalue.foreground = pix_colors[Color_topShadow];
1114	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115	gcvalue.foreground = pix_colors[Color_bottomShadow];
1116	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1118	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119	#endif
1120
1121	#ifdef OFF_FOCUS_FADING	1222	#ifdef OFF_FOCUS_FADING
1122	// initially we are in unfocused state	1223	// initially we are in unfocused state
1123	if (rs[Rs_fade])	1224	if (rs[Rs_fade])
1124	pix_colors = pix_colors_unfocused;	1225	pix_colors = pix_colors_unfocused;
1125	#endif	1226	#endif
…		…
1130		1231
1131	/* ------------------------------------------------------------------------- *	1232	/* ------------------------------------------------------------------------- *
1132	* GET TTY CURRENT STATE *	1233	* GET TTY CURRENT STATE *
1133	* ------------------------------------------------------------------------- */	1234	* ------------------------------------------------------------------------- */
1134	void	1235	void
1135	rxvt_get_ttymode (ttymode_t *tio, int erase)	1236	rxvt_get_ttymode (struct termios *tio, int erase)
1136	{	1237	{
1137	/*	1238	/*
1138	* standard System V termios interface	1239	* standard System V termios interface
1139	*/	1240	*/
1140	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1241	if (tcgetattr (STDIN_FILENO, tio) < 0)
1141	{	1242	{
1142	// return error - use system defaults,	1243	// return error - use system defaults,
1143	// where possible, and zero elsewhere	1244	// where possible, and zero elsewhere
1144	memset (tio, 0, sizeof (ttymode_t));	1245	memset (tio, 0, sizeof (struct termios));
1145		1246
1146	tio->c_cc[VINTR] = CINTR;	1247	tio->c_cc[VINTR] = CINTR;
1147	tio->c_cc[VQUIT] = CQUIT;	1248	tio->c_cc[VQUIT] = CQUIT;
1148	tio->c_cc[VERASE] = CERASE;	1249	tio->c_cc[VERASE] = CERASE;
1149	#ifdef VERASE2	1250	#ifdef VERASE2
…		…
1213		1314
1214	/*	1315	/*
1215	* Debugging	1316	* Debugging
1216	*/	1317	*/
1217	#ifdef DEBUG_TTYMODE	1318	#ifdef DEBUG_TTYMODE
1218	#ifdef HAVE_TERMIOS_H
1219	/* c_iflag bits */	1319	/* c_iflag bits */
1220	fprintf (stderr, "Input flags\n");	1320	fprintf (stderr, "Input flags\n");
1221		1321
1222	/* cpp token stringize doesn't work on all machines <sigh> */	1322	/* cpp token stringize doesn't work on all machines <sigh> */
1223	# define FOO(flag,name) \	1323	# define FOO(flag,name) \
…		…
1286	FOO (VLNEXT, "VLNEXT");	1386	FOO (VLNEXT, "VLNEXT");
1287	# endif	1387	# endif
1288		1388
1289	fprintf (stderr, "\n");	1389	fprintf (stderr, "\n");
1290	# undef FOO	1390	# undef FOO
1291	# endif /* HAVE_TERMIOS_H */	1391	#endif /* DEBUG_TTYMODE */
1292	#endif /* DEBUG_TTYMODE */
1293	}	1392	}
1294		1393
1295	/----------------------------------------------------------------------/	1394	/----------------------------------------------------------------------/
1296	/*	1395	/*
1297	* 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
…		…
1330	else	1429	else
1331	#endif	1430	#endif
1332	er = -1;	1431	er = -1;
1333		1432
1334	rxvt_get_ttymode (&tio, er);	1433	rxvt_get_ttymode (&tio, er);
1335	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);
1336	pty->set_utf8_mode (enc_utf8);	1438	pty->set_utf8_mode (enc_utf8);
1337		1439
1338	/* set initial window size */	1440	/* set initial window size */
1339	tt_winch ();	1441	tt_winch ();
1340		1442
…		…
1400	rxvt_term::run_child (const char const argv)	1502	rxvt_term::run_child (const char const argv)
1401	{	1503	{
1402	char *login;	1504	char *login;
1403		1505
1404	if (option (Opt_console))	1506	if (option (Opt_console))
		1507	{
1405	{ /* be virtual console, fail silently */	1508	/* be virtual console, fail silently */
1406	#ifdef TIOCCONS	1509	#ifdef TIOCCONS
1407	unsigned int on = 1;	1510	unsigned int on = 1;
1408		1511
1409	ioctl (STDIN_FILENO, TIOCCONS, &on);	1512	ioctl (STDIN_FILENO, TIOCCONS, &on);
1410	#elif defined (SRIOCSREDIR)	1513	#elif defined (SRIOCSREDIR)
…		…
1412		1515
1413	fd = open (CONSOLE, O_WRONLY, 0);	1516	fd = open (CONSOLE, O_WRONLY, 0);
1414	if (fd >= 0)	1517	if (fd >= 0)
1415	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1518	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1416	close (fd);	1519	close (fd);
1417	#endif /* SRIOCSREDIR */	1520	#endif /* SRIOCSREDIR */
1418	}	1521	}
1419		1522
1420	/* reset signals and spin off the command interpreter */	1523	/* reset signals and spin off the command interpreter */
1421	signal (SIGINT, SIG_DFL);	1524	signal (SIGINT, SIG_DFL);
1422	signal (SIGQUIT, SIG_DFL);	1525	signal (SIGQUIT, SIG_DFL);
…		…
1429	*/	1532	*/
1430	#ifdef SIGTSTP	1533	#ifdef SIGTSTP
1431	signal (SIGTSTP, SIG_IGN);	1534	signal (SIGTSTP, SIG_IGN);
1432	signal (SIGTTIN, SIG_IGN);	1535	signal (SIGTTIN, SIG_IGN);
1433	signal (SIGTTOU, SIG_IGN);	1536	signal (SIGTTOU, SIG_IGN);
1434	#endif /* SIGTSTP */	1537	#endif /* SIGTSTP */
1435
1436	// unblock signals (signals are blocked by iom.C
1437	sigset_t ss;
1438	sigemptyset (&ss);
1439	sigprocmask (SIG_SETMASK, &ss, 0);
1440		1538
1441	/* command interpreter path */	1539	/* command interpreter path */
1442	if (argv)	1540	if (argv)
1443	{	1541	{
1444	# ifdef DEBUG_CMD	1542	# ifdef DEBUG_CMD

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.216 by ayin, Tue Oct 9 13:34:46 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.216 by ayin, Tue Oct 9 13:34:46 2007 UTC vs.
Revision 1.252 by root, Sun Jun 15 13:54:15 2008 UTC