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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.253 by root, Tue Jul 15 16:41:22 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>
45		46
46	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
47	# define X_LOCALE	48	# define X_LOCALE
48	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
49	#else	50	#else
…		…
154	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
155	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
156	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
157	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
158	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
159	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
160	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
161	# else	162	# else
162	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163	# endif	164	# endif
164	/* high-intensity colors */	165	/* high-intensity colors */
165	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
166	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
250	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
251		252
252	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
253	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
254	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
255	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
256	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
257	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
258	NULL, /* Color_border */	259	NULL, /* Color_border */
259	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
260	NULL, /* Color_BD */	261	NULL, /* Color_BD */
261	NULL, /* Color_IT */	262	NULL, /* Color_IT */
262	NULL, /* Color_UL */	263	NULL, /* Color_UL */
263	NULL, /* Color_RV */	264	NULL, /* Color_RV */
264	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
266	NULL, // Color_underline	267	NULL, // Color_underline
267	#endif	268	#endif
268	#ifdef OPTION_HC	269	#ifdef OPTION_HC
269	NULL,	270	NULL,
270	#endif	271	#endif
271	#ifdef KEEP_SCROLLCOLOR
272	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
273	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
274	#endif /* KEEP_SCROLLCOLOR */	275	#endif
275	#if ENABLE_TRANSPARENCY	276	#if ENABLE_TRANSPARENCY
276	NULL,	277	NULL,
277	#endif	278	#endif
278	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
279	"rgb:00/00/00",	280	"rgb:00/00/00",
280	#endif	281	#endif
281	};	282	};
282		283
283	bool	284	void
284	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
285	{	286	{
286	pix_colors = //	287	pix_colors = pix_colors_focused;
287	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288	#ifdef OFF_FOCUS_FADING
289	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290	#endif
291
292		288
293	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
294	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
295	want_refresh = 1;	291	want_refresh = 1;
296	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
…		…
298	nrow = 24;	294	nrow = 24;
299	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
300	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
301	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
302	saveLines = SAVELINES;	298	saveLines = SAVELINES;
303	numpix_colors = TOTAL_COLORS;
304		299
305	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
306		301
307	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
308	last_bot = last_state = -1;
309		303
310	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
311	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
312	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
313	set_option (Opt_skipScroll);	307	set_option (Opt_skipScroll);
314	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
315	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
316	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
317	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
318	set_option (Opt_iso14755_52);	312	set_option (Opt_iso14755_52);
319		313	set_option (Opt_buffered);
320	return true;
321	}	314	}
322		315
323	void	316	static void
324	rxvt_term::init_secondary ()	317	init_secondary ()
325	{	318	{
326	int i;	319	int i;
327		320
328	/*
329	* Close all unused file descriptors
330	* We don't want them, we don't need them.
331	*/
332	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
333	{	322	{
334	/* TODO: BOO HISS */
335	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
336	}	324	}
337	else if (i != STDIN_FILENO)	325	else if (i != STDIN_FILENO)
338	{	326	{
339	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
340	close (i);	328	close (i);
341	}	329	}
342		330
343	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345	#if 0 // schmorp sayz closing filies is murder
346	for (i = STDERR_FILENO + 1; i < num_fds; i++)
347	{
348	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349	if (i == 4 \|\| i == 7)
350	continue;
351	#endif
352	close (i);
353	}
354	#endif
355	}	332	}
356		333
357	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
358	const char **	335	const char **
359	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
…		…
416	if (rs[Rs_depth])	393	if (rs[Rs_depth])
417	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
418	#endif	395	#endif
419		396
420	#ifdef HAVE_AFTERIMAGE	397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
421	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);
422	#endif	401	#endif
423	free (r_argv);	402	free (r_argv);
424		403
425	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
…		…
479	#endif	458	#endif
480		459
481	/* no point having a scrollbar without having any scrollback! */	460	/* no point having a scrollbar without having any scrollback! */
482	if (!saveLines)	461	if (!saveLines)
483	set_option (Opt_scrollBar, 0);	462	set_option (Opt_scrollBar, 0);
484
485	#ifdef PRINTPIPE
486	if (!rs[Rs_print_pipe])
487	rs[Rs_print_pipe] = PRINTPIPE;
488	#endif
489		463
490	if (!rs[Rs_cutchars])	464	if (!rs[Rs_cutchars])
491	rs[Rs_cutchars] = CUTCHARS;	465	rs[Rs_cutchars] = CUTCHARS;
492		466
493	#ifndef NO_BACKSPACE_KEY	467	#ifndef NO_BACKSPACE_KEY
…		…
506	# else	480	# else
507	rs[Rs_delete_key] = "\033[3~";	481	rs[Rs_delete_key] = "\033[3~";
508	# endif	482	# endif
509	#endif	483	#endif
510		484
511	#ifdef HAVE_SCROLLBARS	485	scrollBar.setup (this);
512	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513	#endif
514		486
515	#ifdef XTERM_REVERSE_VIDEO	487	#ifdef XTERM_REVERSE_VIDEO
516	/* this is how xterm implements reverseVideo */	488	/* this is how xterm implements reverseVideo */
517	if (option (Opt_reverseVideo))	489	if (option (Opt_reverseVideo))
518	{	490	{
…		…
538	color_aliases (Color_fg);	510	color_aliases (Color_fg);
539	color_aliases (Color_bg);	511	color_aliases (Color_bg);
540	#ifndef NO_CURSORCOLOR	512	#ifndef NO_CURSORCOLOR
541	color_aliases (Color_cursor);	513	color_aliases (Color_cursor);
542	color_aliases (Color_cursor2);	514	color_aliases (Color_cursor2);
543	#endif /* NO_CURSORCOLOR */	515	#endif /* NO_CURSORCOLOR */
544	color_aliases (Color_pointer_fg);	516	color_aliases (Color_pointer_fg);
545	color_aliases (Color_pointer_bg);	517	color_aliases (Color_pointer_bg);
546	color_aliases (Color_border);	518	color_aliases (Color_border);
547	#ifndef NO_BOLD_UNDERLINE_REVERSE	519	#ifndef NO_BOLD_UNDERLINE_REVERSE
548	color_aliases (Color_BD);	520	color_aliases (Color_BD);
549	color_aliases (Color_UL);	521	color_aliases (Color_UL);
550	color_aliases (Color_RV);	522	color_aliases (Color_RV);
551	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	523	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552		524
553	if (!rs[Rs_color + Color_border])	525	if (!rs[Rs_color + Color_border])
554	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	526	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555		527
556	return cmd_argv;	528	return cmd_argv;
		529	}
		530
		531	/----------------------------------------------------------------------/
		532	void
		533	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		534	{
		535	this->envv = envv;
		536
		537	SET_R (this);
		538	set_locale ("");
		539	set_environ (envv); // a few things in X do not call setlocale :(
		540
		541	init_vars ();
		542
		543	init_secondary ();
		544
		545	const char **cmd_argv = init_resources (argc, argv);
		546
		547	#ifdef KEYSYM_RESOURCE
		548	keyboard->register_done ();
		549	#endif
		550
		551	if (const char *path = rs[Rs_chdir])
		552	if (*path) // ignored if empty
		553	{
		554	if (*path != '/')
		555	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		556
		557	if (chdir (path))
		558	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		559	}
		560
		561	if (option (Opt_scrollBar))
		562	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		563
		564	pty = ptytty::create ();
		565
		566	create_windows (argc, argv);
		567
		568	init_xlocale ();
		569
		570	scr_reset (); // initialize screen
		571
		572	#if 0
		573	XSynchronize (dpy, True);
		574	#endif
		575
		576	if (option (Opt_scrollBar))
		577	scrollBar.resize (); /* create and map scrollbar */
		578	#ifdef HAVE_BG_PIXMAP
		579	{
		580	bgPixmap.set_target (this);
		581	bgPixmap.invalidate ();
		582
		583	#ifdef ENABLE_TRANSPARENCY
		584	if (option (Opt_transparent))
		585	{
		586	bgPixmap.set_transparent ();
		587
		588	#ifdef HAVE_AFTERIMAGE
		589	if (rs [Rs_blurradius])
		590	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		591	#endif
		592	if (ISSET_PIXCOLOR (Color_tint))
		593	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		594
		595	if (rs [Rs_shade])
		596	bgPixmap.set_shade (rs [Rs_shade]);
		597
		598	bgPixmap.set_root_pixmap ();
		599	XSelectInput (dpy, display->root, PropertyChangeMask);
		600	rootwin_ev.start (display, display->root);
		601	}
		602	#endif
		603
		604	#ifdef BG_IMAGE_FROM_FILE
		605	if (rs[Rs_backgroundPixmap])
		606	{
		607	const char *p = rs[Rs_backgroundPixmap];
		608
		609	if ((p = strchr (p, ';')) != 0)
		610	{
		611	p++;
		612	bgPixmap.set_geometry (p);
		613	}
		614	else
		615	bgPixmap.set_defaultGeometry ();
		616
		617	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		618	if (!bgPixmap.window_position_sensitive ())
		619	update_background ();
		620	}
		621	#endif
		622	}
		623	#endif
		624
		625	#if ENABLE_PERL
		626	rootwin_ev.start (display, display->root);
		627	#endif
		628
		629	set_colorfgbg ();
		630
		631	init_command (cmd_argv);
		632
		633	free (cmd_argv);
		634
		635	if (pty->pty >= 0)
		636	pty_ev.start (pty->pty, ev::READ);
		637
		638	HOOK_INVOKE ((this, HOOK_START, DT_END));
		639
		640	#if ENABLE_XEMBED
		641	if (rs[Rs_embed])
		642	{
		643	long info[2] = { 0, XEMBED_MAPPED };
		644
		645	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		646	32, PropModeReplace, (unsigned char *)&info, 2);
		647	}
		648	#endif
		649
		650	XMapWindow (dpy, vt);
		651	XMapWindow (dpy, parent[0]);
		652
		653	refresh_check ();
557	}	654	}
558		655
559	/----------------------------------------------------------------------/	656	/----------------------------------------------------------------------/
560	void	657	void
561	rxvt_term::init_env ()	658	rxvt_term::init_env ()
…		…
576	*/	673	*/
577	val = rxvt_network_display (rs[Rs_display_name]);	674	val = rxvt_network_display (rs[Rs_display_name]);
578	rs[Rs_display_name] = (const char *)val;	675	rs[Rs_display_name] = (const char *)val;
579		676
580	if (val == NULL)	677	if (val == NULL)
581	#endif /* DISPLAY_IS_IP */	678	#endif /* DISPLAY_IS_IP */
582	val = XDisplayString (dpy);	679	val = XDisplayString (dpy);
583		680
584	if (rs[Rs_display_name] == NULL)	681	if (rs[Rs_display_name] == NULL)
585	rs[Rs_display_name] = val; /* use broken `:0' value */	682	rs[Rs_display_name] = val; /* use broken `:0' value */
586		683
…		…
626	#ifdef HAVE_UNSETENV	723	#ifdef HAVE_UNSETENV
627	/* avoid passing old settings and confusing term size */	724	/* avoid passing old settings and confusing term size */
628	unsetenv ("LINES");	725	unsetenv ("LINES");
629	unsetenv ("COLUMNS");	726	unsetenv ("COLUMNS");
630	unsetenv ("TERMCAP"); /* terminfo should be okay */	727	unsetenv ("TERMCAP"); /* terminfo should be okay */
631	#endif /* HAVE_UNSETENV */	728	#endif /* HAVE_UNSETENV */
632	}	729	}
633		730
634	/----------------------------------------------------------------------/	731	/----------------------------------------------------------------------/
635	/*	732	/*
636	* This is more or less stolen straight from XFree86 xterm.	733	* This is more or less stolen straight from XFree86 xterm.
…		…
657		754
658	this->locale = "C";	755	this->locale = "C";
659	}	756	}
660		757
661		758
662	this->locale = rxvt_strdup (this->locale);	759	this->locale = strdup (this->locale);
663	SET_LOCALE (this->locale);	760	SET_LOCALE (this->locale);
664	mbstate.reset ();	761	mbstate.reset ();
665	#endif	762	#endif
666		763
667	#if HAVE_NL_LANGINFO	764	#if HAVE_NL_LANGINFO
…		…
740	run_command (argv);	837	run_command (argv);
741	}	838	}
742		839
743	/----------------------------------------------------------------------/	840	/----------------------------------------------------------------------/
744	void	841	void
745	rxvt_term::Get_Colours ()	842	rxvt_term::get_colours ()
746	{	843	{
747	int i;	844	int i;
748		845
749	#ifdef OFF_FOCUS_FADING	846	#ifdef OFF_FOCUS_FADING
750	pix_colors = pix_colors_focused;	847	pix_colors = pix_colors_focused;
751	#endif	848	#endif
752		849
753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	850	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754	{	851	{
755	const char *name = rs[Rs_color + i];	852	const char *name = rs[Rs_color + i];
756		853
757	if (!name)	854	if (!name)
…		…
810	* get scrollBar shadow colors	907	* get scrollBar shadow colors
811	*	908	*
812	* The calculations of topShadow/bottomShadow values are adapted	909	* The calculations of topShadow/bottomShadow values are adapted
813	* from the fvwm window manager.	910	* from the fvwm window manager.
814	*/	911	*/
815	#ifdef KEEP_SCROLLCOLOR	912	#ifdef RXVT_SCROLLBAR
816	if (depth <= 2)	913	if (depth <= 2)
817	{	914	{
818	/* Monochrome */	915	/* Monochrome */
819	alias_color (Color_scroll, Color_fg);	916	alias_color (Color_scroll, Color_fg);
820	alias_color (Color_topShadow, Color_bg);	917	alias_color (Color_topShadow, Color_bg);
…		…
835	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	932	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836	cscroll.a)	933	cscroll.a)
837	))	934	))
838	alias_color (Color_topShadow, Color_White);	935	alias_color (Color_topShadow, Color_White);
839	}	936	}
840	#endif /* KEEP_SCROLLCOLOR */	937	#endif
841		938
842	#ifdef OFF_FOCUS_FADING	939	#ifdef OFF_FOCUS_FADING
843	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	940	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844	update_fade_color (i);	941	update_fade_color (i);
845	#endif	942	#endif
…		…
853	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	950	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854	{	951	{
855	int i = atoi (rs[Rs_color + idx]);	952	int i = atoi (rs[Rs_color + idx]);
856		953
857	if (i >= 8 && i <= 15)	954	if (i >= 8 && i <= 15)
858	{ /* bright colors */	955	/* bright colors */
859	i -= 8;
860	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	956	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861	return;	957	else if (i >= 0 && i <= 7)
862	}	958	/* normal colors */
863
864	if (i >= 0 && i <= 7) /* normal colors */
865	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	959	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866	}	960	}
867	}	961	}
868		962
869	/----------------------------------------------------------------------/	963	/----------------------------------------------------------------------/
…		…
970	Window top, parent;	1064	Window top, parent;
971		1065
972	dLocal (Display *, dpy);	1066	dLocal (Display *, dpy);
973		1067
974	/* grab colors before netscape does */	1068	/* grab colors before netscape does */
975	Get_Colours ();	1069	get_colours ();
976		1070
977	if (!set_fonts ())	1071	if (!set_fonts ())
978	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1072	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
979		1073
980	parent = display->root;	1074	parent = display->root;
…		…
1085	termwin_ev.start (display, top);	1179	termwin_ev.start (display, top);
1086		1180
1087	/* vt cursor: Black-on-White is standard, but this is more popular */	1181	/* vt cursor: Black-on-White is standard, but this is more popular */
1088	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1182	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1089		1183
1090	#ifdef HAVE_SCROLLBARS
1091	/* cursor scrollBar: Black-on-White */
1092	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093	#endif
1094
1095	/* the vt window */	1184	/* the vt window */
1096	vt = XCreateSimpleWindow (dpy, top,	1185	vt = XCreateSimpleWindow (dpy, top,
1097	window_vt_x, window_vt_y,	1186	window_vt_x, window_vt_y,
1098	width, height,	1187	width, height,
1099	0,	1188	0,
…		…
1123	GCForeground \| GCBackground \| GCGraphicsExposures,	1212	GCForeground \| GCBackground \| GCGraphicsExposures,
1124	&gcvalue);	1213	&gcvalue);
1125		1214
1126	drawable = new rxvt_drawable (this, vt);	1215	drawable = new rxvt_drawable (this, vt);
1127		1216
1128	#ifdef RXVT_SCROLLBAR
1129	gcvalue.foreground = pix_colors[Color_topShadow];
1130	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131	gcvalue.foreground = pix_colors[Color_bottomShadow];
1132	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135	#endif
1136
1137	#ifdef OFF_FOCUS_FADING	1217	#ifdef OFF_FOCUS_FADING
1138	// initially we are in unfocused state	1218	// initially we are in unfocused state
1139	if (rs[Rs_fade])	1219	if (rs[Rs_fade])
1140	pix_colors = pix_colors_unfocused;	1220	pix_colors = pix_colors_unfocused;
1141	#endif	1221	#endif
…		…
1146		1226
1147	/* ------------------------------------------------------------------------- *	1227	/* ------------------------------------------------------------------------- *
1148	* GET TTY CURRENT STATE *	1228	* GET TTY CURRENT STATE *
1149	* ------------------------------------------------------------------------- */	1229	* ------------------------------------------------------------------------- */
1150	void	1230	void
1151	rxvt_get_ttymode (ttymode_t *tio, int erase)	1231	rxvt_get_ttymode (struct termios *tio, int erase)
1152	{	1232	{
1153	/*	1233	/*
1154	* standard System V termios interface	1234	* standard System V termios interface
1155	*/	1235	*/
1156	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1236	if (tcgetattr (STDIN_FILENO, tio) < 0)
1157	{	1237	{
1158	// return error - use system defaults,	1238	// return error - use system defaults,
1159	// where possible, and zero elsewhere	1239	// where possible, and zero elsewhere
1160	memset (tio, 0, sizeof (ttymode_t));	1240	memset (tio, 0, sizeof (struct termios));
1161		1241
1162	tio->c_cc[VINTR] = CINTR;	1242	tio->c_cc[VINTR] = CINTR;
1163	tio->c_cc[VQUIT] = CQUIT;	1243	tio->c_cc[VQUIT] = CQUIT;
1164	tio->c_cc[VERASE] = CERASE;	1244	tio->c_cc[VERASE] = CERASE;
1165	#ifdef VERASE2	1245	#ifdef VERASE2
…		…
1229		1309
1230	/*	1310	/*
1231	* Debugging	1311	* Debugging
1232	*/	1312	*/
1233	#ifdef DEBUG_TTYMODE	1313	#ifdef DEBUG_TTYMODE
1234	#ifdef HAVE_TERMIOS_H
1235	/* c_iflag bits */	1314	/* c_iflag bits */
1236	fprintf (stderr, "Input flags\n");	1315	fprintf (stderr, "Input flags\n");
1237		1316
1238	/* cpp token stringize doesn't work on all machines <sigh> */	1317	/* cpp token stringize doesn't work on all machines <sigh> */
1239	# define FOO(flag,name) \	1318	# define FOO(flag,name) \
…		…
1302	FOO (VLNEXT, "VLNEXT");	1381	FOO (VLNEXT, "VLNEXT");
1303	# endif	1382	# endif
1304		1383
1305	fprintf (stderr, "\n");	1384	fprintf (stderr, "\n");
1306	# undef FOO	1385	# undef FOO
1307	# endif /* HAVE_TERMIOS_H */	1386	#endif /* DEBUG_TTYMODE */
1308	#endif /* DEBUG_TTYMODE */
1309	}	1387	}
1310		1388
1311	/----------------------------------------------------------------------/	1389	/----------------------------------------------------------------------/
1312	/*	1390	/*
1313	* Run the command in a subprocess and return a file descriptor for the	1391	* Run the command in a subprocess and return a file descriptor for the
…		…
1346	else	1424	else
1347	#endif	1425	#endif
1348	er = -1;	1426	er = -1;
1349		1427
1350	rxvt_get_ttymode (&tio, er);	1428	rxvt_get_ttymode (&tio, er);
1351	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1429	/* init terminal attributes */
		1430	cfsetospeed (&tio, BAUDRATE);
		1431	cfsetispeed (&tio, BAUDRATE);
		1432	tcsetattr (pty->tty, TCSANOW, &tio);
1352	pty->set_utf8_mode (enc_utf8);	1433	pty->set_utf8_mode (enc_utf8);
1353		1434
1354	/* set initial window size */	1435	/* set initial window size */
1355	tt_winch ();	1436	tt_winch ();
1356		1437
…		…
1416	rxvt_term::run_child (const char const argv)	1497	rxvt_term::run_child (const char const argv)
1417	{	1498	{
1418	char *login;	1499	char *login;
1419		1500
1420	if (option (Opt_console))	1501	if (option (Opt_console))
		1502	{
1421	{ /* be virtual console, fail silently */	1503	/* be virtual console, fail silently */
1422	#ifdef TIOCCONS	1504	#ifdef TIOCCONS
1423	unsigned int on = 1;	1505	unsigned int on = 1;
1424		1506
1425	ioctl (STDIN_FILENO, TIOCCONS, &on);	1507	ioctl (STDIN_FILENO, TIOCCONS, &on);
1426	#elif defined (SRIOCSREDIR)	1508	#elif defined (SRIOCSREDIR)
…		…
1428		1510
1429	fd = open (CONSOLE, O_WRONLY, 0);	1511	fd = open (CONSOLE, O_WRONLY, 0);
1430	if (fd >= 0)	1512	if (fd >= 0)
1431	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1513	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432	close (fd);	1514	close (fd);
1433	#endif /* SRIOCSREDIR */	1515	#endif /* SRIOCSREDIR */
1434	}	1516	}
1435		1517
1436	/* reset signals and spin off the command interpreter */	1518	/* reset signals and spin off the command interpreter */
1437	signal (SIGINT, SIG_DFL);	1519	signal (SIGINT, SIG_DFL);
1438	signal (SIGQUIT, SIG_DFL);	1520	signal (SIGQUIT, SIG_DFL);
…		…
1445	*/	1527	*/
1446	#ifdef SIGTSTP	1528	#ifdef SIGTSTP
1447	signal (SIGTSTP, SIG_IGN);	1529	signal (SIGTSTP, SIG_IGN);
1448	signal (SIGTTIN, SIG_IGN);	1530	signal (SIGTTIN, SIG_IGN);
1449	signal (SIGTTOU, SIG_IGN);	1531	signal (SIGTTOU, SIG_IGN);
1450	#endif /* SIGTSTP */	1532	#endif /* SIGTSTP */
1451
1452	// unblock signals (signals are blocked by iom.C
1453	sigset_t ss;
1454	sigemptyset (&ss);
1455	sigprocmask (SIG_SETMASK, &ss, 0);
1456		1533
1457	/* command interpreter path */	1534	/* command interpreter path */
1458	if (argv)	1535	if (argv)
1459	{	1536	{
1460	# ifdef DEBUG_CMD	1537	# ifdef DEBUG_CMD

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs. Revision 1.253 by root, Tue Jul 15 16:41:22 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.253 by root, Tue Jul 15 16:41:22 2008 UTC